diff options
786 files changed, 5571 insertions, 44782 deletions
diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk index 5e58a5568af6..bb2fece4e1c3 100644 --- a/Mk/bsd.kde.mk +++ b/Mk/bsd.kde.mk @@ -104,7 +104,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.5.5 +KDE_VERSION= 3.5.6 KDE_ORIGVER= ${KDE_VERSION} KDE_PREFIX?= ${LOCALBASE} diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk index 5e58a5568af6..bb2fece4e1c3 100644 --- a/Mk/bsd.kde4.mk +++ b/Mk/bsd.kde4.mk @@ -104,7 +104,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.5.5 +KDE_VERSION= 3.5.6 KDE_ORIGVER= ${KDE_VERSION} KDE_PREFIX?= ${LOCALBASE} @@ -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. +20070313: + AFFECTS: users of x11/kdebase3 + AUTHOR: kde@freebsd.org + + The HAL option has been turned on by default and the fstabbackend + patches which have kept the fstab backend for the media kioslave + at the status quo of KDE 3.5.3 have been removed. This means that + + MOUNTING DEVICES THROUGH KDE WILL NO LONGER WORK WITHOUT HAL. + + Thus if you wish to use device icons or the media:/ view in konqueror, + make sure to turn on the HAL option in the x11/kdebase3 port and also + read /usr/ports/UPDATING entry 20061219 and + http://www.freebsd.org/gnome/docs/faq2.html#q19 for more information on + using HAL. + 20070312: AFFECTS: all users of net/py-libdnet AUTHOR: tmclaugh@FreeBSD.org diff --git a/accessibility/kaccessible/distinfo b/accessibility/kaccessible/distinfo index 5d4e5ff1c639..57440d22c4b3 100644 --- a/accessibility/kaccessible/distinfo +++ b/accessibility/kaccessible/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaccessibility-3.5.5.tar.bz2) = a227e65e012b83c8635f6e16c4dc3259 -SHA256 (KDE/kdeaccessibility-3.5.5.tar.bz2) = c7f7ac0b1b2fb19e1ca22209e14bb12108094d5b12574ce2cf9683a497233030 -SIZE (KDE/kdeaccessibility-3.5.5.tar.bz2) = 8610846 +MD5 (KDE/kdeaccessibility-3.5.6.tar.bz2) = 03d3c9f4d8c2fd12b7d0e020e11cd88e +SHA256 (KDE/kdeaccessibility-3.5.6.tar.bz2) = 8e78da851bbe1d11f660c16e670cf1f33a6928d3561009f529bec45875352acf +SIZE (KDE/kdeaccessibility-3.5.6.tar.bz2) = 8614965 diff --git a/accessibility/kdeaccessibility/distinfo b/accessibility/kdeaccessibility/distinfo index 5d4e5ff1c639..57440d22c4b3 100644 --- a/accessibility/kdeaccessibility/distinfo +++ b/accessibility/kdeaccessibility/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaccessibility-3.5.5.tar.bz2) = a227e65e012b83c8635f6e16c4dc3259 -SHA256 (KDE/kdeaccessibility-3.5.5.tar.bz2) = c7f7ac0b1b2fb19e1ca22209e14bb12108094d5b12574ce2cf9683a497233030 -SIZE (KDE/kdeaccessibility-3.5.5.tar.bz2) = 8610846 +MD5 (KDE/kdeaccessibility-3.5.6.tar.bz2) = 03d3c9f4d8c2fd12b7d0e020e11cd88e +SHA256 (KDE/kdeaccessibility-3.5.6.tar.bz2) = 8e78da851bbe1d11f660c16e670cf1f33a6928d3561009f529bec45875352acf +SIZE (KDE/kdeaccessibility-3.5.6.tar.bz2) = 8614965 diff --git a/accessibility/kdeaccessibility4/distinfo b/accessibility/kdeaccessibility4/distinfo index 5d4e5ff1c639..57440d22c4b3 100644 --- a/accessibility/kdeaccessibility4/distinfo +++ b/accessibility/kdeaccessibility4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaccessibility-3.5.5.tar.bz2) = a227e65e012b83c8635f6e16c4dc3259 -SHA256 (KDE/kdeaccessibility-3.5.5.tar.bz2) = c7f7ac0b1b2fb19e1ca22209e14bb12108094d5b12574ce2cf9683a497233030 -SIZE (KDE/kdeaccessibility-3.5.5.tar.bz2) = 8610846 +MD5 (KDE/kdeaccessibility-3.5.6.tar.bz2) = 03d3c9f4d8c2fd12b7d0e020e11cd88e +SHA256 (KDE/kdeaccessibility-3.5.6.tar.bz2) = 8e78da851bbe1d11f660c16e670cf1f33a6928d3561009f529bec45875352acf +SIZE (KDE/kdeaccessibility-3.5.6.tar.bz2) = 8614965 diff --git a/accessibility/kmag/distinfo b/accessibility/kmag/distinfo index 5d4e5ff1c639..57440d22c4b3 100644 --- a/accessibility/kmag/distinfo +++ b/accessibility/kmag/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaccessibility-3.5.5.tar.bz2) = a227e65e012b83c8635f6e16c4dc3259 -SHA256 (KDE/kdeaccessibility-3.5.5.tar.bz2) = c7f7ac0b1b2fb19e1ca22209e14bb12108094d5b12574ce2cf9683a497233030 -SIZE (KDE/kdeaccessibility-3.5.5.tar.bz2) = 8610846 +MD5 (KDE/kdeaccessibility-3.5.6.tar.bz2) = 03d3c9f4d8c2fd12b7d0e020e11cd88e +SHA256 (KDE/kdeaccessibility-3.5.6.tar.bz2) = 8e78da851bbe1d11f660c16e670cf1f33a6928d3561009f529bec45875352acf +SIZE (KDE/kdeaccessibility-3.5.6.tar.bz2) = 8614965 diff --git a/accessibility/kmousetool/distinfo b/accessibility/kmousetool/distinfo index 5d4e5ff1c639..57440d22c4b3 100644 --- a/accessibility/kmousetool/distinfo +++ b/accessibility/kmousetool/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaccessibility-3.5.5.tar.bz2) = a227e65e012b83c8635f6e16c4dc3259 -SHA256 (KDE/kdeaccessibility-3.5.5.tar.bz2) = c7f7ac0b1b2fb19e1ca22209e14bb12108094d5b12574ce2cf9683a497233030 -SIZE (KDE/kdeaccessibility-3.5.5.tar.bz2) = 8610846 +MD5 (KDE/kdeaccessibility-3.5.6.tar.bz2) = 03d3c9f4d8c2fd12b7d0e020e11cd88e +SHA256 (KDE/kdeaccessibility-3.5.6.tar.bz2) = 8e78da851bbe1d11f660c16e670cf1f33a6928d3561009f529bec45875352acf +SIZE (KDE/kdeaccessibility-3.5.6.tar.bz2) = 8614965 diff --git a/accessibility/kmouth/distinfo b/accessibility/kmouth/distinfo index 5d4e5ff1c639..57440d22c4b3 100644 --- a/accessibility/kmouth/distinfo +++ b/accessibility/kmouth/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaccessibility-3.5.5.tar.bz2) = a227e65e012b83c8635f6e16c4dc3259 -SHA256 (KDE/kdeaccessibility-3.5.5.tar.bz2) = c7f7ac0b1b2fb19e1ca22209e14bb12108094d5b12574ce2cf9683a497233030 -SIZE (KDE/kdeaccessibility-3.5.5.tar.bz2) = 8610846 +MD5 (KDE/kdeaccessibility-3.5.6.tar.bz2) = 03d3c9f4d8c2fd12b7d0e020e11cd88e +SHA256 (KDE/kdeaccessibility-3.5.6.tar.bz2) = 8e78da851bbe1d11f660c16e670cf1f33a6928d3561009f529bec45875352acf +SIZE (KDE/kdeaccessibility-3.5.6.tar.bz2) = 8614965 diff --git a/arabic/kde3-i18n/distinfo b/arabic/kde3-i18n/distinfo index bbe11ee0e528..718f52309b6c 100644 --- a/arabic/kde3-i18n/distinfo +++ b/arabic/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ar-3.5.5.tar.bz2) = 237879698e967ba9384b6800f8517ce2 -SHA256 (KDE/kde-i18n/kde-i18n-ar-3.5.5.tar.bz2) = bd63cd5946a5ae1a6b843333f37d555956f2d6d8941626b5c8f8fcbaf3afe98d -SIZE (KDE/kde-i18n/kde-i18n-ar-3.5.5.tar.bz2) = 1646611 +MD5 (KDE/kde-i18n/kde-i18n-ar-3.5.6.tar.bz2) = e79ef203dfc9196ea75089dfcd99339d +SHA256 (KDE/kde-i18n/kde-i18n-ar-3.5.6.tar.bz2) = 885edbdabbdc5ebd014faa42ba2478e0f35551dbe98d075be950e45777c1ae6f +SIZE (KDE/kde-i18n/kde-i18n-ar-3.5.6.tar.bz2) = 1637830 diff --git a/arabic/kde4-l10n/distinfo b/arabic/kde4-l10n/distinfo index bbe11ee0e528..718f52309b6c 100644 --- a/arabic/kde4-l10n/distinfo +++ b/arabic/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ar-3.5.5.tar.bz2) = 237879698e967ba9384b6800f8517ce2 -SHA256 (KDE/kde-i18n/kde-i18n-ar-3.5.5.tar.bz2) = bd63cd5946a5ae1a6b843333f37d555956f2d6d8941626b5c8f8fcbaf3afe98d -SIZE (KDE/kde-i18n/kde-i18n-ar-3.5.5.tar.bz2) = 1646611 +MD5 (KDE/kde-i18n/kde-i18n-ar-3.5.6.tar.bz2) = e79ef203dfc9196ea75089dfcd99339d +SHA256 (KDE/kde-i18n/kde-i18n-ar-3.5.6.tar.bz2) = 885edbdabbdc5ebd014faa42ba2478e0f35551dbe98d075be950e45777c1ae6f +SIZE (KDE/kde-i18n/kde-i18n-ar-3.5.6.tar.bz2) = 1637830 diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile index b686c7c02ca1..d2a8b1c1613f 100644 --- a/archivers/ark/Makefile +++ b/archivers/ark/Makefile @@ -7,7 +7,6 @@ PORTNAME= kdeutils PORTVERSION= ${KDE_VERSION} -PORTREVISION= 3 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -18,7 +17,7 @@ COMMENT= Utilities for the KDE integrated X11 desktop LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4 \ netsnmp:${PORTSDIR}/net-mgmt/net-snmp -RUN_DEPENDS= gpgv:${PORTSDIR}/security/gnupg1 +RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg CONFLICTS= kgpg-[0-9]* superkaramba-[0-9]* @@ -35,7 +34,7 @@ DO_NOT_COMPILE+=klaptopdaemon kmilo CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}" CONFIGURE_ARGS+=--with-pythondir=${LOCALBASE} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/archivers/ark/distinfo b/archivers/ark/distinfo index cdaf81b48169..eecf40517f6e 100644 --- a/archivers/ark/distinfo +++ b/archivers/ark/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.5.tar.bz2) = a20a732284a3dcb735665e45f5be532e -SHA256 (KDE/kdeutils-3.5.5.tar.bz2) = 38914c84c8829ba7beb8a0e0c0ef8b4c7eee29b588c6529ff39c0bc0370f0457 -SIZE (KDE/kdeutils-3.5.5.tar.bz2) = 2988542 +MD5 (KDE/kdeutils-3.5.6.tar.bz2) = e0ea2c15ccf2bd3d8be5f2bf57cfe14a +SHA256 (KDE/kdeutils-3.5.6.tar.bz2) = 7efc558fca536a0b86abd51d7b0b9ca168e8364c222115e29424662acb0e473b +SIZE (KDE/kdeutils-3.5.6.tar.bz2) = 2989659 diff --git a/archivers/ark/pkg-plist b/archivers/ark/pkg-plist index bcd5d9ba088a..782d19b830c1 100644 --- a/archivers/ark/pkg-plist +++ b/archivers/ark/pkg-plist @@ -123,7 +123,6 @@ share/applications/kde/kdf.desktop share/applications/kde/kgpg.desktop share/applications/kde/khexedit.desktop share/applications/kde/kregexpeditor.desktop -share/applications/kde/ksim.desktop share/applications/kde/ktimer.desktop share/applications/kde/kwalletconfig.desktop share/applications/kde/kwalletmanager-kwalletd.desktop diff --git a/audio/akode-plugins-jack/Makefile b/audio/akode-plugins-jack/Makefile index 15cde94d34d3..e1e819eaf59c 100644 --- a/audio/akode-plugins-jack/Makefile +++ b/audio/akode-plugins-jack/Makefile @@ -29,7 +29,7 @@ USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/akode-${PORTVERSION} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ENV+= LDFLAGS=-L${WRKSRC}/akode/lib/.libs CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \ diff --git a/audio/akode-plugins-mpc/Makefile b/audio/akode-plugins-mpc/Makefile index 21ded33fa9d4..e4407b3b0d27 100644 --- a/audio/akode-plugins-mpc/Makefile +++ b/audio/akode-plugins-mpc/Makefile @@ -28,7 +28,7 @@ USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/akode-${PORTVERSION} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ENV+= LDFLAGS=-L${WRKSRC}/akode/lib/.libs CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \ diff --git a/audio/akode-plugins-mpeg/Makefile b/audio/akode-plugins-mpeg/Makefile index 95eaaeb6cead..20d6efc9cb77 100644 --- a/audio/akode-plugins-mpeg/Makefile +++ b/audio/akode-plugins-mpeg/Makefile @@ -30,7 +30,7 @@ USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/akode-${PORTVERSION} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ENV+= LDFLAGS=-L${WRKSRC}/akode/lib/.libs CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \ diff --git a/audio/akode-plugins-oss/Makefile b/audio/akode-plugins-oss/Makefile index 1e182dc3edd2..4f55d42c3972 100644 --- a/audio/akode-plugins-oss/Makefile +++ b/audio/akode-plugins-oss/Makefile @@ -28,7 +28,7 @@ USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/akode-${PORTVERSION} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ENV+= LDFLAGS=-L${WRKSRC}/akode/lib/.libs CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \ diff --git a/audio/akode-plugins-polypaudio/Makefile b/audio/akode-plugins-polypaudio/Makefile index c7082f309c5d..4eb23c20f00f 100644 --- a/audio/akode-plugins-polypaudio/Makefile +++ b/audio/akode-plugins-polypaudio/Makefile @@ -29,7 +29,7 @@ USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/akode-${PORTVERSION} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ENV+= LDFLAGS=-L${WRKSRC}/akode/lib/.libs CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \ diff --git a/audio/akode-plugins-resampler/Makefile b/audio/akode-plugins-resampler/Makefile index 3fdce8d9258b..3c8436adb9ae 100644 --- a/audio/akode-plugins-resampler/Makefile +++ b/audio/akode-plugins-resampler/Makefile @@ -29,7 +29,7 @@ USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/akode-${PORTVERSION} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ENV+= LDFLAGS=-L${WRKSRC}/akode/lib/.libs CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \ diff --git a/audio/akode-plugins-xiph/Makefile b/audio/akode-plugins-xiph/Makefile index 4b752f3ba13a..cd74bbdeac93 100644 --- a/audio/akode-plugins-xiph/Makefile +++ b/audio/akode-plugins-xiph/Makefile @@ -32,7 +32,7 @@ USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/akode-${PORTVERSION} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ENV+= LDFLAGS=-L${WRKSRC}/akode/lib/.libs CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \ diff --git a/audio/akode/Makefile b/audio/akode/Makefile index 6974a3bc6cd6..90b85c7c9641 100644 --- a/audio/akode/Makefile +++ b/audio/akode/Makefile @@ -32,7 +32,7 @@ USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB+= MACHINE_ARCH=${MACHINE_ARCH} CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ diff --git a/audio/arts/Makefile b/audio/arts/Makefile index f877fe7b3eb4..2d1d1577b112 100644 --- a/audio/arts/Makefile +++ b/audio/arts/Makefile @@ -7,7 +7,7 @@ # PORTNAME= arts -PORTVERSION= 1.5.5 +PORTVERSION= 1.5.6 PORTEPOCH= 1 CATEGORIES= audio kde MASTER_SITES= ${MASTER_SITE_KDE} @@ -29,7 +29,7 @@ USE_QT_VER= 3 USE_BZIP2= yes USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes QTCPPFLAGS+= -L${LOCALBASE}/lib DO_NOT_COMPILE+=gmcop _NO_KDE_FINAL= yes diff --git a/audio/arts/distinfo b/audio/arts/distinfo index d424862e9a9b..c0e291daeb28 100644 --- a/audio/arts/distinfo +++ b/audio/arts/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/arts-1.5.5.tar.bz2) = 3b0aa1ee08c6ef2aefd8d2d88d1ec146 -SHA256 (KDE/arts-1.5.5.tar.bz2) = 2e5d5f07078ac79911815c25c6768b7fbf3c54989a4fc5b52a07e4a73b50aec1 -SIZE (KDE/arts-1.5.5.tar.bz2) = 967552 +MD5 (KDE/arts-1.5.6.tar.bz2) = e986393a5827499bbad04a00b797add0 +SHA256 (KDE/arts-1.5.6.tar.bz2) = 66f03a329e45c8a4a96c14c42cf28b9e6803d70740950e238c5ea494b2ab93df +SIZE (KDE/arts-1.5.6.tar.bz2) = 966746 diff --git a/audio/juk/Makefile b/audio/juk/Makefile index 3c5c9d9ee84a..abddc4c304ff 100644 --- a/audio/juk/Makefile +++ b/audio/juk/Makefile @@ -33,7 +33,7 @@ USE_BZIP2= yes USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes WRKSRC= ${WRKDIR}/kdemultimedia-${PORTVERSION} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS+=CFLAGS=-I${LOCALBASE}/include/tunepimp-0.4 \ LDFLAGS=-L${LOCALBASE}/lib/tunepimp-0.4 diff --git a/audio/juk/distinfo b/audio/juk/distinfo index 9b50fd30006c..a745fd185171 100644 --- a/audio/juk/distinfo +++ b/audio/juk/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdemultimedia-3.5.5.tar.bz2) = fc8f0911050c42aec0636cf3873e22ba -SHA256 (KDE/kdemultimedia-3.5.5.tar.bz2) = 1c15f9572bec29fbfac5224b7f7c88bd57375c827622a9017d3861475881fb4c -SIZE (KDE/kdemultimedia-3.5.5.tar.bz2) = 6287234 +MD5 (KDE/kdemultimedia-3.5.6.tar.bz2) = 57c50bfcb0147324a1af02ebcc103376 +SHA256 (KDE/kdemultimedia-3.5.6.tar.bz2) = 1a08f71c73cacb1da1d2269d0376193c23de727235a255866f869caeea300719 +SIZE (KDE/kdemultimedia-3.5.6.tar.bz2) = 6291692 diff --git a/audio/mpeglib_artsplug/Makefile b/audio/mpeglib_artsplug/Makefile index 2881c90ddc19..c5b18cada626 100644 --- a/audio/mpeglib_artsplug/Makefile +++ b/audio/mpeglib_artsplug/Makefile @@ -29,7 +29,7 @@ USE_BZIP2= yes USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes WRKSRC= ${WRKDIR}/kdemultimedia-${PORTVERSION} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes pre-configure: ${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g' ${WRKSRC}/configure diff --git a/audio/mpeglib_artsplug/distinfo b/audio/mpeglib_artsplug/distinfo index 9b50fd30006c..a745fd185171 100644 --- a/audio/mpeglib_artsplug/distinfo +++ b/audio/mpeglib_artsplug/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdemultimedia-3.5.5.tar.bz2) = fc8f0911050c42aec0636cf3873e22ba -SHA256 (KDE/kdemultimedia-3.5.5.tar.bz2) = 1c15f9572bec29fbfac5224b7f7c88bd57375c827622a9017d3861475881fb4c -SIZE (KDE/kdemultimedia-3.5.5.tar.bz2) = 6287234 +MD5 (KDE/kdemultimedia-3.5.6.tar.bz2) = 57c50bfcb0147324a1af02ebcc103376 +SHA256 (KDE/kdemultimedia-3.5.6.tar.bz2) = 1a08f71c73cacb1da1d2269d0376193c23de727235a255866f869caeea300719 +SIZE (KDE/kdemultimedia-3.5.6.tar.bz2) = 6291692 diff --git a/chinese/calligra-l10n-zh_CN/Makefile b/chinese/calligra-l10n-zh_CN/Makefile index 51c2f5739ff0..bc56586813cf 100644 --- a/chinese/calligra-l10n-zh_CN/Makefile +++ b/chinese/calligra-l10n-zh_CN/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= chinese kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/chinese/calligra-l10n-zh_CN/distinfo b/chinese/calligra-l10n-zh_CN/distinfo index 83fe79adc6f7..c7438fe761cd 100644 --- a/chinese/calligra-l10n-zh_CN/distinfo +++ b/chinese/calligra-l10n-zh_CN/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.1.tar.bz2) = 055cf1eed59bc1e491063d4ffa883d9b -SHA256 (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.1.tar.bz2) = f7645d5785e9f014423c2e5952adbdf6e281fdea1a3c7f46304d52b72c66bf23 -SIZE (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.1.tar.bz2) = 359950 +MD5 (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.2.tar.bz2) = 64e8c0cac900d22d4a1cc04c9be160af +SHA256 (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.2.tar.bz2) = ee4e5d237fa7291235e50e8ea3f0b814fad17425bfed21c2c362df9ad62905a9 +SIZE (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.2.tar.bz2) = 360552 diff --git a/chinese/calligra-l10n-zh_CN/pkg-plist b/chinese/calligra-l10n-zh_CN/pkg-plist index 0b464a615910..a6ae7f0b275a 100644 --- a/chinese/calligra-l10n-zh_CN/pkg-plist +++ b/chinese/calligra-l10n-zh_CN/pkg-plist @@ -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_abiword.mo share/locale/zh_CN/LC_MESSAGES/kfile_gnumeric.mo diff --git a/chinese/calligra-l10n-zh_TW/Makefile b/chinese/calligra-l10n-zh_TW/Makefile index e83e9975bfd3..ad67689576bd 100644 --- a/chinese/calligra-l10n-zh_TW/Makefile +++ b/chinese/calligra-l10n-zh_TW/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= chinese kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/chinese/calligra-l10n-zh_TW/distinfo b/chinese/calligra-l10n-zh_TW/distinfo index 1fc0c8365c79..15ab322ee0c9 100644 --- a/chinese/calligra-l10n-zh_TW/distinfo +++ b/chinese/calligra-l10n-zh_TW/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.1.tar.bz2) = 230b02b893873f1fd55f002509549793 -SHA256 (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.1.tar.bz2) = 8683281d2e6fc0610deaca00755d075384a8da78333261f3e614792410a05170 -SIZE (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.1.tar.bz2) = 370170 +MD5 (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.2.tar.bz2) = bc25552d0a21146b542bc764c1fed5a1 +SHA256 (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.2.tar.bz2) = d128a1e15ee65fb1357838df1923c96a9dd9bb95b504466543fbd5fd3a882bed +SIZE (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.2.tar.bz2) = 370875 diff --git a/chinese/calligra-l10n-zh_TW/pkg-plist b/chinese/calligra-l10n-zh_TW/pkg-plist index 2a1040f2cfdc..b84480f92d10 100644 --- a/chinese/calligra-l10n-zh_TW/pkg-plist +++ b/chinese/calligra-l10n-zh_TW/pkg-plist @@ -2,7 +2,6 @@ share/locale/zh_TW/LC_MESSAGES/desktop_koffice.mo share/locale/zh_TW/LC_MESSAGES/example.mo share/locale/zh_TW/LC_MESSAGES/karbon.mo share/locale/zh_TW/LC_MESSAGES/kchart.mo -share/locale/zh_TW/LC_MESSAGES/kdgantt.mo share/locale/zh_TW/LC_MESSAGES/kexi.mo share/locale/zh_TW/LC_MESSAGES/kfile_abiword.mo share/locale/zh_TW/LC_MESSAGES/kfile_gnumeric.mo diff --git a/chinese/kde3-i18n-zh_CN/distinfo b/chinese/kde3-i18n-zh_CN/distinfo index d8c95ea76e1e..5f8995c8fd80 100644 --- a/chinese/kde3-i18n-zh_CN/distinfo +++ b/chinese/kde3-i18n-zh_CN/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-zh_CN-3.5.5.tar.bz2) = c0df78b39982a1ba117539e86c0dabb8 -SHA256 (KDE/kde-i18n/kde-i18n-zh_CN-3.5.5.tar.bz2) = 9eb31fe27bb140c858bc8a17b149eb9e410e907033757cfcff9689597a872675 -SIZE (KDE/kde-i18n/kde-i18n-zh_CN-3.5.5.tar.bz2) = 1969823 +MD5 (KDE/kde-i18n/kde-i18n-zh_CN-3.5.6.tar.bz2) = a74fb6fee6d36a8bd975bb7b1b97fb4c +SHA256 (KDE/kde-i18n/kde-i18n-zh_CN-3.5.6.tar.bz2) = 6e3e3779d6606c4cbc9dc6d322028d630f850cdadf78cb7ef1dcd500fbfd37f1 +SIZE (KDE/kde-i18n/kde-i18n-zh_CN-3.5.6.tar.bz2) = 1969364 diff --git a/chinese/kde3-i18n-zh_CN/pkg-plist b/chinese/kde3-i18n-zh_CN/pkg-plist index 85f045f61565..536037a48201 100644 --- a/chinese/kde3-i18n-zh_CN/pkg-plist +++ b/chinese/kde3-i18n-zh_CN/pkg-plist @@ -268,6 +268,7 @@ share/locale/zh_CN/LC_MESSAGES/khotkeys.mo share/locale/zh_CN/LC_MESSAGES/khtmlkttsd.mo share/locale/zh_CN/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/zh_CN/LC_MESSAGES/kicker.mo +share/locale/zh_CN/LC_MESSAGES/kickermenu_kate.mo share/locale/zh_CN/LC_MESSAGES/kiconedit.mo share/locale/zh_CN/LC_MESSAGES/kig.mo share/locale/zh_CN/LC_MESSAGES/kimagemapeditor.mo diff --git a/chinese/kde3-i18n-zh_TW/distinfo b/chinese/kde3-i18n-zh_TW/distinfo index 50347a0ac13b..3a09644479ab 100644 --- a/chinese/kde3-i18n-zh_TW/distinfo +++ b/chinese/kde3-i18n-zh_TW/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-zh_TW-3.5.5.tar.bz2) = 6c1051a985f68563380844dec9080248 -SHA256 (KDE/kde-i18n/kde-i18n-zh_TW-3.5.5.tar.bz2) = 0ead24dca3410ae0dd9f022964dc17398dbeea62ab19bc16a47d34c6bc386d14 -SIZE (KDE/kde-i18n/kde-i18n-zh_TW-3.5.5.tar.bz2) = 2111961 +MD5 (KDE/kde-i18n/kde-i18n-zh_TW-3.5.6.tar.bz2) = f6211661d09cf7dcc381147d084537a7 +SHA256 (KDE/kde-i18n/kde-i18n-zh_TW-3.5.6.tar.bz2) = b0247e56c711f2755b54c21d769a823bf8b39e5585cc6756552e94e95a79b840 +SIZE (KDE/kde-i18n/kde-i18n-zh_TW-3.5.6.tar.bz2) = 2215756 diff --git a/chinese/kde3-i18n-zh_TW/pkg-plist b/chinese/kde3-i18n-zh_TW/pkg-plist index 298fd8702f3b..731d7ba0e364 100644 --- a/chinese/kde3-i18n-zh_TW/pkg-plist +++ b/chinese/kde3-i18n-zh_TW/pkg-plist @@ -85,6 +85,7 @@ share/locale/zh_TW/LC_MESSAGES/kaboodle.mo share/locale/zh_TW/LC_MESSAGES/kaccess.mo share/locale/zh_TW/LC_MESSAGES/kaddressbook.mo share/locale/zh_TW/LC_MESSAGES/kalarm.mo +share/locale/zh_TW/LC_MESSAGES/kalzium.mo share/locale/zh_TW/LC_MESSAGES/kanagram.mo share/locale/zh_TW/LC_MESSAGES/kandy.mo share/locale/zh_TW/LC_MESSAGES/kappfinder.mo @@ -122,6 +123,7 @@ share/locale/zh_TW/LC_MESSAGES/kbounce.mo share/locale/zh_TW/LC_MESSAGES/kbruch.mo share/locale/zh_TW/LC_MESSAGES/kbstateapplet.mo share/locale/zh_TW/LC_MESSAGES/kbugbuster.mo +share/locale/zh_TW/LC_MESSAGES/kcachegrind.mo share/locale/zh_TW/LC_MESSAGES/kcalc.mo share/locale/zh_TW/LC_MESSAGES/kcharselect.mo share/locale/zh_TW/LC_MESSAGES/kcharselectapplet.mo @@ -304,7 +306,9 @@ share/locale/zh_TW/LC_MESSAGES/khotkeys.mo share/locale/zh_TW/LC_MESSAGES/khtmlkttsd.mo share/locale/zh_TW/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/zh_TW/LC_MESSAGES/kicker.mo +share/locale/zh_TW/LC_MESSAGES/kickermenu_kate.mo share/locale/zh_TW/LC_MESSAGES/kiconedit.mo +share/locale/zh_TW/LC_MESSAGES/kig.mo share/locale/zh_TW/LC_MESSAGES/kimagemapeditor.mo share/locale/zh_TW/LC_MESSAGES/kinetd.mo share/locale/zh_TW/LC_MESSAGES/kio.mo @@ -340,6 +344,7 @@ share/locale/zh_TW/LC_MESSAGES/kio_thumbnail.mo share/locale/zh_TW/LC_MESSAGES/kio_trash.mo share/locale/zh_TW/LC_MESSAGES/kio_zeroconf.mo share/locale/zh_TW/LC_MESSAGES/kioexec.mo +share/locale/zh_TW/LC_MESSAGES/kitchensync.mo share/locale/zh_TW/LC_MESSAGES/kiten.mo share/locale/zh_TW/LC_MESSAGES/kjobviewer.mo share/locale/zh_TW/LC_MESSAGES/kjots.mo @@ -377,6 +382,7 @@ share/locale/zh_TW/LC_MESSAGES/kmobile.mo share/locale/zh_TW/LC_MESSAGES/kmoon.mo share/locale/zh_TW/LC_MESSAGES/kmousetool.mo share/locale/zh_TW/LC_MESSAGES/kmouth.mo +share/locale/zh_TW/LC_MESSAGES/kmplot.mo share/locale/zh_TW/LC_MESSAGES/kmrml.mo share/locale/zh_TW/LC_MESSAGES/knetattach.mo share/locale/zh_TW/LC_MESSAGES/knetwalk.mo @@ -496,6 +502,7 @@ share/locale/zh_TW/LC_MESSAGES/kuick_plugin.mo share/locale/zh_TW/LC_MESSAGES/kuickshow.mo share/locale/zh_TW/LC_MESSAGES/kuiviewer.mo share/locale/zh_TW/LC_MESSAGES/kuser.mo +share/locale/zh_TW/LC_MESSAGES/kverbos.mo share/locale/zh_TW/LC_MESSAGES/kview.mo share/locale/zh_TW/LC_MESSAGES/kview_scale.mo share/locale/zh_TW/LC_MESSAGES/kviewbrowserplugin.mo @@ -505,6 +512,7 @@ share/locale/zh_TW/LC_MESSAGES/kviewpresenterplugin.mo share/locale/zh_TW/LC_MESSAGES/kviewscannerplugin.mo share/locale/zh_TW/LC_MESSAGES/kviewshell.mo share/locale/zh_TW/LC_MESSAGES/kviewviewer.mo +share/locale/zh_TW/LC_MESSAGES/kvoctrain.mo share/locale/zh_TW/LC_MESSAGES/kwalletmanager.mo share/locale/zh_TW/LC_MESSAGES/kwatchgnupg.mo share/locale/zh_TW/LC_MESSAGES/kweather.mo @@ -515,6 +523,7 @@ share/locale/zh_TW/LC_MESSAGES/kwin_art_clients.mo share/locale/zh_TW/LC_MESSAGES/kwin_clients.mo share/locale/zh_TW/LC_MESSAGES/kwin_lib.mo share/locale/zh_TW/LC_MESSAGES/kwireless.mo +share/locale/zh_TW/LC_MESSAGES/kwordquiz.mo share/locale/zh_TW/LC_MESSAGES/kworldclock.mo share/locale/zh_TW/LC_MESSAGES/kwriteconfig.mo share/locale/zh_TW/LC_MESSAGES/kxkb.mo @@ -539,6 +548,7 @@ share/locale/zh_TW/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/zh_TW/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/zh_TW/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/zh_TW/LC_MESSAGES/libkickermenu_tom.mo +share/locale/zh_TW/LC_MESSAGES/libkitchensync.mo share/locale/zh_TW/LC_MESSAGES/libkleopatra.mo share/locale/zh_TW/LC_MESSAGES/libkmime.mo share/locale/zh_TW/LC_MESSAGES/libkonq.mo diff --git a/chinese/kde4-l10n-zh_CN/distinfo b/chinese/kde4-l10n-zh_CN/distinfo index d8c95ea76e1e..5f8995c8fd80 100644 --- a/chinese/kde4-l10n-zh_CN/distinfo +++ b/chinese/kde4-l10n-zh_CN/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-zh_CN-3.5.5.tar.bz2) = c0df78b39982a1ba117539e86c0dabb8 -SHA256 (KDE/kde-i18n/kde-i18n-zh_CN-3.5.5.tar.bz2) = 9eb31fe27bb140c858bc8a17b149eb9e410e907033757cfcff9689597a872675 -SIZE (KDE/kde-i18n/kde-i18n-zh_CN-3.5.5.tar.bz2) = 1969823 +MD5 (KDE/kde-i18n/kde-i18n-zh_CN-3.5.6.tar.bz2) = a74fb6fee6d36a8bd975bb7b1b97fb4c +SHA256 (KDE/kde-i18n/kde-i18n-zh_CN-3.5.6.tar.bz2) = 6e3e3779d6606c4cbc9dc6d322028d630f850cdadf78cb7ef1dcd500fbfd37f1 +SIZE (KDE/kde-i18n/kde-i18n-zh_CN-3.5.6.tar.bz2) = 1969364 diff --git a/chinese/kde4-l10n-zh_CN/pkg-plist b/chinese/kde4-l10n-zh_CN/pkg-plist index 85f045f61565..536037a48201 100644 --- a/chinese/kde4-l10n-zh_CN/pkg-plist +++ b/chinese/kde4-l10n-zh_CN/pkg-plist @@ -268,6 +268,7 @@ share/locale/zh_CN/LC_MESSAGES/khotkeys.mo share/locale/zh_CN/LC_MESSAGES/khtmlkttsd.mo share/locale/zh_CN/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/zh_CN/LC_MESSAGES/kicker.mo +share/locale/zh_CN/LC_MESSAGES/kickermenu_kate.mo share/locale/zh_CN/LC_MESSAGES/kiconedit.mo share/locale/zh_CN/LC_MESSAGES/kig.mo share/locale/zh_CN/LC_MESSAGES/kimagemapeditor.mo diff --git a/chinese/kde4-l10n-zh_TW/distinfo b/chinese/kde4-l10n-zh_TW/distinfo index 50347a0ac13b..3a09644479ab 100644 --- a/chinese/kde4-l10n-zh_TW/distinfo +++ b/chinese/kde4-l10n-zh_TW/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-zh_TW-3.5.5.tar.bz2) = 6c1051a985f68563380844dec9080248 -SHA256 (KDE/kde-i18n/kde-i18n-zh_TW-3.5.5.tar.bz2) = 0ead24dca3410ae0dd9f022964dc17398dbeea62ab19bc16a47d34c6bc386d14 -SIZE (KDE/kde-i18n/kde-i18n-zh_TW-3.5.5.tar.bz2) = 2111961 +MD5 (KDE/kde-i18n/kde-i18n-zh_TW-3.5.6.tar.bz2) = f6211661d09cf7dcc381147d084537a7 +SHA256 (KDE/kde-i18n/kde-i18n-zh_TW-3.5.6.tar.bz2) = b0247e56c711f2755b54c21d769a823bf8b39e5585cc6756552e94e95a79b840 +SIZE (KDE/kde-i18n/kde-i18n-zh_TW-3.5.6.tar.bz2) = 2215756 diff --git a/chinese/kde4-l10n-zh_TW/pkg-plist b/chinese/kde4-l10n-zh_TW/pkg-plist index 298fd8702f3b..731d7ba0e364 100644 --- a/chinese/kde4-l10n-zh_TW/pkg-plist +++ b/chinese/kde4-l10n-zh_TW/pkg-plist @@ -85,6 +85,7 @@ share/locale/zh_TW/LC_MESSAGES/kaboodle.mo share/locale/zh_TW/LC_MESSAGES/kaccess.mo share/locale/zh_TW/LC_MESSAGES/kaddressbook.mo share/locale/zh_TW/LC_MESSAGES/kalarm.mo +share/locale/zh_TW/LC_MESSAGES/kalzium.mo share/locale/zh_TW/LC_MESSAGES/kanagram.mo share/locale/zh_TW/LC_MESSAGES/kandy.mo share/locale/zh_TW/LC_MESSAGES/kappfinder.mo @@ -122,6 +123,7 @@ share/locale/zh_TW/LC_MESSAGES/kbounce.mo share/locale/zh_TW/LC_MESSAGES/kbruch.mo share/locale/zh_TW/LC_MESSAGES/kbstateapplet.mo share/locale/zh_TW/LC_MESSAGES/kbugbuster.mo +share/locale/zh_TW/LC_MESSAGES/kcachegrind.mo share/locale/zh_TW/LC_MESSAGES/kcalc.mo share/locale/zh_TW/LC_MESSAGES/kcharselect.mo share/locale/zh_TW/LC_MESSAGES/kcharselectapplet.mo @@ -304,7 +306,9 @@ share/locale/zh_TW/LC_MESSAGES/khotkeys.mo share/locale/zh_TW/LC_MESSAGES/khtmlkttsd.mo share/locale/zh_TW/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/zh_TW/LC_MESSAGES/kicker.mo +share/locale/zh_TW/LC_MESSAGES/kickermenu_kate.mo share/locale/zh_TW/LC_MESSAGES/kiconedit.mo +share/locale/zh_TW/LC_MESSAGES/kig.mo share/locale/zh_TW/LC_MESSAGES/kimagemapeditor.mo share/locale/zh_TW/LC_MESSAGES/kinetd.mo share/locale/zh_TW/LC_MESSAGES/kio.mo @@ -340,6 +344,7 @@ share/locale/zh_TW/LC_MESSAGES/kio_thumbnail.mo share/locale/zh_TW/LC_MESSAGES/kio_trash.mo share/locale/zh_TW/LC_MESSAGES/kio_zeroconf.mo share/locale/zh_TW/LC_MESSAGES/kioexec.mo +share/locale/zh_TW/LC_MESSAGES/kitchensync.mo share/locale/zh_TW/LC_MESSAGES/kiten.mo share/locale/zh_TW/LC_MESSAGES/kjobviewer.mo share/locale/zh_TW/LC_MESSAGES/kjots.mo @@ -377,6 +382,7 @@ share/locale/zh_TW/LC_MESSAGES/kmobile.mo share/locale/zh_TW/LC_MESSAGES/kmoon.mo share/locale/zh_TW/LC_MESSAGES/kmousetool.mo share/locale/zh_TW/LC_MESSAGES/kmouth.mo +share/locale/zh_TW/LC_MESSAGES/kmplot.mo share/locale/zh_TW/LC_MESSAGES/kmrml.mo share/locale/zh_TW/LC_MESSAGES/knetattach.mo share/locale/zh_TW/LC_MESSAGES/knetwalk.mo @@ -496,6 +502,7 @@ share/locale/zh_TW/LC_MESSAGES/kuick_plugin.mo share/locale/zh_TW/LC_MESSAGES/kuickshow.mo share/locale/zh_TW/LC_MESSAGES/kuiviewer.mo share/locale/zh_TW/LC_MESSAGES/kuser.mo +share/locale/zh_TW/LC_MESSAGES/kverbos.mo share/locale/zh_TW/LC_MESSAGES/kview.mo share/locale/zh_TW/LC_MESSAGES/kview_scale.mo share/locale/zh_TW/LC_MESSAGES/kviewbrowserplugin.mo @@ -505,6 +512,7 @@ share/locale/zh_TW/LC_MESSAGES/kviewpresenterplugin.mo share/locale/zh_TW/LC_MESSAGES/kviewscannerplugin.mo share/locale/zh_TW/LC_MESSAGES/kviewshell.mo share/locale/zh_TW/LC_MESSAGES/kviewviewer.mo +share/locale/zh_TW/LC_MESSAGES/kvoctrain.mo share/locale/zh_TW/LC_MESSAGES/kwalletmanager.mo share/locale/zh_TW/LC_MESSAGES/kwatchgnupg.mo share/locale/zh_TW/LC_MESSAGES/kweather.mo @@ -515,6 +523,7 @@ share/locale/zh_TW/LC_MESSAGES/kwin_art_clients.mo share/locale/zh_TW/LC_MESSAGES/kwin_clients.mo share/locale/zh_TW/LC_MESSAGES/kwin_lib.mo share/locale/zh_TW/LC_MESSAGES/kwireless.mo +share/locale/zh_TW/LC_MESSAGES/kwordquiz.mo share/locale/zh_TW/LC_MESSAGES/kworldclock.mo share/locale/zh_TW/LC_MESSAGES/kwriteconfig.mo share/locale/zh_TW/LC_MESSAGES/kxkb.mo @@ -539,6 +548,7 @@ share/locale/zh_TW/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/zh_TW/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/zh_TW/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/zh_TW/LC_MESSAGES/libkickermenu_tom.mo +share/locale/zh_TW/LC_MESSAGES/libkitchensync.mo share/locale/zh_TW/LC_MESSAGES/libkleopatra.mo share/locale/zh_TW/LC_MESSAGES/libkmime.mo share/locale/zh_TW/LC_MESSAGES/libkonq.mo diff --git a/chinese/koffice-i18n-zh_CN/Makefile b/chinese/koffice-i18n-zh_CN/Makefile index 51c2f5739ff0..bc56586813cf 100644 --- a/chinese/koffice-i18n-zh_CN/Makefile +++ b/chinese/koffice-i18n-zh_CN/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= chinese kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/chinese/koffice-i18n-zh_CN/distinfo b/chinese/koffice-i18n-zh_CN/distinfo index 83fe79adc6f7..c7438fe761cd 100644 --- a/chinese/koffice-i18n-zh_CN/distinfo +++ b/chinese/koffice-i18n-zh_CN/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.1.tar.bz2) = 055cf1eed59bc1e491063d4ffa883d9b -SHA256 (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.1.tar.bz2) = f7645d5785e9f014423c2e5952adbdf6e281fdea1a3c7f46304d52b72c66bf23 -SIZE (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.1.tar.bz2) = 359950 +MD5 (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.2.tar.bz2) = 64e8c0cac900d22d4a1cc04c9be160af +SHA256 (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.2.tar.bz2) = ee4e5d237fa7291235e50e8ea3f0b814fad17425bfed21c2c362df9ad62905a9 +SIZE (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.2.tar.bz2) = 360552 diff --git a/chinese/koffice-i18n-zh_CN/pkg-plist b/chinese/koffice-i18n-zh_CN/pkg-plist index 0b464a615910..a6ae7f0b275a 100644 --- a/chinese/koffice-i18n-zh_CN/pkg-plist +++ b/chinese/koffice-i18n-zh_CN/pkg-plist @@ -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_abiword.mo share/locale/zh_CN/LC_MESSAGES/kfile_gnumeric.mo diff --git a/chinese/koffice-i18n-zh_TW/Makefile b/chinese/koffice-i18n-zh_TW/Makefile index e83e9975bfd3..ad67689576bd 100644 --- a/chinese/koffice-i18n-zh_TW/Makefile +++ b/chinese/koffice-i18n-zh_TW/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= chinese kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/chinese/koffice-i18n-zh_TW/distinfo b/chinese/koffice-i18n-zh_TW/distinfo index 1fc0c8365c79..15ab322ee0c9 100644 --- a/chinese/koffice-i18n-zh_TW/distinfo +++ b/chinese/koffice-i18n-zh_TW/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.1.tar.bz2) = 230b02b893873f1fd55f002509549793 -SHA256 (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.1.tar.bz2) = 8683281d2e6fc0610deaca00755d075384a8da78333261f3e614792410a05170 -SIZE (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.1.tar.bz2) = 370170 +MD5 (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.2.tar.bz2) = bc25552d0a21146b542bc764c1fed5a1 +SHA256 (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.2.tar.bz2) = d128a1e15ee65fb1357838df1923c96a9dd9bb95b504466543fbd5fd3a882bed +SIZE (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.2.tar.bz2) = 370875 diff --git a/chinese/koffice-i18n-zh_TW/pkg-plist b/chinese/koffice-i18n-zh_TW/pkg-plist index 2a1040f2cfdc..b84480f92d10 100644 --- a/chinese/koffice-i18n-zh_TW/pkg-plist +++ b/chinese/koffice-i18n-zh_TW/pkg-plist @@ -2,7 +2,6 @@ share/locale/zh_TW/LC_MESSAGES/desktop_koffice.mo share/locale/zh_TW/LC_MESSAGES/example.mo share/locale/zh_TW/LC_MESSAGES/karbon.mo share/locale/zh_TW/LC_MESSAGES/kchart.mo -share/locale/zh_TW/LC_MESSAGES/kdgantt.mo share/locale/zh_TW/LC_MESSAGES/kexi.mo share/locale/zh_TW/LC_MESSAGES/kfile_abiword.mo share/locale/zh_TW/LC_MESSAGES/kfile_gnumeric.mo diff --git a/chinese/koffice-kde4-l10n-zh_CN/Makefile b/chinese/koffice-kde4-l10n-zh_CN/Makefile index 51c2f5739ff0..bc56586813cf 100644 --- a/chinese/koffice-kde4-l10n-zh_CN/Makefile +++ b/chinese/koffice-kde4-l10n-zh_CN/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= chinese kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/chinese/koffice-kde4-l10n-zh_CN/distinfo b/chinese/koffice-kde4-l10n-zh_CN/distinfo index 83fe79adc6f7..c7438fe761cd 100644 --- a/chinese/koffice-kde4-l10n-zh_CN/distinfo +++ b/chinese/koffice-kde4-l10n-zh_CN/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.1.tar.bz2) = 055cf1eed59bc1e491063d4ffa883d9b -SHA256 (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.1.tar.bz2) = f7645d5785e9f014423c2e5952adbdf6e281fdea1a3c7f46304d52b72c66bf23 -SIZE (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.1.tar.bz2) = 359950 +MD5 (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.2.tar.bz2) = 64e8c0cac900d22d4a1cc04c9be160af +SHA256 (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.2.tar.bz2) = ee4e5d237fa7291235e50e8ea3f0b814fad17425bfed21c2c362df9ad62905a9 +SIZE (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.2.tar.bz2) = 360552 diff --git a/chinese/koffice-kde4-l10n-zh_CN/pkg-plist b/chinese/koffice-kde4-l10n-zh_CN/pkg-plist index 0b464a615910..a6ae7f0b275a 100644 --- a/chinese/koffice-kde4-l10n-zh_CN/pkg-plist +++ b/chinese/koffice-kde4-l10n-zh_CN/pkg-plist @@ -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_abiword.mo share/locale/zh_CN/LC_MESSAGES/kfile_gnumeric.mo diff --git a/chinese/koffice-kde4-l10n-zh_TW/Makefile b/chinese/koffice-kde4-l10n-zh_TW/Makefile index e83e9975bfd3..ad67689576bd 100644 --- a/chinese/koffice-kde4-l10n-zh_TW/Makefile +++ b/chinese/koffice-kde4-l10n-zh_TW/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= chinese kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/chinese/koffice-kde4-l10n-zh_TW/distinfo b/chinese/koffice-kde4-l10n-zh_TW/distinfo index 1fc0c8365c79..15ab322ee0c9 100644 --- a/chinese/koffice-kde4-l10n-zh_TW/distinfo +++ b/chinese/koffice-kde4-l10n-zh_TW/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.1.tar.bz2) = 230b02b893873f1fd55f002509549793 -SHA256 (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.1.tar.bz2) = 8683281d2e6fc0610deaca00755d075384a8da78333261f3e614792410a05170 -SIZE (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.1.tar.bz2) = 370170 +MD5 (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.2.tar.bz2) = bc25552d0a21146b542bc764c1fed5a1 +SHA256 (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.2.tar.bz2) = d128a1e15ee65fb1357838df1923c96a9dd9bb95b504466543fbd5fd3a882bed +SIZE (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.2.tar.bz2) = 370875 diff --git a/chinese/koffice-kde4-l10n-zh_TW/pkg-plist b/chinese/koffice-kde4-l10n-zh_TW/pkg-plist index 2a1040f2cfdc..b84480f92d10 100644 --- a/chinese/koffice-kde4-l10n-zh_TW/pkg-plist +++ b/chinese/koffice-kde4-l10n-zh_TW/pkg-plist @@ -2,7 +2,6 @@ share/locale/zh_TW/LC_MESSAGES/desktop_koffice.mo share/locale/zh_TW/LC_MESSAGES/example.mo share/locale/zh_TW/LC_MESSAGES/karbon.mo share/locale/zh_TW/LC_MESSAGES/kchart.mo -share/locale/zh_TW/LC_MESSAGES/kdgantt.mo share/locale/zh_TW/LC_MESSAGES/kexi.mo share/locale/zh_TW/LC_MESSAGES/kfile_abiword.mo share/locale/zh_TW/LC_MESSAGES/kfile_gnumeric.mo diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol/Makefile index b686c7c02ca1..d2a8b1c1613f 100644 --- a/comms/kremotecontrol/Makefile +++ b/comms/kremotecontrol/Makefile @@ -7,7 +7,6 @@ PORTNAME= kdeutils PORTVERSION= ${KDE_VERSION} -PORTREVISION= 3 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -18,7 +17,7 @@ COMMENT= Utilities for the KDE integrated X11 desktop LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4 \ netsnmp:${PORTSDIR}/net-mgmt/net-snmp -RUN_DEPENDS= gpgv:${PORTSDIR}/security/gnupg1 +RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg CONFLICTS= kgpg-[0-9]* superkaramba-[0-9]* @@ -35,7 +34,7 @@ DO_NOT_COMPILE+=klaptopdaemon kmilo CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}" CONFIGURE_ARGS+=--with-pythondir=${LOCALBASE} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/comms/kremotecontrol/distinfo b/comms/kremotecontrol/distinfo index cdaf81b48169..eecf40517f6e 100644 --- a/comms/kremotecontrol/distinfo +++ b/comms/kremotecontrol/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.5.tar.bz2) = a20a732284a3dcb735665e45f5be532e -SHA256 (KDE/kdeutils-3.5.5.tar.bz2) = 38914c84c8829ba7beb8a0e0c0ef8b4c7eee29b588c6529ff39c0bc0370f0457 -SIZE (KDE/kdeutils-3.5.5.tar.bz2) = 2988542 +MD5 (KDE/kdeutils-3.5.6.tar.bz2) = e0ea2c15ccf2bd3d8be5f2bf57cfe14a +SHA256 (KDE/kdeutils-3.5.6.tar.bz2) = 7efc558fca536a0b86abd51d7b0b9ca168e8364c222115e29424662acb0e473b +SIZE (KDE/kdeutils-3.5.6.tar.bz2) = 2989659 diff --git a/comms/kremotecontrol/pkg-plist b/comms/kremotecontrol/pkg-plist index bcd5d9ba088a..782d19b830c1 100644 --- a/comms/kremotecontrol/pkg-plist +++ b/comms/kremotecontrol/pkg-plist @@ -123,7 +123,6 @@ share/applications/kde/kdf.desktop share/applications/kde/kgpg.desktop share/applications/kde/khexedit.desktop share/applications/kde/kregexpeditor.desktop -share/applications/kde/ksim.desktop share/applications/kde/ktimer.desktop share/applications/kde/kwalletconfig.desktop share/applications/kde/kwalletmanager-kwalletd.desktop diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile index b686c7c02ca1..d2a8b1c1613f 100644 --- a/deskutils/kcharselect/Makefile +++ b/deskutils/kcharselect/Makefile @@ -7,7 +7,6 @@ PORTNAME= kdeutils PORTVERSION= ${KDE_VERSION} -PORTREVISION= 3 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -18,7 +17,7 @@ COMMENT= Utilities for the KDE integrated X11 desktop LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4 \ netsnmp:${PORTSDIR}/net-mgmt/net-snmp -RUN_DEPENDS= gpgv:${PORTSDIR}/security/gnupg1 +RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg CONFLICTS= kgpg-[0-9]* superkaramba-[0-9]* @@ -35,7 +34,7 @@ DO_NOT_COMPILE+=klaptopdaemon kmilo CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}" CONFIGURE_ARGS+=--with-pythondir=${LOCALBASE} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo index cdaf81b48169..eecf40517f6e 100644 --- a/deskutils/kcharselect/distinfo +++ b/deskutils/kcharselect/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.5.tar.bz2) = a20a732284a3dcb735665e45f5be532e -SHA256 (KDE/kdeutils-3.5.5.tar.bz2) = 38914c84c8829ba7beb8a0e0c0ef8b4c7eee29b588c6529ff39c0bc0370f0457 -SIZE (KDE/kdeutils-3.5.5.tar.bz2) = 2988542 +MD5 (KDE/kdeutils-3.5.6.tar.bz2) = e0ea2c15ccf2bd3d8be5f2bf57cfe14a +SHA256 (KDE/kdeutils-3.5.6.tar.bz2) = 7efc558fca536a0b86abd51d7b0b9ca168e8364c222115e29424662acb0e473b +SIZE (KDE/kdeutils-3.5.6.tar.bz2) = 2989659 diff --git a/deskutils/kcharselect/pkg-plist b/deskutils/kcharselect/pkg-plist index bcd5d9ba088a..782d19b830c1 100644 --- a/deskutils/kcharselect/pkg-plist +++ b/deskutils/kcharselect/pkg-plist @@ -123,7 +123,6 @@ share/applications/kde/kdf.desktop share/applications/kde/kgpg.desktop share/applications/kde/khexedit.desktop share/applications/kde/kregexpeditor.desktop -share/applications/kde/ksim.desktop share/applications/kde/ktimer.desktop share/applications/kde/kwalletconfig.desktop share/applications/kde/kwalletmanager-kwalletd.desktop diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile index ae9edf470430..4a32a7510277 100644 --- a/deskutils/kdepim3/Makefile +++ b/deskutils/kdepim3/Makefile @@ -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 @@ -17,7 +16,6 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Personal Information Management tools for KDE LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \ - mal:${PORTSDIR}/palm/libmal \ pisock:${PORTSDIR}/palm/pilot-link \ sasl2:${PORTSDIR}/security/cyrus-sasl2 @@ -32,7 +30,7 @@ USE_OPENSSL= yes USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ARGS= --with-gpg=${LOCALBASE}/bin/gpg \ --with-gpgsm=${LOCALBASE}/bin/gpgsm \ diff --git a/deskutils/kdepim3/distinfo b/deskutils/kdepim3/distinfo index 77abe98678d3..9c9fc308da19 100644 --- a/deskutils/kdepim3/distinfo +++ b/deskutils/kdepim3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdepim-3.5.5.tar.bz2) = 3f2127f74cb496899bb3f1f6f702353b -SHA256 (KDE/kdepim-3.5.5.tar.bz2) = 82887df2c2ff00cb60dcfb8aa04527988123b9a4ed70f4c9082a7a0eb9f1f047 -SIZE (KDE/kdepim-3.5.5.tar.bz2) = 12908968 +MD5 (KDE/kdepim-3.5.6.tar.bz2) = e37e6173fe9fd7f242c9502a4ae1d7de +SHA256 (KDE/kdepim-3.5.6.tar.bz2) = 0b3a04f72fa640d804df1c4cf2c66ac3ccc5033c98e90a7ae9c62611ea8e3a55 +SIZE (KDE/kdepim-3.5.6.tar.bz2) = 13643798 diff --git a/deskutils/kdepim3/files/patch-kpilot_conduits_vcalconduit-vcalRecord.cc b/deskutils/kdepim3/files/patch-kpilot_conduits_vcalconduit-vcalRecord.cc new file mode 100644 index 000000000000..24c411f06150 --- /dev/null +++ b/deskutils/kdepim3/files/patch-kpilot_conduits_vcalconduit-vcalRecord.cc @@ -0,0 +1,19 @@ +--- kpilot/conduits/vcalconduit/vcalRecord.cc.orig Sun Mar 4 13:37:15 2007 ++++ kpilot/conduits/vcalconduit/vcalRecord.cc Sun Mar 4 13:38:35 2007 +@@ -584,7 +584,7 @@ + if (eventCategories.size() < 1) + { + // This event has no categories. +- de->setCategory(Pilot::Unfiled); ++ ((PilotRecordBase *)de)->setCategory(Pilot::Unfiled); + return; + } + +@@ -623,6 +623,6 @@ + } + } + +- de->setCategory(Pilot::Unfiled); ++ ((PilotRecordBase *)de)->setCategory(Pilot::Unfiled); + } + diff --git a/deskutils/kdepim3/pkg-plist b/deskutils/kdepim3/pkg-plist index be431fcaa3d6..3f4096274627 100644 --- a/deskutils/kdepim3/pkg-plist +++ b/deskutils/kdepim3/pkg-plist @@ -171,13 +171,13 @@ include/kontact/summary.h include/korganizer/baseview.h include/korganizer/calendarviewbase.h include/korganizer/calprinter.h -include/korganizer/calprinthelper.h include/korganizer/calprintpluginbase.h include/korganizer/corehelper.h include/korganizer/mainwindow.h include/korganizer/part.h include/korganizer/printplugin.h include/kpilot/kpilotlink.h +include/kpilot/pilot.h include/kpilot/pilotDatabase.h include/kpilot/pilotLinkVersion.h include/kpilot/pilotLocalDatabase.h @@ -291,9 +291,6 @@ lib/kde3/conduit_doc.so lib/kde3/conduit_knotes.a lib/kde3/conduit_knotes.la lib/kde3/conduit_knotes.so -lib/kde3/conduit_mal.a -lib/kde3/conduit_mal.la -lib/kde3/conduit_mal.so lib/kde3/conduit_memofile.a lib/kde3/conduit_memofile.la lib/kde3/conduit_memofile.so @@ -588,6 +585,9 @@ lib/kde3/libkorg_hebrew.so lib/kde3/libkorg_journalprint.a lib/kde3/libkorg_journalprint.la lib/kde3/libkorg_journalprint.so +lib/kde3/libkorg_yearlyprint.a +lib/kde3/libkorg_yearlyprint.la +lib/kde3/libkorg_yearlyprint.so lib/kde3/libkorganizerpart.a lib/kde3/libkorganizerpart.la lib/kde3/libkorganizerpart.so @@ -1696,6 +1696,7 @@ share/apps/libkholidays/holiday_fi share/apps/libkholidays/holiday_fr share/apps/libkholidays/holiday_frswiss share/apps/libkholidays/holiday_gb +share/apps/libkholidays/holiday_gr share/apps/libkholidays/holiday_gt share/apps/libkholidays/holiday_hu share/apps/libkholidays/holiday_ie @@ -1736,6 +1737,7 @@ share/autostart/korgac.desktop share/config.kcfg/abbrowserconduit.kcfg share/config.kcfg/akregator.kcfg share/config.kcfg/custommimeheader.kcfg +share/config.kcfg/customtemplates_kfg.kcfg share/config.kcfg/docconduit.kcfg share/config.kcfg/egroupware.kcfg share/config.kcfg/groupwise.kcfg @@ -1750,7 +1752,6 @@ share/config.kcfg/korganizer.kcfg share/config.kcfg/kpalmdoc.kcfg share/config.kcfg/kpilot.kcfg share/config.kcfg/kpilotlib.kcfg -share/config.kcfg/malconduit.kcfg share/config.kcfg/memofileconduit.kcfg share/config.kcfg/mk4config.kcfg share/config.kcfg/pimemoticons.kcfg @@ -1758,14 +1759,33 @@ share/config.kcfg/popmail.kcfg share/config.kcfg/replyphrases.kcfg share/config.kcfg/slox.kcfg share/config.kcfg/sysinfoconduit.kcfg +share/config.kcfg/templatesconfiguration_kfg.kcfg share/config.kcfg/timeconduit.kcfg share/config.kcfg/vcalconduitbase.kcfg share/config/kmail.antispamrc share/config/kmail.antivirusrc share/config/libkleopatrarc +share/doc/HTML/en/akregator/add-feed.png +share/doc/HTML/en/akregator/add-feed2.png +share/doc/HTML/en/akregator/add-folder.png +share/doc/HTML/en/akregator/add-folder2.png +share/doc/HTML/en/akregator/advanced-tab.png +share/doc/HTML/en/akregator/appearance-tab.png +share/doc/HTML/en/akregator/archive-tab.png +share/doc/HTML/en/akregator/browser-tab.png share/doc/HTML/en/akregator/common +share/doc/HTML/en/akregator/general-tab.png share/doc/HTML/en/akregator/index.cache.bz2 share/doc/HTML/en/akregator/index.docbook +share/doc/HTML/en/akregator/konq.png +share/doc/HTML/en/akregator/konq2.png +share/doc/HTML/en/akregator/main-window.png +share/doc/HTML/en/akregator/main-window2.png +share/doc/HTML/en/akregator/main-window3.png +share/doc/HTML/en/akregator/main-window4.png +share/doc/HTML/en/akregator/quick-filter.png +share/doc/HTML/en/akregator/rss.png +share/doc/HTML/en/akregator/rss3.png share/doc/HTML/en/kaddressbook/addhost.png share/doc/HTML/en/kaddressbook/common share/doc/HTML/en/kaddressbook/conf.png @@ -2247,6 +2267,7 @@ share/services/korganizer/hebrew.desktop share/services/korganizer/holidays.desktop share/services/korganizer/journalprint.desktop share/services/korganizer/webexport.desktop +share/services/korganizer/yearprint.desktop share/services/korganizer_configcolors.desktop share/services/korganizer_configdesignerfields.desktop share/services/korganizer_configfonts.desktop @@ -2295,7 +2316,6 @@ share/services/kresources/konnector/qtopia.desktop share/services/kresources/konnector/remotekonnector.desktop share/services/kresources/konnector_manager.desktop share/services/ldifvcardthumbnail.desktop -share/services/mal_conduit.desktop share/services/mbox.protocol share/services/memofile-conduit.desktop share/services/notepad-conduit.desktop @@ -2695,7 +2715,6 @@ share/servicetypes/kpilotconduit.desktop @dirrm share/apps/akregator/pics @dirrm share/apps/akregator/about @dirrm share/apps/akregator -@dirrm lib/kconf_update_bin @dirrm include/qgpgme @dirrm include/mimelib @dirrm include/libkcal diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile index ae9edf470430..4a32a7510277 100644 --- a/deskutils/kdepim4/Makefile +++ b/deskutils/kdepim4/Makefile @@ -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 @@ -17,7 +16,6 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Personal Information Management tools for KDE LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \ - mal:${PORTSDIR}/palm/libmal \ pisock:${PORTSDIR}/palm/pilot-link \ sasl2:${PORTSDIR}/security/cyrus-sasl2 @@ -32,7 +30,7 @@ USE_OPENSSL= yes USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ARGS= --with-gpg=${LOCALBASE}/bin/gpg \ --with-gpgsm=${LOCALBASE}/bin/gpgsm \ diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo index 77abe98678d3..9c9fc308da19 100644 --- a/deskutils/kdepim4/distinfo +++ b/deskutils/kdepim4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdepim-3.5.5.tar.bz2) = 3f2127f74cb496899bb3f1f6f702353b -SHA256 (KDE/kdepim-3.5.5.tar.bz2) = 82887df2c2ff00cb60dcfb8aa04527988123b9a4ed70f4c9082a7a0eb9f1f047 -SIZE (KDE/kdepim-3.5.5.tar.bz2) = 12908968 +MD5 (KDE/kdepim-3.5.6.tar.bz2) = e37e6173fe9fd7f242c9502a4ae1d7de +SHA256 (KDE/kdepim-3.5.6.tar.bz2) = 0b3a04f72fa640d804df1c4cf2c66ac3ccc5033c98e90a7ae9c62611ea8e3a55 +SIZE (KDE/kdepim-3.5.6.tar.bz2) = 13643798 diff --git a/deskutils/kdepim4/files/patch-kpilot_conduits_vcalconduit-vcalRecord.cc b/deskutils/kdepim4/files/patch-kpilot_conduits_vcalconduit-vcalRecord.cc new file mode 100644 index 000000000000..24c411f06150 --- /dev/null +++ b/deskutils/kdepim4/files/patch-kpilot_conduits_vcalconduit-vcalRecord.cc @@ -0,0 +1,19 @@ +--- kpilot/conduits/vcalconduit/vcalRecord.cc.orig Sun Mar 4 13:37:15 2007 ++++ kpilot/conduits/vcalconduit/vcalRecord.cc Sun Mar 4 13:38:35 2007 +@@ -584,7 +584,7 @@ + if (eventCategories.size() < 1) + { + // This event has no categories. +- de->setCategory(Pilot::Unfiled); ++ ((PilotRecordBase *)de)->setCategory(Pilot::Unfiled); + return; + } + +@@ -623,6 +623,6 @@ + } + } + +- de->setCategory(Pilot::Unfiled); ++ ((PilotRecordBase *)de)->setCategory(Pilot::Unfiled); + } + diff --git a/deskutils/kdepim4/pkg-plist b/deskutils/kdepim4/pkg-plist index be431fcaa3d6..3f4096274627 100644 --- a/deskutils/kdepim4/pkg-plist +++ b/deskutils/kdepim4/pkg-plist @@ -171,13 +171,13 @@ include/kontact/summary.h include/korganizer/baseview.h include/korganizer/calendarviewbase.h include/korganizer/calprinter.h -include/korganizer/calprinthelper.h include/korganizer/calprintpluginbase.h include/korganizer/corehelper.h include/korganizer/mainwindow.h include/korganizer/part.h include/korganizer/printplugin.h include/kpilot/kpilotlink.h +include/kpilot/pilot.h include/kpilot/pilotDatabase.h include/kpilot/pilotLinkVersion.h include/kpilot/pilotLocalDatabase.h @@ -291,9 +291,6 @@ lib/kde3/conduit_doc.so lib/kde3/conduit_knotes.a lib/kde3/conduit_knotes.la lib/kde3/conduit_knotes.so -lib/kde3/conduit_mal.a -lib/kde3/conduit_mal.la -lib/kde3/conduit_mal.so lib/kde3/conduit_memofile.a lib/kde3/conduit_memofile.la lib/kde3/conduit_memofile.so @@ -588,6 +585,9 @@ lib/kde3/libkorg_hebrew.so lib/kde3/libkorg_journalprint.a lib/kde3/libkorg_journalprint.la lib/kde3/libkorg_journalprint.so +lib/kde3/libkorg_yearlyprint.a +lib/kde3/libkorg_yearlyprint.la +lib/kde3/libkorg_yearlyprint.so lib/kde3/libkorganizerpart.a lib/kde3/libkorganizerpart.la lib/kde3/libkorganizerpart.so @@ -1696,6 +1696,7 @@ share/apps/libkholidays/holiday_fi share/apps/libkholidays/holiday_fr share/apps/libkholidays/holiday_frswiss share/apps/libkholidays/holiday_gb +share/apps/libkholidays/holiday_gr share/apps/libkholidays/holiday_gt share/apps/libkholidays/holiday_hu share/apps/libkholidays/holiday_ie @@ -1736,6 +1737,7 @@ share/autostart/korgac.desktop share/config.kcfg/abbrowserconduit.kcfg share/config.kcfg/akregator.kcfg share/config.kcfg/custommimeheader.kcfg +share/config.kcfg/customtemplates_kfg.kcfg share/config.kcfg/docconduit.kcfg share/config.kcfg/egroupware.kcfg share/config.kcfg/groupwise.kcfg @@ -1750,7 +1752,6 @@ share/config.kcfg/korganizer.kcfg share/config.kcfg/kpalmdoc.kcfg share/config.kcfg/kpilot.kcfg share/config.kcfg/kpilotlib.kcfg -share/config.kcfg/malconduit.kcfg share/config.kcfg/memofileconduit.kcfg share/config.kcfg/mk4config.kcfg share/config.kcfg/pimemoticons.kcfg @@ -1758,14 +1759,33 @@ share/config.kcfg/popmail.kcfg share/config.kcfg/replyphrases.kcfg share/config.kcfg/slox.kcfg share/config.kcfg/sysinfoconduit.kcfg +share/config.kcfg/templatesconfiguration_kfg.kcfg share/config.kcfg/timeconduit.kcfg share/config.kcfg/vcalconduitbase.kcfg share/config/kmail.antispamrc share/config/kmail.antivirusrc share/config/libkleopatrarc +share/doc/HTML/en/akregator/add-feed.png +share/doc/HTML/en/akregator/add-feed2.png +share/doc/HTML/en/akregator/add-folder.png +share/doc/HTML/en/akregator/add-folder2.png +share/doc/HTML/en/akregator/advanced-tab.png +share/doc/HTML/en/akregator/appearance-tab.png +share/doc/HTML/en/akregator/archive-tab.png +share/doc/HTML/en/akregator/browser-tab.png share/doc/HTML/en/akregator/common +share/doc/HTML/en/akregator/general-tab.png share/doc/HTML/en/akregator/index.cache.bz2 share/doc/HTML/en/akregator/index.docbook +share/doc/HTML/en/akregator/konq.png +share/doc/HTML/en/akregator/konq2.png +share/doc/HTML/en/akregator/main-window.png +share/doc/HTML/en/akregator/main-window2.png +share/doc/HTML/en/akregator/main-window3.png +share/doc/HTML/en/akregator/main-window4.png +share/doc/HTML/en/akregator/quick-filter.png +share/doc/HTML/en/akregator/rss.png +share/doc/HTML/en/akregator/rss3.png share/doc/HTML/en/kaddressbook/addhost.png share/doc/HTML/en/kaddressbook/common share/doc/HTML/en/kaddressbook/conf.png @@ -2247,6 +2267,7 @@ share/services/korganizer/hebrew.desktop share/services/korganizer/holidays.desktop share/services/korganizer/journalprint.desktop share/services/korganizer/webexport.desktop +share/services/korganizer/yearprint.desktop share/services/korganizer_configcolors.desktop share/services/korganizer_configdesignerfields.desktop share/services/korganizer_configfonts.desktop @@ -2295,7 +2316,6 @@ share/services/kresources/konnector/qtopia.desktop share/services/kresources/konnector/remotekonnector.desktop share/services/kresources/konnector_manager.desktop share/services/ldifvcardthumbnail.desktop -share/services/mal_conduit.desktop share/services/mbox.protocol share/services/memofile-conduit.desktop share/services/notepad-conduit.desktop @@ -2695,7 +2715,6 @@ share/servicetypes/kpilotconduit.desktop @dirrm share/apps/akregator/pics @dirrm share/apps/akregator/about @dirrm share/apps/akregator -@dirrm lib/kconf_update_bin @dirrm include/qgpgme @dirrm include/mimelib @dirrm include/libkcal diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile index ae9edf470430..4a32a7510277 100644 --- a/deskutils/kdepim44/Makefile +++ b/deskutils/kdepim44/Makefile @@ -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 @@ -17,7 +16,6 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Personal Information Management tools for KDE LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \ - mal:${PORTSDIR}/palm/libmal \ pisock:${PORTSDIR}/palm/pilot-link \ sasl2:${PORTSDIR}/security/cyrus-sasl2 @@ -32,7 +30,7 @@ USE_OPENSSL= yes USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ARGS= --with-gpg=${LOCALBASE}/bin/gpg \ --with-gpgsm=${LOCALBASE}/bin/gpgsm \ diff --git a/deskutils/kdepim44/distinfo b/deskutils/kdepim44/distinfo index 77abe98678d3..9c9fc308da19 100644 --- a/deskutils/kdepim44/distinfo +++ b/deskutils/kdepim44/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdepim-3.5.5.tar.bz2) = 3f2127f74cb496899bb3f1f6f702353b -SHA256 (KDE/kdepim-3.5.5.tar.bz2) = 82887df2c2ff00cb60dcfb8aa04527988123b9a4ed70f4c9082a7a0eb9f1f047 -SIZE (KDE/kdepim-3.5.5.tar.bz2) = 12908968 +MD5 (KDE/kdepim-3.5.6.tar.bz2) = e37e6173fe9fd7f242c9502a4ae1d7de +SHA256 (KDE/kdepim-3.5.6.tar.bz2) = 0b3a04f72fa640d804df1c4cf2c66ac3ccc5033c98e90a7ae9c62611ea8e3a55 +SIZE (KDE/kdepim-3.5.6.tar.bz2) = 13643798 diff --git a/deskutils/kdepim44/files/patch-kpilot_conduits_vcalconduit-vcalRecord.cc b/deskutils/kdepim44/files/patch-kpilot_conduits_vcalconduit-vcalRecord.cc new file mode 100644 index 000000000000..24c411f06150 --- /dev/null +++ b/deskutils/kdepim44/files/patch-kpilot_conduits_vcalconduit-vcalRecord.cc @@ -0,0 +1,19 @@ +--- kpilot/conduits/vcalconduit/vcalRecord.cc.orig Sun Mar 4 13:37:15 2007 ++++ kpilot/conduits/vcalconduit/vcalRecord.cc Sun Mar 4 13:38:35 2007 +@@ -584,7 +584,7 @@ + if (eventCategories.size() < 1) + { + // This event has no categories. +- de->setCategory(Pilot::Unfiled); ++ ((PilotRecordBase *)de)->setCategory(Pilot::Unfiled); + return; + } + +@@ -623,6 +623,6 @@ + } + } + +- de->setCategory(Pilot::Unfiled); ++ ((PilotRecordBase *)de)->setCategory(Pilot::Unfiled); + } + diff --git a/deskutils/kdepim44/pkg-plist b/deskutils/kdepim44/pkg-plist index be431fcaa3d6..3f4096274627 100644 --- a/deskutils/kdepim44/pkg-plist +++ b/deskutils/kdepim44/pkg-plist @@ -171,13 +171,13 @@ include/kontact/summary.h include/korganizer/baseview.h include/korganizer/calendarviewbase.h include/korganizer/calprinter.h -include/korganizer/calprinthelper.h include/korganizer/calprintpluginbase.h include/korganizer/corehelper.h include/korganizer/mainwindow.h include/korganizer/part.h include/korganizer/printplugin.h include/kpilot/kpilotlink.h +include/kpilot/pilot.h include/kpilot/pilotDatabase.h include/kpilot/pilotLinkVersion.h include/kpilot/pilotLocalDatabase.h @@ -291,9 +291,6 @@ lib/kde3/conduit_doc.so lib/kde3/conduit_knotes.a lib/kde3/conduit_knotes.la lib/kde3/conduit_knotes.so -lib/kde3/conduit_mal.a -lib/kde3/conduit_mal.la -lib/kde3/conduit_mal.so lib/kde3/conduit_memofile.a lib/kde3/conduit_memofile.la lib/kde3/conduit_memofile.so @@ -588,6 +585,9 @@ lib/kde3/libkorg_hebrew.so lib/kde3/libkorg_journalprint.a lib/kde3/libkorg_journalprint.la lib/kde3/libkorg_journalprint.so +lib/kde3/libkorg_yearlyprint.a +lib/kde3/libkorg_yearlyprint.la +lib/kde3/libkorg_yearlyprint.so lib/kde3/libkorganizerpart.a lib/kde3/libkorganizerpart.la lib/kde3/libkorganizerpart.so @@ -1696,6 +1696,7 @@ share/apps/libkholidays/holiday_fi share/apps/libkholidays/holiday_fr share/apps/libkholidays/holiday_frswiss share/apps/libkholidays/holiday_gb +share/apps/libkholidays/holiday_gr share/apps/libkholidays/holiday_gt share/apps/libkholidays/holiday_hu share/apps/libkholidays/holiday_ie @@ -1736,6 +1737,7 @@ share/autostart/korgac.desktop share/config.kcfg/abbrowserconduit.kcfg share/config.kcfg/akregator.kcfg share/config.kcfg/custommimeheader.kcfg +share/config.kcfg/customtemplates_kfg.kcfg share/config.kcfg/docconduit.kcfg share/config.kcfg/egroupware.kcfg share/config.kcfg/groupwise.kcfg @@ -1750,7 +1752,6 @@ share/config.kcfg/korganizer.kcfg share/config.kcfg/kpalmdoc.kcfg share/config.kcfg/kpilot.kcfg share/config.kcfg/kpilotlib.kcfg -share/config.kcfg/malconduit.kcfg share/config.kcfg/memofileconduit.kcfg share/config.kcfg/mk4config.kcfg share/config.kcfg/pimemoticons.kcfg @@ -1758,14 +1759,33 @@ share/config.kcfg/popmail.kcfg share/config.kcfg/replyphrases.kcfg share/config.kcfg/slox.kcfg share/config.kcfg/sysinfoconduit.kcfg +share/config.kcfg/templatesconfiguration_kfg.kcfg share/config.kcfg/timeconduit.kcfg share/config.kcfg/vcalconduitbase.kcfg share/config/kmail.antispamrc share/config/kmail.antivirusrc share/config/libkleopatrarc +share/doc/HTML/en/akregator/add-feed.png +share/doc/HTML/en/akregator/add-feed2.png +share/doc/HTML/en/akregator/add-folder.png +share/doc/HTML/en/akregator/add-folder2.png +share/doc/HTML/en/akregator/advanced-tab.png +share/doc/HTML/en/akregator/appearance-tab.png +share/doc/HTML/en/akregator/archive-tab.png +share/doc/HTML/en/akregator/browser-tab.png share/doc/HTML/en/akregator/common +share/doc/HTML/en/akregator/general-tab.png share/doc/HTML/en/akregator/index.cache.bz2 share/doc/HTML/en/akregator/index.docbook +share/doc/HTML/en/akregator/konq.png +share/doc/HTML/en/akregator/konq2.png +share/doc/HTML/en/akregator/main-window.png +share/doc/HTML/en/akregator/main-window2.png +share/doc/HTML/en/akregator/main-window3.png +share/doc/HTML/en/akregator/main-window4.png +share/doc/HTML/en/akregator/quick-filter.png +share/doc/HTML/en/akregator/rss.png +share/doc/HTML/en/akregator/rss3.png share/doc/HTML/en/kaddressbook/addhost.png share/doc/HTML/en/kaddressbook/common share/doc/HTML/en/kaddressbook/conf.png @@ -2247,6 +2267,7 @@ share/services/korganizer/hebrew.desktop share/services/korganizer/holidays.desktop share/services/korganizer/journalprint.desktop share/services/korganizer/webexport.desktop +share/services/korganizer/yearprint.desktop share/services/korganizer_configcolors.desktop share/services/korganizer_configdesignerfields.desktop share/services/korganizer_configfonts.desktop @@ -2295,7 +2316,6 @@ share/services/kresources/konnector/qtopia.desktop share/services/kresources/konnector/remotekonnector.desktop share/services/kresources/konnector_manager.desktop share/services/ldifvcardthumbnail.desktop -share/services/mal_conduit.desktop share/services/mbox.protocol share/services/memofile-conduit.desktop share/services/notepad-conduit.desktop @@ -2695,7 +2715,6 @@ share/servicetypes/kpilotconduit.desktop @dirrm share/apps/akregator/pics @dirrm share/apps/akregator/about @dirrm share/apps/akregator -@dirrm lib/kconf_update_bin @dirrm include/qgpgme @dirrm include/mimelib @dirrm include/libkcal diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile index 89b184a3bdc9..634653844522 100644 --- a/devel/kdesdk3/Makefile +++ b/devel/kdesdk3/Makefile @@ -16,8 +16,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE Software Development Kit RUN_DEPENDS= bash:${PORTSDIR}/shells/bash -LIB_DEPENDS= db4:${PORTSDIR}/databases/db4 \ - svn_client-1.0:${PORTSDIR}/devel/subversion +LIB_DEPENDS= svn_client-1.0:${PORTSDIR}/devel/subversion CONFLICTS= umbrello-[0-9]* kcachegrind-[0-9]* @@ -27,13 +26,13 @@ PREFIX= ${KDE_PREFIX} USE_PERL5= yes USE_BZIP2= yes USE_GMAKE= yes +USE_BDB= yes USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes -LDCONFIG_DIRS= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 +USE_LDCONFIG= yes -CONFIGURE_ARGS+=--with-db-include-dir=${LOCALBASE}/include/db4 \ - --with-db-lib-dir=${LOCALBASE}/lib --with-db-name=db4 \ +CONFIGURE_ARGS+=--with-db-include-dir=${BDB_INCLUDE_DIR} \ + --with-db-lib-dir=${BDB_LIB_DIR} --with-db-name=${BDB_LIB_NAME} \ --with-apr-config=${LOCALBASE}/bin/apr-1-config \ --with-apu-config=${LOCALBASE}/bin/apu-1-config \ --with-svn-include=${LOCALBASE}/include \ diff --git a/devel/kdesdk3/distinfo b/devel/kdesdk3/distinfo index 386f9cf1ea10..3924e1bead89 100644 --- a/devel/kdesdk3/distinfo +++ b/devel/kdesdk3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdesdk-3.5.5.tar.bz2) = d226bf07bf8106f37b4e9e31a7d451f0 -SHA256 (KDE/kdesdk-3.5.5.tar.bz2) = fedd1631c2e139d27450dc51ab5aa3e9e46f5d5c0c030992818b9c37058678cd -SIZE (KDE/kdesdk-3.5.5.tar.bz2) = 5043560 +MD5 (KDE/kdesdk-3.5.6.tar.bz2) = 1462e1a884fdaa070ed493c10a336728 +SHA256 (KDE/kdesdk-3.5.6.tar.bz2) = 63cdea02149b38998a4d41899f8da863fd9f9333dd17a8d1d3fea9fc6607d7e4 +SIZE (KDE/kdesdk-3.5.6.tar.bz2) = 5046602 diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile index 89b184a3bdc9..634653844522 100644 --- a/devel/kdesdk4/Makefile +++ b/devel/kdesdk4/Makefile @@ -16,8 +16,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE Software Development Kit RUN_DEPENDS= bash:${PORTSDIR}/shells/bash -LIB_DEPENDS= db4:${PORTSDIR}/databases/db4 \ - svn_client-1.0:${PORTSDIR}/devel/subversion +LIB_DEPENDS= svn_client-1.0:${PORTSDIR}/devel/subversion CONFLICTS= umbrello-[0-9]* kcachegrind-[0-9]* @@ -27,13 +26,13 @@ PREFIX= ${KDE_PREFIX} USE_PERL5= yes USE_BZIP2= yes USE_GMAKE= yes +USE_BDB= yes USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes -LDCONFIG_DIRS= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 +USE_LDCONFIG= yes -CONFIGURE_ARGS+=--with-db-include-dir=${LOCALBASE}/include/db4 \ - --with-db-lib-dir=${LOCALBASE}/lib --with-db-name=db4 \ +CONFIGURE_ARGS+=--with-db-include-dir=${BDB_INCLUDE_DIR} \ + --with-db-lib-dir=${BDB_LIB_DIR} --with-db-name=${BDB_LIB_NAME} \ --with-apr-config=${LOCALBASE}/bin/apr-1-config \ --with-apu-config=${LOCALBASE}/bin/apu-1-config \ --with-svn-include=${LOCALBASE}/include \ diff --git a/devel/kdesdk4/distinfo b/devel/kdesdk4/distinfo index 386f9cf1ea10..3924e1bead89 100644 --- a/devel/kdesdk4/distinfo +++ b/devel/kdesdk4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdesdk-3.5.5.tar.bz2) = d226bf07bf8106f37b4e9e31a7d451f0 -SHA256 (KDE/kdesdk-3.5.5.tar.bz2) = fedd1631c2e139d27450dc51ab5aa3e9e46f5d5c0c030992818b9c37058678cd -SIZE (KDE/kdesdk-3.5.5.tar.bz2) = 5043560 +MD5 (KDE/kdesdk-3.5.6.tar.bz2) = 1462e1a884fdaa070ed493c10a336728 +SHA256 (KDE/kdesdk-3.5.6.tar.bz2) = 63cdea02149b38998a4d41899f8da863fd9f9333dd17a8d1d3fea9fc6607d7e4 +SIZE (KDE/kdesdk-3.5.6.tar.bz2) = 5046602 diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile index ec320a34c202..84b022f605c6 100644 --- a/devel/kdevelop/Makefile +++ b/devel/kdevelop/Makefile @@ -6,10 +6,10 @@ # PORTNAME= kdevelop -PORTVERSION= 3.3.5 +PORTVERSION= 3.4.0 CATEGORIES?= devel kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${KDE_VERSION:S/.0//}/src +MASTER_SITE_SUBDIR= stable/${PORTNAME}-${PORTVERSION}/src # DISTNAME= ${KDE_DISTNAME} DIST_SUBDIR= KDE @@ -17,31 +17,34 @@ MAINTAINER?= kde@FreeBSD.org COMMENT= IDE for a wide variety of programming tasks BUILD_DEPENDS= cervisia:${PORTSDIR}/devel/kdesdk3 \ + dot:${PORTSDIR}/graphics/graphviz \ msgfmt:${PORTSDIR}/devel/gettext -LIB_DEPENDS= db4:${PORTSDIR}/databases/db4 \ - svn_client-1.0:${PORTSDIR}/devel/subversion +LIB_DEPENDS= svn_client-1.0:${PORTSDIR}/devel/subversion RUN_DEPENDS= extractrc:${PORTSDIR}/devel/kdesdk3 \ gmake:${PORTSDIR}/devel/gmake \ ${LOCALBASE}/gnu-autotools/bin/automake:${PORTSDIR}/devel/gnu-automake \ ${LOCALBASE}/gnu-autotools/bin/autoconf:${PORTSDIR}/devel/gnu-autoconf .if defined(WITH_OPTIONAL_DEPENDS) -RUN_DEPENDS+= kiconedit:${PORTSDIR}/graphics/kdegraphics3 \ - ark:${PORTSDIR}/misc/kdeutils3 \ +RUN_DEPENDS+= ark:${PORTSDIR}/misc/kdeutils3 \ + a2ps:${PORTSDIR}/print/a2ps-letter \ + dot:${PORTSDIR}/graphics/graphviz \ glimpse:${PORTSDIR}/textproc/glimpse \ - a2ps:${PORTSDIR}/print/a2ps-letter + kiconedit:${PORTSDIR}/graphics/kdegraphics3 .endif # KDE_DISTNAME= ${PORTNAME}-${PORTVERSION}_for_KDE_3.1 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_KDELIBS_VER=3 USE_BZIP2= yes USE_GMAKE= yes +USE_BDB= yes USE_AUTOTOOLS= libtool:15 +_NO_KDE_FINAL= yes CONFIGURE_ARGS+=--with-qtdoc-dir=${X11BASE}/share/doc/qt/html \ - --with-db-includedir=${LOCALBASE}/include/db4 \ - --with-db-libdir=${LOCALBASE}/lib --with-db-lib=db4 \ + --with-db-includedir=${BDB_INCLUDE_DIR} \ + --with-db-libdir=${BDB_LIB_DIR} --with-db-lib=${BDB_LIB_NAME} \ --with-apr-config=${LOCALBASE}/bin/apr-1-config \ --with-apu-config=${LOCALBASE}/bin/apu-1-config \ --with-subversion-dir=${LOCALBASE} \ diff --git a/devel/kdevelop/distinfo b/devel/kdevelop/distinfo index e7eb377af793..7d68d9afd840 100644 --- a/devel/kdevelop/distinfo +++ b/devel/kdevelop/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdevelop-3.3.5.tar.bz2) = e1bb5566c79022c20d534efae386cfa2 -SHA256 (KDE/kdevelop-3.3.5.tar.bz2) = b92ca82e9b0547251d11a647e01578e3f641e0ea2069d07172885e1035406d29 -SIZE (KDE/kdevelop-3.3.5.tar.bz2) = 8178575 +MD5 (KDE/kdevelop-3.4.0.tar.bz2) = 9cf367c89329acf23738e23c0b663ee9 +SHA256 (KDE/kdevelop-3.4.0.tar.bz2) = c477c8980b5dfd4d512ad793d69dd4d5c7987e376789f68796a8013db08d3194 +SIZE (KDE/kdevelop-3.4.0.tar.bz2) = 9158370 diff --git a/devel/kdevelop/files/patch-vcs_clearcase-clearcasemanipulator b/devel/kdevelop/files/patch-vcs_clearcase-clearcasemanipulator new file mode 100644 index 000000000000..7265445fd835 --- /dev/null +++ b/devel/kdevelop/files/patch-vcs_clearcase-clearcasemanipulator @@ -0,0 +1,11 @@ +--- vcs/clearcase/clearcasemanipulator.cpp.orig Mon Mar 5 13:06:42 2007 ++++ vcs/clearcase/clearcasemanipulator.cpp Mon Mar 5 13:06:56 2007 +@@ -20,7 +20,7 @@ + #include <libgen.h> + #include <errno.h> + +-#if defined(Q_OS_MACX) || defined(MACOSX) ++#if defined(Q_OS_MACX) || defined(MACOSX) || defined(Q_OS_FREEBSD) + //this function is taken from GNU libc + //it does not exist on macos + int getline(char **lineptr, size_t *n, FILE *stream) diff --git a/devel/kdevelop/pkg-descr b/devel/kdevelop/pkg-descr index dcaa24a4f3a5..a291a93a1edf 100644 --- a/devel/kdevelop/pkg-descr +++ b/devel/kdevelop/pkg-descr @@ -1,10 +1,4 @@ -KDevelop is a complete IDE, made primarily for -the K Desktop Environment. It seems to be quite -comparable to CodeWarrior Pro on Windows/MacOS. -Paired with kdbg, ktranslator, and other helper -apps, it makes one heck of a powerful KDE/Qt -application developer. +KDevelop is an integrated evelopment environment for a wide variety of +programming tasks with a special focus on Qt and KDE applications. WWW: http://www.kdevelop.org/ - -- Will <andrews@technologist.com> diff --git a/devel/kdevelop/pkg-plist b/devel/kdevelop/pkg-plist index 130c7ae8ba44..84a292769171 100644 --- a/devel/kdevelop/pkg-plist +++ b/devel/kdevelop/pkg-plist @@ -5,15 +5,10 @@ bin/kdevelop-bin bin/kdevelop-htdig bin/kdevprj2kdevelop bin/kdevprofileeditor -bin/r++ include/kdevelop/buildtools/base/kdevbuildtool.h include/kdevelop/buildtools/parsers/qmake/qmakeast.h include/kdevelop/buildtools/parsers/qmake/qmakeastvisitor.h include/kdevelop/buildtools/parsers/qmake/qmakedriver.h -include/kdevelop/buildtools/projectmanager/interfaces/kdevprojectbuilder.h -include/kdevelop/buildtools/projectmanager/interfaces/kdevprojecteditor.h -include/kdevelop/buildtools/projectmanager/interfaces/kdevprojectimporter.h -include/kdevelop/buildtools/projectmanager/interfaces/kdevprojectmodel.h include/kdevelop/buildtools/widgets/addenvvardlg.h include/kdevelop/buildtools/widgets/addfilesdialog.h include/kdevelop/buildtools/widgets/environmentvariableswidget.h @@ -30,10 +25,13 @@ include/kdevelop/buildtools/widgets/subclassesdlgbase.h include/kdevelop/catalog/catalog.h include/kdevelop/catalog/tag.h include/kdevelop/cppparser/ast.h +include/kdevelop/cppparser/cachemanager.h include/kdevelop/cppparser/driver.h include/kdevelop/cppparser/errors.h include/kdevelop/cppparser/lexer.h +include/kdevelop/cppparser/lexercache.h include/kdevelop/cppparser/lookup.h +include/kdevelop/cppparser/macro.h include/kdevelop/cppparser/parser.h include/kdevelop/cppparser/tree_parser.h include/kdevelop/interfaces/KDevCoreIface.h @@ -41,6 +39,7 @@ include/kdevelop/interfaces/KDevPartControllerIface.h include/kdevelop/interfaces/codemodel.h include/kdevelop/interfaces/codemodel_treeparser.h include/kdevelop/interfaces/codemodel_utils.h +include/kdevelop/interfaces/extensions/codebrowserfrontend.h include/kdevelop/interfaces/extensions/dcop/KDevAppFrontendIface.h include/kdevelop/interfaces/extensions/dcop/KDevMakeFrontendIface.h include/kdevelop/interfaces/extensions/kdevappfrontend.h @@ -51,6 +50,7 @@ include/kdevelop/interfaces/extensions/kdevsourceformatter.h include/kdevelop/interfaces/extensions/kdevversioncontrol.h include/kdevelop/interfaces/extras/kdevcompileroptions.h include/kdevelop/interfaces/extras/kdevvcsintegrator.h +include/kdevelop/interfaces/hashedstring.h include/kdevelop/interfaces/katedocumentmanagerinterface.h include/kdevelop/interfaces/kdevapi.h include/kdevelop/interfaces/kdevcoderepository.h @@ -111,9 +111,8 @@ include/kdevelop/shell/generalinfowidgetbase.h include/kdevelop/shell/languageselectwidget.h include/kdevelop/shell/mainwindowshare.h include/kdevelop/shell/mimewarningdialog.h -include/kdevelop/shell/newmainwindow.h +include/kdevelop/shell/multibuffer.h include/kdevelop/shell/partcontroller.h -include/kdevelop/shell/partselectwidget.h include/kdevelop/shell/plugincontroller.h include/kdevelop/shell/profileengine/profile.h include/kdevelop/shell/profileengine/profileengine.h @@ -132,6 +131,7 @@ include/kdevelop/util/filetemplate.h include/kdevelop/util/kscriptactionmanager.h include/kdevelop/util/rurl.h include/kdevelop/util/urlutil.h +include/kdevelop/widgets/fancylistviewitem.h include/kdevelop/widgets/flagboxes.h include/kdevelop/widgets/kcomboview.h include/kdevelop/widgets/kdevhtmlpart.h @@ -146,6 +146,9 @@ lib/kconf_update_bin/kdev-gen-settings-kconf_update lib/kde3/kio_chm.a lib/kde3/kio_chm.la lib/kde3/kio_chm.so +lib/kde3/kio_csharpdoc.a +lib/kde3/kio_csharpdoc.la +lib/kde3/kio_csharpdoc.so lib/kde3/kio_perldoc.a lib/kde3/kio_perldoc.la lib/kde3/kio_perldoc.so @@ -161,22 +164,18 @@ lib/kde3/libcvsserviceintegrator.so lib/kde3/libdocchmplugin.a lib/kde3/libdocchmplugin.la lib/kde3/libdocchmplugin.so -lib/kde3/libdocchmplugin.so.0 lib/kde3/libdoccustomplugin.a lib/kde3/libdoccustomplugin.la lib/kde3/libdoccustomplugin.so lib/kde3/libdocdevhelpplugin.a lib/kde3/libdocdevhelpplugin.la lib/kde3/libdocdevhelpplugin.so -lib/kde3/libdocdevhelpplugin.so.0 lib/kde3/libdocdoxygenplugin.a lib/kde3/libdocdoxygenplugin.la lib/kde3/libdocdoxygenplugin.so -lib/kde3/libdocdoxygenplugin.so.0 lib/kde3/libdockdevtocplugin.a lib/kde3/libdockdevtocplugin.la lib/kde3/libdockdevtocplugin.so -lib/kde3/libdockdevtocplugin.so.0 lib/kde3/libdocqtplugin.a lib/kde3/libdocqtplugin.la lib/kde3/libdocqtplugin.so @@ -222,9 +221,15 @@ lib/kde3/libkdevclearcase.so lib/kde3/libkdevcppsupport.a lib/kde3/libkdevcppsupport.la lib/kde3/libkdevcppsupport.so +lib/kde3/libkdevcsharpsupport.a +lib/kde3/libkdevcsharpsupport.la +lib/kde3/libkdevcsharpsupport.so lib/kde3/libkdevctags2.a lib/kde3/libkdevctags2.la lib/kde3/libkdevctags2.so +lib/kde3/libkdevcustompcsimporter.a +lib/kde3/libkdevcustompcsimporter.la +lib/kde3/libkdevcustompcsimporter.so lib/kde3/libkdevcustomproject.a lib/kde3/libkdevcustomproject.la lib/kde3/libkdevcustomproject.so @@ -285,24 +290,15 @@ lib/kde3/libkdevfullscreen.so lib/kde3/libkdevgccoptions.a lib/kde3/libkdevgccoptions.la lib/kde3/libkdevgccoptions.so -lib/kde3/libkdevghcoptions.a -lib/kde3/libkdevghcoptions.la -lib/kde3/libkdevghcoptions.so lib/kde3/libkdevgrepview.a lib/kde3/libkdevgrepview.la lib/kde3/libkdevgrepview.so -lib/kde3/libkdevhaskellproject.a -lib/kde3/libkdevhaskellproject.la -lib/kde3/libkdevhaskellproject.so -lib/kde3/libkdevhaskellsupport.a -lib/kde3/libkdevhaskellsupport.la -lib/kde3/libkdevhaskellsupport.so -lib/kde3/libkdevjavadebugger.a -lib/kde3/libkdevjavadebugger.la -lib/kde3/libkdevjavadebugger.so lib/kde3/libkdevjavasupport.a lib/kde3/libkdevjavasupport.la lib/kde3/libkdevjavasupport.so +lib/kde3/libkdevkdelibsimporter.a +lib/kde3/libkdevkdelibsimporter.la +lib/kde3/libkdevkdelibsimporter.so lib/kde3/libkdevkonsoleview.a lib/kde3/libkdevkonsoleview.la lib/kde3/libkdevkonsoleview.so @@ -333,12 +329,15 @@ lib/kde3/libkdevpgioptions.so lib/kde3/libkdevphpsupport.a lib/kde3/libkdevphpsupport.la lib/kde3/libkdevphpsupport.so -lib/kde3/libkdevprojectmanager.a -lib/kde3/libkdevprojectmanager.la -lib/kde3/libkdevprojectmanager.so lib/kde3/libkdevpythonsupport.a lib/kde3/libkdevpythonsupport.la lib/kde3/libkdevpythonsupport.so +lib/kde3/libkdevqt4importer.a +lib/kde3/libkdevqt4importer.la +lib/kde3/libkdevqt4importer.so +lib/kde3/libkdevqtimporter.a +lib/kde3/libkdevqtimporter.la +lib/kde3/libkdevqtimporter.so lib/kde3/libkdevquickopen.a lib/kde3/libkdevquickopen.la lib/kde3/libkdevquickopen.so @@ -360,9 +359,6 @@ lib/kde3/libkdevscripting.so lib/kde3/libkdevscriptproject.a lib/kde3/libkdevscriptproject.la lib/kde3/libkdevscriptproject.so -lib/kde3/libkdevsecurity.a -lib/kde3/libkdevsecurity.la -lib/kde3/libkdevsecurity.so lib/kde3/libkdevsnippet.a lib/kde3/libkdevsnippet.la lib/kde3/libkdevsnippet.so @@ -396,9 +392,6 @@ lib/kde3/libkdevvcsmanager.so lib/kde3/libperforceintegrator.a lib/kde3/libperforceintegrator.la lib/kde3/libperforceintegrator.so -lib/kde3/libqeditorpart.a -lib/kde3/libqeditorpart.la -lib/kde3/libqeditorpart.so lib/kde3/libsubversionintegrator.a lib/kde3/libsubversionintegrator.la lib/kde3/libsubversionintegrator.so @@ -414,9 +407,10 @@ lib/libdocumentation_interfaces.a lib/libdocumentation_interfaces.la lib/libdocumentation_interfaces.so lib/libdocumentation_interfaces.so.0 -lib/libkdevautomakeimporter.a -lib/libkdevautomakeimporter.la -lib/libkdevautomakeimporter.so +lib/libgdbmi_parser.a +lib/libgdbmi_parser.la +lib/libgdbmi_parser.so +lib/libgdbmi_parser.so.0 lib/libkdevbuildbase.a lib/libkdevbuildbase.la lib/libkdevbuildbase.so @@ -433,12 +427,6 @@ lib/libkdevcppparser.a lib/libkdevcppparser.la lib/libkdevcppparser.so lib/libkdevcppparser.so.0 -lib/libkdevcustomimporter.a -lib/libkdevcustomimporter.la -lib/libkdevcustomimporter.so -lib/libkdevcustompcsimporter.a -lib/libkdevcustompcsimporter.la -lib/libkdevcustompcsimporter.so lib/libkdevelop.a lib/libkdevelop.la lib/libkdevelop.so @@ -447,12 +435,6 @@ lib/libkdevextras.a lib/libkdevextras.la lib/libkdevextras.so lib/libkdevextras.so.0 -lib/libkdevkdelibsimporter.a -lib/libkdevkdelibsimporter.la -lib/libkdevkdelibsimporter.so -lib/libkdevmakebuilder.a -lib/libkdevmakebuilder.la -lib/libkdevmakebuilder.so lib/libkdevpropertyeditor.a lib/libkdevpropertyeditor.la lib/libkdevpropertyeditor.so @@ -461,9 +443,6 @@ lib/libkdevqmakeparser.a lib/libkdevqmakeparser.la lib/libkdevqmakeparser.so lib/libkdevqmakeparser.so.0 -lib/libkdevqtimporter.a -lib/libkdevqtimporter.la -lib/libkdevqtimporter.so lib/libkdevshell.a lib/libkdevshell.la lib/libkdevshell.so @@ -488,13 +467,6 @@ lib/libprofileengine.a lib/libprofileengine.la lib/libprofileengine.so lib/libprofileengine.so.0 -lib/libprojectmanager_interfaces.a -lib/libprojectmanager_interfaces.la -lib/libprojectmanager_interfaces.so -lib/libprojectmanager_interfaces.so.1 -lib/libqmakeimporter.a -lib/libqmakeimporter.la -lib/libqmakeimporter.so share/applications/kde/kdevassistant.desktop share/applications/kde/kdevdesigner.desktop share/applications/kde/kdevelop.desktop @@ -509,6 +481,7 @@ share/apps/kdevabbrev/sources/qt_classes share/apps/kdevabbrev/templates/cpptemplates share/apps/kdevabbrev/templates/pascaltemplates share/apps/kdevabbrev/templates/phptemplates +share/apps/kdevabbrev/templates/rubytemplates share/apps/kdevadaproject/kdevadaproject.rc share/apps/kdevadasupport/kdevadasupport.rc share/apps/kdevantproject/kdevantproject.rc @@ -549,12 +522,8 @@ share/apps/kdevappwizard/fpchello.png share/apps/kdevappwizard/fpchello.tar.gz share/apps/kdevappwizard/fpcsharedlib.png share/apps/kdevappwizard/fpcsharedlib.tar.gz -share/apps/kdevappwizard/gnomeapp.png -share/apps/kdevappwizard/gnomeapp.tar.gz share/apps/kdevappwizard/gtk2mmapp.png share/apps/kdevappwizard/gtk2mmapp.tar.gz -share/apps/kdevappwizard/haskellhello.png -share/apps/kdevappwizard/haskellhello.tar.gz share/apps/kdevappwizard/importfiles/ada.kdevelop share/apps/kdevappwizard/importfiles/c-auto.kdevelop share/apps/kdevappwizard/importfiles/c.kdevelop @@ -571,6 +540,7 @@ share/apps/kdevappwizard/importfiles/pascal.kdevelop share/apps/kdevappwizard/importfiles/perl.kdevelop share/apps/kdevappwizard/importfiles/php.kdevelop share/apps/kdevappwizard/importfiles/python.kdevelop +share/apps/kdevappwizard/importfiles/qt4qmake.kdevelop share/apps/kdevappwizard/importfiles/qtqmake.kdevelop share/apps/kdevappwizard/importfiles/qttmake.kdevelop share/apps/kdevappwizard/importfiles/ruby.kdevelop @@ -590,6 +560,7 @@ share/apps/kdevappwizard/imports/pascal share/apps/kdevappwizard/imports/perl share/apps/kdevappwizard/imports/php share/apps/kdevappwizard/imports/python +share/apps/kdevappwizard/imports/qt4qmake share/apps/kdevappwizard/imports/qtqmake share/apps/kdevappwizard/imports/qttmake share/apps/kdevappwizard/imports/ruby @@ -605,12 +576,10 @@ share/apps/kdevappwizard/kateplugin.png share/apps/kdevappwizard/kateplugin.tar.gz share/apps/kdevappwizard/kateplugin2.png share/apps/kdevappwizard/kateplugin2.tar.gz -share/apps/kdevappwizard/kbearimportfilter.png -share/apps/kdevappwizard/kbearimportfilter.tar.gz -share/apps/kdevappwizard/kbearplugin.png -share/apps/kdevappwizard/kbearplugin.tar.gz share/apps/kdevappwizard/kcmodule.png share/apps/kdevappwizard/kcmodule.tar.gz +share/apps/kdevappwizard/kconfig35.png +share/apps/kdevappwizard/kconfig35.tar.gz share/apps/kdevappwizard/kdedcop.png share/apps/kdevappwizard/kdedcop.tar.gz share/apps/kdevappwizard/kdevappwizard.rc @@ -682,6 +651,10 @@ share/apps/kdevappwizard/qmakeapp.png share/apps/kdevappwizard/qmakeapp.tar.gz share/apps/kdevappwizard/qmakesimple.png share/apps/kdevappwizard/qmakesimple.tar.gz +share/apps/kdevappwizard/qt4hello.png +share/apps/kdevappwizard/qt4hello.tar.gz +share/apps/kdevappwizard/qt4makeapp.png +share/apps/kdevappwizard/qt4makeapp.tar.gz share/apps/kdevappwizard/qtopiaapp.png share/apps/kdevappwizard/qtopiaapp.tar.gz share/apps/kdevappwizard/qtruby.png @@ -698,7 +671,6 @@ share/apps/kdevappwizard/superwaba.png share/apps/kdevappwizard/superwaba.tar.gz share/apps/kdevappwizard/template-common/Artistic share/apps/kdevappwizard/template-common/COPYING -share/apps/kdevappwizard/template-common/COPYING-DOCS share/apps/kdevappwizard/template-common/COPYING.LIB share/apps/kdevappwizard/template-common/LICENSE.BSD share/apps/kdevappwizard/template-common/LICENSE.QPL @@ -753,18 +725,15 @@ share/apps/kdevappwizard/templates/fortranhello.kdevtemplate share/apps/kdevappwizard/templates/fpcgtk.kdevtemplate share/apps/kdevappwizard/templates/fpchello.kdevtemplate share/apps/kdevappwizard/templates/fpcsharedlib.kdevtemplate -share/apps/kdevappwizard/templates/gnomeapp.kdevtemplate share/apps/kdevappwizard/templates/gtk2mmapp.kdevtemplate -share/apps/kdevappwizard/templates/haskellhello.kdevtemplate share/apps/kdevappwizard/templates/javahello.kdevtemplate share/apps/kdevappwizard/templates/kapp.kdevtemplate share/apps/kdevappwizard/templates/kappjava.kdevtemplate share/apps/kdevappwizard/templates/kappruby.kdevtemplate share/apps/kdevappwizard/templates/kateplugin.kdevtemplate share/apps/kdevappwizard/templates/kateplugin2.kdevtemplate -share/apps/kdevappwizard/templates/kbearimportfilter.kdevtemplate -share/apps/kdevappwizard/templates/kbearplugin.kdevtemplate share/apps/kdevappwizard/templates/kcmodule.kdevtemplate +share/apps/kdevappwizard/templates/kconfig35.kdevtemplate share/apps/kdevappwizard/templates/kdedcop.kdevtemplate share/apps/kdevappwizard/templates/kdevlang.kdevtemplate share/apps/kdevappwizard/templates/kdevpart.kdevtemplate @@ -800,6 +769,8 @@ share/apps/kdevappwizard/templates/pythonhello.kdevtemplate share/apps/kdevappwizard/templates/pytk.kdevtemplate share/apps/kdevappwizard/templates/qmakeapp.kdevtemplate share/apps/kdevappwizard/templates/qmakesimple.kdevtemplate +share/apps/kdevappwizard/templates/qt4hello.kdevtemplate +share/apps/kdevappwizard/templates/qt4makeapp.kdevtemplate share/apps/kdevappwizard/templates/qtopiaapp.kdevtemplate share/apps/kdevappwizard/templates/qtruby.kdevtemplate share/apps/kdevappwizard/templates/qtrubyapp.kdevtemplate @@ -858,10 +829,13 @@ share/apps/kdevcppsupport/newclass/gtk_header share/apps/kdevcppsupport/newclass/gtk_source share/apps/kdevcppsupport/newclass/objc_header share/apps/kdevcppsupport/newclass/objc_source +share/apps/kdevcppsupport/subclassing/subclass_qt4_template.cpp +share/apps/kdevcppsupport/subclassing/subclass_qt4_template.h share/apps/kdevcppsupport/subclassing/subclass_template.cpp share/apps/kdevcppsupport/subclassing/subclass_template.h share/apps/kdevcppsupport/templates/default.cpp share/apps/kdevcppsupport/templates/default.h +share/apps/kdevcsharpsupport/kdevcsharpsupport.rc share/apps/kdevctags2/kdevpart_ctags2.rc share/apps/kdevcustomproject/kdevcustomproject.rc share/apps/kdevcvsservice/buildcvs.sh @@ -1123,11 +1097,10 @@ share/apps/kdevdocumentation/tocs/fortran_bugs_gcc.toc share/apps/kdevdocumentation/tocs/gnome1.toc share/apps/kdevdocumentation/tocs/gnustep.toc share/apps/kdevdocumentation/tocs/gtk_bugs.toc -share/apps/kdevdocumentation/tocs/haskell.toc -share/apps/kdevdocumentation/tocs/haskell_bugs_ghc.toc share/apps/kdevdocumentation/tocs/java_bugs_gcc.toc share/apps/kdevdocumentation/tocs/java_bugs_sun.toc share/apps/kdevdocumentation/tocs/kde2book.toc +share/apps/kdevdocumentation/tocs/kdetemplates.toc share/apps/kdevdocumentation/tocs/kdev3api.toc share/apps/kdevdocumentation/tocs/libc.toc share/apps/kdevdocumentation/tocs/libstdc++.toc @@ -1161,10 +1134,15 @@ share/apps/kdevelop/icons/hicolor/16x16/actions/methodnew.png share/apps/kdevelop/icons/hicolor/16x16/actions/newwidget.png share/apps/kdevelop/icons/hicolor/16x16/actions/project_open.png share/apps/kdevelop/icons/hicolor/16x16/actions/qmake_app.png +share/apps/kdevelop/icons/hicolor/16x16/actions/qmake_app_disabled.png +share/apps/kdevelop/icons/hicolor/16x16/actions/qmake_func_scope.png +share/apps/kdevelop/icons/hicolor/16x16/actions/qmake_inc_scope.png share/apps/kdevelop/icons/hicolor/16x16/actions/qmake_lib.png +share/apps/kdevelop/icons/hicolor/16x16/actions/qmake_lib_disabled.png share/apps/kdevelop/icons/hicolor/16x16/actions/qmake_scope.png share/apps/kdevelop/icons/hicolor/16x16/actions/qmake_scopenew.png share/apps/kdevelop/icons/hicolor/16x16/actions/qmake_sub.png +share/apps/kdevelop/icons/hicolor/16x16/actions/qmake_sub_disabled.png share/apps/kdevelop/icons/hicolor/16x16/actions/qmake_subclass.png share/apps/kdevelop/icons/hicolor/16x16/actions/qmake_ui_h.png share/apps/kdevelop/icons/hicolor/16x16/actions/qmakerun.png @@ -1226,7 +1204,6 @@ share/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/profile.c share/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/profile.config share/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/FortranIDE/fortran.appwizard share/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/FortranIDE/profile.config -share/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/HaskellIDE/haskell.appwizard share/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/HaskellIDE/profile.config share/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/JavaIDE/java.appwizard share/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/JavaIDE/profile.config @@ -1235,6 +1212,7 @@ share/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/PascalIDE/profile.config share/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/profile.config share/apps/kdevelop/profiles/IDE/DatabaseIDE/profile.config share/apps/kdevelop/profiles/IDE/DatabaseIDE/sql.appwizard +share/apps/kdevelop/profiles/IDE/ScriptingLanguageIDE/CSharpIDE/csharp.appwizard share/apps/kdevelop/profiles/IDE/ScriptingLanguageIDE/PHPIDE/php.appwizard share/apps/kdevelop/profiles/IDE/ScriptingLanguageIDE/PHPIDE/profile.config share/apps/kdevelop/profiles/IDE/ScriptingLanguageIDE/PerlIDE/perl.appwizard @@ -1250,11 +1228,11 @@ share/apps/kdevelop/profiles/IDE/profile.config share/apps/kdevelop/profiles/KDevAssistant/profile.config share/apps/kdevelop/profiles/profile.config share/apps/kdevelop/profiles/projectprofiles -share/apps/kdevfilecreate/file-templates/F share/apps/kdevfilecreate/file-templates/adb share/apps/kdevfilecreate/file-templates/ads share/apps/kdevfilecreate/file-templates/c share/apps/kdevfilecreate/file-templates/cpp +share/apps/kdevfilecreate/file-templates/css share/apps/kdevfilecreate/file-templates/dox share/apps/kdevfilecreate/file-templates/dpr share/apps/kdevfilecreate/file-templates/f @@ -1265,8 +1243,8 @@ share/apps/kdevfilecreate/file-templates/for share/apps/kdevfilecreate/file-templates/fpp share/apps/kdevfilecreate/file-templates/ftn share/apps/kdevfilecreate/file-templates/h -share/apps/kdevfilecreate/file-templates/hs share/apps/kdevfilecreate/file-templates/java +share/apps/kdevfilecreate/file-templates/js share/apps/kdevfilecreate/file-templates/l share/apps/kdevfilecreate/file-templates/ll share/apps/kdevfilecreate/file-templates/pas-program @@ -1277,17 +1255,25 @@ share/apps/kdevfilecreate/file-templates/pm share/apps/kdevfilecreate/file-templates/pp-program share/apps/kdevfilecreate/file-templates/pp-unit share/apps/kdevfilecreate/file-templates/py +share/apps/kdevfilecreate/file-templates/qrc share/apps/kdevfilecreate/file-templates/rb share/apps/kdevfilecreate/file-templates/rhtml +share/apps/kdevfilecreate/file-templates/rjs +share/apps/kdevfilecreate/file-templates/rxml share/apps/kdevfilecreate/file-templates/ts share/apps/kdevfilecreate/file-templates/ui share/apps/kdevfilecreate/file-templates/ui-confdialog share/apps/kdevfilecreate/file-templates/ui-dialog +share/apps/kdevfilecreate/file-templates/ui-dialog-qt4 share/apps/kdevfilecreate/file-templates/ui-dialogb +share/apps/kdevfilecreate/file-templates/ui-dialogb-qt4 share/apps/kdevfilecreate/file-templates/ui-dialogr +share/apps/kdevfilecreate/file-templates/ui-dialogr-qt4 share/apps/kdevfilecreate/file-templates/ui-mainwin +share/apps/kdevfilecreate/file-templates/ui-mainwin-qt4 share/apps/kdevfilecreate/file-templates/ui-tabdialog share/apps/kdevfilecreate/file-templates/ui-widget +share/apps/kdevfilecreate/file-templates/ui-widget-qt4 share/apps/kdevfilecreate/file-templates/ui-wizard share/apps/kdevfilecreate/file-templates/y share/apps/kdevfilecreate/file-templates/yy @@ -1299,9 +1285,6 @@ share/apps/kdevfortransupport/kdevfortransupport.rc share/apps/kdevfullscreen/kdevpart_fullscreen.rc share/apps/kdevgrepview/icons/hicolor/22x22/actions/grep.png share/apps/kdevgrepview/kdevgrepview.rc -share/apps/kdevhaskellproject/kdevhaskellproject.rc -share/apps/kdevhaskellsupport/kdevhaskellsupport.rc -share/apps/kdevjavadebugger/kdevjavadebugger.rc share/apps/kdevjavasupport/kdevjavasupport.rc share/apps/kdevmakeview/kdevmakeview.rc share/apps/kdevpartexplorer/kdevpartexplorer.rc @@ -1310,7 +1293,6 @@ share/apps/kdevpascalsupport/kdevpascalsupport.rc share/apps/kdevperlsupport/kdevperlsupport.rc share/apps/kdevphpsupport/kdevphpsupport.rc share/apps/kdevphpsupport/phpfunctions -share/apps/kdevprojectmanager/kdevprojectmanager.rc share/apps/kdevpythonsupport/kdevpythonsupport.rc share/apps/kdevquickopen/kdevpart_quickopen.rc share/apps/kdevrbdebugger/debuggee.rb @@ -1329,29 +1311,22 @@ share/apps/kdevrubysupport/pics/ruby_config.png share/apps/kdevrubysupport/pics/ruby_run.png share/apps/kdevscripting/kdevscripting.rc share/apps/kdevscriptproject/kdevscriptproject.rc -share/apps/kdevsecurity/patterns share/apps/kdevsqlsupport/kdevsqlsupport.rc share/apps/kdevtipofday/kdevpart_tipofday.rc share/apps/kdevtipofday/tips share/apps/kdevtools/kdevpart_tools.rc share/apps/kdevtrollproject/kdevtrollproject.rc share/apps/kdevvalgrind/kdevpart_valgrind.rc -share/apps/kio_pydoc/kde_inspect.py share/apps/kio_pydoc/kde_pydoc.py -share/apps/qeditorpart/highlight/highlighting.xml -share/apps/qeditorpart/highlight/qt.xml -share/apps/qeditorpart/qeditor_part.rc share/config/kdevassistantrc share/config/kdeveloprc share/desktop-directories/kde-development-kdevelop.directory -share/doc/HTML/en/kde_app_devel/CMakeLists.txt share/doc/HTML/en/kde_app_devel/appwizard.png share/doc/HTML/en/kde_app_devel/common share/doc/HTML/en/kde_app_devel/index.cache.bz2 share/doc/HTML/en/kde_app_devel/index.docbook share/doc/HTML/en/kde_app_devel/kscribblefiles.png share/doc/HTML/en/kdevelop-apidocs/common -share/doc/HTML/en/kdevelop/CMakeLists.txt share/doc/HTML/en/kdevelop/SF-general.png share/doc/HTML/en/kdevelop/SF-indent.png share/doc/HTML/en/kdevelop/SF-other.png @@ -1367,6 +1342,10 @@ share/doc/HTML/en/kdevelop/automake-manager.png share/doc/HTML/en/kdevelop/automake-subproject-popup.png share/doc/HTML/en/kdevelop/automake-target-popup.png share/doc/HTML/en/kdevelop/automakemanager.png +share/doc/HTML/en/kdevelop/build-commands.png +share/doc/HTML/en/kdevelop/build-configurations.png +share/doc/HTML/en/kdevelop/build-menu-automake.png +share/doc/HTML/en/kdevelop/build-menu.png share/doc/HTML/en/kdevelop/class-browsers.docbook share/doc/HTML/en/kdevelop/classview.png share/doc/HTML/en/kdevelop/commands.docbook @@ -1385,15 +1364,25 @@ share/doc/HTML/en/kdevelop/configure-docu-devhelp.png share/doc/HTML/en/kdevelop/configure-docu-dox.png share/doc/HTML/en/kdevelop/configure-docu-edit.png share/doc/HTML/en/kdevelop/configure-docu-general.png +share/doc/HTML/en/kdevelop/configure-docu-indexgen.png share/doc/HTML/en/kdevelop/configure-docu-toc.png share/doc/HTML/en/kdevelop/configure-editor.png share/doc/HTML/en/kdevelop/configure-file-selector.png +share/doc/HTML/en/kdevelop/configure-file-templates.png share/doc/HTML/en/kdevelop/configure-general.png +share/doc/HTML/en/kdevelop/configure-project-buildconfig.png +share/doc/HTML/en/kdevelop/configure-project-configure.png +share/doc/HTML/en/kdevelop/configure-project-cpp.png +share/doc/HTML/en/kdevelop/configure-project-cppoptions.png share/doc/HTML/en/kdevelop/configure-project-doc.png +share/doc/HTML/en/kdevelop/configure-project-make.png +share/doc/HTML/en/kdevelop/configure-project-run.png share/doc/HTML/en/kdevelop/configure-select.png share/doc/HTML/en/kdevelop/configure-snippets.png share/doc/HTML/en/kdevelop/create-new-project-cvs.png +share/doc/HTML/en/kdevelop/create-new-project.png share/doc/HTML/en/kdevelop/createnewproject.png +share/doc/HTML/en/kdevelop/createnewprojectoptions.png share/doc/HTML/en/kdevelop/credits.docbook share/doc/HTML/en/kdevelop/cvs.docbook share/doc/HTML/en/kdevelop/debugger.docbook @@ -1403,18 +1392,31 @@ share/doc/HTML/en/kdevelop/doctree.png share/doc/HTML/en/kdevelop/doctreeview.png share/doc/HTML/en/kdevelop/documentation.docbook share/doc/HTML/en/kdevelop/documents-contents.png +share/doc/HTML/en/kdevelop/documents-search.png share/doc/HTML/en/kdevelop/edit-doctree-TOC-entry.png share/doc/HTML/en/kdevelop/editing.docbook +share/doc/HTML/en/kdevelop/editor-ctags-lookup.png +share/doc/HTML/en/kdevelop/editor-ctags-menu.png +share/doc/HTML/en/kdevelop/editor-ctags-regenerate.png +share/doc/HTML/en/kdevelop/editor-find-menu.png +share/doc/HTML/en/kdevelop/editor-search-doc.png +share/doc/HTML/en/kdevelop/editor-switch-header.png share/doc/HTML/en/kdevelop/empty-ide.png share/doc/HTML/en/kdevelop/file-browsers.docbook +share/doc/HTML/en/kdevelop/file-list-close-selected.png +share/doc/HTML/en/kdevelop/file-list-session-create.png +share/doc/HTML/en/kdevelop/file-list-session-default.png share/doc/HTML/en/kdevelop/file-selector.png share/doc/HTML/en/kdevelop/filetree.png +share/doc/HTML/en/kdevelop/find-in-files.png share/doc/HTML/en/kdevelop/folded-tabs.png share/doc/HTML/en/kdevelop/getting-started.docbook +share/doc/HTML/en/kdevelop/hello-world-app.png share/doc/HTML/en/kdevelop/importdirectory.png share/doc/HTML/en/kdevelop/index.cache.bz2 share/doc/HTML/en/kdevelop/index.docbook share/doc/HTML/en/kdevelop/kdcop_browsing.png +share/doc/HTML/en/kdevelop/kdevdesigner.png share/doc/HTML/en/kdevelop/kdevelop-ideal-mode-0.png share/doc/HTML/en/kdevelop/kdevelop-ideal-mode.png share/doc/HTML/en/kdevelop/kdevelop-install.docbook @@ -1429,13 +1431,26 @@ share/doc/HTML/en/kdevelop/nutshell.docbook share/doc/HTML/en/kdevelop/open-project.png share/doc/HTML/en/kdevelop/open-recent-project.png share/doc/HTML/en/kdevelop/plugin-tools.docbook +share/doc/HTML/en/kdevelop/problem-report-all-todos.png +share/doc/HTML/en/kdevelop/problem-report-marks.png +share/doc/HTML/en/kdevelop/problem-report-todo.png share/doc/HTML/en/kdevelop/project-advanced.docbook share/doc/HTML/en/kdevelop/project-management.docbook +share/doc/HTML/en/kdevelop/raw-project-warning.png +share/doc/HTML/en/kdevelop/run-button.png share/doc/HTML/en/kdevelop/script_location.png share/doc/HTML/en/kdevelop/select-user-interface-0.png share/doc/HTML/en/kdevelop/select-user-interface.png share/doc/HTML/en/kdevelop/setup.docbook +share/doc/HTML/en/kdevelop/split-source-header-navigate.png +share/doc/HTML/en/kdevelop/split-source-header.png +share/doc/HTML/en/kdevelop/split-windows.png +share/doc/HTML/en/kdevelop/split-workspace.png share/doc/HTML/en/kdevelop/survey-manual.docbook +share/doc/HTML/en/kdevelop/tutorial-debug-tree.png +share/doc/HTML/en/kdevelop/tutorial-hello-new.png +share/doc/HTML/en/kdevelop/tutorial-hello-options.png +share/doc/HTML/en/kdevelop/tutorial-new-project.png share/doc/HTML/en/kdevelop/unixdev.docbook share/doc/HTML/en/kdevelop/wrong-project-location.png share/icons/hicolor/16x16/actions/breakpoint_add.png @@ -1459,6 +1474,7 @@ share/icons/locolor/32x32/actions/kdevelop_tip.png share/mimelnk/application/x-kdevelop.desktop share/mimelnk/text/x-fortran.desktop share/services/chm.protocol +share/services/csharpdoc.protocol share/services/docchmplugin.desktop share/services/doccustomplugin.desktop share/services/docdevhelpplugin.desktop @@ -1473,7 +1489,6 @@ share/services/kdevantproject.desktop share/services/kdevappoutputview.desktop share/services/kdevappwizard.desktop share/services/kdevastyle.desktop -share/services/kdevautomakeimporter.desktop share/services/kdevautoproject.desktop share/services/kdevbashsupport.desktop share/services/kdevbookmarks.desktop @@ -1481,9 +1496,9 @@ share/services/kdevclassview.desktop share/services/kdevclearcase.desktop share/services/kdevclearcaseintegrator.desktop share/services/kdevcppsupport.desktop +share/services/kdevcsharpsupport.desktop share/services/kdevcsupport.desktop share/services/kdevctags2.desktop -share/services/kdevcustomimporter.desktop share/services/kdevcustomproject.desktop share/services/kdevcvsservice.desktop share/services/kdevcvsserviceintegrator.desktop @@ -1506,17 +1521,12 @@ share/services/kdevfpcoptions.desktop share/services/kdevfullscreen.desktop share/services/kdevg77options.desktop share/services/kdevgccoptions.desktop -share/services/kdevghcoptions.desktop share/services/kdevgppoptions.desktop share/services/kdevgrepview.desktop -share/services/kdevhaskellproject.desktop -share/services/kdevhaskellsupport.desktop -share/services/kdevjavadebugger.desktop share/services/kdevjavasupport.desktop share/services/kdevkdeautoproject.desktop share/services/kdevkdelibsimporter.desktop share/services/kdevkonsoleview.desktop -share/services/kdevmakebuilder.desktop share/services/kdevmakeview.desktop share/services/kdevopenwith.desktop share/services/kdevpartexplorer.desktop @@ -1529,9 +1539,8 @@ share/services/kdevperlsupport.desktop share/services/kdevpgf77options.desktop share/services/kdevpghpfoptions.desktop share/services/kdevphpsupport.desktop -share/services/kdevprojectmanager.desktop share/services/kdevpythonsupport.desktop -share/services/kdevqmakeimporter.desktop +share/services/kdevqt4importer.desktop share/services/kdevqtimporter.desktop share/services/kdevquickopen.desktop share/services/kdevrbdebugger.desktop @@ -1540,7 +1549,6 @@ share/services/kdevreplace.desktop share/services/kdevrubysupport.desktop share/services/kdevscripting.desktop share/services/kdevscriptproject.desktop -share/services/kdevsecurity.desktop share/services/kdevsnippet.desktop share/services/kdevsqlsupport.desktop share/services/kdevsubversion.desktop @@ -1555,8 +1563,8 @@ share/services/kdevvalgrind.desktop share/services/kdevvcsmanager.desktop share/services/perldoc.protocol share/services/pydoc.protocol -share/services/qeditor_part.desktop share/servicetypes/kdevelopappfrontend.desktop +share/servicetypes/kdevelopcodebrowserfrontend.desktop share/servicetypes/kdevelopcompileroptions.desktop share/servicetypes/kdevelopcreatefile.desktop share/servicetypes/kdevelopdifffrontend.desktop @@ -1566,8 +1574,6 @@ share/servicetypes/kdevelopmakefrontend.desktop share/servicetypes/kdeveloppcsimporter.desktop share/servicetypes/kdevelopplugin.desktop share/servicetypes/kdevelopproject.desktop -share/servicetypes/kdevelopprojectbuilder.desktop -share/servicetypes/kdevelopprojectimporter.desktop share/servicetypes/kdevelopsourceformatter.desktop share/servicetypes/kdevelopvcsintegrator.desktop share/servicetypes/kdevelopversioncontrol.desktop @@ -1636,11 +1642,6 @@ share/servicetypes/kdevelopversioncontrol.desktop @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/languages/lib/designer_integration/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/languages/lib/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/languages/html -@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager/interfaces/html -@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager/interfaces/html -@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager/html -@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager/interfaces/html -@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/widgets/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/widgets/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/qmake/html @@ -1667,8 +1668,6 @@ share/servicetypes/kdevelopversioncontrol.desktop @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/widgets/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/base/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/html -@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager/interfaces/html -@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/util/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/interfaces/extensions/html @@ -1679,6 +1678,9 @@ share/servicetypes/kdevelopversioncontrol.desktop @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/widgets/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/catalog/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/src/profileengine/lib/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/src/profileengine/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/src/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/parts/documentation/interfaces/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/parts/documentation/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/parts/html @@ -1688,17 +1690,12 @@ share/servicetypes/kdevelopversioncontrol.desktop @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/widgets/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/base/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/html -@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager/interfaces/html -@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/languages/lib/interfaces/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/languages/lib/debugger/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/languages/lib/designer_integration/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/languages/lib/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/languages/html -@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/src/profileengine/lib/html -@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/src/profileengine/html -@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/src/html @exec /bin/mkdir -p %D/share/apps/kdevvcsmanager @dirrm share/doc/HTML/en/kdevelop-apidocs/src/profileengine/lib/html @dirrm share/doc/HTML/en/kdevelop-apidocs/src/profileengine/lib @@ -1740,10 +1737,6 @@ share/servicetypes/kdevelopversioncontrol.desktop @dirrm share/doc/HTML/en/kdevelop-apidocs/languages/lib @dirrm share/doc/HTML/en/kdevelop-apidocs/languages/html @dirrm share/doc/HTML/en/kdevelop-apidocs/languages -@dirrm share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager/interfaces/html -@dirrm share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager/interfaces -@dirrm share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager/html -@dirrm share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager @dirrm share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/widgets/html @dirrm share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/widgets @dirrm share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/qmake/html @@ -1761,8 +1754,6 @@ share/servicetypes/kdevelopversioncontrol.desktop @dirrm share/doc/HTML/en/kdevelop-apidocs @dirrm share/doc/HTML/en/kdevelop @dirrm share/doc/HTML/en/kde_app_devel -@dirrm share/apps/qeditorpart/highlight -@dirrm share/apps/qeditorpart @dirrm share/apps/kio_pydoc @dirrm share/apps/kdevvcsmanager @dirrm share/apps/kdevvalgrind @@ -1770,7 +1761,6 @@ share/servicetypes/kdevelopversioncontrol.desktop @dirrm share/apps/kdevtools @dirrm share/apps/kdevtipofday @dirrm share/apps/kdevsqlsupport -@dirrm share/apps/kdevsecurity @dirrm share/apps/kdevscriptproject @dirrm share/apps/kdevscripting @dirrm share/apps/kdevrubysupport/pics @@ -1784,7 +1774,6 @@ share/servicetypes/kdevelopversioncontrol.desktop @dirrm share/apps/kdevrbdebugger @dirrm share/apps/kdevquickopen @dirrm share/apps/kdevpythonsupport -@dirrm share/apps/kdevprojectmanager @dirrm share/apps/kdevphpsupport @dirrm share/apps/kdevperlsupport @dirrm share/apps/kdevpascalsupport @@ -1792,9 +1781,6 @@ share/servicetypes/kdevelopversioncontrol.desktop @dirrm share/apps/kdevpartexplorer @dirrm share/apps/kdevmakeview @dirrm share/apps/kdevjavasupport -@dirrm share/apps/kdevjavadebugger -@dirrm share/apps/kdevhaskellsupport -@dirrm share/apps/kdevhaskellproject @dirrm share/apps/kdevgrepview/icons/hicolor/22x22/actions @dirrm share/apps/kdevgrepview/icons/hicolor/22x22 @dirrm share/apps/kdevgrepview/icons/hicolor @@ -1812,6 +1798,7 @@ share/servicetypes/kdevelopversioncontrol.desktop @dirrm share/apps/kdevelop/profiles/IDE/ScriptingLanguageIDE/PythonIDE @dirrm share/apps/kdevelop/profiles/IDE/ScriptingLanguageIDE/PerlIDE @dirrm share/apps/kdevelop/profiles/IDE/ScriptingLanguageIDE/PHPIDE +@dirrm share/apps/kdevelop/profiles/IDE/ScriptingLanguageIDE/CSharpIDE @dirrm share/apps/kdevelop/profiles/IDE/ScriptingLanguageIDE @dirrm share/apps/kdevelop/profiles/IDE/DatabaseIDE @dirrm share/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/PascalIDE @@ -1859,6 +1846,7 @@ share/servicetypes/kdevelopversioncontrol.desktop @dirrm share/apps/kdevcvsservice @dirrm share/apps/kdevcustomproject @dirrm share/apps/kdevctags2 +@dirrm share/apps/kdevcsharpsupport @dirrm share/apps/kdevcppsupport/templates @dirrm share/apps/kdevcppsupport/subclassing @dirrm share/apps/kdevcppsupport/newclass @@ -1908,8 +1896,6 @@ share/servicetypes/kdevelopversioncontrol.desktop @dirrm include/kdevelop/cppparser @dirrm include/kdevelop/catalog @dirrm include/kdevelop/buildtools/widgets -@dirrm include/kdevelop/buildtools/projectmanager/interfaces -@dirrm include/kdevelop/buildtools/projectmanager @dirrm include/kdevelop/buildtools/parsers/qmake @dirrm include/kdevelop/buildtools/parsers @dirrm include/kdevelop/buildtools/base diff --git a/editors/calligra-l10n-ca/Makefile b/editors/calligra-l10n-ca/Makefile index 5b2c53c82e80..b4bd5f13bd25 100644 --- a/editors/calligra-l10n-ca/Makefile +++ b/editors/calligra-l10n-ca/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/calligra-l10n-ca/distinfo b/editors/calligra-l10n-ca/distinfo index 64dc722ff740..e1f9aef8d9eb 100644 --- a/editors/calligra-l10n-ca/distinfo +++ b/editors/calligra-l10n-ca/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ca-1.6.1.tar.bz2) = 2af9ee48900b76f13c7b205f9f44e454 -SHA256 (KDE/kde-i18n/koffice-l10n-ca-1.6.1.tar.bz2) = bfcd51cae7df0a9985e007a0f7a275b2d0e95a2c0d8f202888c90a8b49ed6346 -SIZE (KDE/kde-i18n/koffice-l10n-ca-1.6.1.tar.bz2) = 1410868 +MD5 (KDE/kde-i18n/koffice-l10n-ca-1.6.2.tar.bz2) = 8809746f5856aa7c2b37583425501ea7 +SHA256 (KDE/kde-i18n/koffice-l10n-ca-1.6.2.tar.bz2) = 8d4104551f098df26fb80b2864fa6b8b5817b4085ff3c33676edbf329fc7eb0a +SIZE (KDE/kde-i18n/koffice-l10n-ca-1.6.2.tar.bz2) = 1675217 diff --git a/editors/calligra-l10n-ca/pkg-plist b/editors/calligra-l10n-ca/pkg-plist index f9699d3b9475..3d339bf1bdf1 100644 --- a/editors/calligra-l10n-ca/pkg-plist +++ b/editors/calligra-l10n-ca/pkg-plist @@ -8,13 +8,18 @@ share/doc/HTML/ca/kchart/index.docbook share/doc/HTML/ca/kexi/basics.docbook share/doc/HTML/ca/kexi/building.docbook share/doc/HTML/ca/kexi/common +share/doc/HTML/ca/kexi/comparing.docbook share/doc/HTML/ca/kexi/configuration.docbook share/doc/HTML/ca/kexi/credits.docbook share/doc/HTML/ca/kexi/database.docbook +share/doc/HTML/ca/kexi/designingforms.docbook +share/doc/HTML/ca/kexi/enteringdataintotables.docbook +share/doc/HTML/ca/kexi/enteringdatausingforms.docbook share/doc/HTML/ca/kexi/index.cache.bz2 share/doc/HTML/ca/kexi/index.docbook share/doc/HTML/ca/kexi/intro.docbook share/doc/HTML/ca/kexi/menus.docbook +share/doc/HTML/ca/kexi/querydesigning.docbook share/doc/HTML/ca/kformula/common share/doc/HTML/ca/kformula/index.cache.bz2 share/doc/HTML/ca/kformula/index.docbook @@ -39,13 +44,44 @@ share/doc/HTML/ca/kplato/index.docbook share/doc/HTML/ca/kplato/mainwindow.docbook share/doc/HTML/ca/kplato/options.docbook share/doc/HTML/ca/kplato/wbs.docbook +share/doc/HTML/ca/kpresenter/a11y.docbook +share/doc/HTML/ca/kpresenter/common share/doc/HTML/ca/kpresenter/faq.docbook share/doc/HTML/ca/kpresenter/great-presentations.docbook share/doc/HTML/ca/kpresenter/guides.docbook +share/doc/HTML/ca/kpresenter/index.cache.bz2 +share/doc/HTML/ca/kpresenter/index.docbook share/doc/HTML/ca/kpresenter/menus.docbook share/doc/HTML/ca/kpresenter/options.docbook share/doc/HTML/ca/kpresenter/screen.docbook share/doc/HTML/ca/kpresenter/tutorial.docbook +share/doc/HTML/ca/krita/commands-dialogs.docbook +share/doc/HTML/ca/krita/commands-menus.docbook +share/doc/HTML/ca/krita/commands-palettes.docbook +share/doc/HTML/ca/krita/commands-toolbars.docbook +share/doc/HTML/ca/krita/commands.docbook +share/doc/HTML/ca/krita/common +share/doc/HTML/ca/krita/credits.docbook +share/doc/HTML/ca/krita/developers-plugins.docbook +share/doc/HTML/ca/krita/developers-scripting.docbook +share/doc/HTML/ca/krita/developers.docbook +share/doc/HTML/ca/krita/faq.docbook +share/doc/HTML/ca/krita/index.cache.bz2 +share/doc/HTML/ca/krita/index.docbook +share/doc/HTML/ca/krita/installation.docbook +share/doc/HTML/ca/krita/introduction.docbook +share/doc/HTML/ca/krita/settings.docbook +share/doc/HTML/ca/krita/tutorial-quick-starts.docbook +share/doc/HTML/ca/krita/tutorial-select-layer.docbook +share/doc/HTML/ca/krita/tutorial-starting.docbook +share/doc/HTML/ca/krita/tutorial-tablet.docbook +share/doc/HTML/ca/krita/tutorial.docbook +share/doc/HTML/ca/krita/using-colorspaces.docbook +share/doc/HTML/ca/krita/using-filters.docbook +share/doc/HTML/ca/krita/using-images.docbook +share/doc/HTML/ca/krita/using-layers.docbook +share/doc/HTML/ca/krita/using-selections.docbook +share/doc/HTML/ca/krita/using-views.docbook share/doc/HTML/ca/kspread/a11y.docbook share/doc/HTML/ca/kspread/advanced.docbook share/doc/HTML/ca/kspread/basics.docbook @@ -81,6 +117,18 @@ share/doc/HTML/ca/kspread/shortcut1.png share/doc/HTML/ca/kspread/shortcut2.png share/doc/HTML/ca/kspread/shortcut3.png share/doc/HTML/ca/kspread/tts.png +share/doc/HTML/ca/kugar/common +share/doc/HTML/ca/kugar/datadtd.docbook +share/doc/HTML/ca/kugar/dataref.docbook +share/doc/HTML/ca/kugar/designer.docbook +share/doc/HTML/ca/kugar/index.cache.bz2 +share/doc/HTML/ca/kugar/index.docbook +share/doc/HTML/ca/kugar/progguide.docbook +share/doc/HTML/ca/kugar/starting.docbook +share/doc/HTML/ca/kugar/template-elements.docbook +share/doc/HTML/ca/kugar/template.docbook +share/doc/HTML/ca/kugar/templatedtd.docbook +share/doc/HTML/ca/kugar/tutorial.docbook share/doc/HTML/ca/kword/a11y.docbook share/doc/HTML/ca/kword/basics.docbook share/doc/HTML/ca/kword/bookmarks.docbook @@ -127,7 +175,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_abiword.mo share/locale/ca/LC_MESSAGES/kfile_gnumeric.mo @@ -156,7 +203,9 @@ share/locale/ca/LC_MESSAGES/kword.mo share/locale/ca/LC_MESSAGES/thesaurus_tool.mo @dirrm share/doc/HTML/ca/thesaurus @dirrm share/doc/HTML/ca/kword +@dirrm share/doc/HTML/ca/kugar @dirrm share/doc/HTML/ca/kspread +@dirrm share/doc/HTML/ca/krita @dirrm share/doc/HTML/ca/kpresenter @dirrm share/doc/HTML/ca/kplato @dirrm share/doc/HTML/ca/koshell diff --git a/editors/calligra-l10n-da/Makefile b/editors/calligra-l10n-da/Makefile index 248790d56afc..d30b137918ee 100644 --- a/editors/calligra-l10n-da/Makefile +++ b/editors/calligra-l10n-da/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/calligra-l10n-da/distinfo b/editors/calligra-l10n-da/distinfo index fb79a71beb1c..583e24f07c56 100644 --- a/editors/calligra-l10n-da/distinfo +++ b/editors/calligra-l10n-da/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-da-1.6.1.tar.bz2) = 34ac13ce5bf8452f5f8b44686d03781a -SHA256 (KDE/kde-i18n/koffice-l10n-da-1.6.1.tar.bz2) = 456b9fa8dd88e20d22ccecf0fb6390738642aea1cbdacd5ae395e40981dfdfb8 -SIZE (KDE/kde-i18n/koffice-l10n-da-1.6.1.tar.bz2) = 1112047 +MD5 (KDE/kde-i18n/koffice-l10n-da-1.6.2.tar.bz2) = ed57736b883215dce9d8cf6985d70fe2 +SHA256 (KDE/kde-i18n/koffice-l10n-da-1.6.2.tar.bz2) = d8fd689d961ef66a1643b6f5e5ec82c996325c7af790a0abc9c1bb87fe2aaf81 +SIZE (KDE/kde-i18n/koffice-l10n-da-1.6.2.tar.bz2) = 1114169 diff --git a/editors/calligra-l10n-da/pkg-plist b/editors/calligra-l10n-da/pkg-plist index 834334517175..a432b4948e04 100644 --- a/editors/calligra-l10n-da/pkg-plist +++ b/editors/calligra-l10n-da/pkg-plist @@ -69,7 +69,6 @@ share/doc/HTML/da/krita/index.cache.bz2 share/doc/HTML/da/krita/index.docbook share/doc/HTML/da/krita/installation.docbook share/doc/HTML/da/krita/introduction.docbook -share/doc/HTML/da/krita/scripting.docbook share/doc/HTML/da/krita/settings.docbook share/doc/HTML/da/krita/tutorial-quick-starts.docbook share/doc/HTML/da/krita/tutorial-select-layer.docbook @@ -152,7 +151,6 @@ share/locale/da/LC_MESSAGES/desktop_koffice.mo share/locale/da/LC_MESSAGES/example.mo share/locale/da/LC_MESSAGES/karbon.mo share/locale/da/LC_MESSAGES/kchart.mo -share/locale/da/LC_MESSAGES/kdgantt.mo share/locale/da/LC_MESSAGES/kexi.mo share/locale/da/LC_MESSAGES/kfile_abiword.mo share/locale/da/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/calligra-l10n-el/Makefile b/editors/calligra-l10n-el/Makefile index 19bbb0d828b6..c88ced91fae5 100644 --- a/editors/calligra-l10n-el/Makefile +++ b/editors/calligra-l10n-el/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/calligra-l10n-el/distinfo b/editors/calligra-l10n-el/distinfo index 0a977fd50dd0..3e43861ac5aa 100644 --- a/editors/calligra-l10n-el/distinfo +++ b/editors/calligra-l10n-el/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-el-1.6.1.tar.bz2) = c2028907c0675534694b5bad4c85ac0f -SHA256 (KDE/kde-i18n/koffice-l10n-el-1.6.1.tar.bz2) = 0fbd0569d485b233a7366d3013bd4b57ab6295e012c4bc2fd73ed961920a7a9d -SIZE (KDE/kde-i18n/koffice-l10n-el-1.6.1.tar.bz2) = 385670 +MD5 (KDE/kde-i18n/koffice-l10n-el-1.6.2.tar.bz2) = 239ea87f98dc701cc8b4b6b1ef1372b9 +SHA256 (KDE/kde-i18n/koffice-l10n-el-1.6.2.tar.bz2) = d15b71d81491ba335ee7077ac1d93272ea81ecf346294906f36e895cfd9912ea +SIZE (KDE/kde-i18n/koffice-l10n-el-1.6.2.tar.bz2) = 386210 diff --git a/editors/calligra-l10n-el/pkg-plist b/editors/calligra-l10n-el/pkg-plist index 46c436194e10..423a32aa7c81 100644 --- a/editors/calligra-l10n-el/pkg-plist +++ b/editors/calligra-l10n-el/pkg-plist @@ -2,7 +2,6 @@ share/locale/el/LC_MESSAGES/desktop_koffice.mo share/locale/el/LC_MESSAGES/example.mo share/locale/el/LC_MESSAGES/karbon.mo share/locale/el/LC_MESSAGES/kchart.mo -share/locale/el/LC_MESSAGES/kdgantt.mo share/locale/el/LC_MESSAGES/kexi.mo share/locale/el/LC_MESSAGES/kfile_abiword.mo share/locale/el/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/calligra-l10n-en_GB/Makefile b/editors/calligra-l10n-en_GB/Makefile index cb490bb940b4..2ceee8de12a2 100644 --- a/editors/calligra-l10n-en_GB/Makefile +++ b/editors/calligra-l10n-en_GB/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/calligra-l10n-en_GB/distinfo b/editors/calligra-l10n-en_GB/distinfo index 97a08e6f157e..6ff200407f58 100644 --- a/editors/calligra-l10n-en_GB/distinfo +++ b/editors/calligra-l10n-en_GB/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-en_GB-1.6.1.tar.bz2) = 0c8edcc2fb6570ff7629e610580cac2f -SHA256 (KDE/kde-i18n/koffice-l10n-en_GB-1.6.1.tar.bz2) = bd003552c53b0b7d949cdb967b9053993e6810061c4922034e520c7e5afbb111 -SIZE (KDE/kde-i18n/koffice-l10n-en_GB-1.6.1.tar.bz2) = 357746 +MD5 (KDE/kde-i18n/koffice-l10n-en_GB-1.6.2.tar.bz2) = 445f7990c5ecb9118cbe3c7d68c74654 +SHA256 (KDE/kde-i18n/koffice-l10n-en_GB-1.6.2.tar.bz2) = 37c177e133701dd1a4c51285f96bcf8afd8c39d3ee47a08d08b706fc4fb262be +SIZE (KDE/kde-i18n/koffice-l10n-en_GB-1.6.2.tar.bz2) = 358135 diff --git a/editors/calligra-l10n-en_GB/pkg-plist b/editors/calligra-l10n-en_GB/pkg-plist index 0e783dd7b5e1..adbbd5d4d225 100644 --- a/editors/calligra-l10n-en_GB/pkg-plist +++ b/editors/calligra-l10n-en_GB/pkg-plist @@ -15,7 +15,6 @@ share/locale/en_GB/LC_MESSAGES/desktop_koffice.mo share/locale/en_GB/LC_MESSAGES/example.mo share/locale/en_GB/LC_MESSAGES/karbon.mo share/locale/en_GB/LC_MESSAGES/kchart.mo -share/locale/en_GB/LC_MESSAGES/kdgantt.mo share/locale/en_GB/LC_MESSAGES/kexi.mo share/locale/en_GB/LC_MESSAGES/kfile_koffice.mo share/locale/en_GB/LC_MESSAGES/kfile_ooo.mo diff --git a/editors/calligra-l10n-es/Makefile b/editors/calligra-l10n-es/Makefile index 3bdebfe0f4b2..22bf89236885 100644 --- a/editors/calligra-l10n-es/Makefile +++ b/editors/calligra-l10n-es/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde spanish MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/calligra-l10n-es/distinfo b/editors/calligra-l10n-es/distinfo index 96a86103ba37..d583f2a2dde6 100644 --- a/editors/calligra-l10n-es/distinfo +++ b/editors/calligra-l10n-es/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-es-1.6.1.tar.bz2) = e3095320b087fdbaf9dea4ca7384c4e7 -SHA256 (KDE/kde-i18n/koffice-l10n-es-1.6.1.tar.bz2) = 94dc8b87aea0f8e1d34ecc2b0762db9fbf0a6914c561c27d8eb6903337521c0d -SIZE (KDE/kde-i18n/koffice-l10n-es-1.6.1.tar.bz2) = 17259132 +MD5 (KDE/kde-i18n/koffice-l10n-es-1.6.2.tar.bz2) = d10222e3c617f73327db7eee522ce753 +SHA256 (KDE/kde-i18n/koffice-l10n-es-1.6.2.tar.bz2) = 09ecb9825cc27030cb5b744ce11fa89869adc8b07cbbc0c7664a8350ad63562f +SIZE (KDE/kde-i18n/koffice-l10n-es-1.6.2.tar.bz2) = 15248673 diff --git a/editors/calligra-l10n-es/pkg-plist b/editors/calligra-l10n-es/pkg-plist index de46c53cba38..b0a5fdca47aa 100644 --- a/editors/calligra-l10n-es/pkg-plist +++ b/editors/calligra-l10n-es/pkg-plist @@ -240,7 +240,6 @@ share/doc/HTML/es/krita/commands-menus.docbook share/doc/HTML/es/krita/commands-palettes.docbook share/doc/HTML/es/krita/commands-toolbars.docbook share/doc/HTML/es/krita/commands.docbook -share/doc/HTML/es/krita/common share/doc/HTML/es/krita/createdocument.png share/doc/HTML/es/krita/credits.docbook share/doc/HTML/es/krita/crocusses-bumpmap.png @@ -289,8 +288,6 @@ share/doc/HTML/es/krita/dialogs-shearimage.png share/doc/HTML/es/krita/dialogs-shearlayer.png share/doc/HTML/es/krita/faq.docbook share/doc/HTML/es/krita/filters-customconvolution.png -share/doc/HTML/es/krita/index.cache.bz2 -share/doc/HTML/es/krita/index.docbook share/doc/HTML/es/krita/installation.docbook share/doc/HTML/es/krita/introduction.docbook share/doc/HTML/es/krita/mainscreen.png @@ -568,6 +565,7 @@ share/doc/HTML/es/kword/formframe2.png share/doc/HTML/es/kword/formframe3.png share/doc/HTML/es/kword/formframe4.png share/doc/HTML/es/kword/formframe5.png +share/doc/HTML/es/kword/formframe6.png share/doc/HTML/es/kword/forminteg.png share/doc/HTML/es/kword/formllind.png share/doc/HTML/es/kword/formlrind.png @@ -727,7 +725,6 @@ share/locale/es/LC_MESSAGES/desktop_koffice.mo share/locale/es/LC_MESSAGES/example.mo share/locale/es/LC_MESSAGES/karbon.mo share/locale/es/LC_MESSAGES/kchart.mo -share/locale/es/LC_MESSAGES/kdgantt.mo share/locale/es/LC_MESSAGES/kexi.mo share/locale/es/LC_MESSAGES/kfile_abiword.mo share/locale/es/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/calligra-l10n-et/Makefile b/editors/calligra-l10n-et/Makefile index 371637a8a638..7f2db742519a 100644 --- a/editors/calligra-l10n-et/Makefile +++ b/editors/calligra-l10n-et/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/calligra-l10n-et/distinfo b/editors/calligra-l10n-et/distinfo index cab102edda59..fc62b9b4b820 100644 --- a/editors/calligra-l10n-et/distinfo +++ b/editors/calligra-l10n-et/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-et-1.6.1.tar.bz2) = d7e32d741c284880ff01530d956cd524 -SHA256 (KDE/kde-i18n/koffice-l10n-et-1.6.1.tar.bz2) = 3af8d5733581df95d5280abfe927f922e364764c64ba5c6ca04be78c310ca395 -SIZE (KDE/kde-i18n/koffice-l10n-et-1.6.1.tar.bz2) = 1218454 +MD5 (KDE/kde-i18n/koffice-l10n-et-1.6.2.tar.bz2) = e7a4017b8db71204650c44bc72cd9500 +SHA256 (KDE/kde-i18n/koffice-l10n-et-1.6.2.tar.bz2) = 3ae6cd7182836ba235af98b679786727bb9a7581a83b3350431e2ea95de4ffdf +SIZE (KDE/kde-i18n/koffice-l10n-et-1.6.2.tar.bz2) = 1217100 diff --git a/editors/calligra-l10n-et/pkg-plist b/editors/calligra-l10n-et/pkg-plist index 42a8b9044ec5..94ca9632ea6b 100644 --- a/editors/calligra-l10n-et/pkg-plist +++ b/editors/calligra-l10n-et/pkg-plist @@ -158,7 +158,6 @@ share/locale/et/LC_MESSAGES/desktop_koffice.mo share/locale/et/LC_MESSAGES/example.mo share/locale/et/LC_MESSAGES/karbon.mo share/locale/et/LC_MESSAGES/kchart.mo -share/locale/et/LC_MESSAGES/kdgantt.mo share/locale/et/LC_MESSAGES/kexi.mo share/locale/et/LC_MESSAGES/kfile_abiword.mo share/locale/et/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/calligra-l10n-it/Makefile b/editors/calligra-l10n-it/Makefile index 7f8a39972722..a5913ca8a679 100644 --- a/editors/calligra-l10n-it/Makefile +++ b/editors/calligra-l10n-it/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/calligra-l10n-it/distinfo b/editors/calligra-l10n-it/distinfo index 9f417dfc625c..ab587c357e0d 100644 --- a/editors/calligra-l10n-it/distinfo +++ b/editors/calligra-l10n-it/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-it-1.6.1.tar.bz2) = 5fc389a6885af2acce7e5b9b48a9ce12 -SHA256 (KDE/kde-i18n/koffice-l10n-it-1.6.1.tar.bz2) = 6679bf2decdf63313bf001a51f8b89cdee2efc8c9d32d51319a84a910ff02b2b -SIZE (KDE/kde-i18n/koffice-l10n-it-1.6.1.tar.bz2) = 1638276 +MD5 (KDE/kde-i18n/koffice-l10n-it-1.6.2.tar.bz2) = 91b2df95b845fa9aabbe33a9af8e37f9 +SHA256 (KDE/kde-i18n/koffice-l10n-it-1.6.2.tar.bz2) = e4f07f020ed3466a433340b2980e215305e92e9175042863573557f98a9ab8ed +SIZE (KDE/kde-i18n/koffice-l10n-it-1.6.2.tar.bz2) = 1639570 diff --git a/editors/calligra-l10n-it/pkg-plist b/editors/calligra-l10n-it/pkg-plist index ac3627f19ced..e2258ffdc5e3 100644 --- a/editors/calligra-l10n-it/pkg-plist +++ b/editors/calligra-l10n-it/pkg-plist @@ -179,7 +179,6 @@ share/locale/it/LC_MESSAGES/desktop_koffice.mo share/locale/it/LC_MESSAGES/example.mo share/locale/it/LC_MESSAGES/karbon.mo share/locale/it/LC_MESSAGES/kchart.mo -share/locale/it/LC_MESSAGES/kdgantt.mo share/locale/it/LC_MESSAGES/kexi.mo share/locale/it/LC_MESSAGES/kfile_abiword.mo share/locale/it/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/calligra-l10n-nb/Makefile b/editors/calligra-l10n-nb/Makefile index 88009ebd778a..d0b367291515 100644 --- a/editors/calligra-l10n-nb/Makefile +++ b/editors/calligra-l10n-nb/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/calligra-l10n-nb/distinfo b/editors/calligra-l10n-nb/distinfo index a75ee96d5fcf..324f5c64fd63 100644 --- a/editors/calligra-l10n-nb/distinfo +++ b/editors/calligra-l10n-nb/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-nb-1.6.1.tar.bz2) = 65d3a4d15e8911faf43d1aa9c6f7b6a7 -SHA256 (KDE/kde-i18n/koffice-l10n-nb-1.6.1.tar.bz2) = 50ed91fec8debd0be62ec356107f3d7c661bd04df480719921f7c45a11e69a1d -SIZE (KDE/kde-i18n/koffice-l10n-nb-1.6.1.tar.bz2) = 380380 +MD5 (KDE/kde-i18n/koffice-l10n-nb-1.6.2.tar.bz2) = 72578347facd96247c52d48ccbbf1f0b +SHA256 (KDE/kde-i18n/koffice-l10n-nb-1.6.2.tar.bz2) = 49ea27fac5df7bc862876d640d95eaed21e37f10ea0441ca62ea0d1523e3a3b7 +SIZE (KDE/kde-i18n/koffice-l10n-nb-1.6.2.tar.bz2) = 382286 diff --git a/editors/calligra-l10n-nb/pkg-plist b/editors/calligra-l10n-nb/pkg-plist index febc3638272c..56cd255ecfe9 100644 --- a/editors/calligra-l10n-nb/pkg-plist +++ b/editors/calligra-l10n-nb/pkg-plist @@ -2,7 +2,6 @@ share/locale/nb/LC_MESSAGES/desktop_koffice.mo share/locale/nb/LC_MESSAGES/example.mo share/locale/nb/LC_MESSAGES/karbon.mo share/locale/nb/LC_MESSAGES/kchart.mo -share/locale/nb/LC_MESSAGES/kdgantt.mo share/locale/nb/LC_MESSAGES/kexi.mo share/locale/nb/LC_MESSAGES/kfile_abiword.mo share/locale/nb/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/calligra-l10n-nl/Makefile b/editors/calligra-l10n-nl/Makefile index 0973f3e6e064..07f2907f9abf 100644 --- a/editors/calligra-l10n-nl/Makefile +++ b/editors/calligra-l10n-nl/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/calligra-l10n-nl/distinfo b/editors/calligra-l10n-nl/distinfo index 65ecfeb4b961..cdbd66afd99c 100644 --- a/editors/calligra-l10n-nl/distinfo +++ b/editors/calligra-l10n-nl/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-nl-1.6.1.tar.bz2) = 006bc0ff8b292fc8836c989d244a45bc -SHA256 (KDE/kde-i18n/koffice-l10n-nl-1.6.1.tar.bz2) = 5a5ea924223b95c56ac32e98e1f63c702574629c6d51786f2697b02f61613fb3 -SIZE (KDE/kde-i18n/koffice-l10n-nl-1.6.1.tar.bz2) = 3374788 +MD5 (KDE/kde-i18n/koffice-l10n-nl-1.6.2.tar.bz2) = 201de20b5285ac1ffccb16e75f1472e7 +SHA256 (KDE/kde-i18n/koffice-l10n-nl-1.6.2.tar.bz2) = 87a1669b6f4e42c237aed461505c291b81d373313b404652c8871d02748a70b7 +SIZE (KDE/kde-i18n/koffice-l10n-nl-1.6.2.tar.bz2) = 3377009 diff --git a/editors/calligra-l10n-nl/pkg-plist b/editors/calligra-l10n-nl/pkg-plist index 40a6e68057bd..94fd5502349f 100644 --- a/editors/calligra-l10n-nl/pkg-plist +++ b/editors/calligra-l10n-nl/pkg-plist @@ -472,7 +472,6 @@ share/locale/nl/LC_MESSAGES/desktop_koffice.mo share/locale/nl/LC_MESSAGES/example.mo share/locale/nl/LC_MESSAGES/karbon.mo share/locale/nl/LC_MESSAGES/kchart.mo -share/locale/nl/LC_MESSAGES/kdgantt.mo share/locale/nl/LC_MESSAGES/kexi.mo share/locale/nl/LC_MESSAGES/kfile_abiword.mo share/locale/nl/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/calligra-l10n-sv/Makefile b/editors/calligra-l10n-sv/Makefile index a41463e11c3c..d3a487787ce0 100644 --- a/editors/calligra-l10n-sv/Makefile +++ b/editors/calligra-l10n-sv/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/calligra-l10n-sv/distinfo b/editors/calligra-l10n-sv/distinfo index 57649992cc47..305fdf94540e 100644 --- a/editors/calligra-l10n-sv/distinfo +++ b/editors/calligra-l10n-sv/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-sv-1.6.1.tar.bz2) = fd5ebf8d8480797f84121f9efcb00823 -SHA256 (KDE/kde-i18n/koffice-l10n-sv-1.6.1.tar.bz2) = 721174f990db6d5ea8254100048463e5d8a721335f7ec318ed52d393fd410bbb -SIZE (KDE/kde-i18n/koffice-l10n-sv-1.6.1.tar.bz2) = 6445810 +MD5 (KDE/kde-i18n/koffice-l10n-sv-1.6.2.tar.bz2) = f63e6deda90f6bc1f10985c5e7971add +SHA256 (KDE/kde-i18n/koffice-l10n-sv-1.6.2.tar.bz2) = a4c053479521cc1e3283071c0690694d3e308729ff8e8ff17e9266698eac14cc +SIZE (KDE/kde-i18n/koffice-l10n-sv-1.6.2.tar.bz2) = 6445892 diff --git a/editors/calligra-l10n-sv/pkg-plist b/editors/calligra-l10n-sv/pkg-plist index 0f24d03f2f32..984eccad701c 100644 --- a/editors/calligra-l10n-sv/pkg-plist +++ b/editors/calligra-l10n-sv/pkg-plist @@ -632,7 +632,6 @@ share/locale/sv/LC_MESSAGES/desktop_koffice.mo share/locale/sv/LC_MESSAGES/example.mo share/locale/sv/LC_MESSAGES/karbon.mo share/locale/sv/LC_MESSAGES/kchart.mo -share/locale/sv/LC_MESSAGES/kdgantt.mo share/locale/sv/LC_MESSAGES/kexi.mo share/locale/sv/LC_MESSAGES/kfile_abiword.mo share/locale/sv/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/calligra-l10n/Makefile b/editors/calligra-l10n/Makefile index bd8bae7d81c3..8cdef1089255 100644 --- a/editors/calligra-l10n/Makefile +++ b/editors/calligra-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES= misc kde MASTER_SITES= # none DISTFILES= # none @@ -16,6 +16,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Localized messages and documentation for KDE RUN_DEPENDS+=\ + ${LOCALBASE}/share/locale/km/LC_MESSAGES/example.mo:${PORTSDIR}/misc/koffice-i18n-km\ ${LOCALBASE}/share/locale/ar/LC_MESSAGES/kword.mo:${PORTSDIR}/arabic/koffice-i18n\ ${LOCALBASE}/share/locale/de/LC_MESSAGES/kword.mo:${PORTSDIR}/german/koffice-i18n\ ${LOCALBASE}/share/locale/fr/LC_MESSAGES/kword.mo:${PORTSDIR}/french/koffice-i18n\ @@ -30,7 +31,7 @@ RUN_DEPENDS+=\ ${LOCALBASE}/share/locale/zh_CN/LC_MESSAGES/kword.mo:${PORTSDIR}/chinese/koffice-i18n-zh_CN \ ${LOCALBASE}/share/locale/zh_TW/LC_MESSAGES/kword.mo:${PORTSDIR}/chinese/koffice-i18n-zh_TW -.for LANG in af bg br bs ca cs cy da el en_GB eo es et eu fa fi ga hi hsb is it \ +.for LANG in af bg br bs ca cs cy da el en_GB eo es et eu fa fi ga gl hi hsb is it \ lo lt lv mk ms mt nb nl nn ro se sk sl sr sr@Latn sv ta tg th tr uz ven xh zu RUN_DEPENDS+=\ ${LOCALBASE}/share/locale/${LANG}/LC_MESSAGES/kword.mo:${PORTSDIR}/misc/koffice-i18n-${LANG} diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index be4d53dee422..ef53f99fcc71 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -6,8 +6,7 @@ # PORTNAME= koffice -PORTVERSION= 1.6.1 -PORTREVISION= 1 +PORTVERSION= 1.6.2 PORTEPOCH= 2 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} diff --git a/editors/calligra/distinfo b/editors/calligra/distinfo index 04ee84201ab5..a851f75e77e8 100644 --- a/editors/calligra/distinfo +++ b/editors/calligra/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/koffice/koffice-1.6.1.tar.bz2) = f7b90b46b79019edc60761a6bff2d387 -SHA256 (KDE/koffice/koffice-1.6.1.tar.bz2) = 5505a6c54009dd0cb75a3770c3daa476154958f92692ca0748b1842d9cd6e728 -SIZE (KDE/koffice/koffice-1.6.1.tar.bz2) = 56999028 +MD5 (KDE/koffice/koffice-1.6.2.tar.bz2) = 74ef62a5f8f766fe8192d5b7d65a3928 +SHA256 (KDE/koffice/koffice-1.6.2.tar.bz2) = fa5ca02eba02219d34c3c6efff92bf767060b4b1343da56eb63139661d53f380 +SIZE (KDE/koffice/koffice-1.6.2.tar.bz2) = 57049103 diff --git a/editors/calligra/files/patch-kexi_examples-build_kexi_file.sh b/editors/calligra/files/patch-kexi_examples-build_kexi_file.sh new file mode 100644 index 000000000000..1fb0916c33a0 --- /dev/null +++ b/editors/calligra/files/patch-kexi_examples-build_kexi_file.sh @@ -0,0 +1,15 @@ +--- kexi/examples/build_kexi_file.sh.orig Mon Mar 5 01:50:05 2007 ++++ kexi/examples/build_kexi_file.sh Mon Mar 5 01:50:31 2007 +@@ -7,9 +7,9 @@ + # Only .kexi file that is older than .sql file is recreated. + # ksqlite is needed on the $PATH. + +-KEXISQL3PATH=../3rdparty/kexisql3/src/.libs/ +-PATH=$PATH:$KEXISQL3PATH +-LD_LIBRARY_PATH=$KEXISQL3PATH:$KEXISQL3PATH ++export KEXISQL3PATH=../3rdparty/kexisql3/src/.libs/ ++export PATH=$PATH:$KEXISQL3PATH ++export LD_LIBRARY_PATH=$KEXISQL3PATH:$KEXISQL3PATH + which ksqlite > /dev/null || exit 1 + + [ $# -lt 1 ] && echo "Missing .sql filename." && exit 1 diff --git a/editors/calligra/files/patch-kexi_examples-update_sql_files.sh b/editors/calligra/files/patch-kexi_examples-update_sql_files.sh new file mode 100644 index 000000000000..1c869369a21e --- /dev/null +++ b/editors/calligra/files/patch-kexi_examples-update_sql_files.sh @@ -0,0 +1,15 @@ +--- kexi/examples/update_sql_files.sh.orig Sun Mar 4 13:49:03 2007 ++++ kexi/examples/update_sql_files.sh Sun Mar 4 13:49:14 2007 +@@ -4,9 +4,9 @@ + # Only .sql file that is older than .kexi file is recreated. + # ksqlite is needed on the PATH + +-KEXISQL3PATH=../3rdparty/kexisql3/src/.libs/ +-PATH=$PATH:$KEXISQL3PATH +-LD_LIBRARY_PATH=$KEXISQL3PATH:$KEXISQL3PATH ++export KEXISQL3PATH=../3rdparty/kexisql3/src/.libs/ ++export PATH=$PATH:$KEXISQL3PATH ++export LD_LIBRARY_PATH=$KEXISQL3PATH:$KEXISQL3PATH + which ksqlite > /dev/null || exit 1 + + for f in `ls -1 *.kexi` ; do diff --git a/editors/calligra/files/patch-koffce-xpdf-CVE-2007-0104.diff b/editors/calligra/files/patch-koffce-xpdf-CVE-2007-0104.diff deleted file mode 100644 index f5e51a1c706e..000000000000 --- a/editors/calligra/files/patch-koffce-xpdf-CVE-2007-0104.diff +++ /dev/null @@ -1,74 +0,0 @@ ------------------------------------------------------------------------- -r622463 | aacid | 2007-01-11 23:05:54 +0100 (Thu, 11 Jan 2007) | 2 lines -Changed paths: - M /branches/koffice/1.6/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.cc - M /branches/koffice/1.6/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.h - -Commiting the patch agreed between kpdf and poppler developers to fix MOAB-06-01-2007 issue. - ------------------------------------------------------------------------- -Index: filters/kword/pdf/xpdf/xpdf/Catalog.cc -=================================================================== ---- filters/kword/pdf/xpdf/xpdf/Catalog.cc (revision 622462) -+++ filters/kword/pdf/xpdf/xpdf/Catalog.cc (revision 622463) -@@ -24,6 +24,12 @@ - #include "Link.h" - #include "Catalog.h" - -+// This define is used to limit the depth of recursive readPageTree calls -+// This is needed because the page tree nodes can reference their parents -+// leaving us in an infinite loop -+// Most sane pdf documents don't have a call depth higher than 10 -+#define MAX_CALL_DEPTH 1000 -+ - //------------------------------------------------------------------------ - // Catalog - //------------------------------------------------------------------------ -@@ -77,7 +83,7 @@ Catalog::Catalog(XRef *xrefA) { - pageRefs[i].num = -1; - pageRefs[i].gen = -1; - } -- numPages = readPageTree(pagesDict.getDict(), NULL, 0); -+ numPages = readPageTree(pagesDict.getDict(), NULL, 0, 0); - if (numPages != numPages0) { - error(-1, "Page count in top-level pages object is incorrect"); - } -@@ -171,7 +177,7 @@ GString *Catalog::readMetadata() { - return s; - } - --int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start) { -+int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start, int callDepth) { - Object kids; - Object kid; - Object kidRef; -@@ -221,9 +227,13 @@ int Catalog::readPageTree(Dict *pagesDic - // This should really be isDict("Pages"), but I've seen at least one - // PDF file where the /Type entry is missing. - } else if (kid.isDict()) { -- if ((start = readPageTree(kid.getDict(), attrs1, start)) -- < 0) -- goto err2; -+ if (callDepth > MAX_CALL_DEPTH) { -+ error(-1, "Limit of %d recursive calls reached while reading the page tree. If your document is correct and not a test to try to force a crash, please report a bug.", MAX_CALL_DEPTH); -+ } else { -+ if ((start = readPageTree(kid.getDict(), attrs1, start, callDepth + 1)) -+ < 0) -+ goto err2; -+ } - } else { - error(-1, "Kid object (page %d) is wrong type (%s)", - start+1, kid.getTypeName()); -Index: filters/kword/pdf/xpdf/xpdf/Catalog.h -=================================================================== ---- filters/kword/pdf/xpdf/xpdf/Catalog.h (revision 622462) -+++ filters/kword/pdf/xpdf/xpdf/Catalog.h (revision 622463) -@@ -82,7 +82,7 @@ private: - Object outline; // outline dictionary - GBool ok; // true if catalog is valid - -- int readPageTree(Dict *pages, PageAttrs *attrs, int start); -+ int readPageTree(Dict *pages, PageAttrs *attrs, int start, int callDepth); - Object *findDestInTree(Object *tree, GString *name, Object *obj); - }; - diff --git a/editors/calligra/pkg-plist b/editors/calligra/pkg-plist index 23edb3d4c816..43968f2c3adf 100644 --- a/editors/calligra/pkg-plist +++ b/editors/calligra/pkg-plist @@ -1,6 +1,10 @@ bin/karbon bin/kchart bin/kexi +bin/kexi_add_column +bin/kexi_add_column_gui +bin/kexi_delete_column +bin/kexi_delete_column_gui bin/kformula bin/kivio bin/koconverter @@ -113,30 +117,40 @@ include/Kolinewidthaction.h include/Koversiondialog.h include/kcoloractions.h include/kdchart_export.h +include/kexidb/admin.h +include/kexidb/alter.h include/kexidb/connection.h include/kexidb/connectiondata.h include/kexidb/cursor.h +include/kexidb/dbobjectnamevalidator.h +include/kexidb/dbproperties.h include/kexidb/driver.h +include/kexidb/driver_p.h include/kexidb/drivermanager.h include/kexidb/error.h include/kexidb/expression.h include/kexidb/field.h include/kexidb/fieldlist.h +include/kexidb/fieldvalidator.h include/kexidb/global.h include/kexidb/indexschema.h include/kexidb/kexidb_export.h include/kexidb/keximigrate.h include/kexidb/keximigratedata.h +include/kexidb/lookupfieldschema.h include/kexidb/migratemanager.h +include/kexidb/msghandler.h include/kexidb/object.h -include/kexidb/parser.h include/kexidb/preparedstatement.h include/kexidb/queryschema.h include/kexidb/queryschemaparameter.h include/kexidb/relationship.h +include/kexidb/roweditbuffer.h include/kexidb/schemadata.h +include/kexidb/simplecommandlineapp.h include/kexidb/tableschema.h include/kexidb/transaction.h +include/kexidb/utils.h include/kexiutils/identifier.h include/kexiutils/kexiutils_export.h include/kexiutils/longlongvalidator.h @@ -459,6 +473,9 @@ lib/kde3/kritacimg.so lib/kde3/kritacmykplugin.a lib/kde3/kritacmykplugin.la lib/kde3/kritacmykplugin.so +lib/kde3/kritacolorify.a +lib/kde3/kritacolorify.la +lib/kde3/kritacolorify.so lib/kde3/kritacolorrange.a lib/kde3/kritacolorrange.la lib/kde3/kritacolorrange.so @@ -1254,8 +1271,19 @@ lib/libkwordprivate.a lib/libkwordprivate.la lib/libkwordprivate.so lib/libkwordprivate.so.4 +share/applications/kde/karbon.desktop +share/applications/kde/kchart.desktop +share/applications/kde/kexi.desktop +share/applications/kde/kformula.desktop share/applications/kde/kivio.desktop +share/applications/kde/koshell.desktop +share/applications/kde/kplato.desktop +share/applications/kde/kpresenter.desktop share/applications/kde/krita.desktop +share/applications/kde/kspread.desktop +share/applications/kde/kudesigner.desktop +share/applications/kde/kugar.desktop +share/applications/kde/kword.desktop share/applnk/.hidden/krita_jpeg.desktop share/applnk/.hidden/krita_magick.desktop share/applnk/.hidden/krita_openexr.desktop @@ -1264,17 +1292,6 @@ share/applnk/.hidden/krita_png.desktop share/applnk/.hidden/krita_raw.desktop share/applnk/.hidden/krita_tiff.desktop share/applnk/Office/KThesaurus.desktop -share/applnk/Office/karbon.desktop -share/applnk/Office/kchart.desktop -share/applnk/Office/kexi.desktop -share/applnk/Office/kformula.desktop -share/applnk/Office/koshell.desktop -share/applnk/Office/kplato.desktop -share/applnk/Office/kpresenter.desktop -share/applnk/Office/kspread.desktop -share/applnk/Office/kudesigner.desktop -share/applnk/Office/kugar.desktop -share/applnk/Office/kword.desktop share/apps/karbon/gradients/allcolors.kgr share/apps/karbon/gradients/simple.kgr share/apps/karbon/icons/crystalsvg/16x16/actions/14_layer_deletelayer.png @@ -1473,11 +1490,13 @@ share/apps/kchart/templates/chart/.source/BarChart.chrt share/apps/kchart/templates/chart/.source/Empty.chrt share/apps/kchart/templates/chart/BarChart.desktop share/apps/kchart/templates/chart/Empty.desktop +share/apps/kexi/examples/Simple_Database.kexi share/apps/kexi/icons/crystalsvg/128x128/actions/form_action.png share/apps/kexi/icons/crystalsvg/16x16/actions/add_field.png share/apps/kexi/icons/crystalsvg/16x16/actions/aofit.png share/apps/kexi/icons/crystalsvg/16x16/actions/aogrid.png share/apps/kexi/icons/crystalsvg/16x16/actions/aopos2grid.png +share/apps/kexi/icons/crystalsvg/16x16/actions/autofield.png share/apps/kexi/icons/crystalsvg/16x16/actions/autonumber.png share/apps/kexi/icons/crystalsvg/16x16/actions/business_user.png share/apps/kexi/icons/crystalsvg/16x16/actions/button.png @@ -1543,6 +1562,7 @@ share/apps/kexi/icons/crystalsvg/22x22/actions/aoshortest.png share/apps/kexi/icons/crystalsvg/22x22/actions/aotallest.png share/apps/kexi/icons/crystalsvg/22x22/actions/aotop.png share/apps/kexi/icons/crystalsvg/22x22/actions/aowidest.png +share/apps/kexi/icons/crystalsvg/22x22/actions/autofield.png share/apps/kexi/icons/crystalsvg/22x22/actions/business_user.png share/apps/kexi/icons/crystalsvg/22x22/actions/button.png share/apps/kexi/icons/crystalsvg/22x22/actions/check.png @@ -5216,6 +5236,8 @@ share/icons/hicolor/scalable/apps/kexi.svgz share/icons/hicolor/scalable/apps/koshell.svgz share/icons/locolor/16x16/apps/kudesigner.png share/icons/locolor/32x32/apps/kudesigner.png +share/locale/pl/LC_MESSAGES/kexi_add_column_gui_transl_pl.sh +share/locale/pl/LC_MESSAGES/kexi_delete_column_gui_transl_pl.sh share/mimelnk/application/x-kexi-connectiondata.desktop share/mimelnk/application/x-kexiproject-shortcut.desktop share/mimelnk/application/x-kexiproject-sqlite.desktop @@ -5320,6 +5342,7 @@ share/services/kritablurfilter.desktop share/services/kritabumpmapfilter.desktop share/services/kritacimg.desktop share/services/kritacmykplugin.desktop +share/services/kritacolorifyfilter.desktop share/services/kritacolorrange.desktop share/services/kritacolorsfilter.desktop share/services/kritacolorspaceconversion.desktop @@ -5807,6 +5830,7 @@ share/templates/TextDocument.desktop @dirrm share/apps/kexi/icons/crystalsvg/128x128 @dirrm share/apps/kexi/icons/crystalsvg @dirrm share/apps/kexi/icons +@dirrm share/apps/kexi/examples @dirrm share/apps/kexi @dirrm share/apps/kchart/templates/chart/.source @dirrm share/apps/kchart/templates/chart diff --git a/editors/kate-plugins/Makefile b/editors/kate-plugins/Makefile index df0a51c88721..e5af1eacd279 100644 --- a/editors/kate-plugins/Makefile +++ b/editors/kate-plugins/Makefile @@ -26,7 +26,7 @@ PREFIX= ${KDE_PREFIX} USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/editors/kate-plugins/distinfo b/editors/kate-plugins/distinfo index b86dc7b77b7f..5a84efd83781 100644 --- a/editors/kate-plugins/distinfo +++ b/editors/kate-plugins/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.5.tar.bz2) = 71c0a690abf8ad0f43135fa887d0b40c -SHA256 (KDE/kdeaddons-3.5.5.tar.bz2) = 1db58293a8b967d254a39c9bdb0c5dfb3759a7d067280dd3d637e2423beb632c -SIZE (KDE/kdeaddons-3.5.5.tar.bz2) = 1663195 +MD5 (KDE/kdeaddons-3.5.6.tar.bz2) = 96d6d2a76da2a5232b3b46318456a5bc +SHA256 (KDE/kdeaddons-3.5.6.tar.bz2) = dec71f341631beb1f3e112083af11e3ef1618ed80394cf4939c662f8c5a3d807 +SIZE (KDE/kdeaddons-3.5.6.tar.bz2) = 1667731 diff --git a/editors/kate-plugins/pkg-plist b/editors/kate-plugins/pkg-plist index b0f0707e12a3..3da29f9f807f 100644 --- a/editors/kate-plugins/pkg-plist +++ b/editors/kate-plugins/pkg-plist @@ -43,7 +43,7 @@ lib/kde3/katexmltoolsplugin.so lib/kde3/libkatetabbarextensionplugin.a lib/kde3/libkatetabbarextensionplugin.la lib/kde3/libkatetabbarextensionplugin.so -share/applications/kdeaddons-kate-plugins-3.5.5 +share/applications/kdeaddons-kate-plugins-3.5.6 share/applnk/.hidden/katefll.desktop share/apps/kate/plugins/katecppsymbolviewer/ui.rc share/apps/kate/plugins/katefiletemplates/templates/cppgpl.cpp.katetemplate diff --git a/editors/koffice-i18n-ca/Makefile b/editors/koffice-i18n-ca/Makefile index 5b2c53c82e80..b4bd5f13bd25 100644 --- a/editors/koffice-i18n-ca/Makefile +++ b/editors/koffice-i18n-ca/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-ca/distinfo b/editors/koffice-i18n-ca/distinfo index 64dc722ff740..e1f9aef8d9eb 100644 --- a/editors/koffice-i18n-ca/distinfo +++ b/editors/koffice-i18n-ca/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ca-1.6.1.tar.bz2) = 2af9ee48900b76f13c7b205f9f44e454 -SHA256 (KDE/kde-i18n/koffice-l10n-ca-1.6.1.tar.bz2) = bfcd51cae7df0a9985e007a0f7a275b2d0e95a2c0d8f202888c90a8b49ed6346 -SIZE (KDE/kde-i18n/koffice-l10n-ca-1.6.1.tar.bz2) = 1410868 +MD5 (KDE/kde-i18n/koffice-l10n-ca-1.6.2.tar.bz2) = 8809746f5856aa7c2b37583425501ea7 +SHA256 (KDE/kde-i18n/koffice-l10n-ca-1.6.2.tar.bz2) = 8d4104551f098df26fb80b2864fa6b8b5817b4085ff3c33676edbf329fc7eb0a +SIZE (KDE/kde-i18n/koffice-l10n-ca-1.6.2.tar.bz2) = 1675217 diff --git a/editors/koffice-i18n-ca/pkg-plist b/editors/koffice-i18n-ca/pkg-plist index f9699d3b9475..3d339bf1bdf1 100644 --- a/editors/koffice-i18n-ca/pkg-plist +++ b/editors/koffice-i18n-ca/pkg-plist @@ -8,13 +8,18 @@ share/doc/HTML/ca/kchart/index.docbook share/doc/HTML/ca/kexi/basics.docbook share/doc/HTML/ca/kexi/building.docbook share/doc/HTML/ca/kexi/common +share/doc/HTML/ca/kexi/comparing.docbook share/doc/HTML/ca/kexi/configuration.docbook share/doc/HTML/ca/kexi/credits.docbook share/doc/HTML/ca/kexi/database.docbook +share/doc/HTML/ca/kexi/designingforms.docbook +share/doc/HTML/ca/kexi/enteringdataintotables.docbook +share/doc/HTML/ca/kexi/enteringdatausingforms.docbook share/doc/HTML/ca/kexi/index.cache.bz2 share/doc/HTML/ca/kexi/index.docbook share/doc/HTML/ca/kexi/intro.docbook share/doc/HTML/ca/kexi/menus.docbook +share/doc/HTML/ca/kexi/querydesigning.docbook share/doc/HTML/ca/kformula/common share/doc/HTML/ca/kformula/index.cache.bz2 share/doc/HTML/ca/kformula/index.docbook @@ -39,13 +44,44 @@ share/doc/HTML/ca/kplato/index.docbook share/doc/HTML/ca/kplato/mainwindow.docbook share/doc/HTML/ca/kplato/options.docbook share/doc/HTML/ca/kplato/wbs.docbook +share/doc/HTML/ca/kpresenter/a11y.docbook +share/doc/HTML/ca/kpresenter/common share/doc/HTML/ca/kpresenter/faq.docbook share/doc/HTML/ca/kpresenter/great-presentations.docbook share/doc/HTML/ca/kpresenter/guides.docbook +share/doc/HTML/ca/kpresenter/index.cache.bz2 +share/doc/HTML/ca/kpresenter/index.docbook share/doc/HTML/ca/kpresenter/menus.docbook share/doc/HTML/ca/kpresenter/options.docbook share/doc/HTML/ca/kpresenter/screen.docbook share/doc/HTML/ca/kpresenter/tutorial.docbook +share/doc/HTML/ca/krita/commands-dialogs.docbook +share/doc/HTML/ca/krita/commands-menus.docbook +share/doc/HTML/ca/krita/commands-palettes.docbook +share/doc/HTML/ca/krita/commands-toolbars.docbook +share/doc/HTML/ca/krita/commands.docbook +share/doc/HTML/ca/krita/common +share/doc/HTML/ca/krita/credits.docbook +share/doc/HTML/ca/krita/developers-plugins.docbook +share/doc/HTML/ca/krita/developers-scripting.docbook +share/doc/HTML/ca/krita/developers.docbook +share/doc/HTML/ca/krita/faq.docbook +share/doc/HTML/ca/krita/index.cache.bz2 +share/doc/HTML/ca/krita/index.docbook +share/doc/HTML/ca/krita/installation.docbook +share/doc/HTML/ca/krita/introduction.docbook +share/doc/HTML/ca/krita/settings.docbook +share/doc/HTML/ca/krita/tutorial-quick-starts.docbook +share/doc/HTML/ca/krita/tutorial-select-layer.docbook +share/doc/HTML/ca/krita/tutorial-starting.docbook +share/doc/HTML/ca/krita/tutorial-tablet.docbook +share/doc/HTML/ca/krita/tutorial.docbook +share/doc/HTML/ca/krita/using-colorspaces.docbook +share/doc/HTML/ca/krita/using-filters.docbook +share/doc/HTML/ca/krita/using-images.docbook +share/doc/HTML/ca/krita/using-layers.docbook +share/doc/HTML/ca/krita/using-selections.docbook +share/doc/HTML/ca/krita/using-views.docbook share/doc/HTML/ca/kspread/a11y.docbook share/doc/HTML/ca/kspread/advanced.docbook share/doc/HTML/ca/kspread/basics.docbook @@ -81,6 +117,18 @@ share/doc/HTML/ca/kspread/shortcut1.png share/doc/HTML/ca/kspread/shortcut2.png share/doc/HTML/ca/kspread/shortcut3.png share/doc/HTML/ca/kspread/tts.png +share/doc/HTML/ca/kugar/common +share/doc/HTML/ca/kugar/datadtd.docbook +share/doc/HTML/ca/kugar/dataref.docbook +share/doc/HTML/ca/kugar/designer.docbook +share/doc/HTML/ca/kugar/index.cache.bz2 +share/doc/HTML/ca/kugar/index.docbook +share/doc/HTML/ca/kugar/progguide.docbook +share/doc/HTML/ca/kugar/starting.docbook +share/doc/HTML/ca/kugar/template-elements.docbook +share/doc/HTML/ca/kugar/template.docbook +share/doc/HTML/ca/kugar/templatedtd.docbook +share/doc/HTML/ca/kugar/tutorial.docbook share/doc/HTML/ca/kword/a11y.docbook share/doc/HTML/ca/kword/basics.docbook share/doc/HTML/ca/kword/bookmarks.docbook @@ -127,7 +175,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_abiword.mo share/locale/ca/LC_MESSAGES/kfile_gnumeric.mo @@ -156,7 +203,9 @@ share/locale/ca/LC_MESSAGES/kword.mo share/locale/ca/LC_MESSAGES/thesaurus_tool.mo @dirrm share/doc/HTML/ca/thesaurus @dirrm share/doc/HTML/ca/kword +@dirrm share/doc/HTML/ca/kugar @dirrm share/doc/HTML/ca/kspread +@dirrm share/doc/HTML/ca/krita @dirrm share/doc/HTML/ca/kpresenter @dirrm share/doc/HTML/ca/kplato @dirrm share/doc/HTML/ca/koshell diff --git a/editors/koffice-i18n-cs/Makefile b/editors/koffice-i18n-cs/Makefile index 2ab74b0b019d..49126017d9aa 100644 --- a/editors/koffice-i18n-cs/Makefile +++ b/editors/koffice-i18n-cs/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-cs/distinfo b/editors/koffice-i18n-cs/distinfo index c8b2753d9841..ba852026af3c 100644 --- a/editors/koffice-i18n-cs/distinfo +++ b/editors/koffice-i18n-cs/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-cs-1.6.1.tar.bz2) = a90d191f1d84bd5c8090ca6e004253c4 -SHA256 (KDE/kde-i18n/koffice-l10n-cs-1.6.1.tar.bz2) = 063a1db2ad60fadda8f1ab64da96e2440ae34c3b9d406ea9a45a78d27bb257c3 -SIZE (KDE/kde-i18n/koffice-l10n-cs-1.6.1.tar.bz2) = 356835 +MD5 (KDE/kde-i18n/koffice-l10n-cs-1.6.2.tar.bz2) = 2b7eb0aa4a3e21048d073b414cbca26e +SHA256 (KDE/kde-i18n/koffice-l10n-cs-1.6.2.tar.bz2) = d79ecf2a2f50b34fd8cfcc15a5f42b3b67ff4a8cd1494ab4c11e01a1fc9b6cf5 +SIZE (KDE/kde-i18n/koffice-l10n-cs-1.6.2.tar.bz2) = 356625 diff --git a/editors/koffice-i18n-cs/pkg-plist b/editors/koffice-i18n-cs/pkg-plist index 64faa279489d..f1283cce6bb0 100644 --- a/editors/koffice-i18n-cs/pkg-plist +++ b/editors/koffice-i18n-cs/pkg-plist @@ -3,7 +3,6 @@ share/locale/cs/LC_MESSAGES/desktop_koffice.mo share/locale/cs/LC_MESSAGES/example.mo share/locale/cs/LC_MESSAGES/karbon.mo share/locale/cs/LC_MESSAGES/kchart.mo -share/locale/cs/LC_MESSAGES/kdgantt.mo share/locale/cs/LC_MESSAGES/kexi.mo share/locale/cs/LC_MESSAGES/kfile_koffice.mo share/locale/cs/LC_MESSAGES/kfile_ooo.mo diff --git a/editors/koffice-i18n-cy/Makefile b/editors/koffice-i18n-cy/Makefile index e2b1ba01c39b..ea51b9d6672c 100644 --- a/editors/koffice-i18n-cy/Makefile +++ b/editors/koffice-i18n-cy/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-cy/distinfo b/editors/koffice-i18n-cy/distinfo index 21d80be97f5b..2d1eabf5a68d 100644 --- a/editors/koffice-i18n-cy/distinfo +++ b/editors/koffice-i18n-cy/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-cy-1.5.2.tar.bz2) = 64782ef55dbdfbbc3672b613dc7f5faf -SHA256 (KDE/kde-i18n/koffice-l10n-cy-1.5.2.tar.bz2) = fe88628577f77f791b445682ab42dbd5448cd2b321135c207308e0399ee6f920 -SIZE (KDE/kde-i18n/koffice-l10n-cy-1.5.2.tar.bz2) = 370382 +MD5 (KDE/kde-i18n/koffice-l10n-cy-1.6.2.tar.bz2) = 8d731dd80ebeb2d89263a3884c0fef44 +SHA256 (KDE/kde-i18n/koffice-l10n-cy-1.6.2.tar.bz2) = 21bda474b12e642a4d073ba8342274a614efa3253b98390e3dad255a47ebe0ca +SIZE (KDE/kde-i18n/koffice-l10n-cy-1.6.2.tar.bz2) = 377246 diff --git a/editors/koffice-i18n-da/Makefile b/editors/koffice-i18n-da/Makefile index 248790d56afc..d30b137918ee 100644 --- a/editors/koffice-i18n-da/Makefile +++ b/editors/koffice-i18n-da/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-da/distinfo b/editors/koffice-i18n-da/distinfo index fb79a71beb1c..583e24f07c56 100644 --- a/editors/koffice-i18n-da/distinfo +++ b/editors/koffice-i18n-da/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-da-1.6.1.tar.bz2) = 34ac13ce5bf8452f5f8b44686d03781a -SHA256 (KDE/kde-i18n/koffice-l10n-da-1.6.1.tar.bz2) = 456b9fa8dd88e20d22ccecf0fb6390738642aea1cbdacd5ae395e40981dfdfb8 -SIZE (KDE/kde-i18n/koffice-l10n-da-1.6.1.tar.bz2) = 1112047 +MD5 (KDE/kde-i18n/koffice-l10n-da-1.6.2.tar.bz2) = ed57736b883215dce9d8cf6985d70fe2 +SHA256 (KDE/kde-i18n/koffice-l10n-da-1.6.2.tar.bz2) = d8fd689d961ef66a1643b6f5e5ec82c996325c7af790a0abc9c1bb87fe2aaf81 +SIZE (KDE/kde-i18n/koffice-l10n-da-1.6.2.tar.bz2) = 1114169 diff --git a/editors/koffice-i18n-da/pkg-plist b/editors/koffice-i18n-da/pkg-plist index 834334517175..a432b4948e04 100644 --- a/editors/koffice-i18n-da/pkg-plist +++ b/editors/koffice-i18n-da/pkg-plist @@ -69,7 +69,6 @@ share/doc/HTML/da/krita/index.cache.bz2 share/doc/HTML/da/krita/index.docbook share/doc/HTML/da/krita/installation.docbook share/doc/HTML/da/krita/introduction.docbook -share/doc/HTML/da/krita/scripting.docbook share/doc/HTML/da/krita/settings.docbook share/doc/HTML/da/krita/tutorial-quick-starts.docbook share/doc/HTML/da/krita/tutorial-select-layer.docbook @@ -152,7 +151,6 @@ share/locale/da/LC_MESSAGES/desktop_koffice.mo share/locale/da/LC_MESSAGES/example.mo share/locale/da/LC_MESSAGES/karbon.mo share/locale/da/LC_MESSAGES/kchart.mo -share/locale/da/LC_MESSAGES/kdgantt.mo share/locale/da/LC_MESSAGES/kexi.mo share/locale/da/LC_MESSAGES/kfile_abiword.mo share/locale/da/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-i18n-el/Makefile b/editors/koffice-i18n-el/Makefile index 19bbb0d828b6..c88ced91fae5 100644 --- a/editors/koffice-i18n-el/Makefile +++ b/editors/koffice-i18n-el/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-el/distinfo b/editors/koffice-i18n-el/distinfo index 0a977fd50dd0..3e43861ac5aa 100644 --- a/editors/koffice-i18n-el/distinfo +++ b/editors/koffice-i18n-el/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-el-1.6.1.tar.bz2) = c2028907c0675534694b5bad4c85ac0f -SHA256 (KDE/kde-i18n/koffice-l10n-el-1.6.1.tar.bz2) = 0fbd0569d485b233a7366d3013bd4b57ab6295e012c4bc2fd73ed961920a7a9d -SIZE (KDE/kde-i18n/koffice-l10n-el-1.6.1.tar.bz2) = 385670 +MD5 (KDE/kde-i18n/koffice-l10n-el-1.6.2.tar.bz2) = 239ea87f98dc701cc8b4b6b1ef1372b9 +SHA256 (KDE/kde-i18n/koffice-l10n-el-1.6.2.tar.bz2) = d15b71d81491ba335ee7077ac1d93272ea81ecf346294906f36e895cfd9912ea +SIZE (KDE/kde-i18n/koffice-l10n-el-1.6.2.tar.bz2) = 386210 diff --git a/editors/koffice-i18n-el/pkg-plist b/editors/koffice-i18n-el/pkg-plist index 46c436194e10..423a32aa7c81 100644 --- a/editors/koffice-i18n-el/pkg-plist +++ b/editors/koffice-i18n-el/pkg-plist @@ -2,7 +2,6 @@ share/locale/el/LC_MESSAGES/desktop_koffice.mo share/locale/el/LC_MESSAGES/example.mo share/locale/el/LC_MESSAGES/karbon.mo share/locale/el/LC_MESSAGES/kchart.mo -share/locale/el/LC_MESSAGES/kdgantt.mo share/locale/el/LC_MESSAGES/kexi.mo share/locale/el/LC_MESSAGES/kfile_abiword.mo share/locale/el/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-i18n-en_GB/Makefile b/editors/koffice-i18n-en_GB/Makefile index cb490bb940b4..2ceee8de12a2 100644 --- a/editors/koffice-i18n-en_GB/Makefile +++ b/editors/koffice-i18n-en_GB/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-en_GB/distinfo b/editors/koffice-i18n-en_GB/distinfo index 97a08e6f157e..6ff200407f58 100644 --- a/editors/koffice-i18n-en_GB/distinfo +++ b/editors/koffice-i18n-en_GB/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-en_GB-1.6.1.tar.bz2) = 0c8edcc2fb6570ff7629e610580cac2f -SHA256 (KDE/kde-i18n/koffice-l10n-en_GB-1.6.1.tar.bz2) = bd003552c53b0b7d949cdb967b9053993e6810061c4922034e520c7e5afbb111 -SIZE (KDE/kde-i18n/koffice-l10n-en_GB-1.6.1.tar.bz2) = 357746 +MD5 (KDE/kde-i18n/koffice-l10n-en_GB-1.6.2.tar.bz2) = 445f7990c5ecb9118cbe3c7d68c74654 +SHA256 (KDE/kde-i18n/koffice-l10n-en_GB-1.6.2.tar.bz2) = 37c177e133701dd1a4c51285f96bcf8afd8c39d3ee47a08d08b706fc4fb262be +SIZE (KDE/kde-i18n/koffice-l10n-en_GB-1.6.2.tar.bz2) = 358135 diff --git a/editors/koffice-i18n-en_GB/pkg-plist b/editors/koffice-i18n-en_GB/pkg-plist index 0e783dd7b5e1..adbbd5d4d225 100644 --- a/editors/koffice-i18n-en_GB/pkg-plist +++ b/editors/koffice-i18n-en_GB/pkg-plist @@ -15,7 +15,6 @@ share/locale/en_GB/LC_MESSAGES/desktop_koffice.mo share/locale/en_GB/LC_MESSAGES/example.mo share/locale/en_GB/LC_MESSAGES/karbon.mo share/locale/en_GB/LC_MESSAGES/kchart.mo -share/locale/en_GB/LC_MESSAGES/kdgantt.mo share/locale/en_GB/LC_MESSAGES/kexi.mo share/locale/en_GB/LC_MESSAGES/kfile_koffice.mo share/locale/en_GB/LC_MESSAGES/kfile_ooo.mo diff --git a/editors/koffice-i18n-es/Makefile b/editors/koffice-i18n-es/Makefile index 3bdebfe0f4b2..22bf89236885 100644 --- a/editors/koffice-i18n-es/Makefile +++ b/editors/koffice-i18n-es/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde spanish MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-es/distinfo b/editors/koffice-i18n-es/distinfo index 96a86103ba37..d583f2a2dde6 100644 --- a/editors/koffice-i18n-es/distinfo +++ b/editors/koffice-i18n-es/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-es-1.6.1.tar.bz2) = e3095320b087fdbaf9dea4ca7384c4e7 -SHA256 (KDE/kde-i18n/koffice-l10n-es-1.6.1.tar.bz2) = 94dc8b87aea0f8e1d34ecc2b0762db9fbf0a6914c561c27d8eb6903337521c0d -SIZE (KDE/kde-i18n/koffice-l10n-es-1.6.1.tar.bz2) = 17259132 +MD5 (KDE/kde-i18n/koffice-l10n-es-1.6.2.tar.bz2) = d10222e3c617f73327db7eee522ce753 +SHA256 (KDE/kde-i18n/koffice-l10n-es-1.6.2.tar.bz2) = 09ecb9825cc27030cb5b744ce11fa89869adc8b07cbbc0c7664a8350ad63562f +SIZE (KDE/kde-i18n/koffice-l10n-es-1.6.2.tar.bz2) = 15248673 diff --git a/editors/koffice-i18n-es/pkg-plist b/editors/koffice-i18n-es/pkg-plist index de46c53cba38..b0a5fdca47aa 100644 --- a/editors/koffice-i18n-es/pkg-plist +++ b/editors/koffice-i18n-es/pkg-plist @@ -240,7 +240,6 @@ share/doc/HTML/es/krita/commands-menus.docbook share/doc/HTML/es/krita/commands-palettes.docbook share/doc/HTML/es/krita/commands-toolbars.docbook share/doc/HTML/es/krita/commands.docbook -share/doc/HTML/es/krita/common share/doc/HTML/es/krita/createdocument.png share/doc/HTML/es/krita/credits.docbook share/doc/HTML/es/krita/crocusses-bumpmap.png @@ -289,8 +288,6 @@ share/doc/HTML/es/krita/dialogs-shearimage.png share/doc/HTML/es/krita/dialogs-shearlayer.png share/doc/HTML/es/krita/faq.docbook share/doc/HTML/es/krita/filters-customconvolution.png -share/doc/HTML/es/krita/index.cache.bz2 -share/doc/HTML/es/krita/index.docbook share/doc/HTML/es/krita/installation.docbook share/doc/HTML/es/krita/introduction.docbook share/doc/HTML/es/krita/mainscreen.png @@ -568,6 +565,7 @@ share/doc/HTML/es/kword/formframe2.png share/doc/HTML/es/kword/formframe3.png share/doc/HTML/es/kword/formframe4.png share/doc/HTML/es/kword/formframe5.png +share/doc/HTML/es/kword/formframe6.png share/doc/HTML/es/kword/forminteg.png share/doc/HTML/es/kword/formllind.png share/doc/HTML/es/kword/formlrind.png @@ -727,7 +725,6 @@ share/locale/es/LC_MESSAGES/desktop_koffice.mo share/locale/es/LC_MESSAGES/example.mo share/locale/es/LC_MESSAGES/karbon.mo share/locale/es/LC_MESSAGES/kchart.mo -share/locale/es/LC_MESSAGES/kdgantt.mo share/locale/es/LC_MESSAGES/kexi.mo share/locale/es/LC_MESSAGES/kfile_abiword.mo share/locale/es/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-i18n-et/Makefile b/editors/koffice-i18n-et/Makefile index 371637a8a638..7f2db742519a 100644 --- a/editors/koffice-i18n-et/Makefile +++ b/editors/koffice-i18n-et/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-et/distinfo b/editors/koffice-i18n-et/distinfo index cab102edda59..fc62b9b4b820 100644 --- a/editors/koffice-i18n-et/distinfo +++ b/editors/koffice-i18n-et/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-et-1.6.1.tar.bz2) = d7e32d741c284880ff01530d956cd524 -SHA256 (KDE/kde-i18n/koffice-l10n-et-1.6.1.tar.bz2) = 3af8d5733581df95d5280abfe927f922e364764c64ba5c6ca04be78c310ca395 -SIZE (KDE/kde-i18n/koffice-l10n-et-1.6.1.tar.bz2) = 1218454 +MD5 (KDE/kde-i18n/koffice-l10n-et-1.6.2.tar.bz2) = e7a4017b8db71204650c44bc72cd9500 +SHA256 (KDE/kde-i18n/koffice-l10n-et-1.6.2.tar.bz2) = 3ae6cd7182836ba235af98b679786727bb9a7581a83b3350431e2ea95de4ffdf +SIZE (KDE/kde-i18n/koffice-l10n-et-1.6.2.tar.bz2) = 1217100 diff --git a/editors/koffice-i18n-et/pkg-plist b/editors/koffice-i18n-et/pkg-plist index 42a8b9044ec5..94ca9632ea6b 100644 --- a/editors/koffice-i18n-et/pkg-plist +++ b/editors/koffice-i18n-et/pkg-plist @@ -158,7 +158,6 @@ share/locale/et/LC_MESSAGES/desktop_koffice.mo share/locale/et/LC_MESSAGES/example.mo share/locale/et/LC_MESSAGES/karbon.mo share/locale/et/LC_MESSAGES/kchart.mo -share/locale/et/LC_MESSAGES/kdgantt.mo share/locale/et/LC_MESSAGES/kexi.mo share/locale/et/LC_MESSAGES/kfile_abiword.mo share/locale/et/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-i18n-eu/Makefile b/editors/koffice-i18n-eu/Makefile index 1b3be23fc95f..f1a3591b8054 100644 --- a/editors/koffice-i18n-eu/Makefile +++ b/editors/koffice-i18n-eu/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-eu/distinfo b/editors/koffice-i18n-eu/distinfo index 61676af5ecb9..cdedb5d75a00 100644 --- a/editors/koffice-i18n-eu/distinfo +++ b/editors/koffice-i18n-eu/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-eu-1.6.1.tar.bz2) = 33bb005893d82eeebbc1dc62495e018a -SHA256 (KDE/kde-i18n/koffice-l10n-eu-1.6.1.tar.bz2) = ba9575d582365dfb530c7e656474fb0f775b0648582c9a3d128782130ba0b624 -SIZE (KDE/kde-i18n/koffice-l10n-eu-1.6.1.tar.bz2) = 364401 +MD5 (KDE/kde-i18n/koffice-l10n-eu-1.6.2.tar.bz2) = 78244fb0777c69433dbc406bd2d5d0cc +SHA256 (KDE/kde-i18n/koffice-l10n-eu-1.6.2.tar.bz2) = 1a4d0fff8d9cce0d3b211b4bd9c4b310fb4b0055da73869535606c76b2175bed +SIZE (KDE/kde-i18n/koffice-l10n-eu-1.6.2.tar.bz2) = 365169 diff --git a/editors/koffice-i18n-eu/pkg-plist b/editors/koffice-i18n-eu/pkg-plist index 0540a7282c7e..cd343ce7a6d9 100644 --- a/editors/koffice-i18n-eu/pkg-plist +++ b/editors/koffice-i18n-eu/pkg-plist @@ -2,7 +2,6 @@ share/locale/eu/LC_MESSAGES/desktop_koffice.mo share/locale/eu/LC_MESSAGES/example.mo share/locale/eu/LC_MESSAGES/karbon.mo share/locale/eu/LC_MESSAGES/kchart.mo -share/locale/eu/LC_MESSAGES/kdgantt.mo share/locale/eu/LC_MESSAGES/kexi.mo share/locale/eu/LC_MESSAGES/kfile_koffice.mo share/locale/eu/LC_MESSAGES/kfile_ooo.mo diff --git a/editors/koffice-i18n-fa/Makefile b/editors/koffice-i18n-fa/Makefile index d21f899d3560..3973b3ccdea8 100644 --- a/editors/koffice-i18n-fa/Makefile +++ b/editors/koffice-i18n-fa/Makefile @@ -6,10 +6,10 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.5 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src/ +MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n PKGNAMEPREFIX= fa- DIST_SUBDIR= KDE diff --git a/editors/koffice-i18n-fa/distinfo b/editors/koffice-i18n-fa/distinfo index 9e825f5e9c4f..acd8c3fd6551 100644 --- a/editors/koffice-i18n-fa/distinfo +++ b/editors/koffice-i18n-fa/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-i18n-fa-1.3.5.tar.bz2) = 385bfe77bee40f92e963d1dc6b687d6c -SHA256 (KDE/kde-i18n/koffice-i18n-fa-1.3.5.tar.bz2) = 93f04eee556565a4d2f56ff9d53d106991a6f0bd47485719d1db12acdfb32eb8 -SIZE (KDE/kde-i18n/koffice-i18n-fa-1.3.5.tar.bz2) = 566310 +MD5 (KDE/kde-i18n/koffice-l10n-fa-1.6.2.tar.bz2) = c210ae6ee1dac06f0858a73183db22b6 +SHA256 (KDE/kde-i18n/koffice-l10n-fa-1.6.2.tar.bz2) = 6f010b65024bb6de408f25ea1f796a11dadb9347495a37726365ddaf10caa7c6 +SIZE (KDE/kde-i18n/koffice-l10n-fa-1.6.2.tar.bz2) = 369115 diff --git a/editors/koffice-i18n-fa/pkg-plist b/editors/koffice-i18n-fa/pkg-plist index 1659f20151bd..4e2c1a0d3dcf 100644 --- a/editors/koffice-i18n-fa/pkg-plist +++ b/editors/koffice-i18n-fa/pkg-plist @@ -1,43 +1,30 @@ -share/locale/fa/LC_MESSAGES/csvfilter.mo share/locale/fa/LC_MESSAGES/desktop_koffice.mo share/locale/fa/LC_MESSAGES/example.mo -share/locale/fa/LC_MESSAGES/karbonepsfilter.mo +share/locale/fa/LC_MESSAGES/karbon.mo share/locale/fa/LC_MESSAGES/kchart.mo +share/locale/fa/LC_MESSAGES/kexi.mo +share/locale/fa/LC_MESSAGES/kfile_abiword.mo +share/locale/fa/LC_MESSAGES/kfile_gnumeric.mo share/locale/fa/LC_MESSAGES/kfile_koffice.mo +share/locale/fa/LC_MESSAGES/kfile_ooo.mo +share/locale/fa/LC_MESSAGES/kformdesigner.mo share/locale/fa/LC_MESSAGES/kformula.mo -share/locale/fa/LC_MESSAGES/kformulalatexfilter.mo -share/locale/fa/LC_MESSAGES/kformulamathmlfilter.mo -share/locale/fa/LC_MESSAGES/kformulapngfilter.mo +share/locale/fa/LC_MESSAGES/kivio.mo share/locale/fa/LC_MESSAGES/koconverter.mo -share/locale/fa/LC_MESSAGES/kocryptfilter.mo share/locale/fa/LC_MESSAGES/koffice.mo +share/locale/fa/LC_MESSAGES/kofficefilters.mo +share/locale/fa/LC_MESSAGES/koproperty.mo share/locale/fa/LC_MESSAGES/koshell.mo share/locale/fa/LC_MESSAGES/kounavail.mo +share/locale/fa/LC_MESSAGES/kplato.mo share/locale/fa/LC_MESSAGES/kpresenter.mo -share/locale/fa/LC_MESSAGES/kpresenterkwordfilter.mo +share/locale/fa/LC_MESSAGES/krita.mo share/locale/fa/LC_MESSAGES/kscan_plugin.mo +share/locale/fa/LC_MESSAGES/kscreenshot_plugin.mo share/locale/fa/LC_MESSAGES/kspread.mo share/locale/fa/LC_MESSAGES/kspreadcalc_calc.mo -share/locale/fa/LC_MESSAGES/kspreaddbasefilter.mo -share/locale/fa/LC_MESSAGES/kspreadexcelimportfilter.mo -share/locale/fa/LC_MESSAGES/kspreadlatexexportfilter.mo -share/locale/fa/LC_MESSAGES/kspreadopencalcfilter.mo -share/locale/fa/LC_MESSAGES/kspreadqprofilter.mo +share/locale/fa/LC_MESSAGES/kspreadinsertcalendar.mo share/locale/fa/LC_MESSAGES/kthesaurus.mo share/locale/fa/LC_MESSAGES/kugar.mo share/locale/fa/LC_MESSAGES/kword.mo -share/locale/fa/LC_MESSAGES/kwordabiwordfilter.mo -share/locale/fa/LC_MESSAGES/kwordasciifilter.mo -share/locale/fa/LC_MESSAGES/kwordhtmlexportfilter.mo -share/locale/fa/LC_MESSAGES/kwordhtmlimportfilter.mo -share/locale/fa/LC_MESSAGES/kwordlatexexportfilter.mo -share/locale/fa/LC_MESSAGES/kwordlatexfilter.mo -share/locale/fa/LC_MESSAGES/kwordlateximportfilter.mo -share/locale/fa/LC_MESSAGES/kwordmswordfilter.mo -share/locale/fa/LC_MESSAGES/kwordmswritefilter.mo -share/locale/fa/LC_MESSAGES/kwordoowriterfilter.mo -share/locale/fa/LC_MESSAGES/kwordpdfimport.mo -share/locale/fa/LC_MESSAGES/olefilterswinword97filter.mo share/locale/fa/LC_MESSAGES/thesaurus_tool.mo -share/locale/fa/LC_MESSAGES/xsltexportfilter.mo -share/locale/fa/LC_MESSAGES/xsltimportfilter.mo diff --git a/editors/koffice-i18n-fi/Makefile b/editors/koffice-i18n-fi/Makefile index 8a405b0616db..cf720071bf73 100644 --- a/editors/koffice-i18n-fi/Makefile +++ b/editors/koffice-i18n-fi/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-fi/distinfo b/editors/koffice-i18n-fi/distinfo index 6e1c1ac19e88..6cc2c0e33294 100644 --- a/editors/koffice-i18n-fi/distinfo +++ b/editors/koffice-i18n-fi/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-fi-1.6.1.tar.bz2) = dc0b99fe0b1c2f0bdc5823804cf5f7f7 -SHA256 (KDE/kde-i18n/koffice-l10n-fi-1.6.1.tar.bz2) = 08a5385cc0351072849ee7b4974b22b1448200bfe98231639f243d162e90ef8a -SIZE (KDE/kde-i18n/koffice-l10n-fi-1.6.1.tar.bz2) = 359845 +MD5 (KDE/kde-i18n/koffice-l10n-fi-1.6.2.tar.bz2) = 1d3904967d3a8be1616dc0c215f4e196 +SHA256 (KDE/kde-i18n/koffice-l10n-fi-1.6.2.tar.bz2) = 6068182b07f26df45ad1bb8d5d3c9f70aeeed8708b650266143b5d8ee6fefd03 +SIZE (KDE/kde-i18n/koffice-l10n-fi-1.6.2.tar.bz2) = 365172 diff --git a/editors/koffice-i18n-fi/pkg-plist b/editors/koffice-i18n-fi/pkg-plist index f1b34356427a..a303ef4d83f7 100644 --- a/editors/koffice-i18n-fi/pkg-plist +++ b/editors/koffice-i18n-fi/pkg-plist @@ -2,7 +2,6 @@ share/locale/fi/LC_MESSAGES/desktop_koffice.mo share/locale/fi/LC_MESSAGES/example.mo share/locale/fi/LC_MESSAGES/karbon.mo share/locale/fi/LC_MESSAGES/kchart.mo -share/locale/fi/LC_MESSAGES/kdgantt.mo share/locale/fi/LC_MESSAGES/kexi.mo share/locale/fi/LC_MESSAGES/kfile_abiword.mo share/locale/fi/LC_MESSAGES/kfile_gnumeric.mo @@ -16,6 +15,7 @@ share/locale/fi/LC_MESSAGES/koffice.mo share/locale/fi/LC_MESSAGES/kofficefilters.mo share/locale/fi/LC_MESSAGES/koshell.mo share/locale/fi/LC_MESSAGES/kounavail.mo +share/locale/fi/LC_MESSAGES/kplato.mo share/locale/fi/LC_MESSAGES/kpresenter.mo share/locale/fi/LC_MESSAGES/krita.mo share/locale/fi/LC_MESSAGES/kscan_plugin.mo diff --git a/editors/koffice-i18n-ga/Makefile b/editors/koffice-i18n-ga/Makefile index 19e61ac4b29e..672d43e4ecb6 100644 --- a/editors/koffice-i18n-ga/Makefile +++ b/editors/koffice-i18n-ga/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-ga/distinfo b/editors/koffice-i18n-ga/distinfo index ac64a92304b3..5bff3e1df9f1 100644 --- a/editors/koffice-i18n-ga/distinfo +++ b/editors/koffice-i18n-ga/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ga-1.5.2.tar.bz2) = b8b4d4cbb0ff29bc0da4954eb9ba4e13 -SHA256 (KDE/kde-i18n/koffice-l10n-ga-1.5.2.tar.bz2) = 84c257d3c6672af336a3bf117a9eed2b54376dea172483bc1cb5a3ec021928a5 -SIZE (KDE/kde-i18n/koffice-l10n-ga-1.5.2.tar.bz2) = 315618 +MD5 (KDE/kde-i18n/koffice-l10n-ga-1.6.2.tar.bz2) = 721f0ae5b438ffba3e2b48b442bb4329 +SHA256 (KDE/kde-i18n/koffice-l10n-ga-1.6.2.tar.bz2) = bbfd1daf408790df032bc9eb39755cd0318d281b42cbe5ce6ecc41305c553287 +SIZE (KDE/kde-i18n/koffice-l10n-ga-1.6.2.tar.bz2) = 337275 diff --git a/editors/koffice-i18n-ga/pkg-plist b/editors/koffice-i18n-ga/pkg-plist index 8e1c92da1d07..b22327bd8a2a 100644 --- a/editors/koffice-i18n-ga/pkg-plist +++ b/editors/koffice-i18n-ga/pkg-plist @@ -3,6 +3,8 @@ share/locale/ga/LC_MESSAGES/example.mo share/locale/ga/LC_MESSAGES/karbon.mo share/locale/ga/LC_MESSAGES/kchart.mo share/locale/ga/LC_MESSAGES/kexi.mo +share/locale/ga/LC_MESSAGES/kfile_abiword.mo +share/locale/ga/LC_MESSAGES/kfile_gnumeric.mo share/locale/ga/LC_MESSAGES/kfile_koffice.mo share/locale/ga/LC_MESSAGES/kfile_ooo.mo share/locale/ga/LC_MESSAGES/kformdesigner.mo @@ -11,8 +13,10 @@ share/locale/ga/LC_MESSAGES/kivio.mo share/locale/ga/LC_MESSAGES/koconverter.mo share/locale/ga/LC_MESSAGES/koffice.mo share/locale/ga/LC_MESSAGES/kofficefilters.mo +share/locale/ga/LC_MESSAGES/koproperty.mo share/locale/ga/LC_MESSAGES/koshell.mo share/locale/ga/LC_MESSAGES/kounavail.mo +share/locale/ga/LC_MESSAGES/kplato.mo share/locale/ga/LC_MESSAGES/kpresenter.mo share/locale/ga/LC_MESSAGES/krita.mo share/locale/ga/LC_MESSAGES/kscan_plugin.mo diff --git a/editors/koffice-i18n-gl/Makefile b/editors/koffice-i18n-gl/Makefile new file mode 100644 index 000000000000..d91721e5ce05 --- /dev/null +++ b/editors/koffice-i18n-gl/Makefile @@ -0,0 +1,29 @@ +# New ports collection makefile for: koffice-i18n-gl +# Date created: 03 March 2007 +# Whom: Michael Nottebrock <lofi@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= koffice-i18n +PORTVERSION= 1.6.2 +CATEGORIES?= misc kde +MASTER_SITES= ${MASTER_SITE_KDE} +MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n +PKGNAMEPREFIX= gl- +DIST_SUBDIR= KDE + +MAINTAINER= kde@FreeBSD.org +COMMENT= Gallegan messages and documentation for koffice + +BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext + +USE_KDELIBS_VER=3 +USE_BZIP2= yes +USE_GMAKE= yes +GNU_CONFIGURE= yes +KDE_I18N= yes + +.include "${.CURDIR}/../../x11/kde3/Makefile.kde" + +.include <bsd.port.mk> diff --git a/editors/koffice-i18n-gl/distinfo b/editors/koffice-i18n-gl/distinfo new file mode 100644 index 000000000000..608bed2bb001 --- /dev/null +++ b/editors/koffice-i18n-gl/distinfo @@ -0,0 +1,3 @@ +MD5 (KDE/kde-i18n/koffice-l10n-gl-1.6.2.tar.bz2) = ab7b69562abe5d66618aa1d03296ebaa +SHA256 (KDE/kde-i18n/koffice-l10n-gl-1.6.2.tar.bz2) = be8200211cfde89e4be619efc0c460f757339190cbc5e3361c154c30b29f021c +SIZE (KDE/kde-i18n/koffice-l10n-gl-1.6.2.tar.bz2) = 460998 diff --git a/editors/koffice-i18n-gl/pkg-descr b/editors/koffice-i18n-gl/pkg-descr new file mode 100644 index 000000000000..9cb0386755e8 --- /dev/null +++ b/editors/koffice-i18n-gl/pkg-descr @@ -0,0 +1,3 @@ +Localized messages and documentation for koffice. + +WWW: http://koffice.kde.org/ diff --git a/editors/koffice-i18n-gl/pkg-plist b/editors/koffice-i18n-gl/pkg-plist new file mode 100644 index 000000000000..79e330c28a1a --- /dev/null +++ b/editors/koffice-i18n-gl/pkg-plist @@ -0,0 +1,51 @@ +share/doc/HTML/gl/karbon/common +share/doc/HTML/gl/karbon/index.cache.bz2 +share/doc/HTML/gl/karbon/index.docbook +share/doc/HTML/gl/kchart/common +share/doc/HTML/gl/kchart/index.cache.bz2 +share/doc/HTML/gl/kchart/index.docbook +share/doc/HTML/gl/koffice/common +share/doc/HTML/gl/koffice/index.cache.bz2 +share/doc/HTML/gl/koffice/index.docbook +share/doc/HTML/gl/koshell/common +share/doc/HTML/gl/koshell/index.cache.bz2 +share/doc/HTML/gl/koshell/index.docbook +share/doc/HTML/gl/thesaurus/common +share/doc/HTML/gl/thesaurus/index.cache.bz2 +share/doc/HTML/gl/thesaurus/index.docbook +share/locale/gl/LC_MESSAGES/desktop_koffice.mo +share/locale/gl/LC_MESSAGES/example.mo +share/locale/gl/LC_MESSAGES/karbon.mo +share/locale/gl/LC_MESSAGES/kchart.mo +share/locale/gl/LC_MESSAGES/kexi.mo +share/locale/gl/LC_MESSAGES/kfile_abiword.mo +share/locale/gl/LC_MESSAGES/kfile_gnumeric.mo +share/locale/gl/LC_MESSAGES/kfile_koffice.mo +share/locale/gl/LC_MESSAGES/kfile_ooo.mo +share/locale/gl/LC_MESSAGES/kformdesigner.mo +share/locale/gl/LC_MESSAGES/kformula.mo +share/locale/gl/LC_MESSAGES/kivio.mo +share/locale/gl/LC_MESSAGES/koconverter.mo +share/locale/gl/LC_MESSAGES/koffice.mo +share/locale/gl/LC_MESSAGES/kofficefilters.mo +share/locale/gl/LC_MESSAGES/koproperty.mo +share/locale/gl/LC_MESSAGES/koshell.mo +share/locale/gl/LC_MESSAGES/kounavail.mo +share/locale/gl/LC_MESSAGES/kplato.mo +share/locale/gl/LC_MESSAGES/kpresenter.mo +share/locale/gl/LC_MESSAGES/krita.mo +share/locale/gl/LC_MESSAGES/kscan_plugin.mo +share/locale/gl/LC_MESSAGES/kscreenshot_plugin.mo +share/locale/gl/LC_MESSAGES/kspread.mo +share/locale/gl/LC_MESSAGES/kspreadcalc_calc.mo +share/locale/gl/LC_MESSAGES/kspreadinsertcalendar.mo +share/locale/gl/LC_MESSAGES/kthesaurus.mo +share/locale/gl/LC_MESSAGES/kugar.mo +share/locale/gl/LC_MESSAGES/kword.mo +share/locale/gl/LC_MESSAGES/thesaurus_tool.mo +@dirrm share/doc/HTML/gl/thesaurus +@dirrm share/doc/HTML/gl/koshell +@dirrm share/doc/HTML/gl/koffice +@dirrm share/doc/HTML/gl/kchart +@dirrm share/doc/HTML/gl/karbon +@dirrm share/doc/HTML/gl diff --git a/editors/koffice-i18n-it/Makefile b/editors/koffice-i18n-it/Makefile index 7f8a39972722..a5913ca8a679 100644 --- a/editors/koffice-i18n-it/Makefile +++ b/editors/koffice-i18n-it/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-it/distinfo b/editors/koffice-i18n-it/distinfo index 9f417dfc625c..ab587c357e0d 100644 --- a/editors/koffice-i18n-it/distinfo +++ b/editors/koffice-i18n-it/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-it-1.6.1.tar.bz2) = 5fc389a6885af2acce7e5b9b48a9ce12 -SHA256 (KDE/kde-i18n/koffice-l10n-it-1.6.1.tar.bz2) = 6679bf2decdf63313bf001a51f8b89cdee2efc8c9d32d51319a84a910ff02b2b -SIZE (KDE/kde-i18n/koffice-l10n-it-1.6.1.tar.bz2) = 1638276 +MD5 (KDE/kde-i18n/koffice-l10n-it-1.6.2.tar.bz2) = 91b2df95b845fa9aabbe33a9af8e37f9 +SHA256 (KDE/kde-i18n/koffice-l10n-it-1.6.2.tar.bz2) = e4f07f020ed3466a433340b2980e215305e92e9175042863573557f98a9ab8ed +SIZE (KDE/kde-i18n/koffice-l10n-it-1.6.2.tar.bz2) = 1639570 diff --git a/editors/koffice-i18n-it/pkg-plist b/editors/koffice-i18n-it/pkg-plist index ac3627f19ced..e2258ffdc5e3 100644 --- a/editors/koffice-i18n-it/pkg-plist +++ b/editors/koffice-i18n-it/pkg-plist @@ -179,7 +179,6 @@ share/locale/it/LC_MESSAGES/desktop_koffice.mo share/locale/it/LC_MESSAGES/example.mo share/locale/it/LC_MESSAGES/karbon.mo share/locale/it/LC_MESSAGES/kchart.mo -share/locale/it/LC_MESSAGES/kdgantt.mo share/locale/it/LC_MESSAGES/kexi.mo share/locale/it/LC_MESSAGES/kfile_abiword.mo share/locale/it/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-i18n-km/Makefile b/editors/koffice-i18n-km/Makefile new file mode 100644 index 000000000000..0931776a6a16 --- /dev/null +++ b/editors/koffice-i18n-km/Makefile @@ -0,0 +1,29 @@ +# New ports collection makefile for: koffice-i18n-km +# Date created: 03 March 2007 +# Whom: Michael Nottebrock <lofi@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= koffice-i18n +PORTVERSION= 1.6.2 +CATEGORIES?= misc kde +MASTER_SITES= ${MASTER_SITE_KDE} +MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n +PKGNAMEPREFIX= km- +DIST_SUBDIR= KDE + +MAINTAINER= kde@FreeBSD.org +COMMENT= Khmer messages and documentation for koffice + +BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext + +USE_KDELIBS_VER=3 +USE_BZIP2= yes +USE_GMAKE= yes +GNU_CONFIGURE= yes +KDE_I18N= yes + +.include "${.CURDIR}/../../x11/kde3/Makefile.kde" + +.include <bsd.port.mk> diff --git a/editors/koffice-i18n-km/distinfo b/editors/koffice-i18n-km/distinfo new file mode 100644 index 000000000000..6ef849c219fc --- /dev/null +++ b/editors/koffice-i18n-km/distinfo @@ -0,0 +1,3 @@ +MD5 (KDE/kde-i18n/koffice-l10n-km-1.6.2.tar.bz2) = a199933f40e29a3fe05c4cfd52525479 +SHA256 (KDE/kde-i18n/koffice-l10n-km-1.6.2.tar.bz2) = f2046ac1b64c246568df9ff7843eb4e6ff8e7f9a40629e3d28e61f6a61cdfd80 +SIZE (KDE/kde-i18n/koffice-l10n-km-1.6.2.tar.bz2) = 162505 diff --git a/editors/koffice-i18n-km/pkg-descr b/editors/koffice-i18n-km/pkg-descr new file mode 100644 index 000000000000..9cb0386755e8 --- /dev/null +++ b/editors/koffice-i18n-km/pkg-descr @@ -0,0 +1,3 @@ +Localized messages and documentation for koffice. + +WWW: http://koffice.kde.org/ diff --git a/editors/koffice-i18n-km/pkg-plist b/editors/koffice-i18n-km/pkg-plist new file mode 100644 index 000000000000..880db7abb1c0 --- /dev/null +++ b/editors/koffice-i18n-km/pkg-plist @@ -0,0 +1,13 @@ +share/locale/km/LC_MESSAGES/desktop_koffice.mo +share/locale/km/LC_MESSAGES/example.mo +share/locale/km/LC_MESSAGES/kfile_abiword.mo +share/locale/km/LC_MESSAGES/kfile_gnumeric.mo +share/locale/km/LC_MESSAGES/kfile_koffice.mo +share/locale/km/LC_MESSAGES/kfile_ooo.mo +share/locale/km/LC_MESSAGES/kformula.mo +share/locale/km/LC_MESSAGES/kivio.mo +share/locale/km/LC_MESSAGES/koconverter.mo +share/locale/km/LC_MESSAGES/kplato.mo +share/locale/km/LC_MESSAGES/krita.mo +@dirrm share/locale/km/LC_MESSAGES +@dirrm share/locale/km diff --git a/editors/koffice-i18n-lv/Makefile b/editors/koffice-i18n-lv/Makefile index 3ec6ff5b12bf..106daf74b643 100644 --- a/editors/koffice-i18n-lv/Makefile +++ b/editors/koffice-i18n-lv/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-lv/distinfo b/editors/koffice-i18n-lv/distinfo index cfcbabb1821d..9bf05e42995b 100644 --- a/editors/koffice-i18n-lv/distinfo +++ b/editors/koffice-i18n-lv/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-lv-1.6.1.tar.bz2) = 512650fbc0638ac0f0bae2864f295cca -SHA256 (KDE/kde-i18n/koffice-l10n-lv-1.6.1.tar.bz2) = 1c28ae196d901ddaf7ad30802510b1668014c4d4ae0299b8dde267a9faf726e2 -SIZE (KDE/kde-i18n/koffice-l10n-lv-1.6.1.tar.bz2) = 321620 +MD5 (KDE/kde-i18n/koffice-l10n-lv-1.6.2.tar.bz2) = 7e1938aa7dfef401759122bdbd54c98d +SHA256 (KDE/kde-i18n/koffice-l10n-lv-1.6.2.tar.bz2) = 0c594251d76ece8eeadcce65a1c4a511323e0f94b65e6b9d0d34735ef20ce8e4 +SIZE (KDE/kde-i18n/koffice-l10n-lv-1.6.2.tar.bz2) = 322261 diff --git a/editors/koffice-i18n-ms/Makefile b/editors/koffice-i18n-ms/Makefile index a53ad3ba941b..143d7c5f7fdb 100644 --- a/editors/koffice-i18n-ms/Makefile +++ b/editors/koffice-i18n-ms/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-ms/distinfo b/editors/koffice-i18n-ms/distinfo index 4df1b70947bc..dc987341a398 100644 --- a/editors/koffice-i18n-ms/distinfo +++ b/editors/koffice-i18n-ms/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ms-1.6.1.tar.bz2) = ff1d6abe79bf4b4239ebaccc2509c35e -SHA256 (KDE/kde-i18n/koffice-l10n-ms-1.6.1.tar.bz2) = 3f777241e8d22201f97b4be242624ec6c690ca3ee74fd9357e4e454598502d2a -SIZE (KDE/kde-i18n/koffice-l10n-ms-1.6.1.tar.bz2) = 353895 +MD5 (KDE/kde-i18n/koffice-l10n-ms-1.6.2.tar.bz2) = dbe0339a7d7bf8626e4ea7ccc8ef5c1b +SHA256 (KDE/kde-i18n/koffice-l10n-ms-1.6.2.tar.bz2) = 223ce3a2e2d2fe8cd823457c1da8ddd3ec59959facb458dd7eb9911f3e7e2b9c +SIZE (KDE/kde-i18n/koffice-l10n-ms-1.6.2.tar.bz2) = 354403 diff --git a/editors/koffice-i18n-ms/pkg-plist b/editors/koffice-i18n-ms/pkg-plist index e38de83005ca..99390aad8df2 100644 --- a/editors/koffice-i18n-ms/pkg-plist +++ b/editors/koffice-i18n-ms/pkg-plist @@ -2,7 +2,6 @@ share/locale/ms/LC_MESSAGES/desktop_koffice.mo share/locale/ms/LC_MESSAGES/example.mo share/locale/ms/LC_MESSAGES/karbon.mo share/locale/ms/LC_MESSAGES/kchart.mo -share/locale/ms/LC_MESSAGES/kdgantt.mo share/locale/ms/LC_MESSAGES/kexi.mo share/locale/ms/LC_MESSAGES/kfile_koffice.mo share/locale/ms/LC_MESSAGES/kfile_ooo.mo diff --git a/editors/koffice-i18n-nb/Makefile b/editors/koffice-i18n-nb/Makefile index 88009ebd778a..d0b367291515 100644 --- a/editors/koffice-i18n-nb/Makefile +++ b/editors/koffice-i18n-nb/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-nb/distinfo b/editors/koffice-i18n-nb/distinfo index a75ee96d5fcf..324f5c64fd63 100644 --- a/editors/koffice-i18n-nb/distinfo +++ b/editors/koffice-i18n-nb/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-nb-1.6.1.tar.bz2) = 65d3a4d15e8911faf43d1aa9c6f7b6a7 -SHA256 (KDE/kde-i18n/koffice-l10n-nb-1.6.1.tar.bz2) = 50ed91fec8debd0be62ec356107f3d7c661bd04df480719921f7c45a11e69a1d -SIZE (KDE/kde-i18n/koffice-l10n-nb-1.6.1.tar.bz2) = 380380 +MD5 (KDE/kde-i18n/koffice-l10n-nb-1.6.2.tar.bz2) = 72578347facd96247c52d48ccbbf1f0b +SHA256 (KDE/kde-i18n/koffice-l10n-nb-1.6.2.tar.bz2) = 49ea27fac5df7bc862876d640d95eaed21e37f10ea0441ca62ea0d1523e3a3b7 +SIZE (KDE/kde-i18n/koffice-l10n-nb-1.6.2.tar.bz2) = 382286 diff --git a/editors/koffice-i18n-nb/pkg-plist b/editors/koffice-i18n-nb/pkg-plist index febc3638272c..56cd255ecfe9 100644 --- a/editors/koffice-i18n-nb/pkg-plist +++ b/editors/koffice-i18n-nb/pkg-plist @@ -2,7 +2,6 @@ share/locale/nb/LC_MESSAGES/desktop_koffice.mo share/locale/nb/LC_MESSAGES/example.mo share/locale/nb/LC_MESSAGES/karbon.mo share/locale/nb/LC_MESSAGES/kchart.mo -share/locale/nb/LC_MESSAGES/kdgantt.mo share/locale/nb/LC_MESSAGES/kexi.mo share/locale/nb/LC_MESSAGES/kfile_abiword.mo share/locale/nb/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-i18n-nl/Makefile b/editors/koffice-i18n-nl/Makefile index 0973f3e6e064..07f2907f9abf 100644 --- a/editors/koffice-i18n-nl/Makefile +++ b/editors/koffice-i18n-nl/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-nl/distinfo b/editors/koffice-i18n-nl/distinfo index 65ecfeb4b961..cdbd66afd99c 100644 --- a/editors/koffice-i18n-nl/distinfo +++ b/editors/koffice-i18n-nl/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-nl-1.6.1.tar.bz2) = 006bc0ff8b292fc8836c989d244a45bc -SHA256 (KDE/kde-i18n/koffice-l10n-nl-1.6.1.tar.bz2) = 5a5ea924223b95c56ac32e98e1f63c702574629c6d51786f2697b02f61613fb3 -SIZE (KDE/kde-i18n/koffice-l10n-nl-1.6.1.tar.bz2) = 3374788 +MD5 (KDE/kde-i18n/koffice-l10n-nl-1.6.2.tar.bz2) = 201de20b5285ac1ffccb16e75f1472e7 +SHA256 (KDE/kde-i18n/koffice-l10n-nl-1.6.2.tar.bz2) = 87a1669b6f4e42c237aed461505c291b81d373313b404652c8871d02748a70b7 +SIZE (KDE/kde-i18n/koffice-l10n-nl-1.6.2.tar.bz2) = 3377009 diff --git a/editors/koffice-i18n-nl/pkg-plist b/editors/koffice-i18n-nl/pkg-plist index 40a6e68057bd..94fd5502349f 100644 --- a/editors/koffice-i18n-nl/pkg-plist +++ b/editors/koffice-i18n-nl/pkg-plist @@ -472,7 +472,6 @@ share/locale/nl/LC_MESSAGES/desktop_koffice.mo share/locale/nl/LC_MESSAGES/example.mo share/locale/nl/LC_MESSAGES/karbon.mo share/locale/nl/LC_MESSAGES/kchart.mo -share/locale/nl/LC_MESSAGES/kdgantt.mo share/locale/nl/LC_MESSAGES/kexi.mo share/locale/nl/LC_MESSAGES/kfile_abiword.mo share/locale/nl/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-i18n-sk/Makefile b/editors/koffice-i18n-sk/Makefile index 5a250b48c116..fb5d0adf4a3b 100644 --- a/editors/koffice-i18n-sk/Makefile +++ b/editors/koffice-i18n-sk/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-sk/distinfo b/editors/koffice-i18n-sk/distinfo index 7c87ec248a99..17c10c29e366 100644 --- a/editors/koffice-i18n-sk/distinfo +++ b/editors/koffice-i18n-sk/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-sk-1.6.1.tar.bz2) = 63b2d698040b2f5ece72e7ca67407669 -SHA256 (KDE/kde-i18n/koffice-l10n-sk-1.6.1.tar.bz2) = 45c7fb18a7046466513526c30c3d2fde70f2ecb822e9eda4f9f12a7133c9499c -SIZE (KDE/kde-i18n/koffice-l10n-sk-1.6.1.tar.bz2) = 987194 +MD5 (KDE/kde-i18n/koffice-l10n-sk-1.6.2.tar.bz2) = 8f151c52c09db40849cd67bcc11cb447 +SHA256 (KDE/kde-i18n/koffice-l10n-sk-1.6.2.tar.bz2) = cc4840c272457500e5fdb912cae69472efd709768ae950e92cc7410e696057ed +SIZE (KDE/kde-i18n/koffice-l10n-sk-1.6.2.tar.bz2) = 988301 diff --git a/editors/koffice-i18n-sk/pkg-plist b/editors/koffice-i18n-sk/pkg-plist index 9fa58c01e183..ffb01b7a3064 100644 --- a/editors/koffice-i18n-sk/pkg-plist +++ b/editors/koffice-i18n-sk/pkg-plist @@ -34,7 +34,6 @@ share/locale/sk/LC_MESSAGES/desktop_koffice.mo share/locale/sk/LC_MESSAGES/example.mo share/locale/sk/LC_MESSAGES/karbon.mo share/locale/sk/LC_MESSAGES/kchart.mo -share/locale/sk/LC_MESSAGES/kdgantt.mo share/locale/sk/LC_MESSAGES/kexi.mo share/locale/sk/LC_MESSAGES/kfile_abiword.mo share/locale/sk/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-i18n-sl/Makefile b/editors/koffice-i18n-sl/Makefile index dc9e320c05f1..a4ae3da03d9e 100644 --- a/editors/koffice-i18n-sl/Makefile +++ b/editors/koffice-i18n-sl/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-sl/distinfo b/editors/koffice-i18n-sl/distinfo index 169aad72f8b6..d029c72b3fd7 100644 --- a/editors/koffice-i18n-sl/distinfo +++ b/editors/koffice-i18n-sl/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-sl-1.5.2.tar.bz2) = e5fe2c8a350ba2636f4bd8dd2168b017 -SHA256 (KDE/kde-i18n/koffice-l10n-sl-1.5.2.tar.bz2) = 9a81919a223b2f8b243a68ea2802518843b861f721165c3be3f2405ecd28fa24 -SIZE (KDE/kde-i18n/koffice-l10n-sl-1.5.2.tar.bz2) = 361997 +MD5 (KDE/kde-i18n/koffice-l10n-sl-1.6.2.tar.bz2) = 0e12b6670b31a089c054b9b7370ba4d3 +SHA256 (KDE/kde-i18n/koffice-l10n-sl-1.6.2.tar.bz2) = d28f6a895c412d8ea1f1db4b99954890c879aacc237d323c46351c29c81ab4c6 +SIZE (KDE/kde-i18n/koffice-l10n-sl-1.6.2.tar.bz2) = 374020 diff --git a/editors/koffice-i18n-sr/Makefile b/editors/koffice-i18n-sr/Makefile index bb7e9a3fae66..12976dc3fbdd 100644 --- a/editors/koffice-i18n-sr/Makefile +++ b/editors/koffice-i18n-sr/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-sr/distinfo b/editors/koffice-i18n-sr/distinfo index 00cc0748b09d..87a5fa0fe6ec 100644 --- a/editors/koffice-i18n-sr/distinfo +++ b/editors/koffice-i18n-sr/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-sr-1.6.1.tar.bz2) = ff1137b214460cfc6c647643da08e098 -SHA256 (KDE/kde-i18n/koffice-l10n-sr-1.6.1.tar.bz2) = 5a790a5ede02129e82f500dface6b1bc11592b14e60ed2c16865cafb883660a8 -SIZE (KDE/kde-i18n/koffice-l10n-sr-1.6.1.tar.bz2) = 382309 +MD5 (KDE/kde-i18n/koffice-l10n-sr-1.6.2.tar.bz2) = 94fb0ca00bd2f089db2854413316fe87 +SHA256 (KDE/kde-i18n/koffice-l10n-sr-1.6.2.tar.bz2) = 7a069436518a231fbbf849c8663287ba8ea1766b980fdc0b56a3845a9f58f13b +SIZE (KDE/kde-i18n/koffice-l10n-sr-1.6.2.tar.bz2) = 382991 diff --git a/editors/koffice-i18n-sr/pkg-plist b/editors/koffice-i18n-sr/pkg-plist index 2cbaa6d90f6b..44c0504be1af 100644 --- a/editors/koffice-i18n-sr/pkg-plist +++ b/editors/koffice-i18n-sr/pkg-plist @@ -2,7 +2,6 @@ share/locale/sr/LC_MESSAGES/desktop_koffice.mo share/locale/sr/LC_MESSAGES/example.mo share/locale/sr/LC_MESSAGES/karbon.mo share/locale/sr/LC_MESSAGES/kchart.mo -share/locale/sr/LC_MESSAGES/kdgantt.mo share/locale/sr/LC_MESSAGES/kexi.mo share/locale/sr/LC_MESSAGES/kfile_abiword.mo share/locale/sr/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-i18n-sr@Latn/Makefile b/editors/koffice-i18n-sr@Latn/Makefile index 1d65f9705213..ef6cb3f78c8f 100644 --- a/editors/koffice-i18n-sr@Latn/Makefile +++ b/editors/koffice-i18n-sr@Latn/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-sr@Latn/distinfo b/editors/koffice-i18n-sr@Latn/distinfo index 366e86446314..4a65db2a9a5b 100644 --- a/editors/koffice-i18n-sr@Latn/distinfo +++ b/editors/koffice-i18n-sr@Latn/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.6.1.tar.bz2) = ed4eab803a7c0443ff3c4839e32757d1 -SHA256 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.6.1.tar.bz2) = e3305d41f6fb1b812f091c56ab390f9094d191916ee23bde883c13b93d36b85f -SIZE (KDE/kde-i18n/koffice-l10n-sr@Latn-1.6.1.tar.bz2) = 385044 +MD5 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.6.2.tar.bz2) = 93f0ba1b6b54d677a354806f0e204fe5 +SHA256 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.6.2.tar.bz2) = d1b54736996e9a55d768d7d07cab365c64d9b30267946bc4e4374fbbc0640898 +SIZE (KDE/kde-i18n/koffice-l10n-sr@Latn-1.6.2.tar.bz2) = 384555 diff --git a/editors/koffice-i18n-sr@Latn/pkg-plist b/editors/koffice-i18n-sr@Latn/pkg-plist index 48ef6abe70ee..98143cd5c517 100644 --- a/editors/koffice-i18n-sr@Latn/pkg-plist +++ b/editors/koffice-i18n-sr@Latn/pkg-plist @@ -2,7 +2,6 @@ share/locale/sr@Latn/LC_MESSAGES/desktop_koffice.mo share/locale/sr@Latn/LC_MESSAGES/example.mo share/locale/sr@Latn/LC_MESSAGES/karbon.mo share/locale/sr@Latn/LC_MESSAGES/kchart.mo -share/locale/sr@Latn/LC_MESSAGES/kdgantt.mo share/locale/sr@Latn/LC_MESSAGES/kexi.mo share/locale/sr@Latn/LC_MESSAGES/kfile_abiword.mo share/locale/sr@Latn/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-i18n-sr_Latn/Makefile b/editors/koffice-i18n-sr_Latn/Makefile index 1d65f9705213..ef6cb3f78c8f 100644 --- a/editors/koffice-i18n-sr_Latn/Makefile +++ b/editors/koffice-i18n-sr_Latn/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-sr_Latn/distinfo b/editors/koffice-i18n-sr_Latn/distinfo index 366e86446314..4a65db2a9a5b 100644 --- a/editors/koffice-i18n-sr_Latn/distinfo +++ b/editors/koffice-i18n-sr_Latn/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.6.1.tar.bz2) = ed4eab803a7c0443ff3c4839e32757d1 -SHA256 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.6.1.tar.bz2) = e3305d41f6fb1b812f091c56ab390f9094d191916ee23bde883c13b93d36b85f -SIZE (KDE/kde-i18n/koffice-l10n-sr@Latn-1.6.1.tar.bz2) = 385044 +MD5 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.6.2.tar.bz2) = 93f0ba1b6b54d677a354806f0e204fe5 +SHA256 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.6.2.tar.bz2) = d1b54736996e9a55d768d7d07cab365c64d9b30267946bc4e4374fbbc0640898 +SIZE (KDE/kde-i18n/koffice-l10n-sr@Latn-1.6.2.tar.bz2) = 384555 diff --git a/editors/koffice-i18n-sr_Latn/pkg-plist b/editors/koffice-i18n-sr_Latn/pkg-plist index 48ef6abe70ee..98143cd5c517 100644 --- a/editors/koffice-i18n-sr_Latn/pkg-plist +++ b/editors/koffice-i18n-sr_Latn/pkg-plist @@ -2,7 +2,6 @@ share/locale/sr@Latn/LC_MESSAGES/desktop_koffice.mo share/locale/sr@Latn/LC_MESSAGES/example.mo share/locale/sr@Latn/LC_MESSAGES/karbon.mo share/locale/sr@Latn/LC_MESSAGES/kchart.mo -share/locale/sr@Latn/LC_MESSAGES/kdgantt.mo share/locale/sr@Latn/LC_MESSAGES/kexi.mo share/locale/sr@Latn/LC_MESSAGES/kfile_abiword.mo share/locale/sr@Latn/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-i18n-sv/Makefile b/editors/koffice-i18n-sv/Makefile index a41463e11c3c..d3a487787ce0 100644 --- a/editors/koffice-i18n-sv/Makefile +++ b/editors/koffice-i18n-sv/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-sv/distinfo b/editors/koffice-i18n-sv/distinfo index 57649992cc47..305fdf94540e 100644 --- a/editors/koffice-i18n-sv/distinfo +++ b/editors/koffice-i18n-sv/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-sv-1.6.1.tar.bz2) = fd5ebf8d8480797f84121f9efcb00823 -SHA256 (KDE/kde-i18n/koffice-l10n-sv-1.6.1.tar.bz2) = 721174f990db6d5ea8254100048463e5d8a721335f7ec318ed52d393fd410bbb -SIZE (KDE/kde-i18n/koffice-l10n-sv-1.6.1.tar.bz2) = 6445810 +MD5 (KDE/kde-i18n/koffice-l10n-sv-1.6.2.tar.bz2) = f63e6deda90f6bc1f10985c5e7971add +SHA256 (KDE/kde-i18n/koffice-l10n-sv-1.6.2.tar.bz2) = a4c053479521cc1e3283071c0690694d3e308729ff8e8ff17e9266698eac14cc +SIZE (KDE/kde-i18n/koffice-l10n-sv-1.6.2.tar.bz2) = 6445892 diff --git a/editors/koffice-i18n-sv/pkg-plist b/editors/koffice-i18n-sv/pkg-plist index 0f24d03f2f32..984eccad701c 100644 --- a/editors/koffice-i18n-sv/pkg-plist +++ b/editors/koffice-i18n-sv/pkg-plist @@ -632,7 +632,6 @@ share/locale/sv/LC_MESSAGES/desktop_koffice.mo share/locale/sv/LC_MESSAGES/example.mo share/locale/sv/LC_MESSAGES/karbon.mo share/locale/sv/LC_MESSAGES/kchart.mo -share/locale/sv/LC_MESSAGES/kdgantt.mo share/locale/sv/LC_MESSAGES/kexi.mo share/locale/sv/LC_MESSAGES/kfile_abiword.mo share/locale/sv/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-i18n-tr/Makefile b/editors/koffice-i18n-tr/Makefile index 7fbbde696c26..d8370e503c5d 100644 --- a/editors/koffice-i18n-tr/Makefile +++ b/editors/koffice-i18n-tr/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-tr/distinfo b/editors/koffice-i18n-tr/distinfo index 8391191c7b6d..c135f7660690 100644 --- a/editors/koffice-i18n-tr/distinfo +++ b/editors/koffice-i18n-tr/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-tr-1.6.1.tar.bz2) = 909ed845836e7219a4cf6710ee128846 -SHA256 (KDE/kde-i18n/koffice-l10n-tr-1.6.1.tar.bz2) = 70433437988733b889eaa4b62d7f3f7f34df9f13517dfd190dbdb8bde0975058 -SIZE (KDE/kde-i18n/koffice-l10n-tr-1.6.1.tar.bz2) = 369415 +MD5 (KDE/kde-i18n/koffice-l10n-tr-1.6.2.tar.bz2) = a17e9f38819b242b9019b92412b2d22f +SHA256 (KDE/kde-i18n/koffice-l10n-tr-1.6.2.tar.bz2) = c33d57249c97fe689cb6b1a05612b69987d3a12064527b1c523c5fd95edd48b5 +SIZE (KDE/kde-i18n/koffice-l10n-tr-1.6.2.tar.bz2) = 368002 diff --git a/editors/koffice-i18n-tr/pkg-plist b/editors/koffice-i18n-tr/pkg-plist index 265074fd8d3e..a45d88477dc7 100644 --- a/editors/koffice-i18n-tr/pkg-plist +++ b/editors/koffice-i18n-tr/pkg-plist @@ -2,7 +2,6 @@ share/locale/tr/LC_MESSAGES/desktop_koffice.mo share/locale/tr/LC_MESSAGES/example.mo share/locale/tr/LC_MESSAGES/karbon.mo share/locale/tr/LC_MESSAGES/kchart.mo -share/locale/tr/LC_MESSAGES/kdgantt.mo share/locale/tr/LC_MESSAGES/kexi.mo share/locale/tr/LC_MESSAGES/kfile_abiword.mo share/locale/tr/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-i18n/Makefile b/editors/koffice-i18n/Makefile index bd8bae7d81c3..8cdef1089255 100644 --- a/editors/koffice-i18n/Makefile +++ b/editors/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES= misc kde MASTER_SITES= # none DISTFILES= # none @@ -16,6 +16,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Localized messages and documentation for KDE RUN_DEPENDS+=\ + ${LOCALBASE}/share/locale/km/LC_MESSAGES/example.mo:${PORTSDIR}/misc/koffice-i18n-km\ ${LOCALBASE}/share/locale/ar/LC_MESSAGES/kword.mo:${PORTSDIR}/arabic/koffice-i18n\ ${LOCALBASE}/share/locale/de/LC_MESSAGES/kword.mo:${PORTSDIR}/german/koffice-i18n\ ${LOCALBASE}/share/locale/fr/LC_MESSAGES/kword.mo:${PORTSDIR}/french/koffice-i18n\ @@ -30,7 +31,7 @@ RUN_DEPENDS+=\ ${LOCALBASE}/share/locale/zh_CN/LC_MESSAGES/kword.mo:${PORTSDIR}/chinese/koffice-i18n-zh_CN \ ${LOCALBASE}/share/locale/zh_TW/LC_MESSAGES/kword.mo:${PORTSDIR}/chinese/koffice-i18n-zh_TW -.for LANG in af bg br bs ca cs cy da el en_GB eo es et eu fa fi ga hi hsb is it \ +.for LANG in af bg br bs ca cs cy da el en_GB eo es et eu fa fi ga gl hi hsb is it \ lo lt lv mk ms mt nb nl nn ro se sk sl sr sr@Latn sv ta tg th tr uz ven xh zu RUN_DEPENDS+=\ ${LOCALBASE}/share/locale/${LANG}/LC_MESSAGES/kword.mo:${PORTSDIR}/misc/koffice-i18n-${LANG} diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile index be4d53dee422..ef53f99fcc71 100644 --- a/editors/koffice-kde3/Makefile +++ b/editors/koffice-kde3/Makefile @@ -6,8 +6,7 @@ # PORTNAME= koffice -PORTVERSION= 1.6.1 -PORTREVISION= 1 +PORTVERSION= 1.6.2 PORTEPOCH= 2 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} diff --git a/editors/koffice-kde3/distinfo b/editors/koffice-kde3/distinfo index 04ee84201ab5..a851f75e77e8 100644 --- a/editors/koffice-kde3/distinfo +++ b/editors/koffice-kde3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/koffice/koffice-1.6.1.tar.bz2) = f7b90b46b79019edc60761a6bff2d387 -SHA256 (KDE/koffice/koffice-1.6.1.tar.bz2) = 5505a6c54009dd0cb75a3770c3daa476154958f92692ca0748b1842d9cd6e728 -SIZE (KDE/koffice/koffice-1.6.1.tar.bz2) = 56999028 +MD5 (KDE/koffice/koffice-1.6.2.tar.bz2) = 74ef62a5f8f766fe8192d5b7d65a3928 +SHA256 (KDE/koffice/koffice-1.6.2.tar.bz2) = fa5ca02eba02219d34c3c6efff92bf767060b4b1343da56eb63139661d53f380 +SIZE (KDE/koffice/koffice-1.6.2.tar.bz2) = 57049103 diff --git a/editors/koffice-kde3/files/patch-kexi_examples-build_kexi_file.sh b/editors/koffice-kde3/files/patch-kexi_examples-build_kexi_file.sh new file mode 100644 index 000000000000..1fb0916c33a0 --- /dev/null +++ b/editors/koffice-kde3/files/patch-kexi_examples-build_kexi_file.sh @@ -0,0 +1,15 @@ +--- kexi/examples/build_kexi_file.sh.orig Mon Mar 5 01:50:05 2007 ++++ kexi/examples/build_kexi_file.sh Mon Mar 5 01:50:31 2007 +@@ -7,9 +7,9 @@ + # Only .kexi file that is older than .sql file is recreated. + # ksqlite is needed on the $PATH. + +-KEXISQL3PATH=../3rdparty/kexisql3/src/.libs/ +-PATH=$PATH:$KEXISQL3PATH +-LD_LIBRARY_PATH=$KEXISQL3PATH:$KEXISQL3PATH ++export KEXISQL3PATH=../3rdparty/kexisql3/src/.libs/ ++export PATH=$PATH:$KEXISQL3PATH ++export LD_LIBRARY_PATH=$KEXISQL3PATH:$KEXISQL3PATH + which ksqlite > /dev/null || exit 1 + + [ $# -lt 1 ] && echo "Missing .sql filename." && exit 1 diff --git a/editors/koffice-kde3/files/patch-kexi_examples-update_sql_files.sh b/editors/koffice-kde3/files/patch-kexi_examples-update_sql_files.sh new file mode 100644 index 000000000000..1c869369a21e --- /dev/null +++ b/editors/koffice-kde3/files/patch-kexi_examples-update_sql_files.sh @@ -0,0 +1,15 @@ +--- kexi/examples/update_sql_files.sh.orig Sun Mar 4 13:49:03 2007 ++++ kexi/examples/update_sql_files.sh Sun Mar 4 13:49:14 2007 +@@ -4,9 +4,9 @@ + # Only .sql file that is older than .kexi file is recreated. + # ksqlite is needed on the PATH + +-KEXISQL3PATH=../3rdparty/kexisql3/src/.libs/ +-PATH=$PATH:$KEXISQL3PATH +-LD_LIBRARY_PATH=$KEXISQL3PATH:$KEXISQL3PATH ++export KEXISQL3PATH=../3rdparty/kexisql3/src/.libs/ ++export PATH=$PATH:$KEXISQL3PATH ++export LD_LIBRARY_PATH=$KEXISQL3PATH:$KEXISQL3PATH + which ksqlite > /dev/null || exit 1 + + for f in `ls -1 *.kexi` ; do diff --git a/editors/koffice-kde3/files/patch-koffce-xpdf-CVE-2007-0104.diff b/editors/koffice-kde3/files/patch-koffce-xpdf-CVE-2007-0104.diff deleted file mode 100644 index f5e51a1c706e..000000000000 --- a/editors/koffice-kde3/files/patch-koffce-xpdf-CVE-2007-0104.diff +++ /dev/null @@ -1,74 +0,0 @@ ------------------------------------------------------------------------- -r622463 | aacid | 2007-01-11 23:05:54 +0100 (Thu, 11 Jan 2007) | 2 lines -Changed paths: - M /branches/koffice/1.6/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.cc - M /branches/koffice/1.6/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.h - -Commiting the patch agreed between kpdf and poppler developers to fix MOAB-06-01-2007 issue. - ------------------------------------------------------------------------- -Index: filters/kword/pdf/xpdf/xpdf/Catalog.cc -=================================================================== ---- filters/kword/pdf/xpdf/xpdf/Catalog.cc (revision 622462) -+++ filters/kword/pdf/xpdf/xpdf/Catalog.cc (revision 622463) -@@ -24,6 +24,12 @@ - #include "Link.h" - #include "Catalog.h" - -+// This define is used to limit the depth of recursive readPageTree calls -+// This is needed because the page tree nodes can reference their parents -+// leaving us in an infinite loop -+// Most sane pdf documents don't have a call depth higher than 10 -+#define MAX_CALL_DEPTH 1000 -+ - //------------------------------------------------------------------------ - // Catalog - //------------------------------------------------------------------------ -@@ -77,7 +83,7 @@ Catalog::Catalog(XRef *xrefA) { - pageRefs[i].num = -1; - pageRefs[i].gen = -1; - } -- numPages = readPageTree(pagesDict.getDict(), NULL, 0); -+ numPages = readPageTree(pagesDict.getDict(), NULL, 0, 0); - if (numPages != numPages0) { - error(-1, "Page count in top-level pages object is incorrect"); - } -@@ -171,7 +177,7 @@ GString *Catalog::readMetadata() { - return s; - } - --int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start) { -+int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start, int callDepth) { - Object kids; - Object kid; - Object kidRef; -@@ -221,9 +227,13 @@ int Catalog::readPageTree(Dict *pagesDic - // This should really be isDict("Pages"), but I've seen at least one - // PDF file where the /Type entry is missing. - } else if (kid.isDict()) { -- if ((start = readPageTree(kid.getDict(), attrs1, start)) -- < 0) -- goto err2; -+ if (callDepth > MAX_CALL_DEPTH) { -+ error(-1, "Limit of %d recursive calls reached while reading the page tree. If your document is correct and not a test to try to force a crash, please report a bug.", MAX_CALL_DEPTH); -+ } else { -+ if ((start = readPageTree(kid.getDict(), attrs1, start, callDepth + 1)) -+ < 0) -+ goto err2; -+ } - } else { - error(-1, "Kid object (page %d) is wrong type (%s)", - start+1, kid.getTypeName()); -Index: filters/kword/pdf/xpdf/xpdf/Catalog.h -=================================================================== ---- filters/kword/pdf/xpdf/xpdf/Catalog.h (revision 622462) -+++ filters/kword/pdf/xpdf/xpdf/Catalog.h (revision 622463) -@@ -82,7 +82,7 @@ private: - Object outline; // outline dictionary - GBool ok; // true if catalog is valid - -- int readPageTree(Dict *pages, PageAttrs *attrs, int start); -+ int readPageTree(Dict *pages, PageAttrs *attrs, int start, int callDepth); - Object *findDestInTree(Object *tree, GString *name, Object *obj); - }; - diff --git a/editors/koffice-kde3/pkg-plist b/editors/koffice-kde3/pkg-plist index 23edb3d4c816..43968f2c3adf 100644 --- a/editors/koffice-kde3/pkg-plist +++ b/editors/koffice-kde3/pkg-plist @@ -1,6 +1,10 @@ bin/karbon bin/kchart bin/kexi +bin/kexi_add_column +bin/kexi_add_column_gui +bin/kexi_delete_column +bin/kexi_delete_column_gui bin/kformula bin/kivio bin/koconverter @@ -113,30 +117,40 @@ include/Kolinewidthaction.h include/Koversiondialog.h include/kcoloractions.h include/kdchart_export.h +include/kexidb/admin.h +include/kexidb/alter.h include/kexidb/connection.h include/kexidb/connectiondata.h include/kexidb/cursor.h +include/kexidb/dbobjectnamevalidator.h +include/kexidb/dbproperties.h include/kexidb/driver.h +include/kexidb/driver_p.h include/kexidb/drivermanager.h include/kexidb/error.h include/kexidb/expression.h include/kexidb/field.h include/kexidb/fieldlist.h +include/kexidb/fieldvalidator.h include/kexidb/global.h include/kexidb/indexschema.h include/kexidb/kexidb_export.h include/kexidb/keximigrate.h include/kexidb/keximigratedata.h +include/kexidb/lookupfieldschema.h include/kexidb/migratemanager.h +include/kexidb/msghandler.h include/kexidb/object.h -include/kexidb/parser.h include/kexidb/preparedstatement.h include/kexidb/queryschema.h include/kexidb/queryschemaparameter.h include/kexidb/relationship.h +include/kexidb/roweditbuffer.h include/kexidb/schemadata.h +include/kexidb/simplecommandlineapp.h include/kexidb/tableschema.h include/kexidb/transaction.h +include/kexidb/utils.h include/kexiutils/identifier.h include/kexiutils/kexiutils_export.h include/kexiutils/longlongvalidator.h @@ -459,6 +473,9 @@ lib/kde3/kritacimg.so lib/kde3/kritacmykplugin.a lib/kde3/kritacmykplugin.la lib/kde3/kritacmykplugin.so +lib/kde3/kritacolorify.a +lib/kde3/kritacolorify.la +lib/kde3/kritacolorify.so lib/kde3/kritacolorrange.a lib/kde3/kritacolorrange.la lib/kde3/kritacolorrange.so @@ -1254,8 +1271,19 @@ lib/libkwordprivate.a lib/libkwordprivate.la lib/libkwordprivate.so lib/libkwordprivate.so.4 +share/applications/kde/karbon.desktop +share/applications/kde/kchart.desktop +share/applications/kde/kexi.desktop +share/applications/kde/kformula.desktop share/applications/kde/kivio.desktop +share/applications/kde/koshell.desktop +share/applications/kde/kplato.desktop +share/applications/kde/kpresenter.desktop share/applications/kde/krita.desktop +share/applications/kde/kspread.desktop +share/applications/kde/kudesigner.desktop +share/applications/kde/kugar.desktop +share/applications/kde/kword.desktop share/applnk/.hidden/krita_jpeg.desktop share/applnk/.hidden/krita_magick.desktop share/applnk/.hidden/krita_openexr.desktop @@ -1264,17 +1292,6 @@ share/applnk/.hidden/krita_png.desktop share/applnk/.hidden/krita_raw.desktop share/applnk/.hidden/krita_tiff.desktop share/applnk/Office/KThesaurus.desktop -share/applnk/Office/karbon.desktop -share/applnk/Office/kchart.desktop -share/applnk/Office/kexi.desktop -share/applnk/Office/kformula.desktop -share/applnk/Office/koshell.desktop -share/applnk/Office/kplato.desktop -share/applnk/Office/kpresenter.desktop -share/applnk/Office/kspread.desktop -share/applnk/Office/kudesigner.desktop -share/applnk/Office/kugar.desktop -share/applnk/Office/kword.desktop share/apps/karbon/gradients/allcolors.kgr share/apps/karbon/gradients/simple.kgr share/apps/karbon/icons/crystalsvg/16x16/actions/14_layer_deletelayer.png @@ -1473,11 +1490,13 @@ share/apps/kchart/templates/chart/.source/BarChart.chrt share/apps/kchart/templates/chart/.source/Empty.chrt share/apps/kchart/templates/chart/BarChart.desktop share/apps/kchart/templates/chart/Empty.desktop +share/apps/kexi/examples/Simple_Database.kexi share/apps/kexi/icons/crystalsvg/128x128/actions/form_action.png share/apps/kexi/icons/crystalsvg/16x16/actions/add_field.png share/apps/kexi/icons/crystalsvg/16x16/actions/aofit.png share/apps/kexi/icons/crystalsvg/16x16/actions/aogrid.png share/apps/kexi/icons/crystalsvg/16x16/actions/aopos2grid.png +share/apps/kexi/icons/crystalsvg/16x16/actions/autofield.png share/apps/kexi/icons/crystalsvg/16x16/actions/autonumber.png share/apps/kexi/icons/crystalsvg/16x16/actions/business_user.png share/apps/kexi/icons/crystalsvg/16x16/actions/button.png @@ -1543,6 +1562,7 @@ share/apps/kexi/icons/crystalsvg/22x22/actions/aoshortest.png share/apps/kexi/icons/crystalsvg/22x22/actions/aotallest.png share/apps/kexi/icons/crystalsvg/22x22/actions/aotop.png share/apps/kexi/icons/crystalsvg/22x22/actions/aowidest.png +share/apps/kexi/icons/crystalsvg/22x22/actions/autofield.png share/apps/kexi/icons/crystalsvg/22x22/actions/business_user.png share/apps/kexi/icons/crystalsvg/22x22/actions/button.png share/apps/kexi/icons/crystalsvg/22x22/actions/check.png @@ -5216,6 +5236,8 @@ share/icons/hicolor/scalable/apps/kexi.svgz share/icons/hicolor/scalable/apps/koshell.svgz share/icons/locolor/16x16/apps/kudesigner.png share/icons/locolor/32x32/apps/kudesigner.png +share/locale/pl/LC_MESSAGES/kexi_add_column_gui_transl_pl.sh +share/locale/pl/LC_MESSAGES/kexi_delete_column_gui_transl_pl.sh share/mimelnk/application/x-kexi-connectiondata.desktop share/mimelnk/application/x-kexiproject-shortcut.desktop share/mimelnk/application/x-kexiproject-sqlite.desktop @@ -5320,6 +5342,7 @@ share/services/kritablurfilter.desktop share/services/kritabumpmapfilter.desktop share/services/kritacimg.desktop share/services/kritacmykplugin.desktop +share/services/kritacolorifyfilter.desktop share/services/kritacolorrange.desktop share/services/kritacolorsfilter.desktop share/services/kritacolorspaceconversion.desktop @@ -5807,6 +5830,7 @@ share/templates/TextDocument.desktop @dirrm share/apps/kexi/icons/crystalsvg/128x128 @dirrm share/apps/kexi/icons/crystalsvg @dirrm share/apps/kexi/icons +@dirrm share/apps/kexi/examples @dirrm share/apps/kexi @dirrm share/apps/kchart/templates/chart/.source @dirrm share/apps/kchart/templates/chart diff --git a/editors/koffice-kde4-l10n-ca/Makefile b/editors/koffice-kde4-l10n-ca/Makefile index 5b2c53c82e80..b4bd5f13bd25 100644 --- a/editors/koffice-kde4-l10n-ca/Makefile +++ b/editors/koffice-kde4-l10n-ca/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-kde4-l10n-ca/distinfo b/editors/koffice-kde4-l10n-ca/distinfo index 64dc722ff740..e1f9aef8d9eb 100644 --- a/editors/koffice-kde4-l10n-ca/distinfo +++ b/editors/koffice-kde4-l10n-ca/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ca-1.6.1.tar.bz2) = 2af9ee48900b76f13c7b205f9f44e454 -SHA256 (KDE/kde-i18n/koffice-l10n-ca-1.6.1.tar.bz2) = bfcd51cae7df0a9985e007a0f7a275b2d0e95a2c0d8f202888c90a8b49ed6346 -SIZE (KDE/kde-i18n/koffice-l10n-ca-1.6.1.tar.bz2) = 1410868 +MD5 (KDE/kde-i18n/koffice-l10n-ca-1.6.2.tar.bz2) = 8809746f5856aa7c2b37583425501ea7 +SHA256 (KDE/kde-i18n/koffice-l10n-ca-1.6.2.tar.bz2) = 8d4104551f098df26fb80b2864fa6b8b5817b4085ff3c33676edbf329fc7eb0a +SIZE (KDE/kde-i18n/koffice-l10n-ca-1.6.2.tar.bz2) = 1675217 diff --git a/editors/koffice-kde4-l10n-ca/pkg-plist b/editors/koffice-kde4-l10n-ca/pkg-plist index f9699d3b9475..3d339bf1bdf1 100644 --- a/editors/koffice-kde4-l10n-ca/pkg-plist +++ b/editors/koffice-kde4-l10n-ca/pkg-plist @@ -8,13 +8,18 @@ share/doc/HTML/ca/kchart/index.docbook share/doc/HTML/ca/kexi/basics.docbook share/doc/HTML/ca/kexi/building.docbook share/doc/HTML/ca/kexi/common +share/doc/HTML/ca/kexi/comparing.docbook share/doc/HTML/ca/kexi/configuration.docbook share/doc/HTML/ca/kexi/credits.docbook share/doc/HTML/ca/kexi/database.docbook +share/doc/HTML/ca/kexi/designingforms.docbook +share/doc/HTML/ca/kexi/enteringdataintotables.docbook +share/doc/HTML/ca/kexi/enteringdatausingforms.docbook share/doc/HTML/ca/kexi/index.cache.bz2 share/doc/HTML/ca/kexi/index.docbook share/doc/HTML/ca/kexi/intro.docbook share/doc/HTML/ca/kexi/menus.docbook +share/doc/HTML/ca/kexi/querydesigning.docbook share/doc/HTML/ca/kformula/common share/doc/HTML/ca/kformula/index.cache.bz2 share/doc/HTML/ca/kformula/index.docbook @@ -39,13 +44,44 @@ share/doc/HTML/ca/kplato/index.docbook share/doc/HTML/ca/kplato/mainwindow.docbook share/doc/HTML/ca/kplato/options.docbook share/doc/HTML/ca/kplato/wbs.docbook +share/doc/HTML/ca/kpresenter/a11y.docbook +share/doc/HTML/ca/kpresenter/common share/doc/HTML/ca/kpresenter/faq.docbook share/doc/HTML/ca/kpresenter/great-presentations.docbook share/doc/HTML/ca/kpresenter/guides.docbook +share/doc/HTML/ca/kpresenter/index.cache.bz2 +share/doc/HTML/ca/kpresenter/index.docbook share/doc/HTML/ca/kpresenter/menus.docbook share/doc/HTML/ca/kpresenter/options.docbook share/doc/HTML/ca/kpresenter/screen.docbook share/doc/HTML/ca/kpresenter/tutorial.docbook +share/doc/HTML/ca/krita/commands-dialogs.docbook +share/doc/HTML/ca/krita/commands-menus.docbook +share/doc/HTML/ca/krita/commands-palettes.docbook +share/doc/HTML/ca/krita/commands-toolbars.docbook +share/doc/HTML/ca/krita/commands.docbook +share/doc/HTML/ca/krita/common +share/doc/HTML/ca/krita/credits.docbook +share/doc/HTML/ca/krita/developers-plugins.docbook +share/doc/HTML/ca/krita/developers-scripting.docbook +share/doc/HTML/ca/krita/developers.docbook +share/doc/HTML/ca/krita/faq.docbook +share/doc/HTML/ca/krita/index.cache.bz2 +share/doc/HTML/ca/krita/index.docbook +share/doc/HTML/ca/krita/installation.docbook +share/doc/HTML/ca/krita/introduction.docbook +share/doc/HTML/ca/krita/settings.docbook +share/doc/HTML/ca/krita/tutorial-quick-starts.docbook +share/doc/HTML/ca/krita/tutorial-select-layer.docbook +share/doc/HTML/ca/krita/tutorial-starting.docbook +share/doc/HTML/ca/krita/tutorial-tablet.docbook +share/doc/HTML/ca/krita/tutorial.docbook +share/doc/HTML/ca/krita/using-colorspaces.docbook +share/doc/HTML/ca/krita/using-filters.docbook +share/doc/HTML/ca/krita/using-images.docbook +share/doc/HTML/ca/krita/using-layers.docbook +share/doc/HTML/ca/krita/using-selections.docbook +share/doc/HTML/ca/krita/using-views.docbook share/doc/HTML/ca/kspread/a11y.docbook share/doc/HTML/ca/kspread/advanced.docbook share/doc/HTML/ca/kspread/basics.docbook @@ -81,6 +117,18 @@ share/doc/HTML/ca/kspread/shortcut1.png share/doc/HTML/ca/kspread/shortcut2.png share/doc/HTML/ca/kspread/shortcut3.png share/doc/HTML/ca/kspread/tts.png +share/doc/HTML/ca/kugar/common +share/doc/HTML/ca/kugar/datadtd.docbook +share/doc/HTML/ca/kugar/dataref.docbook +share/doc/HTML/ca/kugar/designer.docbook +share/doc/HTML/ca/kugar/index.cache.bz2 +share/doc/HTML/ca/kugar/index.docbook +share/doc/HTML/ca/kugar/progguide.docbook +share/doc/HTML/ca/kugar/starting.docbook +share/doc/HTML/ca/kugar/template-elements.docbook +share/doc/HTML/ca/kugar/template.docbook +share/doc/HTML/ca/kugar/templatedtd.docbook +share/doc/HTML/ca/kugar/tutorial.docbook share/doc/HTML/ca/kword/a11y.docbook share/doc/HTML/ca/kword/basics.docbook share/doc/HTML/ca/kword/bookmarks.docbook @@ -127,7 +175,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_abiword.mo share/locale/ca/LC_MESSAGES/kfile_gnumeric.mo @@ -156,7 +203,9 @@ share/locale/ca/LC_MESSAGES/kword.mo share/locale/ca/LC_MESSAGES/thesaurus_tool.mo @dirrm share/doc/HTML/ca/thesaurus @dirrm share/doc/HTML/ca/kword +@dirrm share/doc/HTML/ca/kugar @dirrm share/doc/HTML/ca/kspread +@dirrm share/doc/HTML/ca/krita @dirrm share/doc/HTML/ca/kpresenter @dirrm share/doc/HTML/ca/kplato @dirrm share/doc/HTML/ca/koshell diff --git a/editors/koffice-kde4-l10n-da/Makefile b/editors/koffice-kde4-l10n-da/Makefile index 248790d56afc..d30b137918ee 100644 --- a/editors/koffice-kde4-l10n-da/Makefile +++ b/editors/koffice-kde4-l10n-da/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-kde4-l10n-da/distinfo b/editors/koffice-kde4-l10n-da/distinfo index fb79a71beb1c..583e24f07c56 100644 --- a/editors/koffice-kde4-l10n-da/distinfo +++ b/editors/koffice-kde4-l10n-da/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-da-1.6.1.tar.bz2) = 34ac13ce5bf8452f5f8b44686d03781a -SHA256 (KDE/kde-i18n/koffice-l10n-da-1.6.1.tar.bz2) = 456b9fa8dd88e20d22ccecf0fb6390738642aea1cbdacd5ae395e40981dfdfb8 -SIZE (KDE/kde-i18n/koffice-l10n-da-1.6.1.tar.bz2) = 1112047 +MD5 (KDE/kde-i18n/koffice-l10n-da-1.6.2.tar.bz2) = ed57736b883215dce9d8cf6985d70fe2 +SHA256 (KDE/kde-i18n/koffice-l10n-da-1.6.2.tar.bz2) = d8fd689d961ef66a1643b6f5e5ec82c996325c7af790a0abc9c1bb87fe2aaf81 +SIZE (KDE/kde-i18n/koffice-l10n-da-1.6.2.tar.bz2) = 1114169 diff --git a/editors/koffice-kde4-l10n-da/pkg-plist b/editors/koffice-kde4-l10n-da/pkg-plist index 834334517175..a432b4948e04 100644 --- a/editors/koffice-kde4-l10n-da/pkg-plist +++ b/editors/koffice-kde4-l10n-da/pkg-plist @@ -69,7 +69,6 @@ share/doc/HTML/da/krita/index.cache.bz2 share/doc/HTML/da/krita/index.docbook share/doc/HTML/da/krita/installation.docbook share/doc/HTML/da/krita/introduction.docbook -share/doc/HTML/da/krita/scripting.docbook share/doc/HTML/da/krita/settings.docbook share/doc/HTML/da/krita/tutorial-quick-starts.docbook share/doc/HTML/da/krita/tutorial-select-layer.docbook @@ -152,7 +151,6 @@ share/locale/da/LC_MESSAGES/desktop_koffice.mo share/locale/da/LC_MESSAGES/example.mo share/locale/da/LC_MESSAGES/karbon.mo share/locale/da/LC_MESSAGES/kchart.mo -share/locale/da/LC_MESSAGES/kdgantt.mo share/locale/da/LC_MESSAGES/kexi.mo share/locale/da/LC_MESSAGES/kfile_abiword.mo share/locale/da/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-kde4-l10n-el/Makefile b/editors/koffice-kde4-l10n-el/Makefile index 19bbb0d828b6..c88ced91fae5 100644 --- a/editors/koffice-kde4-l10n-el/Makefile +++ b/editors/koffice-kde4-l10n-el/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-kde4-l10n-el/distinfo b/editors/koffice-kde4-l10n-el/distinfo index 0a977fd50dd0..3e43861ac5aa 100644 --- a/editors/koffice-kde4-l10n-el/distinfo +++ b/editors/koffice-kde4-l10n-el/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-el-1.6.1.tar.bz2) = c2028907c0675534694b5bad4c85ac0f -SHA256 (KDE/kde-i18n/koffice-l10n-el-1.6.1.tar.bz2) = 0fbd0569d485b233a7366d3013bd4b57ab6295e012c4bc2fd73ed961920a7a9d -SIZE (KDE/kde-i18n/koffice-l10n-el-1.6.1.tar.bz2) = 385670 +MD5 (KDE/kde-i18n/koffice-l10n-el-1.6.2.tar.bz2) = 239ea87f98dc701cc8b4b6b1ef1372b9 +SHA256 (KDE/kde-i18n/koffice-l10n-el-1.6.2.tar.bz2) = d15b71d81491ba335ee7077ac1d93272ea81ecf346294906f36e895cfd9912ea +SIZE (KDE/kde-i18n/koffice-l10n-el-1.6.2.tar.bz2) = 386210 diff --git a/editors/koffice-kde4-l10n-el/pkg-plist b/editors/koffice-kde4-l10n-el/pkg-plist index 46c436194e10..423a32aa7c81 100644 --- a/editors/koffice-kde4-l10n-el/pkg-plist +++ b/editors/koffice-kde4-l10n-el/pkg-plist @@ -2,7 +2,6 @@ share/locale/el/LC_MESSAGES/desktop_koffice.mo share/locale/el/LC_MESSAGES/example.mo share/locale/el/LC_MESSAGES/karbon.mo share/locale/el/LC_MESSAGES/kchart.mo -share/locale/el/LC_MESSAGES/kdgantt.mo share/locale/el/LC_MESSAGES/kexi.mo share/locale/el/LC_MESSAGES/kfile_abiword.mo share/locale/el/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-kde4-l10n-en_GB/Makefile b/editors/koffice-kde4-l10n-en_GB/Makefile index cb490bb940b4..2ceee8de12a2 100644 --- a/editors/koffice-kde4-l10n-en_GB/Makefile +++ b/editors/koffice-kde4-l10n-en_GB/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-kde4-l10n-en_GB/distinfo b/editors/koffice-kde4-l10n-en_GB/distinfo index 97a08e6f157e..6ff200407f58 100644 --- a/editors/koffice-kde4-l10n-en_GB/distinfo +++ b/editors/koffice-kde4-l10n-en_GB/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-en_GB-1.6.1.tar.bz2) = 0c8edcc2fb6570ff7629e610580cac2f -SHA256 (KDE/kde-i18n/koffice-l10n-en_GB-1.6.1.tar.bz2) = bd003552c53b0b7d949cdb967b9053993e6810061c4922034e520c7e5afbb111 -SIZE (KDE/kde-i18n/koffice-l10n-en_GB-1.6.1.tar.bz2) = 357746 +MD5 (KDE/kde-i18n/koffice-l10n-en_GB-1.6.2.tar.bz2) = 445f7990c5ecb9118cbe3c7d68c74654 +SHA256 (KDE/kde-i18n/koffice-l10n-en_GB-1.6.2.tar.bz2) = 37c177e133701dd1a4c51285f96bcf8afd8c39d3ee47a08d08b706fc4fb262be +SIZE (KDE/kde-i18n/koffice-l10n-en_GB-1.6.2.tar.bz2) = 358135 diff --git a/editors/koffice-kde4-l10n-en_GB/pkg-plist b/editors/koffice-kde4-l10n-en_GB/pkg-plist index 0e783dd7b5e1..adbbd5d4d225 100644 --- a/editors/koffice-kde4-l10n-en_GB/pkg-plist +++ b/editors/koffice-kde4-l10n-en_GB/pkg-plist @@ -15,7 +15,6 @@ share/locale/en_GB/LC_MESSAGES/desktop_koffice.mo share/locale/en_GB/LC_MESSAGES/example.mo share/locale/en_GB/LC_MESSAGES/karbon.mo share/locale/en_GB/LC_MESSAGES/kchart.mo -share/locale/en_GB/LC_MESSAGES/kdgantt.mo share/locale/en_GB/LC_MESSAGES/kexi.mo share/locale/en_GB/LC_MESSAGES/kfile_koffice.mo share/locale/en_GB/LC_MESSAGES/kfile_ooo.mo diff --git a/editors/koffice-kde4-l10n-es/Makefile b/editors/koffice-kde4-l10n-es/Makefile index 3bdebfe0f4b2..22bf89236885 100644 --- a/editors/koffice-kde4-l10n-es/Makefile +++ b/editors/koffice-kde4-l10n-es/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde spanish MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-kde4-l10n-es/distinfo b/editors/koffice-kde4-l10n-es/distinfo index 96a86103ba37..d583f2a2dde6 100644 --- a/editors/koffice-kde4-l10n-es/distinfo +++ b/editors/koffice-kde4-l10n-es/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-es-1.6.1.tar.bz2) = e3095320b087fdbaf9dea4ca7384c4e7 -SHA256 (KDE/kde-i18n/koffice-l10n-es-1.6.1.tar.bz2) = 94dc8b87aea0f8e1d34ecc2b0762db9fbf0a6914c561c27d8eb6903337521c0d -SIZE (KDE/kde-i18n/koffice-l10n-es-1.6.1.tar.bz2) = 17259132 +MD5 (KDE/kde-i18n/koffice-l10n-es-1.6.2.tar.bz2) = d10222e3c617f73327db7eee522ce753 +SHA256 (KDE/kde-i18n/koffice-l10n-es-1.6.2.tar.bz2) = 09ecb9825cc27030cb5b744ce11fa89869adc8b07cbbc0c7664a8350ad63562f +SIZE (KDE/kde-i18n/koffice-l10n-es-1.6.2.tar.bz2) = 15248673 diff --git a/editors/koffice-kde4-l10n-es/pkg-plist b/editors/koffice-kde4-l10n-es/pkg-plist index de46c53cba38..b0a5fdca47aa 100644 --- a/editors/koffice-kde4-l10n-es/pkg-plist +++ b/editors/koffice-kde4-l10n-es/pkg-plist @@ -240,7 +240,6 @@ share/doc/HTML/es/krita/commands-menus.docbook share/doc/HTML/es/krita/commands-palettes.docbook share/doc/HTML/es/krita/commands-toolbars.docbook share/doc/HTML/es/krita/commands.docbook -share/doc/HTML/es/krita/common share/doc/HTML/es/krita/createdocument.png share/doc/HTML/es/krita/credits.docbook share/doc/HTML/es/krita/crocusses-bumpmap.png @@ -289,8 +288,6 @@ share/doc/HTML/es/krita/dialogs-shearimage.png share/doc/HTML/es/krita/dialogs-shearlayer.png share/doc/HTML/es/krita/faq.docbook share/doc/HTML/es/krita/filters-customconvolution.png -share/doc/HTML/es/krita/index.cache.bz2 -share/doc/HTML/es/krita/index.docbook share/doc/HTML/es/krita/installation.docbook share/doc/HTML/es/krita/introduction.docbook share/doc/HTML/es/krita/mainscreen.png @@ -568,6 +565,7 @@ share/doc/HTML/es/kword/formframe2.png share/doc/HTML/es/kword/formframe3.png share/doc/HTML/es/kword/formframe4.png share/doc/HTML/es/kword/formframe5.png +share/doc/HTML/es/kword/formframe6.png share/doc/HTML/es/kword/forminteg.png share/doc/HTML/es/kword/formllind.png share/doc/HTML/es/kword/formlrind.png @@ -727,7 +725,6 @@ share/locale/es/LC_MESSAGES/desktop_koffice.mo share/locale/es/LC_MESSAGES/example.mo share/locale/es/LC_MESSAGES/karbon.mo share/locale/es/LC_MESSAGES/kchart.mo -share/locale/es/LC_MESSAGES/kdgantt.mo share/locale/es/LC_MESSAGES/kexi.mo share/locale/es/LC_MESSAGES/kfile_abiword.mo share/locale/es/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-kde4-l10n-et/Makefile b/editors/koffice-kde4-l10n-et/Makefile index 371637a8a638..7f2db742519a 100644 --- a/editors/koffice-kde4-l10n-et/Makefile +++ b/editors/koffice-kde4-l10n-et/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-kde4-l10n-et/distinfo b/editors/koffice-kde4-l10n-et/distinfo index cab102edda59..fc62b9b4b820 100644 --- a/editors/koffice-kde4-l10n-et/distinfo +++ b/editors/koffice-kde4-l10n-et/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-et-1.6.1.tar.bz2) = d7e32d741c284880ff01530d956cd524 -SHA256 (KDE/kde-i18n/koffice-l10n-et-1.6.1.tar.bz2) = 3af8d5733581df95d5280abfe927f922e364764c64ba5c6ca04be78c310ca395 -SIZE (KDE/kde-i18n/koffice-l10n-et-1.6.1.tar.bz2) = 1218454 +MD5 (KDE/kde-i18n/koffice-l10n-et-1.6.2.tar.bz2) = e7a4017b8db71204650c44bc72cd9500 +SHA256 (KDE/kde-i18n/koffice-l10n-et-1.6.2.tar.bz2) = 3ae6cd7182836ba235af98b679786727bb9a7581a83b3350431e2ea95de4ffdf +SIZE (KDE/kde-i18n/koffice-l10n-et-1.6.2.tar.bz2) = 1217100 diff --git a/editors/koffice-kde4-l10n-et/pkg-plist b/editors/koffice-kde4-l10n-et/pkg-plist index 42a8b9044ec5..94ca9632ea6b 100644 --- a/editors/koffice-kde4-l10n-et/pkg-plist +++ b/editors/koffice-kde4-l10n-et/pkg-plist @@ -158,7 +158,6 @@ share/locale/et/LC_MESSAGES/desktop_koffice.mo share/locale/et/LC_MESSAGES/example.mo share/locale/et/LC_MESSAGES/karbon.mo share/locale/et/LC_MESSAGES/kchart.mo -share/locale/et/LC_MESSAGES/kdgantt.mo share/locale/et/LC_MESSAGES/kexi.mo share/locale/et/LC_MESSAGES/kfile_abiword.mo share/locale/et/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-kde4-l10n-gl/Makefile b/editors/koffice-kde4-l10n-gl/Makefile new file mode 100644 index 000000000000..d91721e5ce05 --- /dev/null +++ b/editors/koffice-kde4-l10n-gl/Makefile @@ -0,0 +1,29 @@ +# New ports collection makefile for: koffice-i18n-gl +# Date created: 03 March 2007 +# Whom: Michael Nottebrock <lofi@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= koffice-i18n +PORTVERSION= 1.6.2 +CATEGORIES?= misc kde +MASTER_SITES= ${MASTER_SITE_KDE} +MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n +PKGNAMEPREFIX= gl- +DIST_SUBDIR= KDE + +MAINTAINER= kde@FreeBSD.org +COMMENT= Gallegan messages and documentation for koffice + +BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext + +USE_KDELIBS_VER=3 +USE_BZIP2= yes +USE_GMAKE= yes +GNU_CONFIGURE= yes +KDE_I18N= yes + +.include "${.CURDIR}/../../x11/kde3/Makefile.kde" + +.include <bsd.port.mk> diff --git a/editors/koffice-kde4-l10n-gl/distinfo b/editors/koffice-kde4-l10n-gl/distinfo new file mode 100644 index 000000000000..608bed2bb001 --- /dev/null +++ b/editors/koffice-kde4-l10n-gl/distinfo @@ -0,0 +1,3 @@ +MD5 (KDE/kde-i18n/koffice-l10n-gl-1.6.2.tar.bz2) = ab7b69562abe5d66618aa1d03296ebaa +SHA256 (KDE/kde-i18n/koffice-l10n-gl-1.6.2.tar.bz2) = be8200211cfde89e4be619efc0c460f757339190cbc5e3361c154c30b29f021c +SIZE (KDE/kde-i18n/koffice-l10n-gl-1.6.2.tar.bz2) = 460998 diff --git a/editors/koffice-kde4-l10n-gl/pkg-descr b/editors/koffice-kde4-l10n-gl/pkg-descr new file mode 100644 index 000000000000..9cb0386755e8 --- /dev/null +++ b/editors/koffice-kde4-l10n-gl/pkg-descr @@ -0,0 +1,3 @@ +Localized messages and documentation for koffice. + +WWW: http://koffice.kde.org/ diff --git a/editors/koffice-kde4-l10n-gl/pkg-plist b/editors/koffice-kde4-l10n-gl/pkg-plist new file mode 100644 index 000000000000..79e330c28a1a --- /dev/null +++ b/editors/koffice-kde4-l10n-gl/pkg-plist @@ -0,0 +1,51 @@ +share/doc/HTML/gl/karbon/common +share/doc/HTML/gl/karbon/index.cache.bz2 +share/doc/HTML/gl/karbon/index.docbook +share/doc/HTML/gl/kchart/common +share/doc/HTML/gl/kchart/index.cache.bz2 +share/doc/HTML/gl/kchart/index.docbook +share/doc/HTML/gl/koffice/common +share/doc/HTML/gl/koffice/index.cache.bz2 +share/doc/HTML/gl/koffice/index.docbook +share/doc/HTML/gl/koshell/common +share/doc/HTML/gl/koshell/index.cache.bz2 +share/doc/HTML/gl/koshell/index.docbook +share/doc/HTML/gl/thesaurus/common +share/doc/HTML/gl/thesaurus/index.cache.bz2 +share/doc/HTML/gl/thesaurus/index.docbook +share/locale/gl/LC_MESSAGES/desktop_koffice.mo +share/locale/gl/LC_MESSAGES/example.mo +share/locale/gl/LC_MESSAGES/karbon.mo +share/locale/gl/LC_MESSAGES/kchart.mo +share/locale/gl/LC_MESSAGES/kexi.mo +share/locale/gl/LC_MESSAGES/kfile_abiword.mo +share/locale/gl/LC_MESSAGES/kfile_gnumeric.mo +share/locale/gl/LC_MESSAGES/kfile_koffice.mo +share/locale/gl/LC_MESSAGES/kfile_ooo.mo +share/locale/gl/LC_MESSAGES/kformdesigner.mo +share/locale/gl/LC_MESSAGES/kformula.mo +share/locale/gl/LC_MESSAGES/kivio.mo +share/locale/gl/LC_MESSAGES/koconverter.mo +share/locale/gl/LC_MESSAGES/koffice.mo +share/locale/gl/LC_MESSAGES/kofficefilters.mo +share/locale/gl/LC_MESSAGES/koproperty.mo +share/locale/gl/LC_MESSAGES/koshell.mo +share/locale/gl/LC_MESSAGES/kounavail.mo +share/locale/gl/LC_MESSAGES/kplato.mo +share/locale/gl/LC_MESSAGES/kpresenter.mo +share/locale/gl/LC_MESSAGES/krita.mo +share/locale/gl/LC_MESSAGES/kscan_plugin.mo +share/locale/gl/LC_MESSAGES/kscreenshot_plugin.mo +share/locale/gl/LC_MESSAGES/kspread.mo +share/locale/gl/LC_MESSAGES/kspreadcalc_calc.mo +share/locale/gl/LC_MESSAGES/kspreadinsertcalendar.mo +share/locale/gl/LC_MESSAGES/kthesaurus.mo +share/locale/gl/LC_MESSAGES/kugar.mo +share/locale/gl/LC_MESSAGES/kword.mo +share/locale/gl/LC_MESSAGES/thesaurus_tool.mo +@dirrm share/doc/HTML/gl/thesaurus +@dirrm share/doc/HTML/gl/koshell +@dirrm share/doc/HTML/gl/koffice +@dirrm share/doc/HTML/gl/kchart +@dirrm share/doc/HTML/gl/karbon +@dirrm share/doc/HTML/gl diff --git a/editors/koffice-kde4-l10n-it/Makefile b/editors/koffice-kde4-l10n-it/Makefile index 7f8a39972722..a5913ca8a679 100644 --- a/editors/koffice-kde4-l10n-it/Makefile +++ b/editors/koffice-kde4-l10n-it/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-kde4-l10n-it/distinfo b/editors/koffice-kde4-l10n-it/distinfo index 9f417dfc625c..ab587c357e0d 100644 --- a/editors/koffice-kde4-l10n-it/distinfo +++ b/editors/koffice-kde4-l10n-it/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-it-1.6.1.tar.bz2) = 5fc389a6885af2acce7e5b9b48a9ce12 -SHA256 (KDE/kde-i18n/koffice-l10n-it-1.6.1.tar.bz2) = 6679bf2decdf63313bf001a51f8b89cdee2efc8c9d32d51319a84a910ff02b2b -SIZE (KDE/kde-i18n/koffice-l10n-it-1.6.1.tar.bz2) = 1638276 +MD5 (KDE/kde-i18n/koffice-l10n-it-1.6.2.tar.bz2) = 91b2df95b845fa9aabbe33a9af8e37f9 +SHA256 (KDE/kde-i18n/koffice-l10n-it-1.6.2.tar.bz2) = e4f07f020ed3466a433340b2980e215305e92e9175042863573557f98a9ab8ed +SIZE (KDE/kde-i18n/koffice-l10n-it-1.6.2.tar.bz2) = 1639570 diff --git a/editors/koffice-kde4-l10n-it/pkg-plist b/editors/koffice-kde4-l10n-it/pkg-plist index ac3627f19ced..e2258ffdc5e3 100644 --- a/editors/koffice-kde4-l10n-it/pkg-plist +++ b/editors/koffice-kde4-l10n-it/pkg-plist @@ -179,7 +179,6 @@ share/locale/it/LC_MESSAGES/desktop_koffice.mo share/locale/it/LC_MESSAGES/example.mo share/locale/it/LC_MESSAGES/karbon.mo share/locale/it/LC_MESSAGES/kchart.mo -share/locale/it/LC_MESSAGES/kdgantt.mo share/locale/it/LC_MESSAGES/kexi.mo share/locale/it/LC_MESSAGES/kfile_abiword.mo share/locale/it/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-kde4-l10n-nb/Makefile b/editors/koffice-kde4-l10n-nb/Makefile index 88009ebd778a..d0b367291515 100644 --- a/editors/koffice-kde4-l10n-nb/Makefile +++ b/editors/koffice-kde4-l10n-nb/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-kde4-l10n-nb/distinfo b/editors/koffice-kde4-l10n-nb/distinfo index a75ee96d5fcf..324f5c64fd63 100644 --- a/editors/koffice-kde4-l10n-nb/distinfo +++ b/editors/koffice-kde4-l10n-nb/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-nb-1.6.1.tar.bz2) = 65d3a4d15e8911faf43d1aa9c6f7b6a7 -SHA256 (KDE/kde-i18n/koffice-l10n-nb-1.6.1.tar.bz2) = 50ed91fec8debd0be62ec356107f3d7c661bd04df480719921f7c45a11e69a1d -SIZE (KDE/kde-i18n/koffice-l10n-nb-1.6.1.tar.bz2) = 380380 +MD5 (KDE/kde-i18n/koffice-l10n-nb-1.6.2.tar.bz2) = 72578347facd96247c52d48ccbbf1f0b +SHA256 (KDE/kde-i18n/koffice-l10n-nb-1.6.2.tar.bz2) = 49ea27fac5df7bc862876d640d95eaed21e37f10ea0441ca62ea0d1523e3a3b7 +SIZE (KDE/kde-i18n/koffice-l10n-nb-1.6.2.tar.bz2) = 382286 diff --git a/editors/koffice-kde4-l10n-nb/pkg-plist b/editors/koffice-kde4-l10n-nb/pkg-plist index febc3638272c..56cd255ecfe9 100644 --- a/editors/koffice-kde4-l10n-nb/pkg-plist +++ b/editors/koffice-kde4-l10n-nb/pkg-plist @@ -2,7 +2,6 @@ share/locale/nb/LC_MESSAGES/desktop_koffice.mo share/locale/nb/LC_MESSAGES/example.mo share/locale/nb/LC_MESSAGES/karbon.mo share/locale/nb/LC_MESSAGES/kchart.mo -share/locale/nb/LC_MESSAGES/kdgantt.mo share/locale/nb/LC_MESSAGES/kexi.mo share/locale/nb/LC_MESSAGES/kfile_abiword.mo share/locale/nb/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-kde4-l10n-nl/Makefile b/editors/koffice-kde4-l10n-nl/Makefile index 0973f3e6e064..07f2907f9abf 100644 --- a/editors/koffice-kde4-l10n-nl/Makefile +++ b/editors/koffice-kde4-l10n-nl/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-kde4-l10n-nl/distinfo b/editors/koffice-kde4-l10n-nl/distinfo index 65ecfeb4b961..cdbd66afd99c 100644 --- a/editors/koffice-kde4-l10n-nl/distinfo +++ b/editors/koffice-kde4-l10n-nl/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-nl-1.6.1.tar.bz2) = 006bc0ff8b292fc8836c989d244a45bc -SHA256 (KDE/kde-i18n/koffice-l10n-nl-1.6.1.tar.bz2) = 5a5ea924223b95c56ac32e98e1f63c702574629c6d51786f2697b02f61613fb3 -SIZE (KDE/kde-i18n/koffice-l10n-nl-1.6.1.tar.bz2) = 3374788 +MD5 (KDE/kde-i18n/koffice-l10n-nl-1.6.2.tar.bz2) = 201de20b5285ac1ffccb16e75f1472e7 +SHA256 (KDE/kde-i18n/koffice-l10n-nl-1.6.2.tar.bz2) = 87a1669b6f4e42c237aed461505c291b81d373313b404652c8871d02748a70b7 +SIZE (KDE/kde-i18n/koffice-l10n-nl-1.6.2.tar.bz2) = 3377009 diff --git a/editors/koffice-kde4-l10n-nl/pkg-plist b/editors/koffice-kde4-l10n-nl/pkg-plist index 40a6e68057bd..94fd5502349f 100644 --- a/editors/koffice-kde4-l10n-nl/pkg-plist +++ b/editors/koffice-kde4-l10n-nl/pkg-plist @@ -472,7 +472,6 @@ share/locale/nl/LC_MESSAGES/desktop_koffice.mo share/locale/nl/LC_MESSAGES/example.mo share/locale/nl/LC_MESSAGES/karbon.mo share/locale/nl/LC_MESSAGES/kchart.mo -share/locale/nl/LC_MESSAGES/kdgantt.mo share/locale/nl/LC_MESSAGES/kexi.mo share/locale/nl/LC_MESSAGES/kfile_abiword.mo share/locale/nl/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-kde4-l10n-sv/Makefile b/editors/koffice-kde4-l10n-sv/Makefile index a41463e11c3c..d3a487787ce0 100644 --- a/editors/koffice-kde4-l10n-sv/Makefile +++ b/editors/koffice-kde4-l10n-sv/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-kde4-l10n-sv/distinfo b/editors/koffice-kde4-l10n-sv/distinfo index 57649992cc47..305fdf94540e 100644 --- a/editors/koffice-kde4-l10n-sv/distinfo +++ b/editors/koffice-kde4-l10n-sv/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-sv-1.6.1.tar.bz2) = fd5ebf8d8480797f84121f9efcb00823 -SHA256 (KDE/kde-i18n/koffice-l10n-sv-1.6.1.tar.bz2) = 721174f990db6d5ea8254100048463e5d8a721335f7ec318ed52d393fd410bbb -SIZE (KDE/kde-i18n/koffice-l10n-sv-1.6.1.tar.bz2) = 6445810 +MD5 (KDE/kde-i18n/koffice-l10n-sv-1.6.2.tar.bz2) = f63e6deda90f6bc1f10985c5e7971add +SHA256 (KDE/kde-i18n/koffice-l10n-sv-1.6.2.tar.bz2) = a4c053479521cc1e3283071c0690694d3e308729ff8e8ff17e9266698eac14cc +SIZE (KDE/kde-i18n/koffice-l10n-sv-1.6.2.tar.bz2) = 6445892 diff --git a/editors/koffice-kde4-l10n-sv/pkg-plist b/editors/koffice-kde4-l10n-sv/pkg-plist index 0f24d03f2f32..984eccad701c 100644 --- a/editors/koffice-kde4-l10n-sv/pkg-plist +++ b/editors/koffice-kde4-l10n-sv/pkg-plist @@ -632,7 +632,6 @@ share/locale/sv/LC_MESSAGES/desktop_koffice.mo share/locale/sv/LC_MESSAGES/example.mo share/locale/sv/LC_MESSAGES/karbon.mo share/locale/sv/LC_MESSAGES/kchart.mo -share/locale/sv/LC_MESSAGES/kdgantt.mo share/locale/sv/LC_MESSAGES/kexi.mo share/locale/sv/LC_MESSAGES/kfile_abiword.mo share/locale/sv/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-kde4-l10n-tr/Makefile b/editors/koffice-kde4-l10n-tr/Makefile index 7fbbde696c26..d8370e503c5d 100644 --- a/editors/koffice-kde4-l10n-tr/Makefile +++ b/editors/koffice-kde4-l10n-tr/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-kde4-l10n-tr/distinfo b/editors/koffice-kde4-l10n-tr/distinfo index 8391191c7b6d..c135f7660690 100644 --- a/editors/koffice-kde4-l10n-tr/distinfo +++ b/editors/koffice-kde4-l10n-tr/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-tr-1.6.1.tar.bz2) = 909ed845836e7219a4cf6710ee128846 -SHA256 (KDE/kde-i18n/koffice-l10n-tr-1.6.1.tar.bz2) = 70433437988733b889eaa4b62d7f3f7f34df9f13517dfd190dbdb8bde0975058 -SIZE (KDE/kde-i18n/koffice-l10n-tr-1.6.1.tar.bz2) = 369415 +MD5 (KDE/kde-i18n/koffice-l10n-tr-1.6.2.tar.bz2) = a17e9f38819b242b9019b92412b2d22f +SHA256 (KDE/kde-i18n/koffice-l10n-tr-1.6.2.tar.bz2) = c33d57249c97fe689cb6b1a05612b69987d3a12064527b1c523c5fd95edd48b5 +SIZE (KDE/kde-i18n/koffice-l10n-tr-1.6.2.tar.bz2) = 368002 diff --git a/editors/koffice-kde4-l10n-tr/pkg-plist b/editors/koffice-kde4-l10n-tr/pkg-plist index 265074fd8d3e..a45d88477dc7 100644 --- a/editors/koffice-kde4-l10n-tr/pkg-plist +++ b/editors/koffice-kde4-l10n-tr/pkg-plist @@ -2,7 +2,6 @@ share/locale/tr/LC_MESSAGES/desktop_koffice.mo share/locale/tr/LC_MESSAGES/example.mo share/locale/tr/LC_MESSAGES/karbon.mo share/locale/tr/LC_MESSAGES/kchart.mo -share/locale/tr/LC_MESSAGES/kdgantt.mo share/locale/tr/LC_MESSAGES/kexi.mo share/locale/tr/LC_MESSAGES/kfile_abiword.mo share/locale/tr/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-kde4-l10n/Makefile b/editors/koffice-kde4-l10n/Makefile index bd8bae7d81c3..8cdef1089255 100644 --- a/editors/koffice-kde4-l10n/Makefile +++ b/editors/koffice-kde4-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES= misc kde MASTER_SITES= # none DISTFILES= # none @@ -16,6 +16,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Localized messages and documentation for KDE RUN_DEPENDS+=\ + ${LOCALBASE}/share/locale/km/LC_MESSAGES/example.mo:${PORTSDIR}/misc/koffice-i18n-km\ ${LOCALBASE}/share/locale/ar/LC_MESSAGES/kword.mo:${PORTSDIR}/arabic/koffice-i18n\ ${LOCALBASE}/share/locale/de/LC_MESSAGES/kword.mo:${PORTSDIR}/german/koffice-i18n\ ${LOCALBASE}/share/locale/fr/LC_MESSAGES/kword.mo:${PORTSDIR}/french/koffice-i18n\ @@ -30,7 +31,7 @@ RUN_DEPENDS+=\ ${LOCALBASE}/share/locale/zh_CN/LC_MESSAGES/kword.mo:${PORTSDIR}/chinese/koffice-i18n-zh_CN \ ${LOCALBASE}/share/locale/zh_TW/LC_MESSAGES/kword.mo:${PORTSDIR}/chinese/koffice-i18n-zh_TW -.for LANG in af bg br bs ca cs cy da el en_GB eo es et eu fa fi ga hi hsb is it \ +.for LANG in af bg br bs ca cs cy da el en_GB eo es et eu fa fi ga gl hi hsb is it \ lo lt lv mk ms mt nb nl nn ro se sk sl sr sr@Latn sv ta tg th tr uz ven xh zu RUN_DEPENDS+=\ ${LOCALBASE}/share/locale/${LANG}/LC_MESSAGES/kword.mo:${PORTSDIR}/misc/koffice-i18n-${LANG} diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile index be4d53dee422..ef53f99fcc71 100644 --- a/editors/koffice-kde4/Makefile +++ b/editors/koffice-kde4/Makefile @@ -6,8 +6,7 @@ # PORTNAME= koffice -PORTVERSION= 1.6.1 -PORTREVISION= 1 +PORTVERSION= 1.6.2 PORTEPOCH= 2 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} diff --git a/editors/koffice-kde4/distinfo b/editors/koffice-kde4/distinfo index 04ee84201ab5..a851f75e77e8 100644 --- a/editors/koffice-kde4/distinfo +++ b/editors/koffice-kde4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/koffice/koffice-1.6.1.tar.bz2) = f7b90b46b79019edc60761a6bff2d387 -SHA256 (KDE/koffice/koffice-1.6.1.tar.bz2) = 5505a6c54009dd0cb75a3770c3daa476154958f92692ca0748b1842d9cd6e728 -SIZE (KDE/koffice/koffice-1.6.1.tar.bz2) = 56999028 +MD5 (KDE/koffice/koffice-1.6.2.tar.bz2) = 74ef62a5f8f766fe8192d5b7d65a3928 +SHA256 (KDE/koffice/koffice-1.6.2.tar.bz2) = fa5ca02eba02219d34c3c6efff92bf767060b4b1343da56eb63139661d53f380 +SIZE (KDE/koffice/koffice-1.6.2.tar.bz2) = 57049103 diff --git a/editors/koffice-kde4/files/patch-kexi_examples-build_kexi_file.sh b/editors/koffice-kde4/files/patch-kexi_examples-build_kexi_file.sh new file mode 100644 index 000000000000..1fb0916c33a0 --- /dev/null +++ b/editors/koffice-kde4/files/patch-kexi_examples-build_kexi_file.sh @@ -0,0 +1,15 @@ +--- kexi/examples/build_kexi_file.sh.orig Mon Mar 5 01:50:05 2007 ++++ kexi/examples/build_kexi_file.sh Mon Mar 5 01:50:31 2007 +@@ -7,9 +7,9 @@ + # Only .kexi file that is older than .sql file is recreated. + # ksqlite is needed on the $PATH. + +-KEXISQL3PATH=../3rdparty/kexisql3/src/.libs/ +-PATH=$PATH:$KEXISQL3PATH +-LD_LIBRARY_PATH=$KEXISQL3PATH:$KEXISQL3PATH ++export KEXISQL3PATH=../3rdparty/kexisql3/src/.libs/ ++export PATH=$PATH:$KEXISQL3PATH ++export LD_LIBRARY_PATH=$KEXISQL3PATH:$KEXISQL3PATH + which ksqlite > /dev/null || exit 1 + + [ $# -lt 1 ] && echo "Missing .sql filename." && exit 1 diff --git a/editors/koffice-kde4/files/patch-kexi_examples-update_sql_files.sh b/editors/koffice-kde4/files/patch-kexi_examples-update_sql_files.sh new file mode 100644 index 000000000000..1c869369a21e --- /dev/null +++ b/editors/koffice-kde4/files/patch-kexi_examples-update_sql_files.sh @@ -0,0 +1,15 @@ +--- kexi/examples/update_sql_files.sh.orig Sun Mar 4 13:49:03 2007 ++++ kexi/examples/update_sql_files.sh Sun Mar 4 13:49:14 2007 +@@ -4,9 +4,9 @@ + # Only .sql file that is older than .kexi file is recreated. + # ksqlite is needed on the PATH + +-KEXISQL3PATH=../3rdparty/kexisql3/src/.libs/ +-PATH=$PATH:$KEXISQL3PATH +-LD_LIBRARY_PATH=$KEXISQL3PATH:$KEXISQL3PATH ++export KEXISQL3PATH=../3rdparty/kexisql3/src/.libs/ ++export PATH=$PATH:$KEXISQL3PATH ++export LD_LIBRARY_PATH=$KEXISQL3PATH:$KEXISQL3PATH + which ksqlite > /dev/null || exit 1 + + for f in `ls -1 *.kexi` ; do diff --git a/editors/koffice-kde4/files/patch-koffce-xpdf-CVE-2007-0104.diff b/editors/koffice-kde4/files/patch-koffce-xpdf-CVE-2007-0104.diff deleted file mode 100644 index f5e51a1c706e..000000000000 --- a/editors/koffice-kde4/files/patch-koffce-xpdf-CVE-2007-0104.diff +++ /dev/null @@ -1,74 +0,0 @@ ------------------------------------------------------------------------- -r622463 | aacid | 2007-01-11 23:05:54 +0100 (Thu, 11 Jan 2007) | 2 lines -Changed paths: - M /branches/koffice/1.6/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.cc - M /branches/koffice/1.6/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.h - -Commiting the patch agreed between kpdf and poppler developers to fix MOAB-06-01-2007 issue. - ------------------------------------------------------------------------- -Index: filters/kword/pdf/xpdf/xpdf/Catalog.cc -=================================================================== ---- filters/kword/pdf/xpdf/xpdf/Catalog.cc (revision 622462) -+++ filters/kword/pdf/xpdf/xpdf/Catalog.cc (revision 622463) -@@ -24,6 +24,12 @@ - #include "Link.h" - #include "Catalog.h" - -+// This define is used to limit the depth of recursive readPageTree calls -+// This is needed because the page tree nodes can reference their parents -+// leaving us in an infinite loop -+// Most sane pdf documents don't have a call depth higher than 10 -+#define MAX_CALL_DEPTH 1000 -+ - //------------------------------------------------------------------------ - // Catalog - //------------------------------------------------------------------------ -@@ -77,7 +83,7 @@ Catalog::Catalog(XRef *xrefA) { - pageRefs[i].num = -1; - pageRefs[i].gen = -1; - } -- numPages = readPageTree(pagesDict.getDict(), NULL, 0); -+ numPages = readPageTree(pagesDict.getDict(), NULL, 0, 0); - if (numPages != numPages0) { - error(-1, "Page count in top-level pages object is incorrect"); - } -@@ -171,7 +177,7 @@ GString *Catalog::readMetadata() { - return s; - } - --int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start) { -+int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start, int callDepth) { - Object kids; - Object kid; - Object kidRef; -@@ -221,9 +227,13 @@ int Catalog::readPageTree(Dict *pagesDic - // This should really be isDict("Pages"), but I've seen at least one - // PDF file where the /Type entry is missing. - } else if (kid.isDict()) { -- if ((start = readPageTree(kid.getDict(), attrs1, start)) -- < 0) -- goto err2; -+ if (callDepth > MAX_CALL_DEPTH) { -+ error(-1, "Limit of %d recursive calls reached while reading the page tree. If your document is correct and not a test to try to force a crash, please report a bug.", MAX_CALL_DEPTH); -+ } else { -+ if ((start = readPageTree(kid.getDict(), attrs1, start, callDepth + 1)) -+ < 0) -+ goto err2; -+ } - } else { - error(-1, "Kid object (page %d) is wrong type (%s)", - start+1, kid.getTypeName()); -Index: filters/kword/pdf/xpdf/xpdf/Catalog.h -=================================================================== ---- filters/kword/pdf/xpdf/xpdf/Catalog.h (revision 622462) -+++ filters/kword/pdf/xpdf/xpdf/Catalog.h (revision 622463) -@@ -82,7 +82,7 @@ private: - Object outline; // outline dictionary - GBool ok; // true if catalog is valid - -- int readPageTree(Dict *pages, PageAttrs *attrs, int start); -+ int readPageTree(Dict *pages, PageAttrs *attrs, int start, int callDepth); - Object *findDestInTree(Object *tree, GString *name, Object *obj); - }; - diff --git a/editors/koffice-kde4/pkg-plist b/editors/koffice-kde4/pkg-plist index 23edb3d4c816..43968f2c3adf 100644 --- a/editors/koffice-kde4/pkg-plist +++ b/editors/koffice-kde4/pkg-plist @@ -1,6 +1,10 @@ bin/karbon bin/kchart bin/kexi +bin/kexi_add_column +bin/kexi_add_column_gui +bin/kexi_delete_column +bin/kexi_delete_column_gui bin/kformula bin/kivio bin/koconverter @@ -113,30 +117,40 @@ include/Kolinewidthaction.h include/Koversiondialog.h include/kcoloractions.h include/kdchart_export.h +include/kexidb/admin.h +include/kexidb/alter.h include/kexidb/connection.h include/kexidb/connectiondata.h include/kexidb/cursor.h +include/kexidb/dbobjectnamevalidator.h +include/kexidb/dbproperties.h include/kexidb/driver.h +include/kexidb/driver_p.h include/kexidb/drivermanager.h include/kexidb/error.h include/kexidb/expression.h include/kexidb/field.h include/kexidb/fieldlist.h +include/kexidb/fieldvalidator.h include/kexidb/global.h include/kexidb/indexschema.h include/kexidb/kexidb_export.h include/kexidb/keximigrate.h include/kexidb/keximigratedata.h +include/kexidb/lookupfieldschema.h include/kexidb/migratemanager.h +include/kexidb/msghandler.h include/kexidb/object.h -include/kexidb/parser.h include/kexidb/preparedstatement.h include/kexidb/queryschema.h include/kexidb/queryschemaparameter.h include/kexidb/relationship.h +include/kexidb/roweditbuffer.h include/kexidb/schemadata.h +include/kexidb/simplecommandlineapp.h include/kexidb/tableschema.h include/kexidb/transaction.h +include/kexidb/utils.h include/kexiutils/identifier.h include/kexiutils/kexiutils_export.h include/kexiutils/longlongvalidator.h @@ -459,6 +473,9 @@ lib/kde3/kritacimg.so lib/kde3/kritacmykplugin.a lib/kde3/kritacmykplugin.la lib/kde3/kritacmykplugin.so +lib/kde3/kritacolorify.a +lib/kde3/kritacolorify.la +lib/kde3/kritacolorify.so lib/kde3/kritacolorrange.a lib/kde3/kritacolorrange.la lib/kde3/kritacolorrange.so @@ -1254,8 +1271,19 @@ lib/libkwordprivate.a lib/libkwordprivate.la lib/libkwordprivate.so lib/libkwordprivate.so.4 +share/applications/kde/karbon.desktop +share/applications/kde/kchart.desktop +share/applications/kde/kexi.desktop +share/applications/kde/kformula.desktop share/applications/kde/kivio.desktop +share/applications/kde/koshell.desktop +share/applications/kde/kplato.desktop +share/applications/kde/kpresenter.desktop share/applications/kde/krita.desktop +share/applications/kde/kspread.desktop +share/applications/kde/kudesigner.desktop +share/applications/kde/kugar.desktop +share/applications/kde/kword.desktop share/applnk/.hidden/krita_jpeg.desktop share/applnk/.hidden/krita_magick.desktop share/applnk/.hidden/krita_openexr.desktop @@ -1264,17 +1292,6 @@ share/applnk/.hidden/krita_png.desktop share/applnk/.hidden/krita_raw.desktop share/applnk/.hidden/krita_tiff.desktop share/applnk/Office/KThesaurus.desktop -share/applnk/Office/karbon.desktop -share/applnk/Office/kchart.desktop -share/applnk/Office/kexi.desktop -share/applnk/Office/kformula.desktop -share/applnk/Office/koshell.desktop -share/applnk/Office/kplato.desktop -share/applnk/Office/kpresenter.desktop -share/applnk/Office/kspread.desktop -share/applnk/Office/kudesigner.desktop -share/applnk/Office/kugar.desktop -share/applnk/Office/kword.desktop share/apps/karbon/gradients/allcolors.kgr share/apps/karbon/gradients/simple.kgr share/apps/karbon/icons/crystalsvg/16x16/actions/14_layer_deletelayer.png @@ -1473,11 +1490,13 @@ share/apps/kchart/templates/chart/.source/BarChart.chrt share/apps/kchart/templates/chart/.source/Empty.chrt share/apps/kchart/templates/chart/BarChart.desktop share/apps/kchart/templates/chart/Empty.desktop +share/apps/kexi/examples/Simple_Database.kexi share/apps/kexi/icons/crystalsvg/128x128/actions/form_action.png share/apps/kexi/icons/crystalsvg/16x16/actions/add_field.png share/apps/kexi/icons/crystalsvg/16x16/actions/aofit.png share/apps/kexi/icons/crystalsvg/16x16/actions/aogrid.png share/apps/kexi/icons/crystalsvg/16x16/actions/aopos2grid.png +share/apps/kexi/icons/crystalsvg/16x16/actions/autofield.png share/apps/kexi/icons/crystalsvg/16x16/actions/autonumber.png share/apps/kexi/icons/crystalsvg/16x16/actions/business_user.png share/apps/kexi/icons/crystalsvg/16x16/actions/button.png @@ -1543,6 +1562,7 @@ share/apps/kexi/icons/crystalsvg/22x22/actions/aoshortest.png share/apps/kexi/icons/crystalsvg/22x22/actions/aotallest.png share/apps/kexi/icons/crystalsvg/22x22/actions/aotop.png share/apps/kexi/icons/crystalsvg/22x22/actions/aowidest.png +share/apps/kexi/icons/crystalsvg/22x22/actions/autofield.png share/apps/kexi/icons/crystalsvg/22x22/actions/business_user.png share/apps/kexi/icons/crystalsvg/22x22/actions/button.png share/apps/kexi/icons/crystalsvg/22x22/actions/check.png @@ -5216,6 +5236,8 @@ share/icons/hicolor/scalable/apps/kexi.svgz share/icons/hicolor/scalable/apps/koshell.svgz share/icons/locolor/16x16/apps/kudesigner.png share/icons/locolor/32x32/apps/kudesigner.png +share/locale/pl/LC_MESSAGES/kexi_add_column_gui_transl_pl.sh +share/locale/pl/LC_MESSAGES/kexi_delete_column_gui_transl_pl.sh share/mimelnk/application/x-kexi-connectiondata.desktop share/mimelnk/application/x-kexiproject-shortcut.desktop share/mimelnk/application/x-kexiproject-sqlite.desktop @@ -5320,6 +5342,7 @@ share/services/kritablurfilter.desktop share/services/kritabumpmapfilter.desktop share/services/kritacimg.desktop share/services/kritacmykplugin.desktop +share/services/kritacolorifyfilter.desktop share/services/kritacolorrange.desktop share/services/kritacolorsfilter.desktop share/services/kritacolorspaceconversion.desktop @@ -5807,6 +5830,7 @@ share/templates/TextDocument.desktop @dirrm share/apps/kexi/icons/crystalsvg/128x128 @dirrm share/apps/kexi/icons/crystalsvg @dirrm share/apps/kexi/icons +@dirrm share/apps/kexi/examples @dirrm share/apps/kexi @dirrm share/apps/kchart/templates/chart/.source @dirrm share/apps/kchart/templates/chart diff --git a/french/calligra-l10n/Makefile b/french/calligra-l10n/Makefile index 772cd8a5320b..6b619a05114c 100644 --- a/french/calligra-l10n/Makefile +++ b/french/calligra-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= french kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/french/calligra-l10n/distinfo b/french/calligra-l10n/distinfo index b4d9b06a4253..91645f8c8934 100644 --- a/french/calligra-l10n/distinfo +++ b/french/calligra-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-fr-1.6.1.tar.bz2) = 74a658f3f323f016b202cc4e2063da19 -SHA256 (KDE/kde-i18n/koffice-l10n-fr-1.6.1.tar.bz2) = b180dd0d941883eac98304a54445e8c2046ab523af799f0c0cdf045d9fc0d27d -SIZE (KDE/kde-i18n/koffice-l10n-fr-1.6.1.tar.bz2) = 6597505 +MD5 (KDE/kde-i18n/koffice-l10n-fr-1.6.2.tar.bz2) = d6ba1878f85ad21d678019098124094b +SHA256 (KDE/kde-i18n/koffice-l10n-fr-1.6.2.tar.bz2) = 3759987c7733d7b86fe3a57939da605cb73d29aab87d56ff265c6806a1d70fcf +SIZE (KDE/kde-i18n/koffice-l10n-fr-1.6.2.tar.bz2) = 6598654 diff --git a/french/calligra-l10n/pkg-plist b/french/calligra-l10n/pkg-plist index 26b46d27aa38..0dbc43bd0014 100644 --- a/french/calligra-l10n/pkg-plist +++ b/french/calligra-l10n/pkg-plist @@ -398,7 +398,6 @@ share/locale/fr/LC_MESSAGES/desktop_koffice.mo share/locale/fr/LC_MESSAGES/example.mo share/locale/fr/LC_MESSAGES/karbon.mo share/locale/fr/LC_MESSAGES/kchart.mo -share/locale/fr/LC_MESSAGES/kdgantt.mo share/locale/fr/LC_MESSAGES/kexi.mo share/locale/fr/LC_MESSAGES/kfile_abiword.mo share/locale/fr/LC_MESSAGES/kfile_gnumeric.mo diff --git a/french/kde3-i18n/distinfo b/french/kde3-i18n/distinfo index df9bb6fe995b..5d6a9b23d02d 100644 --- a/french/kde3-i18n/distinfo +++ b/french/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-fr-3.5.5.tar.bz2) = 0a0e9ba98b33e81a092110563def9ca4 -SHA256 (KDE/kde-i18n/kde-i18n-fr-3.5.5.tar.bz2) = 69ac0f012a711437691d3ad2e1404ac839f9244abe6917c02f6d980b4e1fa688 -SIZE (KDE/kde-i18n/kde-i18n-fr-3.5.5.tar.bz2) = 19954633 +MD5 (KDE/kde-i18n/kde-i18n-fr-3.5.6.tar.bz2) = f700524f68cf6d34770784c69f9cc293 +SHA256 (KDE/kde-i18n/kde-i18n-fr-3.5.6.tar.bz2) = 9845e55b45a662e8650f7e1b0605d762bb7b7492961e1d2e9b688321b1a04784 +SIZE (KDE/kde-i18n/kde-i18n-fr-3.5.6.tar.bz2) = 21876605 diff --git a/french/kde3-i18n/pkg-plist b/french/kde3-i18n/pkg-plist index 3537303787ef..c18396f8ae7c 100644 --- a/french/kde3-i18n/pkg-plist +++ b/french/kde3-i18n/pkg-plist @@ -1,3 +1,5 @@ +share/apps/kanagram/data/fr/animals.kvtml +share/apps/kanagram/data/fr/clothing.kvtml share/apps/katepart/syntax/logohighlightstyle.fr_FR.xml share/apps/khangman/data/fr/animals.kvtml share/apps/khangman/data/fr/easy.kvtml @@ -28,9 +30,25 @@ share/apps/kturtle/examples/fr_FR/triangle.logo share/doc/HTML/fr/KRegExpEditor/common share/doc/HTML/fr/KRegExpEditor/index.cache.bz2 share/doc/HTML/fr/KRegExpEditor/index.docbook +share/doc/HTML/fr/akregator/add-feed.png +share/doc/HTML/fr/akregator/add-feed2.png +share/doc/HTML/fr/akregator/add-folder.png +share/doc/HTML/fr/akregator/add-folder2.png +share/doc/HTML/fr/akregator/advanced-tab.png +share/doc/HTML/fr/akregator/appearance-tab.png +share/doc/HTML/fr/akregator/archive-tab.png +share/doc/HTML/fr/akregator/browser-tab.png share/doc/HTML/fr/akregator/common +share/doc/HTML/fr/akregator/general-tab.png share/doc/HTML/fr/akregator/index.cache.bz2 share/doc/HTML/fr/akregator/index.docbook +share/doc/HTML/fr/akregator/konq.png +share/doc/HTML/fr/akregator/konq2.png +share/doc/HTML/fr/akregator/main-window.png +share/doc/HTML/fr/akregator/main-window2.png +share/doc/HTML/fr/akregator/main-window3.png +share/doc/HTML/fr/akregator/main-window4.png +share/doc/HTML/fr/akregator/quick-filter.png share/doc/HTML/fr/amor/common share/doc/HTML/fr/amor/index.cache.bz2 share/doc/HTML/fr/amor/index.docbook @@ -57,6 +75,13 @@ share/doc/HTML/fr/atlantik/common share/doc/HTML/fr/atlantik/index.cache.bz2 share/doc/HTML/fr/atlantik/index.docbook share/doc/HTML/fr/atlantik/man-atlantik.6.docbook +share/doc/HTML/fr/blinken/blinken1.png +share/doc/HTML/fr/blinken/blinken2.png +share/doc/HTML/fr/blinken/blinken_accesskeys.png +share/doc/HTML/fr/blinken/blinken_nickprompt.png +share/doc/HTML/fr/blinken/common +share/doc/HTML/fr/blinken/index.cache.bz2 +share/doc/HTML/fr/blinken/index.docbook share/doc/HTML/fr/cervisia/annotate.png share/doc/HTML/fr/cervisia/checkout.png share/doc/HTML/fr/cervisia/commit.png @@ -75,6 +100,9 @@ share/doc/HTML/fr/docs/common/gpl-translated.html share/doc/HTML/fr/docs/common/kde-localised.css share/doc/HTML/fr/docs/common/lgpl-translated.html share/doc/HTML/fr/docs/common/logotp3.png +share/doc/HTML/fr/irkick/common +share/doc/HTML/fr/irkick/index.cache.bz2 +share/doc/HTML/fr/irkick/index.docbook share/doc/HTML/fr/juk/common share/doc/HTML/fr/juk/index.cache.bz2 share/doc/HTML/fr/juk/index.docbook @@ -104,6 +132,18 @@ share/doc/HTML/fr/kalzium/settings.png share/doc/HTML/fr/kamera/common share/doc/HTML/fr/kamera/index.cache.bz2 share/doc/HTML/fr/kamera/index.docbook +share/doc/HTML/fr/kanagram/common +share/doc/HTML/fr/kanagram/general-settings.png +share/doc/HTML/fr/kanagram/helpstates.png +share/doc/HTML/fr/kanagram/index.cache.bz2 +share/doc/HTML/fr/kanagram/index.docbook +share/doc/HTML/fr/kanagram/kanagram-hint.png +share/doc/HTML/fr/kanagram/kanagram.png +share/doc/HTML/fr/kanagram/newstuff-dialog.png +share/doc/HTML/fr/kanagram/newstuff-settings.png +share/doc/HTML/fr/kanagram/standard-fonts.png +share/doc/HTML/fr/kanagram/vocab-editor.png +share/doc/HTML/fr/kanagram/vocab-settings.png share/doc/HTML/fr/kandy/common share/doc/HTML/fr/kandy/index.cache.bz2 share/doc/HTML/fr/kandy/index.docbook @@ -173,10 +213,14 @@ share/doc/HTML/fr/kbounce/jezball_corridor2.png share/doc/HTML/fr/kbounce/jezball_newWall.png share/doc/HTML/fr/kbruch/checked.png share/doc/HTML/fr/kbruch/common +share/doc/HTML/fr/kbruch/compare.png +share/doc/HTML/fr/kbruch/convert.png +share/doc/HTML/fr/kbruch/factorize.png share/doc/HTML/fr/kbruch/gui_main.png share/doc/HTML/fr/kbruch/index.cache.bz2 share/doc/HTML/fr/kbruch/index.docbook share/doc/HTML/fr/kbruch/reduced.png +share/doc/HTML/fr/kbruch/settings.png share/doc/HTML/fr/kbugbuster/common share/doc/HTML/fr/kbugbuster/index.cache.bz2 share/doc/HTML/fr/kbugbuster/index.docbook @@ -189,6 +233,9 @@ share/doc/HTML/fr/kcalc/index.docbook share/doc/HTML/fr/kcharselect/common share/doc/HTML/fr/kcharselect/index.cache.bz2 share/doc/HTML/fr/kcharselect/index.docbook +share/doc/HTML/fr/kcmlirc/common +share/doc/HTML/fr/kcmlirc/index.cache.bz2 +share/doc/HTML/fr/kcmlirc/index.docbook share/doc/HTML/fr/kcoloredit/common share/doc/HTML/fr/kcoloredit/index.cache.bz2 share/doc/HTML/fr/kcoloredit/index.docbook @@ -389,12 +436,6 @@ share/doc/HTML/fr/kdelibs/man-dcop.1.docbook share/doc/HTML/fr/kdelibs/man-kbuildsycoca.8.docbook share/doc/HTML/fr/kdelibs/man-kdeoptions.7.docbook share/doc/HTML/fr/kdelibs/man-qtoptions.7.docbook -share/doc/HTML/fr/kdelirc/irkick/common -share/doc/HTML/fr/kdelirc/irkick/index.cache.bz2 -share/doc/HTML/fr/kdelirc/irkick/index.docbook -share/doc/HTML/fr/kdelirc/kcmlirc/common -share/doc/HTML/fr/kdelirc/kcmlirc/index.cache.bz2 -share/doc/HTML/fr/kdelirc/kcmlirc/index.docbook share/doc/HTML/fr/kdeprint/add-printer-wiz.docbook share/doc/HTML/fr/kdeprint/common share/doc/HTML/fr/kdeprint/cups-config.docbook @@ -477,6 +518,23 @@ share/doc/HTML/fr/kfouleggs/index.docbook share/doc/HTML/fr/kgamma/common share/doc/HTML/fr/kgamma/index.cache.bz2 share/doc/HTML/fr/kgamma/index.docbook +share/doc/HTML/fr/kgeography/common +share/doc/HTML/fr/kgeography/first-start1.png +share/doc/HTML/fr/kgeography/first-start10.png +share/doc/HTML/fr/kgeography/first-start11.png +share/doc/HTML/fr/kgeography/first-start12.png +share/doc/HTML/fr/kgeography/first-start2.png +share/doc/HTML/fr/kgeography/first-start3.png +share/doc/HTML/fr/kgeography/first-start4.png +share/doc/HTML/fr/kgeography/first-start5.png +share/doc/HTML/fr/kgeography/first-start6.png +share/doc/HTML/fr/kgeography/first-start7.png +share/doc/HTML/fr/kgeography/first-start8.png +share/doc/HTML/fr/kgeography/first-start9.png +share/doc/HTML/fr/kgeography/index.cache.bz2 +share/doc/HTML/fr/kgeography/index.docbook +share/doc/HTML/fr/kgeography/kgeography.png +share/doc/HTML/fr/kgeography/zoom.png share/doc/HTML/fr/kget/common share/doc/HTML/fr/kget/index.cache.bz2 share/doc/HTML/fr/kget/index.docbook @@ -690,6 +748,9 @@ share/doc/HTML/fr/kig/selecting_objects.png share/doc/HTML/fr/kinfocenter/blockdevices/common share/doc/HTML/fr/kinfocenter/blockdevices/index.cache.bz2 share/doc/HTML/fr/kinfocenter/blockdevices/index.docbook +share/doc/HTML/fr/kinfocenter/cdinfo/common +share/doc/HTML/fr/kinfocenter/cdinfo/index.cache.bz2 +share/doc/HTML/fr/kinfocenter/cdinfo/index.docbook share/doc/HTML/fr/kinfocenter/common share/doc/HTML/fr/kinfocenter/devices/common share/doc/HTML/fr/kinfocenter/devices/index.cache.bz2 @@ -794,7 +855,10 @@ share/doc/HTML/fr/kjots/index.docbook share/doc/HTML/fr/kjumpingcube/common share/doc/HTML/fr/kjumpingcube/index.cache.bz2 share/doc/HTML/fr/kjumpingcube/index.docbook +share/doc/HTML/fr/kleopatra/common share/doc/HTML/fr/kleopatra/entities.docbook +share/doc/HTML/fr/kleopatra/index.cache.bz2 +share/doc/HTML/fr/kleopatra/index.docbook share/doc/HTML/fr/klettres/common share/doc/HTML/fr/klettres/index.cache.bz2 share/doc/HTML/fr/klettres/index.docbook @@ -802,6 +866,8 @@ share/doc/HTML/fr/klettres/klettres1.png share/doc/HTML/fr/klettres/klettres2.png share/doc/HTML/fr/klettres/klettres3.png share/doc/HTML/fr/klettres/klettres4.png +share/doc/HTML/fr/klettres/klettres5.png +share/doc/HTML/fr/klettres/klettres6.png share/doc/HTML/fr/klickety/common share/doc/HTML/fr/klickety/index.cache.bz2 share/doc/HTML/fr/klickety/index.docbook @@ -884,10 +950,14 @@ share/doc/HTML/fr/kmouth/kmouthmain.png share/doc/HTML/fr/kmouth/kmouthwizard.png share/doc/HTML/fr/kmouth/man-kmouth.1.docbook share/doc/HTML/fr/kmplot/commands.docbook +share/doc/HTML/fr/kmplot/common share/doc/HTML/fr/kmplot/configuration.docbook share/doc/HTML/fr/kmplot/credits.docbook +share/doc/HTML/fr/kmplot/dcop.docbook share/doc/HTML/fr/kmplot/developer.docbook share/doc/HTML/fr/kmplot/firststeps.docbook +share/doc/HTML/fr/kmplot/index.cache.bz2 +share/doc/HTML/fr/kmplot/index.docbook share/doc/HTML/fr/kmplot/install.docbook share/doc/HTML/fr/kmplot/introduction.docbook share/doc/HTML/fr/kmplot/main.png @@ -1829,6 +1899,7 @@ share/locale/fr/LC_MESSAGES/khotkeys.mo share/locale/fr/LC_MESSAGES/khtmlkttsd.mo share/locale/fr/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/fr/LC_MESSAGES/kicker.mo +share/locale/fr/LC_MESSAGES/kickermenu_kate.mo share/locale/fr/LC_MESSAGES/kiconedit.mo share/locale/fr/LC_MESSAGES/kig.mo share/locale/fr/LC_MESSAGES/kimagemapeditor.mo @@ -1866,6 +1937,7 @@ share/locale/fr/LC_MESSAGES/kio_thumbnail.mo share/locale/fr/LC_MESSAGES/kio_trash.mo share/locale/fr/LC_MESSAGES/kio_zeroconf.mo share/locale/fr/LC_MESSAGES/kioexec.mo +share/locale/fr/LC_MESSAGES/kitchensync.mo share/locale/fr/LC_MESSAGES/kiten.mo share/locale/fr/LC_MESSAGES/kjobviewer.mo share/locale/fr/LC_MESSAGES/kjots.mo @@ -2069,6 +2141,7 @@ share/locale/fr/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/fr/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/fr/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/fr/LC_MESSAGES/libkickermenu_tom.mo +share/locale/fr/LC_MESSAGES/libkitchensync.mo share/locale/fr/LC_MESSAGES/libkleopatra.mo share/locale/fr/LC_MESSAGES/libkmime.mo share/locale/fr/LC_MESSAGES/libkonq.mo @@ -2253,6 +2326,7 @@ share/locale/fr/relecture_gui @dirrm share/doc/HTML/fr/kinfocenter/interrupts @dirrm share/doc/HTML/fr/kinfocenter/dma @dirrm share/doc/HTML/fr/kinfocenter/devices +@dirrm share/doc/HTML/fr/kinfocenter/cdinfo @dirrm share/doc/HTML/fr/kinfocenter/blockdevices @dirrm share/doc/HTML/fr/kinfocenter @dirrm share/doc/HTML/fr/kig @@ -2271,6 +2345,7 @@ share/locale/fr/relecture_gui @dirrm share/doc/HTML/fr/kgoldrunner @dirrm share/doc/HTML/fr/kghostview @dirrm share/doc/HTML/fr/kget +@dirrm share/doc/HTML/fr/kgeography @dirrm share/doc/HTML/fr/kgamma @dirrm share/doc/HTML/fr/kfouleggs @dirrm share/doc/HTML/fr/kfloppy @@ -2285,9 +2360,6 @@ share/locale/fr/relecture_gui @dirrm share/doc/HTML/fr/kdevelop @dirrm share/doc/HTML/fr/kdesu @dirrm share/doc/HTML/fr/kdeprint -@dirrm share/doc/HTML/fr/kdelirc/kcmlirc -@dirrm share/doc/HTML/fr/kdelirc/irkick -@dirrm share/doc/HTML/fr/kdelirc @dirrm share/doc/HTML/fr/kdelibs @dirrm share/doc/HTML/fr/kdebugdialog @dirrm share/doc/HTML/fr/kdearch @@ -2350,6 +2422,7 @@ share/locale/fr/relecture_gui @dirrm share/doc/HTML/fr/kcontrol/arts @dirrm share/doc/HTML/fr/kcontrol @dirrm share/doc/HTML/fr/kcoloredit +@dirrm share/doc/HTML/fr/kcmlirc @dirrm share/doc/HTML/fr/kcharselect @dirrm share/doc/HTML/fr/kcalc @dirrm share/doc/HTML/fr/kcachegrind @@ -2367,15 +2440,18 @@ share/locale/fr/relecture_gui @dirrm share/doc/HTML/fr/karm @dirrm share/doc/HTML/fr/kappfinder @dirrm share/doc/HTML/fr/kandy +@dirrm share/doc/HTML/fr/kanagram @dirrm share/doc/HTML/fr/kamera @dirrm share/doc/HTML/fr/kalzium @dirrm share/doc/HTML/fr/kalarm @dirrm share/doc/HTML/fr/kaddressbook @dirrm share/doc/HTML/fr/kaboodle @dirrm share/doc/HTML/fr/juk +@dirrm share/doc/HTML/fr/irkick @dirrm share/doc/HTML/fr/docs/common @dirrm share/doc/HTML/fr/docs @dirrm share/doc/HTML/fr/cervisia +@dirrm share/doc/HTML/fr/blinken @dirrm share/doc/HTML/fr/atlantik @dirrm share/doc/HTML/fr/artsbuilder/images @dirrm share/doc/HTML/fr/artsbuilder @@ -2393,3 +2469,6 @@ share/locale/fr/relecture_gui @dirrm share/apps/khangman/data/fr @dirrm share/apps/khangman/data @dirrm share/apps/khangman +@dirrm share/apps/kanagram/data/fr +@dirrm share/apps/kanagram/data +@dirrm share/apps/kanagram diff --git a/french/kde4-l10n/distinfo b/french/kde4-l10n/distinfo index df9bb6fe995b..5d6a9b23d02d 100644 --- a/french/kde4-l10n/distinfo +++ b/french/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-fr-3.5.5.tar.bz2) = 0a0e9ba98b33e81a092110563def9ca4 -SHA256 (KDE/kde-i18n/kde-i18n-fr-3.5.5.tar.bz2) = 69ac0f012a711437691d3ad2e1404ac839f9244abe6917c02f6d980b4e1fa688 -SIZE (KDE/kde-i18n/kde-i18n-fr-3.5.5.tar.bz2) = 19954633 +MD5 (KDE/kde-i18n/kde-i18n-fr-3.5.6.tar.bz2) = f700524f68cf6d34770784c69f9cc293 +SHA256 (KDE/kde-i18n/kde-i18n-fr-3.5.6.tar.bz2) = 9845e55b45a662e8650f7e1b0605d762bb7b7492961e1d2e9b688321b1a04784 +SIZE (KDE/kde-i18n/kde-i18n-fr-3.5.6.tar.bz2) = 21876605 diff --git a/french/kde4-l10n/pkg-plist b/french/kde4-l10n/pkg-plist index 3537303787ef..c18396f8ae7c 100644 --- a/french/kde4-l10n/pkg-plist +++ b/french/kde4-l10n/pkg-plist @@ -1,3 +1,5 @@ +share/apps/kanagram/data/fr/animals.kvtml +share/apps/kanagram/data/fr/clothing.kvtml share/apps/katepart/syntax/logohighlightstyle.fr_FR.xml share/apps/khangman/data/fr/animals.kvtml share/apps/khangman/data/fr/easy.kvtml @@ -28,9 +30,25 @@ share/apps/kturtle/examples/fr_FR/triangle.logo share/doc/HTML/fr/KRegExpEditor/common share/doc/HTML/fr/KRegExpEditor/index.cache.bz2 share/doc/HTML/fr/KRegExpEditor/index.docbook +share/doc/HTML/fr/akregator/add-feed.png +share/doc/HTML/fr/akregator/add-feed2.png +share/doc/HTML/fr/akregator/add-folder.png +share/doc/HTML/fr/akregator/add-folder2.png +share/doc/HTML/fr/akregator/advanced-tab.png +share/doc/HTML/fr/akregator/appearance-tab.png +share/doc/HTML/fr/akregator/archive-tab.png +share/doc/HTML/fr/akregator/browser-tab.png share/doc/HTML/fr/akregator/common +share/doc/HTML/fr/akregator/general-tab.png share/doc/HTML/fr/akregator/index.cache.bz2 share/doc/HTML/fr/akregator/index.docbook +share/doc/HTML/fr/akregator/konq.png +share/doc/HTML/fr/akregator/konq2.png +share/doc/HTML/fr/akregator/main-window.png +share/doc/HTML/fr/akregator/main-window2.png +share/doc/HTML/fr/akregator/main-window3.png +share/doc/HTML/fr/akregator/main-window4.png +share/doc/HTML/fr/akregator/quick-filter.png share/doc/HTML/fr/amor/common share/doc/HTML/fr/amor/index.cache.bz2 share/doc/HTML/fr/amor/index.docbook @@ -57,6 +75,13 @@ share/doc/HTML/fr/atlantik/common share/doc/HTML/fr/atlantik/index.cache.bz2 share/doc/HTML/fr/atlantik/index.docbook share/doc/HTML/fr/atlantik/man-atlantik.6.docbook +share/doc/HTML/fr/blinken/blinken1.png +share/doc/HTML/fr/blinken/blinken2.png +share/doc/HTML/fr/blinken/blinken_accesskeys.png +share/doc/HTML/fr/blinken/blinken_nickprompt.png +share/doc/HTML/fr/blinken/common +share/doc/HTML/fr/blinken/index.cache.bz2 +share/doc/HTML/fr/blinken/index.docbook share/doc/HTML/fr/cervisia/annotate.png share/doc/HTML/fr/cervisia/checkout.png share/doc/HTML/fr/cervisia/commit.png @@ -75,6 +100,9 @@ share/doc/HTML/fr/docs/common/gpl-translated.html share/doc/HTML/fr/docs/common/kde-localised.css share/doc/HTML/fr/docs/common/lgpl-translated.html share/doc/HTML/fr/docs/common/logotp3.png +share/doc/HTML/fr/irkick/common +share/doc/HTML/fr/irkick/index.cache.bz2 +share/doc/HTML/fr/irkick/index.docbook share/doc/HTML/fr/juk/common share/doc/HTML/fr/juk/index.cache.bz2 share/doc/HTML/fr/juk/index.docbook @@ -104,6 +132,18 @@ share/doc/HTML/fr/kalzium/settings.png share/doc/HTML/fr/kamera/common share/doc/HTML/fr/kamera/index.cache.bz2 share/doc/HTML/fr/kamera/index.docbook +share/doc/HTML/fr/kanagram/common +share/doc/HTML/fr/kanagram/general-settings.png +share/doc/HTML/fr/kanagram/helpstates.png +share/doc/HTML/fr/kanagram/index.cache.bz2 +share/doc/HTML/fr/kanagram/index.docbook +share/doc/HTML/fr/kanagram/kanagram-hint.png +share/doc/HTML/fr/kanagram/kanagram.png +share/doc/HTML/fr/kanagram/newstuff-dialog.png +share/doc/HTML/fr/kanagram/newstuff-settings.png +share/doc/HTML/fr/kanagram/standard-fonts.png +share/doc/HTML/fr/kanagram/vocab-editor.png +share/doc/HTML/fr/kanagram/vocab-settings.png share/doc/HTML/fr/kandy/common share/doc/HTML/fr/kandy/index.cache.bz2 share/doc/HTML/fr/kandy/index.docbook @@ -173,10 +213,14 @@ share/doc/HTML/fr/kbounce/jezball_corridor2.png share/doc/HTML/fr/kbounce/jezball_newWall.png share/doc/HTML/fr/kbruch/checked.png share/doc/HTML/fr/kbruch/common +share/doc/HTML/fr/kbruch/compare.png +share/doc/HTML/fr/kbruch/convert.png +share/doc/HTML/fr/kbruch/factorize.png share/doc/HTML/fr/kbruch/gui_main.png share/doc/HTML/fr/kbruch/index.cache.bz2 share/doc/HTML/fr/kbruch/index.docbook share/doc/HTML/fr/kbruch/reduced.png +share/doc/HTML/fr/kbruch/settings.png share/doc/HTML/fr/kbugbuster/common share/doc/HTML/fr/kbugbuster/index.cache.bz2 share/doc/HTML/fr/kbugbuster/index.docbook @@ -189,6 +233,9 @@ share/doc/HTML/fr/kcalc/index.docbook share/doc/HTML/fr/kcharselect/common share/doc/HTML/fr/kcharselect/index.cache.bz2 share/doc/HTML/fr/kcharselect/index.docbook +share/doc/HTML/fr/kcmlirc/common +share/doc/HTML/fr/kcmlirc/index.cache.bz2 +share/doc/HTML/fr/kcmlirc/index.docbook share/doc/HTML/fr/kcoloredit/common share/doc/HTML/fr/kcoloredit/index.cache.bz2 share/doc/HTML/fr/kcoloredit/index.docbook @@ -389,12 +436,6 @@ share/doc/HTML/fr/kdelibs/man-dcop.1.docbook share/doc/HTML/fr/kdelibs/man-kbuildsycoca.8.docbook share/doc/HTML/fr/kdelibs/man-kdeoptions.7.docbook share/doc/HTML/fr/kdelibs/man-qtoptions.7.docbook -share/doc/HTML/fr/kdelirc/irkick/common -share/doc/HTML/fr/kdelirc/irkick/index.cache.bz2 -share/doc/HTML/fr/kdelirc/irkick/index.docbook -share/doc/HTML/fr/kdelirc/kcmlirc/common -share/doc/HTML/fr/kdelirc/kcmlirc/index.cache.bz2 -share/doc/HTML/fr/kdelirc/kcmlirc/index.docbook share/doc/HTML/fr/kdeprint/add-printer-wiz.docbook share/doc/HTML/fr/kdeprint/common share/doc/HTML/fr/kdeprint/cups-config.docbook @@ -477,6 +518,23 @@ share/doc/HTML/fr/kfouleggs/index.docbook share/doc/HTML/fr/kgamma/common share/doc/HTML/fr/kgamma/index.cache.bz2 share/doc/HTML/fr/kgamma/index.docbook +share/doc/HTML/fr/kgeography/common +share/doc/HTML/fr/kgeography/first-start1.png +share/doc/HTML/fr/kgeography/first-start10.png +share/doc/HTML/fr/kgeography/first-start11.png +share/doc/HTML/fr/kgeography/first-start12.png +share/doc/HTML/fr/kgeography/first-start2.png +share/doc/HTML/fr/kgeography/first-start3.png +share/doc/HTML/fr/kgeography/first-start4.png +share/doc/HTML/fr/kgeography/first-start5.png +share/doc/HTML/fr/kgeography/first-start6.png +share/doc/HTML/fr/kgeography/first-start7.png +share/doc/HTML/fr/kgeography/first-start8.png +share/doc/HTML/fr/kgeography/first-start9.png +share/doc/HTML/fr/kgeography/index.cache.bz2 +share/doc/HTML/fr/kgeography/index.docbook +share/doc/HTML/fr/kgeography/kgeography.png +share/doc/HTML/fr/kgeography/zoom.png share/doc/HTML/fr/kget/common share/doc/HTML/fr/kget/index.cache.bz2 share/doc/HTML/fr/kget/index.docbook @@ -690,6 +748,9 @@ share/doc/HTML/fr/kig/selecting_objects.png share/doc/HTML/fr/kinfocenter/blockdevices/common share/doc/HTML/fr/kinfocenter/blockdevices/index.cache.bz2 share/doc/HTML/fr/kinfocenter/blockdevices/index.docbook +share/doc/HTML/fr/kinfocenter/cdinfo/common +share/doc/HTML/fr/kinfocenter/cdinfo/index.cache.bz2 +share/doc/HTML/fr/kinfocenter/cdinfo/index.docbook share/doc/HTML/fr/kinfocenter/common share/doc/HTML/fr/kinfocenter/devices/common share/doc/HTML/fr/kinfocenter/devices/index.cache.bz2 @@ -794,7 +855,10 @@ share/doc/HTML/fr/kjots/index.docbook share/doc/HTML/fr/kjumpingcube/common share/doc/HTML/fr/kjumpingcube/index.cache.bz2 share/doc/HTML/fr/kjumpingcube/index.docbook +share/doc/HTML/fr/kleopatra/common share/doc/HTML/fr/kleopatra/entities.docbook +share/doc/HTML/fr/kleopatra/index.cache.bz2 +share/doc/HTML/fr/kleopatra/index.docbook share/doc/HTML/fr/klettres/common share/doc/HTML/fr/klettres/index.cache.bz2 share/doc/HTML/fr/klettres/index.docbook @@ -802,6 +866,8 @@ share/doc/HTML/fr/klettres/klettres1.png share/doc/HTML/fr/klettres/klettres2.png share/doc/HTML/fr/klettres/klettres3.png share/doc/HTML/fr/klettres/klettres4.png +share/doc/HTML/fr/klettres/klettres5.png +share/doc/HTML/fr/klettres/klettres6.png share/doc/HTML/fr/klickety/common share/doc/HTML/fr/klickety/index.cache.bz2 share/doc/HTML/fr/klickety/index.docbook @@ -884,10 +950,14 @@ share/doc/HTML/fr/kmouth/kmouthmain.png share/doc/HTML/fr/kmouth/kmouthwizard.png share/doc/HTML/fr/kmouth/man-kmouth.1.docbook share/doc/HTML/fr/kmplot/commands.docbook +share/doc/HTML/fr/kmplot/common share/doc/HTML/fr/kmplot/configuration.docbook share/doc/HTML/fr/kmplot/credits.docbook +share/doc/HTML/fr/kmplot/dcop.docbook share/doc/HTML/fr/kmplot/developer.docbook share/doc/HTML/fr/kmplot/firststeps.docbook +share/doc/HTML/fr/kmplot/index.cache.bz2 +share/doc/HTML/fr/kmplot/index.docbook share/doc/HTML/fr/kmplot/install.docbook share/doc/HTML/fr/kmplot/introduction.docbook share/doc/HTML/fr/kmplot/main.png @@ -1829,6 +1899,7 @@ share/locale/fr/LC_MESSAGES/khotkeys.mo share/locale/fr/LC_MESSAGES/khtmlkttsd.mo share/locale/fr/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/fr/LC_MESSAGES/kicker.mo +share/locale/fr/LC_MESSAGES/kickermenu_kate.mo share/locale/fr/LC_MESSAGES/kiconedit.mo share/locale/fr/LC_MESSAGES/kig.mo share/locale/fr/LC_MESSAGES/kimagemapeditor.mo @@ -1866,6 +1937,7 @@ share/locale/fr/LC_MESSAGES/kio_thumbnail.mo share/locale/fr/LC_MESSAGES/kio_trash.mo share/locale/fr/LC_MESSAGES/kio_zeroconf.mo share/locale/fr/LC_MESSAGES/kioexec.mo +share/locale/fr/LC_MESSAGES/kitchensync.mo share/locale/fr/LC_MESSAGES/kiten.mo share/locale/fr/LC_MESSAGES/kjobviewer.mo share/locale/fr/LC_MESSAGES/kjots.mo @@ -2069,6 +2141,7 @@ share/locale/fr/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/fr/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/fr/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/fr/LC_MESSAGES/libkickermenu_tom.mo +share/locale/fr/LC_MESSAGES/libkitchensync.mo share/locale/fr/LC_MESSAGES/libkleopatra.mo share/locale/fr/LC_MESSAGES/libkmime.mo share/locale/fr/LC_MESSAGES/libkonq.mo @@ -2253,6 +2326,7 @@ share/locale/fr/relecture_gui @dirrm share/doc/HTML/fr/kinfocenter/interrupts @dirrm share/doc/HTML/fr/kinfocenter/dma @dirrm share/doc/HTML/fr/kinfocenter/devices +@dirrm share/doc/HTML/fr/kinfocenter/cdinfo @dirrm share/doc/HTML/fr/kinfocenter/blockdevices @dirrm share/doc/HTML/fr/kinfocenter @dirrm share/doc/HTML/fr/kig @@ -2271,6 +2345,7 @@ share/locale/fr/relecture_gui @dirrm share/doc/HTML/fr/kgoldrunner @dirrm share/doc/HTML/fr/kghostview @dirrm share/doc/HTML/fr/kget +@dirrm share/doc/HTML/fr/kgeography @dirrm share/doc/HTML/fr/kgamma @dirrm share/doc/HTML/fr/kfouleggs @dirrm share/doc/HTML/fr/kfloppy @@ -2285,9 +2360,6 @@ share/locale/fr/relecture_gui @dirrm share/doc/HTML/fr/kdevelop @dirrm share/doc/HTML/fr/kdesu @dirrm share/doc/HTML/fr/kdeprint -@dirrm share/doc/HTML/fr/kdelirc/kcmlirc -@dirrm share/doc/HTML/fr/kdelirc/irkick -@dirrm share/doc/HTML/fr/kdelirc @dirrm share/doc/HTML/fr/kdelibs @dirrm share/doc/HTML/fr/kdebugdialog @dirrm share/doc/HTML/fr/kdearch @@ -2350,6 +2422,7 @@ share/locale/fr/relecture_gui @dirrm share/doc/HTML/fr/kcontrol/arts @dirrm share/doc/HTML/fr/kcontrol @dirrm share/doc/HTML/fr/kcoloredit +@dirrm share/doc/HTML/fr/kcmlirc @dirrm share/doc/HTML/fr/kcharselect @dirrm share/doc/HTML/fr/kcalc @dirrm share/doc/HTML/fr/kcachegrind @@ -2367,15 +2440,18 @@ share/locale/fr/relecture_gui @dirrm share/doc/HTML/fr/karm @dirrm share/doc/HTML/fr/kappfinder @dirrm share/doc/HTML/fr/kandy +@dirrm share/doc/HTML/fr/kanagram @dirrm share/doc/HTML/fr/kamera @dirrm share/doc/HTML/fr/kalzium @dirrm share/doc/HTML/fr/kalarm @dirrm share/doc/HTML/fr/kaddressbook @dirrm share/doc/HTML/fr/kaboodle @dirrm share/doc/HTML/fr/juk +@dirrm share/doc/HTML/fr/irkick @dirrm share/doc/HTML/fr/docs/common @dirrm share/doc/HTML/fr/docs @dirrm share/doc/HTML/fr/cervisia +@dirrm share/doc/HTML/fr/blinken @dirrm share/doc/HTML/fr/atlantik @dirrm share/doc/HTML/fr/artsbuilder/images @dirrm share/doc/HTML/fr/artsbuilder @@ -2393,3 +2469,6 @@ share/locale/fr/relecture_gui @dirrm share/apps/khangman/data/fr @dirrm share/apps/khangman/data @dirrm share/apps/khangman +@dirrm share/apps/kanagram/data/fr +@dirrm share/apps/kanagram/data +@dirrm share/apps/kanagram diff --git a/french/koffice-i18n/Makefile b/french/koffice-i18n/Makefile index 772cd8a5320b..6b619a05114c 100644 --- a/french/koffice-i18n/Makefile +++ b/french/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= french kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/french/koffice-i18n/distinfo b/french/koffice-i18n/distinfo index b4d9b06a4253..91645f8c8934 100644 --- a/french/koffice-i18n/distinfo +++ b/french/koffice-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-fr-1.6.1.tar.bz2) = 74a658f3f323f016b202cc4e2063da19 -SHA256 (KDE/kde-i18n/koffice-l10n-fr-1.6.1.tar.bz2) = b180dd0d941883eac98304a54445e8c2046ab523af799f0c0cdf045d9fc0d27d -SIZE (KDE/kde-i18n/koffice-l10n-fr-1.6.1.tar.bz2) = 6597505 +MD5 (KDE/kde-i18n/koffice-l10n-fr-1.6.2.tar.bz2) = d6ba1878f85ad21d678019098124094b +SHA256 (KDE/kde-i18n/koffice-l10n-fr-1.6.2.tar.bz2) = 3759987c7733d7b86fe3a57939da605cb73d29aab87d56ff265c6806a1d70fcf +SIZE (KDE/kde-i18n/koffice-l10n-fr-1.6.2.tar.bz2) = 6598654 diff --git a/french/koffice-i18n/pkg-plist b/french/koffice-i18n/pkg-plist index 26b46d27aa38..0dbc43bd0014 100644 --- a/french/koffice-i18n/pkg-plist +++ b/french/koffice-i18n/pkg-plist @@ -398,7 +398,6 @@ share/locale/fr/LC_MESSAGES/desktop_koffice.mo share/locale/fr/LC_MESSAGES/example.mo share/locale/fr/LC_MESSAGES/karbon.mo share/locale/fr/LC_MESSAGES/kchart.mo -share/locale/fr/LC_MESSAGES/kdgantt.mo share/locale/fr/LC_MESSAGES/kexi.mo share/locale/fr/LC_MESSAGES/kfile_abiword.mo share/locale/fr/LC_MESSAGES/kfile_gnumeric.mo diff --git a/french/koffice-kde4-l10n/Makefile b/french/koffice-kde4-l10n/Makefile index 772cd8a5320b..6b619a05114c 100644 --- a/french/koffice-kde4-l10n/Makefile +++ b/french/koffice-kde4-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= french kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/french/koffice-kde4-l10n/distinfo b/french/koffice-kde4-l10n/distinfo index b4d9b06a4253..91645f8c8934 100644 --- a/french/koffice-kde4-l10n/distinfo +++ b/french/koffice-kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-fr-1.6.1.tar.bz2) = 74a658f3f323f016b202cc4e2063da19 -SHA256 (KDE/kde-i18n/koffice-l10n-fr-1.6.1.tar.bz2) = b180dd0d941883eac98304a54445e8c2046ab523af799f0c0cdf045d9fc0d27d -SIZE (KDE/kde-i18n/koffice-l10n-fr-1.6.1.tar.bz2) = 6597505 +MD5 (KDE/kde-i18n/koffice-l10n-fr-1.6.2.tar.bz2) = d6ba1878f85ad21d678019098124094b +SHA256 (KDE/kde-i18n/koffice-l10n-fr-1.6.2.tar.bz2) = 3759987c7733d7b86fe3a57939da605cb73d29aab87d56ff265c6806a1d70fcf +SIZE (KDE/kde-i18n/koffice-l10n-fr-1.6.2.tar.bz2) = 6598654 diff --git a/french/koffice-kde4-l10n/pkg-plist b/french/koffice-kde4-l10n/pkg-plist index 26b46d27aa38..0dbc43bd0014 100644 --- a/french/koffice-kde4-l10n/pkg-plist +++ b/french/koffice-kde4-l10n/pkg-plist @@ -398,7 +398,6 @@ share/locale/fr/LC_MESSAGES/desktop_koffice.mo share/locale/fr/LC_MESSAGES/example.mo share/locale/fr/LC_MESSAGES/karbon.mo share/locale/fr/LC_MESSAGES/kchart.mo -share/locale/fr/LC_MESSAGES/kdgantt.mo share/locale/fr/LC_MESSAGES/kexi.mo share/locale/fr/LC_MESSAGES/kfile_abiword.mo share/locale/fr/LC_MESSAGES/kfile_gnumeric.mo diff --git a/games/atlantikdesigner/Makefile b/games/atlantikdesigner/Makefile index f7adf29a4f8d..8ccf86bfe2ac 100644 --- a/games/atlantikdesigner/Makefile +++ b/games/atlantikdesigner/Makefile @@ -27,7 +27,7 @@ PREFIX= ${KDE_PREFIX} USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/games/atlantikdesigner/distinfo b/games/atlantikdesigner/distinfo index b86dc7b77b7f..5a84efd83781 100644 --- a/games/atlantikdesigner/distinfo +++ b/games/atlantikdesigner/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.5.tar.bz2) = 71c0a690abf8ad0f43135fa887d0b40c -SHA256 (KDE/kdeaddons-3.5.5.tar.bz2) = 1db58293a8b967d254a39c9bdb0c5dfb3759a7d067280dd3d637e2423beb632c -SIZE (KDE/kdeaddons-3.5.5.tar.bz2) = 1663195 +MD5 (KDE/kdeaddons-3.5.6.tar.bz2) = 96d6d2a76da2a5232b3b46318456a5bc +SHA256 (KDE/kdeaddons-3.5.6.tar.bz2) = dec71f341631beb1f3e112083af11e3ef1618ed80394cf4939c662f8c5a3d807 +SIZE (KDE/kdeaddons-3.5.6.tar.bz2) = 1667731 diff --git a/games/atlantikdesigner/pkg-plist b/games/atlantikdesigner/pkg-plist index 4468941b87ba..9acc5e2c80bd 100644 --- a/games/atlantikdesigner/pkg-plist +++ b/games/atlantikdesigner/pkg-plist @@ -1,6 +1,6 @@ bin/atlantikdesigner share/applications/kde/atlantikdesigner.desktop -share/applications/kdeaddons-atlantikdesigner-3.5.5 +share/applications/kdeaddons-atlantikdesigner-3.5.6 share/apps/atlantikdesigner/atlantikdesignerui.rc share/icons/hicolor/16x16/apps/atlantikdesigner.png share/icons/hicolor/32x32/apps/atlantikdesigner.png diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile index ec8e97dc049c..82c1724ada84 100644 --- a/games/kdegames3/Makefile +++ b/games/kdegames3/Makefile @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib CONFIGURE_ARGS= --disable-setgid diff --git a/games/kdegames3/distinfo b/games/kdegames3/distinfo index 5870312f8c71..f44854077914 100644 --- a/games/kdegames3/distinfo +++ b/games/kdegames3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdegames-3.5.5.tar.bz2) = 1db8e3960ffb6af0a8d683756b89efa7 -SHA256 (KDE/kdegames-3.5.5.tar.bz2) = 957563339f241c7bd5d6ec3a4fedc21a0c20387b7a01fc4bd62ce892eae68935 -SIZE (KDE/kdegames-3.5.5.tar.bz2) = 10749927 +MD5 (KDE/kdegames-3.5.6.tar.bz2) = d6cdf7d9235896670d5299e9e91665e2 +SHA256 (KDE/kdegames-3.5.6.tar.bz2) = 11358a33f0d5a83c0d3f31fefe99040f065696b476c95f1f30c5f83a8bd59202 +SIZE (KDE/kdegames-3.5.6.tar.bz2) = 10763523 diff --git a/games/kdegames3/pkg-plist b/games/kdegames3/pkg-plist index f849dcb8affb..b5311c684591 100644 --- a/games/kdegames3/pkg-plist +++ b/games/kdegames3/pkg-plist @@ -141,6 +141,7 @@ share/applications/kde/klickety.desktop share/applications/kde/klines.desktop share/applications/kde/kmahjongg.desktop share/applications/kde/kmines.desktop +share/applications/kde/knetwalk.desktop share/applications/kde/kolf.desktop share/applications/kde/konquest.desktop share/applications/kde/kpat.desktop @@ -844,8 +845,8 @@ share/apps/carddecks/decks/deck8.desktop share/apps/carddecks/decks/deck8.png share/apps/carddecks/decks/deck9.desktop share/apps/carddecks/decks/deck9.png -%%FREEBSD_DECK%%share/apps/carddecks/decks/deck_freebsd.desktop -%%FREEBSD_DECK%%share/apps/carddecks/decks/deck_freebsd.png +share/apps/carddecks/decks/deck_freebsd.desktop +share/apps/carddecks/decks/deck_freebsd.png share/apps/kasteroids/kasteroidsui.rc share/apps/kasteroids/sounds/Explosion.wav share/apps/kasteroids/sprites/bg.png @@ -1121,7 +1122,7 @@ share/apps/katomic/levels/level_8 share/apps/katomic/levels/level_80 share/apps/katomic/levels/level_81 share/apps/katomic/levels/level_82 -share/apps/katomic/levels/level_84 +share/apps/katomic/levels/level_83 share/apps/katomic/levels/level_9 share/apps/katomic/pics/abilder.png share/apps/katomic/pics/molek.png diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile index ec8e97dc049c..82c1724ada84 100644 --- a/games/kdegames4/Makefile +++ b/games/kdegames4/Makefile @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib CONFIGURE_ARGS= --disable-setgid diff --git a/games/kdegames4/distinfo b/games/kdegames4/distinfo index 5870312f8c71..f44854077914 100644 --- a/games/kdegames4/distinfo +++ b/games/kdegames4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdegames-3.5.5.tar.bz2) = 1db8e3960ffb6af0a8d683756b89efa7 -SHA256 (KDE/kdegames-3.5.5.tar.bz2) = 957563339f241c7bd5d6ec3a4fedc21a0c20387b7a01fc4bd62ce892eae68935 -SIZE (KDE/kdegames-3.5.5.tar.bz2) = 10749927 +MD5 (KDE/kdegames-3.5.6.tar.bz2) = d6cdf7d9235896670d5299e9e91665e2 +SHA256 (KDE/kdegames-3.5.6.tar.bz2) = 11358a33f0d5a83c0d3f31fefe99040f065696b476c95f1f30c5f83a8bd59202 +SIZE (KDE/kdegames-3.5.6.tar.bz2) = 10763523 diff --git a/games/kdegames4/pkg-plist b/games/kdegames4/pkg-plist index f849dcb8affb..b5311c684591 100644 --- a/games/kdegames4/pkg-plist +++ b/games/kdegames4/pkg-plist @@ -141,6 +141,7 @@ share/applications/kde/klickety.desktop share/applications/kde/klines.desktop share/applications/kde/kmahjongg.desktop share/applications/kde/kmines.desktop +share/applications/kde/knetwalk.desktop share/applications/kde/kolf.desktop share/applications/kde/konquest.desktop share/applications/kde/kpat.desktop @@ -844,8 +845,8 @@ share/apps/carddecks/decks/deck8.desktop share/apps/carddecks/decks/deck8.png share/apps/carddecks/decks/deck9.desktop share/apps/carddecks/decks/deck9.png -%%FREEBSD_DECK%%share/apps/carddecks/decks/deck_freebsd.desktop -%%FREEBSD_DECK%%share/apps/carddecks/decks/deck_freebsd.png +share/apps/carddecks/decks/deck_freebsd.desktop +share/apps/carddecks/decks/deck_freebsd.png share/apps/kasteroids/kasteroidsui.rc share/apps/kasteroids/sounds/Explosion.wav share/apps/kasteroids/sprites/bg.png @@ -1121,7 +1122,7 @@ share/apps/katomic/levels/level_8 share/apps/katomic/levels/level_80 share/apps/katomic/levels/level_81 share/apps/katomic/levels/level_82 -share/apps/katomic/levels/level_84 +share/apps/katomic/levels/level_83 share/apps/katomic/levels/level_9 share/apps/katomic/pics/abilder.png share/apps/katomic/pics/molek.png diff --git a/german/calligra-l10n/Makefile b/german/calligra-l10n/Makefile index 2755f853e1ca..494feefdc028 100644 --- a/german/calligra-l10n/Makefile +++ b/german/calligra-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= german kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/german/calligra-l10n/distinfo b/german/calligra-l10n/distinfo index 20b79849be3b..9406f22763cf 100644 --- a/german/calligra-l10n/distinfo +++ b/german/calligra-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-de-1.6.1.tar.bz2) = 9ec1030ec8f55b4689a4664a3032050d -SHA256 (KDE/kde-i18n/koffice-l10n-de-1.6.1.tar.bz2) = 54e661582f985092e171e5a7fde9397f123a2fc4764af507612050b8d760bc40 -SIZE (KDE/kde-i18n/koffice-l10n-de-1.6.1.tar.bz2) = 4402474 +MD5 (KDE/kde-i18n/koffice-l10n-de-1.6.2.tar.bz2) = 3cf83fceb1caff5ba1c5bcad31a7df81 +SHA256 (KDE/kde-i18n/koffice-l10n-de-1.6.2.tar.bz2) = 9e897fafb029a04d7a96c6489b4cf7ff0bb59af73c6785b27354ec683ce5b18b +SIZE (KDE/kde-i18n/koffice-l10n-de-1.6.2.tar.bz2) = 7168089 diff --git a/german/calligra-l10n/pkg-plist b/german/calligra-l10n/pkg-plist index 32270fbc27d7..d3dab2ec3557 100644 --- a/german/calligra-l10n/pkg-plist +++ b/german/calligra-l10n/pkg-plist @@ -32,7 +32,21 @@ share/doc/HTML/de/kchart/kchart-wizard3.png share/doc/HTML/de/kchart/kchart-wizard4.png share/doc/HTML/de/kchart/shortcut.png share/doc/HTML/de/kchart/toolbars.png +share/doc/HTML/de/kexi/basics.docbook +share/doc/HTML/de/kexi/building.docbook +share/doc/HTML/de/kexi/common +share/doc/HTML/de/kexi/comparing.docbook +share/doc/HTML/de/kexi/configuration.docbook share/doc/HTML/de/kexi/credits.docbook +share/doc/HTML/de/kexi/database.docbook +share/doc/HTML/de/kexi/designingforms.docbook +share/doc/HTML/de/kexi/enteringdataintotables.docbook +share/doc/HTML/de/kexi/enteringdatausingforms.docbook +share/doc/HTML/de/kexi/index.cache.bz2 +share/doc/HTML/de/kexi/index.docbook +share/doc/HTML/de/kexi/intro.docbook +share/doc/HTML/de/kexi/menus.docbook +share/doc/HTML/de/kexi/querydesigning.docbook share/doc/HTML/de/kformula/ambiguous-string.png share/doc/HTML/de/kformula/common share/doc/HTML/de/kformula/green1.png @@ -65,6 +79,15 @@ share/doc/HTML/de/koffice/index.docbook share/doc/HTML/de/koshell/common share/doc/HTML/de/koshell/index.cache.bz2 share/doc/HTML/de/koshell/index.docbook +share/doc/HTML/de/kplato/commands.docbook +share/doc/HTML/de/kplato/common +share/doc/HTML/de/kplato/definitions.docbook +share/doc/HTML/de/kplato/index.cache.bz2 +share/doc/HTML/de/kplato/index.docbook +share/doc/HTML/de/kplato/mainwindow.docbook +share/doc/HTML/de/kplato/options.docbook +share/doc/HTML/de/kplato/wbs.docbook +share/doc/HTML/de/kpresenter/a11y.docbook share/doc/HTML/de/kpresenter/common share/doc/HTML/de/kpresenter/faq.docbook share/doc/HTML/de/kpresenter/great-presentations.docbook @@ -75,10 +98,97 @@ share/doc/HTML/de/kpresenter/menus.docbook share/doc/HTML/de/kpresenter/options.docbook share/doc/HTML/de/kpresenter/screen.docbook share/doc/HTML/de/kpresenter/tutorial.docbook +share/doc/HTML/de/krita/commands-dialogs.docbook +share/doc/HTML/de/krita/commands-menus.docbook +share/doc/HTML/de/krita/commands-palettes.docbook +share/doc/HTML/de/krita/commands-toolbars.docbook share/doc/HTML/de/krita/commands.docbook +share/doc/HTML/de/krita/common +share/doc/HTML/de/krita/createdocument.png share/doc/HTML/de/krita/credits.docbook +share/doc/HTML/de/krita/developers-plugins.docbook +share/doc/HTML/de/krita/developers-scripting.docbook share/doc/HTML/de/krita/developers.docbook +share/doc/HTML/de/krita/dialogs-addpalette.png +share/doc/HTML/de/krita/dialogs-blur.png +share/doc/HTML/de/krita/dialogs-brightnesscontrast.png +share/doc/HTML/de/krita/dialogs-bumpmap.png +share/doc/HTML/de/krita/dialogs-coloradjustment.png +share/doc/HTML/de/krita/dialogs-colorrange.png +share/doc/HTML/de/krita/dialogs-colortoalpha.png +share/doc/HTML/de/krita/dialogs-colortransfer.png +share/doc/HTML/de/krita/dialogs-convertimagetype.png +share/doc/HTML/de/krita/dialogs-convertlayertype.png +share/doc/HTML/de/krita/dialogs-customconvolution.png +share/doc/HTML/de/krita/dialogs-documentinformation.png +share/doc/HTML/de/krita/dialogs-dropshadow.png +share/doc/HTML/de/krita/dialogs-emboss.png +share/doc/HTML/de/krita/dialogs-filtersgallery.png +share/doc/HTML/de/krita/dialogs-gaussiannoise.png +share/doc/HTML/de/krita/dialogs-imageproperties.png +share/doc/HTML/de/krita/dialogs-imagerestoration.png +share/doc/HTML/de/krita/dialogs-imagesize.png +share/doc/HTML/de/krita/dialogs-layerproperties.png +share/doc/HTML/de/krita/dialogs-layersize.png +share/doc/HTML/de/krita/dialogs-lenscorrection.png +share/doc/HTML/de/krita/dialogs-newlayer.png +share/doc/HTML/de/krita/dialogs-oilpaint.png +share/doc/HTML/de/krita/dialogs-pixelize.png +share/doc/HTML/de/krita/dialogs-raindrops.png +share/doc/HTML/de/krita/dialogs-randomnoise.png +share/doc/HTML/de/krita/dialogs-randompick.png +share/doc/HTML/de/krita/dialogs-rotateimage.png +share/doc/HTML/de/krita/dialogs-rotatelayer.png +share/doc/HTML/de/krita/dialogs-separateimage.png +share/doc/HTML/de/krita/dialogs-shearimage.png +share/doc/HTML/de/krita/dialogs-shearlayer.png +share/doc/HTML/de/krita/dialogs-smalltiles.png +share/doc/HTML/de/krita/dialogs-sobel.png +share/doc/HTML/de/krita/dialogs-substrate.png +share/doc/HTML/de/krita/dialogs-unsharpmask.png +share/doc/HTML/de/krita/dialogs-wave.png +share/doc/HTML/de/krita/dialogs-waveletnoise.png +share/doc/HTML/de/krita/faq.docbook +share/doc/HTML/de/krita/index.cache.bz2 +share/doc/HTML/de/krita/index.docbook share/doc/HTML/de/krita/installation.docbook +share/doc/HTML/de/krita/introduction.docbook +share/doc/HTML/de/krita/mainscreen.png +share/doc/HTML/de/krita/newimage.png +share/doc/HTML/de/krita/palettes-controlbox-brush.png +share/doc/HTML/de/krita/palettes-controlbox-colorpicker.png +share/doc/HTML/de/krita/palettes-controlbox-contiguousfill.png +share/doc/HTML/de/krita/palettes-controlbox-crop.png +share/doc/HTML/de/krita/palettes-controlbox-duplicate.png +share/doc/HTML/de/krita/palettes-controlbox-gradient.png +share/doc/HTML/de/krita/palettes-controlbox-line.png +share/doc/HTML/de/krita/palettes-controlbox-paintwithfilters.png +share/doc/HTML/de/krita/palettes-controlbox-rectangle.png +share/doc/HTML/de/krita/palettes-controlbox-select.png +share/doc/HTML/de/krita/palettes-controlbox-selectcontiguous.png +share/doc/HTML/de/krita/palettes-controlbox-selectmagnetic.png +share/doc/HTML/de/krita/palettes-controlbox-star.png +share/doc/HTML/de/krita/palettes-controlbox-text.png +share/doc/HTML/de/krita/preferences-color.png +share/doc/HTML/de/krita/preferences-display.png +share/doc/HTML/de/krita/preferences-general.png +share/doc/HTML/de/krita/preferences-grid.png +share/doc/HTML/de/krita/preferences-performance.png +share/doc/HTML/de/krita/preferences-sidebar.png +share/doc/HTML/de/krita/preferences-tablet.png +share/doc/HTML/de/krita/settings.docbook +share/doc/HTML/de/krita/toolbar-brushesandstuff.png +share/doc/HTML/de/krita/tutorial-quick-starts.docbook +share/doc/HTML/de/krita/tutorial-select-layer.docbook +share/doc/HTML/de/krita/tutorial-starting.docbook +share/doc/HTML/de/krita/tutorial-tablet.docbook +share/doc/HTML/de/krita/tutorial.docbook +share/doc/HTML/de/krita/using-colorspaces.docbook +share/doc/HTML/de/krita/using-filters.docbook +share/doc/HTML/de/krita/using-images.docbook +share/doc/HTML/de/krita/using-layers.docbook +share/doc/HTML/de/krita/using-selections.docbook +share/doc/HTML/de/krita/using-views.docbook share/doc/HTML/de/kspread/a11y.docbook share/doc/HTML/de/kspread/advanced.docbook share/doc/HTML/de/kspread/basics.docbook @@ -251,7 +361,6 @@ share/locale/de/LC_MESSAGES/desktop_koffice.mo share/locale/de/LC_MESSAGES/example.mo share/locale/de/LC_MESSAGES/karbon.mo share/locale/de/LC_MESSAGES/kchart.mo -share/locale/de/LC_MESSAGES/kdgantt.mo share/locale/de/LC_MESSAGES/kexi.mo share/locale/de/LC_MESSAGES/kfile_abiword.mo share/locale/de/LC_MESSAGES/kfile_gnumeric.mo @@ -284,6 +393,7 @@ share/locale/de/LC_MESSAGES/thesaurus_tool.mo @dirrm share/doc/HTML/de/kspread @dirrm share/doc/HTML/de/krita @dirrm share/doc/HTML/de/kpresenter +@dirrm share/doc/HTML/de/kplato @dirrm share/doc/HTML/de/koshell @dirrm share/doc/HTML/de/koffice @dirrm share/doc/HTML/de/kivio diff --git a/german/kde3-i18n/distinfo b/german/kde3-i18n/distinfo index 7ca53a0c4233..8ff68d0f9f30 100644 --- a/german/kde3-i18n/distinfo +++ b/german/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-de-3.5.5.tar.bz2) = a99bf0e5d298fce191ad2c938af3afdb -SHA256 (KDE/kde-i18n/kde-i18n-de-3.5.5.tar.bz2) = b50ee614bc6045ba3b7e2508fcd1213c0d2c45b31a6da9e50513a6aff0a66d80 -SIZE (KDE/kde-i18n/kde-i18n-de-3.5.5.tar.bz2) = 23235722 +MD5 (KDE/kde-i18n/kde-i18n-de-3.5.6.tar.bz2) = c8a52e825c610ae5779ef84d1bf7e3c5 +SHA256 (KDE/kde-i18n/kde-i18n-de-3.5.6.tar.bz2) = 3353e95810f4c65bc55b1150a3a60baddaa9b85041005a4c45574d9bbeed0f08 +SIZE (KDE/kde-i18n/kde-i18n-de-3.5.6.tar.bz2) = 23483986 diff --git a/german/kde3-i18n/pkg-plist b/german/kde3-i18n/pkg-plist index ec3a7321ed84..92914cfb1cd5 100644 --- a/german/kde3-i18n/pkg-plist +++ b/german/kde3-i18n/pkg-plist @@ -1,3 +1,6 @@ +share/apps/kanagram/data/de/hauptstaedte.kvtml +share/apps/kanagram/data/de/personen.kvtml +share/apps/kanagram/data/de/tiere.kvtml share/apps/katepart/syntax/logohighlightstyle.de_DE.xml share/apps/khangman/data/de/animals.kvtml share/apps/khangman/data/de/easy.kvtml @@ -95,9 +98,6 @@ share/apps/kturtle/examples/de_DE/zufallsname.logo share/doc/HTML/de/KRegExpEditor/common share/doc/HTML/de/KRegExpEditor/index.cache.bz2 share/doc/HTML/de/KRegExpEditor/index.docbook -share/doc/HTML/de/akregator/common -share/doc/HTML/de/akregator/index.cache.bz2 -share/doc/HTML/de/akregator/index.docbook share/doc/HTML/de/amor/common share/doc/HTML/de/amor/index.cache.bz2 share/doc/HTML/de/amor/index.docbook @@ -147,6 +147,9 @@ share/doc/HTML/de/docs/common/gpl-translated.html share/doc/HTML/de/docs/common/kde-localised.css share/doc/HTML/de/docs/common/lgpl-translated.html share/doc/HTML/de/docs/common/logotp3.png +share/doc/HTML/de/irkick/common +share/doc/HTML/de/irkick/index.cache.bz2 +share/doc/HTML/de/irkick/index.docbook share/doc/HTML/de/juk/common share/doc/HTML/de/juk/history-playlist.png share/doc/HTML/de/juk/index.cache.bz2 @@ -200,10 +203,14 @@ share/doc/HTML/de/kalzium/timeline.png share/doc/HTML/de/kamera/common share/doc/HTML/de/kamera/index.cache.bz2 share/doc/HTML/de/kamera/index.docbook +share/doc/HTML/de/kanagram/common +share/doc/HTML/de/kanagram/index.cache.bz2 +share/doc/HTML/de/kanagram/index.docbook share/doc/HTML/de/kandy/common share/doc/HTML/de/kandy/index.cache.bz2 share/doc/HTML/de/kandy/index.docbook share/doc/HTML/de/kappfinder/man-kappfinder.1.docbook +share/doc/HTML/de/kapptemplate/man-kapptemplate.1.docbook share/doc/HTML/de/karm/common share/doc/HTML/de/karm/copy-this-task.png share/doc/HTML/de/karm/csvexport.png @@ -249,8 +256,12 @@ share/doc/HTML/de/katomic/common share/doc/HTML/de/katomic/index.cache.bz2 share/doc/HTML/de/katomic/index.docbook share/doc/HTML/de/kbabel/catman.docbook +share/doc/HTML/de/kbabel/common +share/doc/HTML/de/kbabel/dictionaries.docbook share/doc/HTML/de/kbabel/faq.docbook share/doc/HTML/de/kbabel/glossary.docbook +share/doc/HTML/de/kbabel/index.cache.bz2 +share/doc/HTML/de/kbabel/index.docbook share/doc/HTML/de/kbabel/kbabeldict.docbook share/doc/HTML/de/kbabel/man-catalogmanager.1.docbook share/doc/HTML/de/kbabel/menu.docbook @@ -288,12 +299,16 @@ share/doc/HTML/de/kbugbuster/index.docbook share/doc/HTML/de/kcachegrind/common share/doc/HTML/de/kcachegrind/index.cache.bz2 share/doc/HTML/de/kcachegrind/index.docbook +share/doc/HTML/de/kcalc/commands.docbook share/doc/HTML/de/kcalc/common share/doc/HTML/de/kcalc/index.cache.bz2 share/doc/HTML/de/kcalc/index.docbook share/doc/HTML/de/kcharselect/common share/doc/HTML/de/kcharselect/index.cache.bz2 share/doc/HTML/de/kcharselect/index.docbook +share/doc/HTML/de/kcmlirc/common +share/doc/HTML/de/kcmlirc/index.cache.bz2 +share/doc/HTML/de/kcmlirc/index.docbook share/doc/HTML/de/kcoloredit/common share/doc/HTML/de/kcoloredit/index.cache.bz2 share/doc/HTML/de/kcoloredit/index.docbook @@ -480,12 +495,6 @@ share/doc/HTML/de/kdelibs/man-dcop.1.docbook share/doc/HTML/de/kdelibs/man-kbuildsycoca.8.docbook share/doc/HTML/de/kdelibs/man-kdeoptions.7.docbook share/doc/HTML/de/kdelibs/man-qtoptions.7.docbook -share/doc/HTML/de/kdelirc/irkick/common -share/doc/HTML/de/kdelirc/irkick/index.cache.bz2 -share/doc/HTML/de/kdelirc/irkick/index.docbook -share/doc/HTML/de/kdelirc/kcmlirc/common -share/doc/HTML/de/kdelirc/kcmlirc/index.cache.bz2 -share/doc/HTML/de/kdelirc/kcmlirc/index.docbook share/doc/HTML/de/kdeprint/add-printer-wiz.docbook share/doc/HTML/de/kdeprint/common share/doc/HTML/de/kdeprint/cups-config.docbook @@ -507,6 +516,9 @@ share/doc/HTML/de/kdesu/common share/doc/HTML/de/kdesu/index.cache.bz2 share/doc/HTML/de/kdesu/index.docbook share/doc/HTML/de/kdesu/man-kdesu.1.docbook +share/doc/HTML/de/kdesvn-build/common +share/doc/HTML/de/kdesvn-build/index.cache.bz2 +share/doc/HTML/de/kdesvn-build/index.docbook share/doc/HTML/de/kdf/common share/doc/HTML/de/kdf/index.cache.bz2 share/doc/HTML/de/kdf/index.docbook @@ -533,6 +545,7 @@ share/doc/HTML/de/keduca/common share/doc/HTML/de/keduca/index.cache.bz2 share/doc/HTML/de/keduca/index.docbook share/doc/HTML/de/keduca/man-keduca.1.docbook +share/doc/HTML/de/keduca/man-keducabuilder.1.docbook share/doc/HTML/de/keduca/screenshot.png share/doc/HTML/de/kenolaba/common share/doc/HTML/de/kenolaba/index.cache.bz2 @@ -581,6 +594,9 @@ share/doc/HTML/de/kfouleggs/index.docbook share/doc/HTML/de/kgamma/common share/doc/HTML/de/kgamma/index.cache.bz2 share/doc/HTML/de/kgamma/index.docbook +share/doc/HTML/de/kgeography/common +share/doc/HTML/de/kgeography/index.cache.bz2 +share/doc/HTML/de/kgeography/index.docbook share/doc/HTML/de/kget/common share/doc/HTML/de/kget/index.cache.bz2 share/doc/HTML/de/kget/index.docbook @@ -614,6 +630,7 @@ share/doc/HTML/de/khangman/index.cache.bz2 share/doc/HTML/de/khangman/index.docbook share/doc/HTML/de/khangman/khangman1.png share/doc/HTML/de/khangman/khangman2.png +share/doc/HTML/de/khangman/man-khangman.6.docbook share/doc/HTML/de/khangman/normalsettings.png share/doc/HTML/de/khelpcenter/common share/doc/HTML/de/khelpcenter/contact.docbook @@ -660,6 +677,7 @@ share/doc/HTML/de/khelpcenter/userguide/common share/doc/HTML/de/khelpcenter/userguide/control-center.docbook share/doc/HTML/de/khelpcenter/userguide/creating-graphics.docbook share/doc/HTML/de/khelpcenter/userguide/credits-and-license.docbook +share/doc/HTML/de/khelpcenter/userguide/customizing-desktop.docbook share/doc/HTML/de/khelpcenter/userguide/email.docbook share/doc/HTML/de/khelpcenter/userguide/extragear-applications.docbook share/doc/HTML/de/khelpcenter/userguide/file-sharing.docbook @@ -708,6 +726,23 @@ share/doc/HTML/de/khelpcenter/userguide/your-kde-account.docbook share/doc/HTML/de/khelpcenter/visualdict/common share/doc/HTML/de/khelpcenter/visualdict/index.cache.bz2 share/doc/HTML/de/khelpcenter/visualdict/index.docbook +share/doc/HTML/de/khelpcenter/visualdict/pict1.png +share/doc/HTML/de/khelpcenter/visualdict/pict10.png +share/doc/HTML/de/khelpcenter/visualdict/pict11.png +share/doc/HTML/de/khelpcenter/visualdict/pict12.png +share/doc/HTML/de/khelpcenter/visualdict/pict13.png +share/doc/HTML/de/khelpcenter/visualdict/pict14.png +share/doc/HTML/de/khelpcenter/visualdict/pict16.png +share/doc/HTML/de/khelpcenter/visualdict/pict19.png +share/doc/HTML/de/khelpcenter/visualdict/pict20.png +share/doc/HTML/de/khelpcenter/visualdict/pict21.png +share/doc/HTML/de/khelpcenter/visualdict/pict22.png +share/doc/HTML/de/khelpcenter/visualdict/pict23.png +share/doc/HTML/de/khelpcenter/visualdict/pict4.png +share/doc/HTML/de/khelpcenter/visualdict/pict5.png +share/doc/HTML/de/khelpcenter/visualdict/pict6.png +share/doc/HTML/de/khelpcenter/visualdict/pict7.png +share/doc/HTML/de/khelpcenter/visualdict/pict8.png share/doc/HTML/de/khelpcenter/welcome.docbook share/doc/HTML/de/khelpcenter/whatiskde.docbook share/doc/HTML/de/khexedit/common @@ -738,6 +773,7 @@ share/doc/HTML/de/kig/index.cache.bz2 share/doc/HTML/de/kig/index.docbook share/doc/HTML/de/kig/macro_wizard.png share/doc/HTML/de/kig/macros_at_work.png +share/doc/HTML/de/kig/man-kig.1.docbook share/doc/HTML/de/kig/script_wizard.png share/doc/HTML/de/kig/script_wizard_entering_code.png share/doc/HTML/de/kig/selecting_objects.png @@ -1235,6 +1271,7 @@ share/doc/HTML/de/kpf/common share/doc/HTML/de/kpf/index.cache.bz2 share/doc/HTML/de/kpf/index.docbook share/doc/HTML/de/kpilot/common +share/doc/HTML/de/kpilot/faq.docbook share/doc/HTML/de/kpilot/index.cache.bz2 share/doc/HTML/de/kpilot/index.docbook share/doc/HTML/de/kpoker/common @@ -1417,6 +1454,7 @@ share/doc/HTML/de/kstars/ellipticalgalaxies.docbook share/doc/HTML/de/kstars/equinox.docbook share/doc/HTML/de/kstars/faq.docbook share/doc/HTML/de/kstars/find.png +share/doc/HTML/de/kstars/fitsviewer.docbook share/doc/HTML/de/kstars/flux.docbook share/doc/HTML/de/kstars/fovdialog.png share/doc/HTML/de/kstars/geocoords.docbook @@ -1438,6 +1476,16 @@ share/doc/HTML/de/kstars/leapyear.docbook share/doc/HTML/de/kstars/lightcurves.docbook share/doc/HTML/de/kstars/luminosity.docbook share/doc/HTML/de/kstars/magnitude.docbook +share/doc/HTML/de/kstars/man-celestrongps.1.docbook +share/doc/HTML/de/kstars/man-fliccd.1.docbook +share/doc/HTML/de/kstars/man-indiserver.1.docbook +share/doc/HTML/de/kstars/man-lx200_16.1.docbook +share/doc/HTML/de/kstars/man-lx200autostar.1.docbook +share/doc/HTML/de/kstars/man-lx200classic.1.docbook +share/doc/HTML/de/kstars/man-lx200generic.1.docbook +share/doc/HTML/de/kstars/man-temma.1.docbook +share/doc/HTML/de/kstars/man-v4ldriver.1.docbook +share/doc/HTML/de/kstars/man-v4lphilips.1.docbook share/doc/HTML/de/kstars/meridian.docbook share/doc/HTML/de/kstars/newfov.png share/doc/HTML/de/kstars/observinglist.docbook @@ -1475,14 +1523,19 @@ share/doc/HTML/de/ktalkd/common share/doc/HTML/de/ktalkd/index.cache.bz2 share/doc/HTML/de/ktalkd/index.docbook share/doc/HTML/de/kteatime/common +share/doc/HTML/de/kteatime/config.png share/doc/HTML/de/kteatime/index.cache.bz2 share/doc/HTML/de/kteatime/index.docbook share/doc/HTML/de/ktimer/common share/doc/HTML/de/ktimer/index.cache.bz2 share/doc/HTML/de/ktimer/index.docbook +share/doc/HTML/de/ktnef/common +share/doc/HTML/de/ktnef/index.cache.bz2 +share/doc/HTML/de/ktnef/index.docbook share/doc/HTML/de/ktouch/common share/doc/HTML/de/ktouch/index.cache.bz2 share/doc/HTML/de/ktouch/index.docbook +share/doc/HTML/de/ktouch/man-ktouch.1.docbook share/doc/HTML/de/ktouch/screenshot1.png share/doc/HTML/de/ktouch/screenshot2.png share/doc/HTML/de/ktouch/screenshot3.png @@ -1706,6 +1759,28 @@ share/doc/HTML/de/quanta/quanta-menus.docbook share/doc/HTML/de/quanta/quanta-projects.docbook share/doc/HTML/de/quanta/working-with-quanta.docbook share/doc/HTML/de/scripts/man-adddebug.1.docbook +share/doc/HTML/de/scripts/man-cheatmake.1.docbook +share/doc/HTML/de/scripts/man-create_cvsignore.1.docbook +share/doc/HTML/de/scripts/man-create_makefile.1.docbook +share/doc/HTML/de/scripts/man-create_makefiles.1.docbook +share/doc/HTML/de/scripts/man-cvscheck.1.docbook +share/doc/HTML/de/scripts/man-cvslastchange.1.docbook +share/doc/HTML/de/scripts/man-cvslastlog.1.docbook +share/doc/HTML/de/scripts/man-cvsrevertlast.1.docbook +share/doc/HTML/de/scripts/man-cxxmetric.1.docbook +share/doc/HTML/de/scripts/man-demangle.1.docbook +share/doc/HTML/de/scripts/man-extend_dmalloc.1.docbook +share/doc/HTML/de/scripts/man-extractrc.1.docbook +share/doc/HTML/de/scripts/man-fixincludes.1.docbook +share/doc/HTML/de/scripts/man-po2xml.1.docbook +share/doc/HTML/de/scripts/man-pruneemptydirs.1.docbook +share/doc/HTML/de/scripts/man-qtdoc.1.docbook +share/doc/HTML/de/scripts/man-reportview.1.docbook +share/doc/HTML/de/scripts/man-split2po.1.docbook +share/doc/HTML/de/scripts/man-swappo.1.docbook +share/doc/HTML/de/scripts/man-transxx.1.docbook +share/doc/HTML/de/scripts/man-xml2pot.1.docbook +share/doc/HTML/de/scripts/man-zonetab2pot.1.docbook share/doc/HTML/de/superkaramba/common share/doc/HTML/de/superkaramba/index.cache.bz2 share/doc/HTML/de/superkaramba/index.docbook @@ -2013,6 +2088,7 @@ share/locale/de/LC_MESSAGES/khotkeys.mo share/locale/de/LC_MESSAGES/khtmlkttsd.mo share/locale/de/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/de/LC_MESSAGES/kicker.mo +share/locale/de/LC_MESSAGES/kickermenu_kate.mo share/locale/de/LC_MESSAGES/kiconedit.mo share/locale/de/LC_MESSAGES/kig.mo share/locale/de/LC_MESSAGES/kimagemapeditor.mo @@ -2050,6 +2126,7 @@ share/locale/de/LC_MESSAGES/kio_thumbnail.mo share/locale/de/LC_MESSAGES/kio_trash.mo share/locale/de/LC_MESSAGES/kio_zeroconf.mo share/locale/de/LC_MESSAGES/kioexec.mo +share/locale/de/LC_MESSAGES/kitchensync.mo share/locale/de/LC_MESSAGES/kiten.mo share/locale/de/LC_MESSAGES/kjobviewer.mo share/locale/de/LC_MESSAGES/kjots.mo @@ -2253,6 +2330,7 @@ share/locale/de/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/de/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/de/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/de/LC_MESSAGES/libkickermenu_tom.mo +share/locale/de/LC_MESSAGES/libkitchensync.mo share/locale/de/LC_MESSAGES/libkleopatra.mo share/locale/de/LC_MESSAGES/libkmime.mo share/locale/de/LC_MESSAGES/libkonq.mo @@ -2331,6 +2409,7 @@ share/locale/de/flag.png @dirrm share/doc/HTML/de/kttsd @dirrm share/doc/HTML/de/ktron @dirrm share/doc/HTML/de/ktouch +@dirrm share/doc/HTML/de/ktnef @dirrm share/doc/HTML/de/ktimer @dirrm share/doc/HTML/de/kteatime @dirrm share/doc/HTML/de/ktalkd @@ -2457,6 +2536,7 @@ share/locale/de/flag.png @dirrm share/doc/HTML/de/kgoldrunner @dirrm share/doc/HTML/de/kghostview @dirrm share/doc/HTML/de/kget +@dirrm share/doc/HTML/de/kgeography @dirrm share/doc/HTML/de/kgamma @dirrm share/doc/HTML/de/kfouleggs @dirrm share/doc/HTML/de/kfloppy @@ -2469,11 +2549,9 @@ share/locale/de/flag.png @dirrm share/doc/HTML/de/kdm @dirrm share/doc/HTML/de/kdict @dirrm share/doc/HTML/de/kdf +@dirrm share/doc/HTML/de/kdesvn-build @dirrm share/doc/HTML/de/kdesu @dirrm share/doc/HTML/de/kdeprint -@dirrm share/doc/HTML/de/kdelirc/kcmlirc -@dirrm share/doc/HTML/de/kdelirc/irkick -@dirrm share/doc/HTML/de/kdelirc @dirrm share/doc/HTML/de/kdelibs @dirrm share/doc/HTML/de/kdebugdialog @dirrm share/doc/HTML/de/kdcop @@ -2532,6 +2610,7 @@ share/locale/de/flag.png @dirrm share/doc/HTML/de/kcontrol/arts @dirrm share/doc/HTML/de/kcontrol @dirrm share/doc/HTML/de/kcoloredit +@dirrm share/doc/HTML/de/kcmlirc @dirrm share/doc/HTML/de/kcharselect @dirrm share/doc/HTML/de/kcalc @dirrm share/doc/HTML/de/kcachegrind @@ -2547,14 +2626,17 @@ share/locale/de/flag.png @dirrm share/doc/HTML/de/kate @dirrm share/doc/HTML/de/kasteroids @dirrm share/doc/HTML/de/karm +@dirrm share/doc/HTML/de/kapptemplate @dirrm share/doc/HTML/de/kappfinder @dirrm share/doc/HTML/de/kandy +@dirrm share/doc/HTML/de/kanagram @dirrm share/doc/HTML/de/kamera @dirrm share/doc/HTML/de/kalzium @dirrm share/doc/HTML/de/kalarm @dirrm share/doc/HTML/de/kaddressbook @dirrm share/doc/HTML/de/kaboodle @dirrm share/doc/HTML/de/juk +@dirrm share/doc/HTML/de/irkick @dirrm share/doc/HTML/de/docs/common @dirrm share/doc/HTML/de/docs @dirrm share/doc/HTML/de/cervisia @@ -2563,7 +2645,6 @@ share/locale/de/flag.png @dirrm share/doc/HTML/de/artsbuilder @dirrm share/doc/HTML/de/ark @dirrm share/doc/HTML/de/amor -@dirrm share/doc/HTML/de/akregator @dirrm share/doc/HTML/de/KRegExpEditor @dirrm share/apps/kturtle/examples/de_DE @dirrm share/apps/kturtle/examples @@ -2579,3 +2660,6 @@ share/locale/de/flag.png @dirrm share/apps/khangman/data/de @dirrm share/apps/khangman/data @dirrm share/apps/khangman +@dirrm share/apps/kanagram/data/de +@dirrm share/apps/kanagram/data +@dirrm share/apps/kanagram diff --git a/german/kde4-l10n/distinfo b/german/kde4-l10n/distinfo index 7ca53a0c4233..8ff68d0f9f30 100644 --- a/german/kde4-l10n/distinfo +++ b/german/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-de-3.5.5.tar.bz2) = a99bf0e5d298fce191ad2c938af3afdb -SHA256 (KDE/kde-i18n/kde-i18n-de-3.5.5.tar.bz2) = b50ee614bc6045ba3b7e2508fcd1213c0d2c45b31a6da9e50513a6aff0a66d80 -SIZE (KDE/kde-i18n/kde-i18n-de-3.5.5.tar.bz2) = 23235722 +MD5 (KDE/kde-i18n/kde-i18n-de-3.5.6.tar.bz2) = c8a52e825c610ae5779ef84d1bf7e3c5 +SHA256 (KDE/kde-i18n/kde-i18n-de-3.5.6.tar.bz2) = 3353e95810f4c65bc55b1150a3a60baddaa9b85041005a4c45574d9bbeed0f08 +SIZE (KDE/kde-i18n/kde-i18n-de-3.5.6.tar.bz2) = 23483986 diff --git a/german/kde4-l10n/pkg-plist b/german/kde4-l10n/pkg-plist index ec3a7321ed84..92914cfb1cd5 100644 --- a/german/kde4-l10n/pkg-plist +++ b/german/kde4-l10n/pkg-plist @@ -1,3 +1,6 @@ +share/apps/kanagram/data/de/hauptstaedte.kvtml +share/apps/kanagram/data/de/personen.kvtml +share/apps/kanagram/data/de/tiere.kvtml share/apps/katepart/syntax/logohighlightstyle.de_DE.xml share/apps/khangman/data/de/animals.kvtml share/apps/khangman/data/de/easy.kvtml @@ -95,9 +98,6 @@ share/apps/kturtle/examples/de_DE/zufallsname.logo share/doc/HTML/de/KRegExpEditor/common share/doc/HTML/de/KRegExpEditor/index.cache.bz2 share/doc/HTML/de/KRegExpEditor/index.docbook -share/doc/HTML/de/akregator/common -share/doc/HTML/de/akregator/index.cache.bz2 -share/doc/HTML/de/akregator/index.docbook share/doc/HTML/de/amor/common share/doc/HTML/de/amor/index.cache.bz2 share/doc/HTML/de/amor/index.docbook @@ -147,6 +147,9 @@ share/doc/HTML/de/docs/common/gpl-translated.html share/doc/HTML/de/docs/common/kde-localised.css share/doc/HTML/de/docs/common/lgpl-translated.html share/doc/HTML/de/docs/common/logotp3.png +share/doc/HTML/de/irkick/common +share/doc/HTML/de/irkick/index.cache.bz2 +share/doc/HTML/de/irkick/index.docbook share/doc/HTML/de/juk/common share/doc/HTML/de/juk/history-playlist.png share/doc/HTML/de/juk/index.cache.bz2 @@ -200,10 +203,14 @@ share/doc/HTML/de/kalzium/timeline.png share/doc/HTML/de/kamera/common share/doc/HTML/de/kamera/index.cache.bz2 share/doc/HTML/de/kamera/index.docbook +share/doc/HTML/de/kanagram/common +share/doc/HTML/de/kanagram/index.cache.bz2 +share/doc/HTML/de/kanagram/index.docbook share/doc/HTML/de/kandy/common share/doc/HTML/de/kandy/index.cache.bz2 share/doc/HTML/de/kandy/index.docbook share/doc/HTML/de/kappfinder/man-kappfinder.1.docbook +share/doc/HTML/de/kapptemplate/man-kapptemplate.1.docbook share/doc/HTML/de/karm/common share/doc/HTML/de/karm/copy-this-task.png share/doc/HTML/de/karm/csvexport.png @@ -249,8 +256,12 @@ share/doc/HTML/de/katomic/common share/doc/HTML/de/katomic/index.cache.bz2 share/doc/HTML/de/katomic/index.docbook share/doc/HTML/de/kbabel/catman.docbook +share/doc/HTML/de/kbabel/common +share/doc/HTML/de/kbabel/dictionaries.docbook share/doc/HTML/de/kbabel/faq.docbook share/doc/HTML/de/kbabel/glossary.docbook +share/doc/HTML/de/kbabel/index.cache.bz2 +share/doc/HTML/de/kbabel/index.docbook share/doc/HTML/de/kbabel/kbabeldict.docbook share/doc/HTML/de/kbabel/man-catalogmanager.1.docbook share/doc/HTML/de/kbabel/menu.docbook @@ -288,12 +299,16 @@ share/doc/HTML/de/kbugbuster/index.docbook share/doc/HTML/de/kcachegrind/common share/doc/HTML/de/kcachegrind/index.cache.bz2 share/doc/HTML/de/kcachegrind/index.docbook +share/doc/HTML/de/kcalc/commands.docbook share/doc/HTML/de/kcalc/common share/doc/HTML/de/kcalc/index.cache.bz2 share/doc/HTML/de/kcalc/index.docbook share/doc/HTML/de/kcharselect/common share/doc/HTML/de/kcharselect/index.cache.bz2 share/doc/HTML/de/kcharselect/index.docbook +share/doc/HTML/de/kcmlirc/common +share/doc/HTML/de/kcmlirc/index.cache.bz2 +share/doc/HTML/de/kcmlirc/index.docbook share/doc/HTML/de/kcoloredit/common share/doc/HTML/de/kcoloredit/index.cache.bz2 share/doc/HTML/de/kcoloredit/index.docbook @@ -480,12 +495,6 @@ share/doc/HTML/de/kdelibs/man-dcop.1.docbook share/doc/HTML/de/kdelibs/man-kbuildsycoca.8.docbook share/doc/HTML/de/kdelibs/man-kdeoptions.7.docbook share/doc/HTML/de/kdelibs/man-qtoptions.7.docbook -share/doc/HTML/de/kdelirc/irkick/common -share/doc/HTML/de/kdelirc/irkick/index.cache.bz2 -share/doc/HTML/de/kdelirc/irkick/index.docbook -share/doc/HTML/de/kdelirc/kcmlirc/common -share/doc/HTML/de/kdelirc/kcmlirc/index.cache.bz2 -share/doc/HTML/de/kdelirc/kcmlirc/index.docbook share/doc/HTML/de/kdeprint/add-printer-wiz.docbook share/doc/HTML/de/kdeprint/common share/doc/HTML/de/kdeprint/cups-config.docbook @@ -507,6 +516,9 @@ share/doc/HTML/de/kdesu/common share/doc/HTML/de/kdesu/index.cache.bz2 share/doc/HTML/de/kdesu/index.docbook share/doc/HTML/de/kdesu/man-kdesu.1.docbook +share/doc/HTML/de/kdesvn-build/common +share/doc/HTML/de/kdesvn-build/index.cache.bz2 +share/doc/HTML/de/kdesvn-build/index.docbook share/doc/HTML/de/kdf/common share/doc/HTML/de/kdf/index.cache.bz2 share/doc/HTML/de/kdf/index.docbook @@ -533,6 +545,7 @@ share/doc/HTML/de/keduca/common share/doc/HTML/de/keduca/index.cache.bz2 share/doc/HTML/de/keduca/index.docbook share/doc/HTML/de/keduca/man-keduca.1.docbook +share/doc/HTML/de/keduca/man-keducabuilder.1.docbook share/doc/HTML/de/keduca/screenshot.png share/doc/HTML/de/kenolaba/common share/doc/HTML/de/kenolaba/index.cache.bz2 @@ -581,6 +594,9 @@ share/doc/HTML/de/kfouleggs/index.docbook share/doc/HTML/de/kgamma/common share/doc/HTML/de/kgamma/index.cache.bz2 share/doc/HTML/de/kgamma/index.docbook +share/doc/HTML/de/kgeography/common +share/doc/HTML/de/kgeography/index.cache.bz2 +share/doc/HTML/de/kgeography/index.docbook share/doc/HTML/de/kget/common share/doc/HTML/de/kget/index.cache.bz2 share/doc/HTML/de/kget/index.docbook @@ -614,6 +630,7 @@ share/doc/HTML/de/khangman/index.cache.bz2 share/doc/HTML/de/khangman/index.docbook share/doc/HTML/de/khangman/khangman1.png share/doc/HTML/de/khangman/khangman2.png +share/doc/HTML/de/khangman/man-khangman.6.docbook share/doc/HTML/de/khangman/normalsettings.png share/doc/HTML/de/khelpcenter/common share/doc/HTML/de/khelpcenter/contact.docbook @@ -660,6 +677,7 @@ share/doc/HTML/de/khelpcenter/userguide/common share/doc/HTML/de/khelpcenter/userguide/control-center.docbook share/doc/HTML/de/khelpcenter/userguide/creating-graphics.docbook share/doc/HTML/de/khelpcenter/userguide/credits-and-license.docbook +share/doc/HTML/de/khelpcenter/userguide/customizing-desktop.docbook share/doc/HTML/de/khelpcenter/userguide/email.docbook share/doc/HTML/de/khelpcenter/userguide/extragear-applications.docbook share/doc/HTML/de/khelpcenter/userguide/file-sharing.docbook @@ -708,6 +726,23 @@ share/doc/HTML/de/khelpcenter/userguide/your-kde-account.docbook share/doc/HTML/de/khelpcenter/visualdict/common share/doc/HTML/de/khelpcenter/visualdict/index.cache.bz2 share/doc/HTML/de/khelpcenter/visualdict/index.docbook +share/doc/HTML/de/khelpcenter/visualdict/pict1.png +share/doc/HTML/de/khelpcenter/visualdict/pict10.png +share/doc/HTML/de/khelpcenter/visualdict/pict11.png +share/doc/HTML/de/khelpcenter/visualdict/pict12.png +share/doc/HTML/de/khelpcenter/visualdict/pict13.png +share/doc/HTML/de/khelpcenter/visualdict/pict14.png +share/doc/HTML/de/khelpcenter/visualdict/pict16.png +share/doc/HTML/de/khelpcenter/visualdict/pict19.png +share/doc/HTML/de/khelpcenter/visualdict/pict20.png +share/doc/HTML/de/khelpcenter/visualdict/pict21.png +share/doc/HTML/de/khelpcenter/visualdict/pict22.png +share/doc/HTML/de/khelpcenter/visualdict/pict23.png +share/doc/HTML/de/khelpcenter/visualdict/pict4.png +share/doc/HTML/de/khelpcenter/visualdict/pict5.png +share/doc/HTML/de/khelpcenter/visualdict/pict6.png +share/doc/HTML/de/khelpcenter/visualdict/pict7.png +share/doc/HTML/de/khelpcenter/visualdict/pict8.png share/doc/HTML/de/khelpcenter/welcome.docbook share/doc/HTML/de/khelpcenter/whatiskde.docbook share/doc/HTML/de/khexedit/common @@ -738,6 +773,7 @@ share/doc/HTML/de/kig/index.cache.bz2 share/doc/HTML/de/kig/index.docbook share/doc/HTML/de/kig/macro_wizard.png share/doc/HTML/de/kig/macros_at_work.png +share/doc/HTML/de/kig/man-kig.1.docbook share/doc/HTML/de/kig/script_wizard.png share/doc/HTML/de/kig/script_wizard_entering_code.png share/doc/HTML/de/kig/selecting_objects.png @@ -1235,6 +1271,7 @@ share/doc/HTML/de/kpf/common share/doc/HTML/de/kpf/index.cache.bz2 share/doc/HTML/de/kpf/index.docbook share/doc/HTML/de/kpilot/common +share/doc/HTML/de/kpilot/faq.docbook share/doc/HTML/de/kpilot/index.cache.bz2 share/doc/HTML/de/kpilot/index.docbook share/doc/HTML/de/kpoker/common @@ -1417,6 +1454,7 @@ share/doc/HTML/de/kstars/ellipticalgalaxies.docbook share/doc/HTML/de/kstars/equinox.docbook share/doc/HTML/de/kstars/faq.docbook share/doc/HTML/de/kstars/find.png +share/doc/HTML/de/kstars/fitsviewer.docbook share/doc/HTML/de/kstars/flux.docbook share/doc/HTML/de/kstars/fovdialog.png share/doc/HTML/de/kstars/geocoords.docbook @@ -1438,6 +1476,16 @@ share/doc/HTML/de/kstars/leapyear.docbook share/doc/HTML/de/kstars/lightcurves.docbook share/doc/HTML/de/kstars/luminosity.docbook share/doc/HTML/de/kstars/magnitude.docbook +share/doc/HTML/de/kstars/man-celestrongps.1.docbook +share/doc/HTML/de/kstars/man-fliccd.1.docbook +share/doc/HTML/de/kstars/man-indiserver.1.docbook +share/doc/HTML/de/kstars/man-lx200_16.1.docbook +share/doc/HTML/de/kstars/man-lx200autostar.1.docbook +share/doc/HTML/de/kstars/man-lx200classic.1.docbook +share/doc/HTML/de/kstars/man-lx200generic.1.docbook +share/doc/HTML/de/kstars/man-temma.1.docbook +share/doc/HTML/de/kstars/man-v4ldriver.1.docbook +share/doc/HTML/de/kstars/man-v4lphilips.1.docbook share/doc/HTML/de/kstars/meridian.docbook share/doc/HTML/de/kstars/newfov.png share/doc/HTML/de/kstars/observinglist.docbook @@ -1475,14 +1523,19 @@ share/doc/HTML/de/ktalkd/common share/doc/HTML/de/ktalkd/index.cache.bz2 share/doc/HTML/de/ktalkd/index.docbook share/doc/HTML/de/kteatime/common +share/doc/HTML/de/kteatime/config.png share/doc/HTML/de/kteatime/index.cache.bz2 share/doc/HTML/de/kteatime/index.docbook share/doc/HTML/de/ktimer/common share/doc/HTML/de/ktimer/index.cache.bz2 share/doc/HTML/de/ktimer/index.docbook +share/doc/HTML/de/ktnef/common +share/doc/HTML/de/ktnef/index.cache.bz2 +share/doc/HTML/de/ktnef/index.docbook share/doc/HTML/de/ktouch/common share/doc/HTML/de/ktouch/index.cache.bz2 share/doc/HTML/de/ktouch/index.docbook +share/doc/HTML/de/ktouch/man-ktouch.1.docbook share/doc/HTML/de/ktouch/screenshot1.png share/doc/HTML/de/ktouch/screenshot2.png share/doc/HTML/de/ktouch/screenshot3.png @@ -1706,6 +1759,28 @@ share/doc/HTML/de/quanta/quanta-menus.docbook share/doc/HTML/de/quanta/quanta-projects.docbook share/doc/HTML/de/quanta/working-with-quanta.docbook share/doc/HTML/de/scripts/man-adddebug.1.docbook +share/doc/HTML/de/scripts/man-cheatmake.1.docbook +share/doc/HTML/de/scripts/man-create_cvsignore.1.docbook +share/doc/HTML/de/scripts/man-create_makefile.1.docbook +share/doc/HTML/de/scripts/man-create_makefiles.1.docbook +share/doc/HTML/de/scripts/man-cvscheck.1.docbook +share/doc/HTML/de/scripts/man-cvslastchange.1.docbook +share/doc/HTML/de/scripts/man-cvslastlog.1.docbook +share/doc/HTML/de/scripts/man-cvsrevertlast.1.docbook +share/doc/HTML/de/scripts/man-cxxmetric.1.docbook +share/doc/HTML/de/scripts/man-demangle.1.docbook +share/doc/HTML/de/scripts/man-extend_dmalloc.1.docbook +share/doc/HTML/de/scripts/man-extractrc.1.docbook +share/doc/HTML/de/scripts/man-fixincludes.1.docbook +share/doc/HTML/de/scripts/man-po2xml.1.docbook +share/doc/HTML/de/scripts/man-pruneemptydirs.1.docbook +share/doc/HTML/de/scripts/man-qtdoc.1.docbook +share/doc/HTML/de/scripts/man-reportview.1.docbook +share/doc/HTML/de/scripts/man-split2po.1.docbook +share/doc/HTML/de/scripts/man-swappo.1.docbook +share/doc/HTML/de/scripts/man-transxx.1.docbook +share/doc/HTML/de/scripts/man-xml2pot.1.docbook +share/doc/HTML/de/scripts/man-zonetab2pot.1.docbook share/doc/HTML/de/superkaramba/common share/doc/HTML/de/superkaramba/index.cache.bz2 share/doc/HTML/de/superkaramba/index.docbook @@ -2013,6 +2088,7 @@ share/locale/de/LC_MESSAGES/khotkeys.mo share/locale/de/LC_MESSAGES/khtmlkttsd.mo share/locale/de/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/de/LC_MESSAGES/kicker.mo +share/locale/de/LC_MESSAGES/kickermenu_kate.mo share/locale/de/LC_MESSAGES/kiconedit.mo share/locale/de/LC_MESSAGES/kig.mo share/locale/de/LC_MESSAGES/kimagemapeditor.mo @@ -2050,6 +2126,7 @@ share/locale/de/LC_MESSAGES/kio_thumbnail.mo share/locale/de/LC_MESSAGES/kio_trash.mo share/locale/de/LC_MESSAGES/kio_zeroconf.mo share/locale/de/LC_MESSAGES/kioexec.mo +share/locale/de/LC_MESSAGES/kitchensync.mo share/locale/de/LC_MESSAGES/kiten.mo share/locale/de/LC_MESSAGES/kjobviewer.mo share/locale/de/LC_MESSAGES/kjots.mo @@ -2253,6 +2330,7 @@ share/locale/de/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/de/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/de/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/de/LC_MESSAGES/libkickermenu_tom.mo +share/locale/de/LC_MESSAGES/libkitchensync.mo share/locale/de/LC_MESSAGES/libkleopatra.mo share/locale/de/LC_MESSAGES/libkmime.mo share/locale/de/LC_MESSAGES/libkonq.mo @@ -2331,6 +2409,7 @@ share/locale/de/flag.png @dirrm share/doc/HTML/de/kttsd @dirrm share/doc/HTML/de/ktron @dirrm share/doc/HTML/de/ktouch +@dirrm share/doc/HTML/de/ktnef @dirrm share/doc/HTML/de/ktimer @dirrm share/doc/HTML/de/kteatime @dirrm share/doc/HTML/de/ktalkd @@ -2457,6 +2536,7 @@ share/locale/de/flag.png @dirrm share/doc/HTML/de/kgoldrunner @dirrm share/doc/HTML/de/kghostview @dirrm share/doc/HTML/de/kget +@dirrm share/doc/HTML/de/kgeography @dirrm share/doc/HTML/de/kgamma @dirrm share/doc/HTML/de/kfouleggs @dirrm share/doc/HTML/de/kfloppy @@ -2469,11 +2549,9 @@ share/locale/de/flag.png @dirrm share/doc/HTML/de/kdm @dirrm share/doc/HTML/de/kdict @dirrm share/doc/HTML/de/kdf +@dirrm share/doc/HTML/de/kdesvn-build @dirrm share/doc/HTML/de/kdesu @dirrm share/doc/HTML/de/kdeprint -@dirrm share/doc/HTML/de/kdelirc/kcmlirc -@dirrm share/doc/HTML/de/kdelirc/irkick -@dirrm share/doc/HTML/de/kdelirc @dirrm share/doc/HTML/de/kdelibs @dirrm share/doc/HTML/de/kdebugdialog @dirrm share/doc/HTML/de/kdcop @@ -2532,6 +2610,7 @@ share/locale/de/flag.png @dirrm share/doc/HTML/de/kcontrol/arts @dirrm share/doc/HTML/de/kcontrol @dirrm share/doc/HTML/de/kcoloredit +@dirrm share/doc/HTML/de/kcmlirc @dirrm share/doc/HTML/de/kcharselect @dirrm share/doc/HTML/de/kcalc @dirrm share/doc/HTML/de/kcachegrind @@ -2547,14 +2626,17 @@ share/locale/de/flag.png @dirrm share/doc/HTML/de/kate @dirrm share/doc/HTML/de/kasteroids @dirrm share/doc/HTML/de/karm +@dirrm share/doc/HTML/de/kapptemplate @dirrm share/doc/HTML/de/kappfinder @dirrm share/doc/HTML/de/kandy +@dirrm share/doc/HTML/de/kanagram @dirrm share/doc/HTML/de/kamera @dirrm share/doc/HTML/de/kalzium @dirrm share/doc/HTML/de/kalarm @dirrm share/doc/HTML/de/kaddressbook @dirrm share/doc/HTML/de/kaboodle @dirrm share/doc/HTML/de/juk +@dirrm share/doc/HTML/de/irkick @dirrm share/doc/HTML/de/docs/common @dirrm share/doc/HTML/de/docs @dirrm share/doc/HTML/de/cervisia @@ -2563,7 +2645,6 @@ share/locale/de/flag.png @dirrm share/doc/HTML/de/artsbuilder @dirrm share/doc/HTML/de/ark @dirrm share/doc/HTML/de/amor -@dirrm share/doc/HTML/de/akregator @dirrm share/doc/HTML/de/KRegExpEditor @dirrm share/apps/kturtle/examples/de_DE @dirrm share/apps/kturtle/examples @@ -2579,3 +2660,6 @@ share/locale/de/flag.png @dirrm share/apps/khangman/data/de @dirrm share/apps/khangman/data @dirrm share/apps/khangman +@dirrm share/apps/kanagram/data/de +@dirrm share/apps/kanagram/data +@dirrm share/apps/kanagram diff --git a/german/koffice-i18n/Makefile b/german/koffice-i18n/Makefile index 2755f853e1ca..494feefdc028 100644 --- a/german/koffice-i18n/Makefile +++ b/german/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= german kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/german/koffice-i18n/distinfo b/german/koffice-i18n/distinfo index 20b79849be3b..9406f22763cf 100644 --- a/german/koffice-i18n/distinfo +++ b/german/koffice-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-de-1.6.1.tar.bz2) = 9ec1030ec8f55b4689a4664a3032050d -SHA256 (KDE/kde-i18n/koffice-l10n-de-1.6.1.tar.bz2) = 54e661582f985092e171e5a7fde9397f123a2fc4764af507612050b8d760bc40 -SIZE (KDE/kde-i18n/koffice-l10n-de-1.6.1.tar.bz2) = 4402474 +MD5 (KDE/kde-i18n/koffice-l10n-de-1.6.2.tar.bz2) = 3cf83fceb1caff5ba1c5bcad31a7df81 +SHA256 (KDE/kde-i18n/koffice-l10n-de-1.6.2.tar.bz2) = 9e897fafb029a04d7a96c6489b4cf7ff0bb59af73c6785b27354ec683ce5b18b +SIZE (KDE/kde-i18n/koffice-l10n-de-1.6.2.tar.bz2) = 7168089 diff --git a/german/koffice-i18n/pkg-plist b/german/koffice-i18n/pkg-plist index 32270fbc27d7..d3dab2ec3557 100644 --- a/german/koffice-i18n/pkg-plist +++ b/german/koffice-i18n/pkg-plist @@ -32,7 +32,21 @@ share/doc/HTML/de/kchart/kchart-wizard3.png share/doc/HTML/de/kchart/kchart-wizard4.png share/doc/HTML/de/kchart/shortcut.png share/doc/HTML/de/kchart/toolbars.png +share/doc/HTML/de/kexi/basics.docbook +share/doc/HTML/de/kexi/building.docbook +share/doc/HTML/de/kexi/common +share/doc/HTML/de/kexi/comparing.docbook +share/doc/HTML/de/kexi/configuration.docbook share/doc/HTML/de/kexi/credits.docbook +share/doc/HTML/de/kexi/database.docbook +share/doc/HTML/de/kexi/designingforms.docbook +share/doc/HTML/de/kexi/enteringdataintotables.docbook +share/doc/HTML/de/kexi/enteringdatausingforms.docbook +share/doc/HTML/de/kexi/index.cache.bz2 +share/doc/HTML/de/kexi/index.docbook +share/doc/HTML/de/kexi/intro.docbook +share/doc/HTML/de/kexi/menus.docbook +share/doc/HTML/de/kexi/querydesigning.docbook share/doc/HTML/de/kformula/ambiguous-string.png share/doc/HTML/de/kformula/common share/doc/HTML/de/kformula/green1.png @@ -65,6 +79,15 @@ share/doc/HTML/de/koffice/index.docbook share/doc/HTML/de/koshell/common share/doc/HTML/de/koshell/index.cache.bz2 share/doc/HTML/de/koshell/index.docbook +share/doc/HTML/de/kplato/commands.docbook +share/doc/HTML/de/kplato/common +share/doc/HTML/de/kplato/definitions.docbook +share/doc/HTML/de/kplato/index.cache.bz2 +share/doc/HTML/de/kplato/index.docbook +share/doc/HTML/de/kplato/mainwindow.docbook +share/doc/HTML/de/kplato/options.docbook +share/doc/HTML/de/kplato/wbs.docbook +share/doc/HTML/de/kpresenter/a11y.docbook share/doc/HTML/de/kpresenter/common share/doc/HTML/de/kpresenter/faq.docbook share/doc/HTML/de/kpresenter/great-presentations.docbook @@ -75,10 +98,97 @@ share/doc/HTML/de/kpresenter/menus.docbook share/doc/HTML/de/kpresenter/options.docbook share/doc/HTML/de/kpresenter/screen.docbook share/doc/HTML/de/kpresenter/tutorial.docbook +share/doc/HTML/de/krita/commands-dialogs.docbook +share/doc/HTML/de/krita/commands-menus.docbook +share/doc/HTML/de/krita/commands-palettes.docbook +share/doc/HTML/de/krita/commands-toolbars.docbook share/doc/HTML/de/krita/commands.docbook +share/doc/HTML/de/krita/common +share/doc/HTML/de/krita/createdocument.png share/doc/HTML/de/krita/credits.docbook +share/doc/HTML/de/krita/developers-plugins.docbook +share/doc/HTML/de/krita/developers-scripting.docbook share/doc/HTML/de/krita/developers.docbook +share/doc/HTML/de/krita/dialogs-addpalette.png +share/doc/HTML/de/krita/dialogs-blur.png +share/doc/HTML/de/krita/dialogs-brightnesscontrast.png +share/doc/HTML/de/krita/dialogs-bumpmap.png +share/doc/HTML/de/krita/dialogs-coloradjustment.png +share/doc/HTML/de/krita/dialogs-colorrange.png +share/doc/HTML/de/krita/dialogs-colortoalpha.png +share/doc/HTML/de/krita/dialogs-colortransfer.png +share/doc/HTML/de/krita/dialogs-convertimagetype.png +share/doc/HTML/de/krita/dialogs-convertlayertype.png +share/doc/HTML/de/krita/dialogs-customconvolution.png +share/doc/HTML/de/krita/dialogs-documentinformation.png +share/doc/HTML/de/krita/dialogs-dropshadow.png +share/doc/HTML/de/krita/dialogs-emboss.png +share/doc/HTML/de/krita/dialogs-filtersgallery.png +share/doc/HTML/de/krita/dialogs-gaussiannoise.png +share/doc/HTML/de/krita/dialogs-imageproperties.png +share/doc/HTML/de/krita/dialogs-imagerestoration.png +share/doc/HTML/de/krita/dialogs-imagesize.png +share/doc/HTML/de/krita/dialogs-layerproperties.png +share/doc/HTML/de/krita/dialogs-layersize.png +share/doc/HTML/de/krita/dialogs-lenscorrection.png +share/doc/HTML/de/krita/dialogs-newlayer.png +share/doc/HTML/de/krita/dialogs-oilpaint.png +share/doc/HTML/de/krita/dialogs-pixelize.png +share/doc/HTML/de/krita/dialogs-raindrops.png +share/doc/HTML/de/krita/dialogs-randomnoise.png +share/doc/HTML/de/krita/dialogs-randompick.png +share/doc/HTML/de/krita/dialogs-rotateimage.png +share/doc/HTML/de/krita/dialogs-rotatelayer.png +share/doc/HTML/de/krita/dialogs-separateimage.png +share/doc/HTML/de/krita/dialogs-shearimage.png +share/doc/HTML/de/krita/dialogs-shearlayer.png +share/doc/HTML/de/krita/dialogs-smalltiles.png +share/doc/HTML/de/krita/dialogs-sobel.png +share/doc/HTML/de/krita/dialogs-substrate.png +share/doc/HTML/de/krita/dialogs-unsharpmask.png +share/doc/HTML/de/krita/dialogs-wave.png +share/doc/HTML/de/krita/dialogs-waveletnoise.png +share/doc/HTML/de/krita/faq.docbook +share/doc/HTML/de/krita/index.cache.bz2 +share/doc/HTML/de/krita/index.docbook share/doc/HTML/de/krita/installation.docbook +share/doc/HTML/de/krita/introduction.docbook +share/doc/HTML/de/krita/mainscreen.png +share/doc/HTML/de/krita/newimage.png +share/doc/HTML/de/krita/palettes-controlbox-brush.png +share/doc/HTML/de/krita/palettes-controlbox-colorpicker.png +share/doc/HTML/de/krita/palettes-controlbox-contiguousfill.png +share/doc/HTML/de/krita/palettes-controlbox-crop.png +share/doc/HTML/de/krita/palettes-controlbox-duplicate.png +share/doc/HTML/de/krita/palettes-controlbox-gradient.png +share/doc/HTML/de/krita/palettes-controlbox-line.png +share/doc/HTML/de/krita/palettes-controlbox-paintwithfilters.png +share/doc/HTML/de/krita/palettes-controlbox-rectangle.png +share/doc/HTML/de/krita/palettes-controlbox-select.png +share/doc/HTML/de/krita/palettes-controlbox-selectcontiguous.png +share/doc/HTML/de/krita/palettes-controlbox-selectmagnetic.png +share/doc/HTML/de/krita/palettes-controlbox-star.png +share/doc/HTML/de/krita/palettes-controlbox-text.png +share/doc/HTML/de/krita/preferences-color.png +share/doc/HTML/de/krita/preferences-display.png +share/doc/HTML/de/krita/preferences-general.png +share/doc/HTML/de/krita/preferences-grid.png +share/doc/HTML/de/krita/preferences-performance.png +share/doc/HTML/de/krita/preferences-sidebar.png +share/doc/HTML/de/krita/preferences-tablet.png +share/doc/HTML/de/krita/settings.docbook +share/doc/HTML/de/krita/toolbar-brushesandstuff.png +share/doc/HTML/de/krita/tutorial-quick-starts.docbook +share/doc/HTML/de/krita/tutorial-select-layer.docbook +share/doc/HTML/de/krita/tutorial-starting.docbook +share/doc/HTML/de/krita/tutorial-tablet.docbook +share/doc/HTML/de/krita/tutorial.docbook +share/doc/HTML/de/krita/using-colorspaces.docbook +share/doc/HTML/de/krita/using-filters.docbook +share/doc/HTML/de/krita/using-images.docbook +share/doc/HTML/de/krita/using-layers.docbook +share/doc/HTML/de/krita/using-selections.docbook +share/doc/HTML/de/krita/using-views.docbook share/doc/HTML/de/kspread/a11y.docbook share/doc/HTML/de/kspread/advanced.docbook share/doc/HTML/de/kspread/basics.docbook @@ -251,7 +361,6 @@ share/locale/de/LC_MESSAGES/desktop_koffice.mo share/locale/de/LC_MESSAGES/example.mo share/locale/de/LC_MESSAGES/karbon.mo share/locale/de/LC_MESSAGES/kchart.mo -share/locale/de/LC_MESSAGES/kdgantt.mo share/locale/de/LC_MESSAGES/kexi.mo share/locale/de/LC_MESSAGES/kfile_abiword.mo share/locale/de/LC_MESSAGES/kfile_gnumeric.mo @@ -284,6 +393,7 @@ share/locale/de/LC_MESSAGES/thesaurus_tool.mo @dirrm share/doc/HTML/de/kspread @dirrm share/doc/HTML/de/krita @dirrm share/doc/HTML/de/kpresenter +@dirrm share/doc/HTML/de/kplato @dirrm share/doc/HTML/de/koshell @dirrm share/doc/HTML/de/koffice @dirrm share/doc/HTML/de/kivio diff --git a/german/koffice-kde4-l10n/Makefile b/german/koffice-kde4-l10n/Makefile index 2755f853e1ca..494feefdc028 100644 --- a/german/koffice-kde4-l10n/Makefile +++ b/german/koffice-kde4-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= german kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/german/koffice-kde4-l10n/distinfo b/german/koffice-kde4-l10n/distinfo index 20b79849be3b..9406f22763cf 100644 --- a/german/koffice-kde4-l10n/distinfo +++ b/german/koffice-kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-de-1.6.1.tar.bz2) = 9ec1030ec8f55b4689a4664a3032050d -SHA256 (KDE/kde-i18n/koffice-l10n-de-1.6.1.tar.bz2) = 54e661582f985092e171e5a7fde9397f123a2fc4764af507612050b8d760bc40 -SIZE (KDE/kde-i18n/koffice-l10n-de-1.6.1.tar.bz2) = 4402474 +MD5 (KDE/kde-i18n/koffice-l10n-de-1.6.2.tar.bz2) = 3cf83fceb1caff5ba1c5bcad31a7df81 +SHA256 (KDE/kde-i18n/koffice-l10n-de-1.6.2.tar.bz2) = 9e897fafb029a04d7a96c6489b4cf7ff0bb59af73c6785b27354ec683ce5b18b +SIZE (KDE/kde-i18n/koffice-l10n-de-1.6.2.tar.bz2) = 7168089 diff --git a/german/koffice-kde4-l10n/pkg-plist b/german/koffice-kde4-l10n/pkg-plist index 32270fbc27d7..d3dab2ec3557 100644 --- a/german/koffice-kde4-l10n/pkg-plist +++ b/german/koffice-kde4-l10n/pkg-plist @@ -32,7 +32,21 @@ share/doc/HTML/de/kchart/kchart-wizard3.png share/doc/HTML/de/kchart/kchart-wizard4.png share/doc/HTML/de/kchart/shortcut.png share/doc/HTML/de/kchart/toolbars.png +share/doc/HTML/de/kexi/basics.docbook +share/doc/HTML/de/kexi/building.docbook +share/doc/HTML/de/kexi/common +share/doc/HTML/de/kexi/comparing.docbook +share/doc/HTML/de/kexi/configuration.docbook share/doc/HTML/de/kexi/credits.docbook +share/doc/HTML/de/kexi/database.docbook +share/doc/HTML/de/kexi/designingforms.docbook +share/doc/HTML/de/kexi/enteringdataintotables.docbook +share/doc/HTML/de/kexi/enteringdatausingforms.docbook +share/doc/HTML/de/kexi/index.cache.bz2 +share/doc/HTML/de/kexi/index.docbook +share/doc/HTML/de/kexi/intro.docbook +share/doc/HTML/de/kexi/menus.docbook +share/doc/HTML/de/kexi/querydesigning.docbook share/doc/HTML/de/kformula/ambiguous-string.png share/doc/HTML/de/kformula/common share/doc/HTML/de/kformula/green1.png @@ -65,6 +79,15 @@ share/doc/HTML/de/koffice/index.docbook share/doc/HTML/de/koshell/common share/doc/HTML/de/koshell/index.cache.bz2 share/doc/HTML/de/koshell/index.docbook +share/doc/HTML/de/kplato/commands.docbook +share/doc/HTML/de/kplato/common +share/doc/HTML/de/kplato/definitions.docbook +share/doc/HTML/de/kplato/index.cache.bz2 +share/doc/HTML/de/kplato/index.docbook +share/doc/HTML/de/kplato/mainwindow.docbook +share/doc/HTML/de/kplato/options.docbook +share/doc/HTML/de/kplato/wbs.docbook +share/doc/HTML/de/kpresenter/a11y.docbook share/doc/HTML/de/kpresenter/common share/doc/HTML/de/kpresenter/faq.docbook share/doc/HTML/de/kpresenter/great-presentations.docbook @@ -75,10 +98,97 @@ share/doc/HTML/de/kpresenter/menus.docbook share/doc/HTML/de/kpresenter/options.docbook share/doc/HTML/de/kpresenter/screen.docbook share/doc/HTML/de/kpresenter/tutorial.docbook +share/doc/HTML/de/krita/commands-dialogs.docbook +share/doc/HTML/de/krita/commands-menus.docbook +share/doc/HTML/de/krita/commands-palettes.docbook +share/doc/HTML/de/krita/commands-toolbars.docbook share/doc/HTML/de/krita/commands.docbook +share/doc/HTML/de/krita/common +share/doc/HTML/de/krita/createdocument.png share/doc/HTML/de/krita/credits.docbook +share/doc/HTML/de/krita/developers-plugins.docbook +share/doc/HTML/de/krita/developers-scripting.docbook share/doc/HTML/de/krita/developers.docbook +share/doc/HTML/de/krita/dialogs-addpalette.png +share/doc/HTML/de/krita/dialogs-blur.png +share/doc/HTML/de/krita/dialogs-brightnesscontrast.png +share/doc/HTML/de/krita/dialogs-bumpmap.png +share/doc/HTML/de/krita/dialogs-coloradjustment.png +share/doc/HTML/de/krita/dialogs-colorrange.png +share/doc/HTML/de/krita/dialogs-colortoalpha.png +share/doc/HTML/de/krita/dialogs-colortransfer.png +share/doc/HTML/de/krita/dialogs-convertimagetype.png +share/doc/HTML/de/krita/dialogs-convertlayertype.png +share/doc/HTML/de/krita/dialogs-customconvolution.png +share/doc/HTML/de/krita/dialogs-documentinformation.png +share/doc/HTML/de/krita/dialogs-dropshadow.png +share/doc/HTML/de/krita/dialogs-emboss.png +share/doc/HTML/de/krita/dialogs-filtersgallery.png +share/doc/HTML/de/krita/dialogs-gaussiannoise.png +share/doc/HTML/de/krita/dialogs-imageproperties.png +share/doc/HTML/de/krita/dialogs-imagerestoration.png +share/doc/HTML/de/krita/dialogs-imagesize.png +share/doc/HTML/de/krita/dialogs-layerproperties.png +share/doc/HTML/de/krita/dialogs-layersize.png +share/doc/HTML/de/krita/dialogs-lenscorrection.png +share/doc/HTML/de/krita/dialogs-newlayer.png +share/doc/HTML/de/krita/dialogs-oilpaint.png +share/doc/HTML/de/krita/dialogs-pixelize.png +share/doc/HTML/de/krita/dialogs-raindrops.png +share/doc/HTML/de/krita/dialogs-randomnoise.png +share/doc/HTML/de/krita/dialogs-randompick.png +share/doc/HTML/de/krita/dialogs-rotateimage.png +share/doc/HTML/de/krita/dialogs-rotatelayer.png +share/doc/HTML/de/krita/dialogs-separateimage.png +share/doc/HTML/de/krita/dialogs-shearimage.png +share/doc/HTML/de/krita/dialogs-shearlayer.png +share/doc/HTML/de/krita/dialogs-smalltiles.png +share/doc/HTML/de/krita/dialogs-sobel.png +share/doc/HTML/de/krita/dialogs-substrate.png +share/doc/HTML/de/krita/dialogs-unsharpmask.png +share/doc/HTML/de/krita/dialogs-wave.png +share/doc/HTML/de/krita/dialogs-waveletnoise.png +share/doc/HTML/de/krita/faq.docbook +share/doc/HTML/de/krita/index.cache.bz2 +share/doc/HTML/de/krita/index.docbook share/doc/HTML/de/krita/installation.docbook +share/doc/HTML/de/krita/introduction.docbook +share/doc/HTML/de/krita/mainscreen.png +share/doc/HTML/de/krita/newimage.png +share/doc/HTML/de/krita/palettes-controlbox-brush.png +share/doc/HTML/de/krita/palettes-controlbox-colorpicker.png +share/doc/HTML/de/krita/palettes-controlbox-contiguousfill.png +share/doc/HTML/de/krita/palettes-controlbox-crop.png +share/doc/HTML/de/krita/palettes-controlbox-duplicate.png +share/doc/HTML/de/krita/palettes-controlbox-gradient.png +share/doc/HTML/de/krita/palettes-controlbox-line.png +share/doc/HTML/de/krita/palettes-controlbox-paintwithfilters.png +share/doc/HTML/de/krita/palettes-controlbox-rectangle.png +share/doc/HTML/de/krita/palettes-controlbox-select.png +share/doc/HTML/de/krita/palettes-controlbox-selectcontiguous.png +share/doc/HTML/de/krita/palettes-controlbox-selectmagnetic.png +share/doc/HTML/de/krita/palettes-controlbox-star.png +share/doc/HTML/de/krita/palettes-controlbox-text.png +share/doc/HTML/de/krita/preferences-color.png +share/doc/HTML/de/krita/preferences-display.png +share/doc/HTML/de/krita/preferences-general.png +share/doc/HTML/de/krita/preferences-grid.png +share/doc/HTML/de/krita/preferences-performance.png +share/doc/HTML/de/krita/preferences-sidebar.png +share/doc/HTML/de/krita/preferences-tablet.png +share/doc/HTML/de/krita/settings.docbook +share/doc/HTML/de/krita/toolbar-brushesandstuff.png +share/doc/HTML/de/krita/tutorial-quick-starts.docbook +share/doc/HTML/de/krita/tutorial-select-layer.docbook +share/doc/HTML/de/krita/tutorial-starting.docbook +share/doc/HTML/de/krita/tutorial-tablet.docbook +share/doc/HTML/de/krita/tutorial.docbook +share/doc/HTML/de/krita/using-colorspaces.docbook +share/doc/HTML/de/krita/using-filters.docbook +share/doc/HTML/de/krita/using-images.docbook +share/doc/HTML/de/krita/using-layers.docbook +share/doc/HTML/de/krita/using-selections.docbook +share/doc/HTML/de/krita/using-views.docbook share/doc/HTML/de/kspread/a11y.docbook share/doc/HTML/de/kspread/advanced.docbook share/doc/HTML/de/kspread/basics.docbook @@ -251,7 +361,6 @@ share/locale/de/LC_MESSAGES/desktop_koffice.mo share/locale/de/LC_MESSAGES/example.mo share/locale/de/LC_MESSAGES/karbon.mo share/locale/de/LC_MESSAGES/kchart.mo -share/locale/de/LC_MESSAGES/kdgantt.mo share/locale/de/LC_MESSAGES/kexi.mo share/locale/de/LC_MESSAGES/kfile_abiword.mo share/locale/de/LC_MESSAGES/kfile_gnumeric.mo @@ -284,6 +393,7 @@ share/locale/de/LC_MESSAGES/thesaurus_tool.mo @dirrm share/doc/HTML/de/kspread @dirrm share/doc/HTML/de/krita @dirrm share/doc/HTML/de/kpresenter +@dirrm share/doc/HTML/de/kplato @dirrm share/doc/HTML/de/koshell @dirrm share/doc/HTML/de/koffice @dirrm share/doc/HTML/de/kivio diff --git a/graphics/kamera-kde4/distinfo b/graphics/kamera-kde4/distinfo index 3ec4b021f4d2..f464c51b95e6 100644 --- a/graphics/kamera-kde4/distinfo +++ b/graphics/kamera-kde4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdegraphics-3.5.5.tar.bz2) = cdbe15afc01c5da7af9557e803bbb7e6 -SHA256 (KDE/kdegraphics-3.5.5.tar.bz2) = b6706d37568686e1ca4b4bb2cf1f79c027b94a512f6fe1156b7c7b7f79336f16 -SIZE (KDE/kdegraphics-3.5.5.tar.bz2) = 7334117 +MD5 (KDE/kdegraphics-3.5.6.tar.bz2) = 79a1ffb7ae89bede1410411a30be3210 +SHA256 (KDE/kdegraphics-3.5.6.tar.bz2) = 2c397f3c524b7c465e6d9289944aa8ed2acc43c8bafb983eb3f252aba7a19a1f +SIZE (KDE/kdegraphics-3.5.6.tar.bz2) = 7332938 diff --git a/graphics/kamera/distinfo b/graphics/kamera/distinfo index 3ec4b021f4d2..f464c51b95e6 100644 --- a/graphics/kamera/distinfo +++ b/graphics/kamera/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdegraphics-3.5.5.tar.bz2) = cdbe15afc01c5da7af9557e803bbb7e6 -SHA256 (KDE/kdegraphics-3.5.5.tar.bz2) = b6706d37568686e1ca4b4bb2cf1f79c027b94a512f6fe1156b7c7b7f79336f16 -SIZE (KDE/kdegraphics-3.5.5.tar.bz2) = 7334117 +MD5 (KDE/kdegraphics-3.5.6.tar.bz2) = 79a1ffb7ae89bede1410411a30be3210 +SHA256 (KDE/kdegraphics-3.5.6.tar.bz2) = 2c397f3c524b7c465e6d9289944aa8ed2acc43c8bafb983eb3f252aba7a19a1f +SIZE (KDE/kdegraphics-3.5.6.tar.bz2) = 7332938 diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile index e316a72b0b35..abe09d60e488 100644 --- a/graphics/kdegraphics3/Makefile +++ b/graphics/kdegraphics3/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdegraphics PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src diff --git a/graphics/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo index 3ec4b021f4d2..f464c51b95e6 100644 --- a/graphics/kdegraphics3/distinfo +++ b/graphics/kdegraphics3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdegraphics-3.5.5.tar.bz2) = cdbe15afc01c5da7af9557e803bbb7e6 -SHA256 (KDE/kdegraphics-3.5.5.tar.bz2) = b6706d37568686e1ca4b4bb2cf1f79c027b94a512f6fe1156b7c7b7f79336f16 -SIZE (KDE/kdegraphics-3.5.5.tar.bz2) = 7334117 +MD5 (KDE/kdegraphics-3.5.6.tar.bz2) = 79a1ffb7ae89bede1410411a30be3210 +SHA256 (KDE/kdegraphics-3.5.6.tar.bz2) = 2c397f3c524b7c465e6d9289944aa8ed2acc43c8bafb983eb3f252aba7a19a1f +SIZE (KDE/kdegraphics-3.5.6.tar.bz2) = 7332938 diff --git a/graphics/kdegraphics3/files/patch-post-3.5.5-kdegraphics-CVE-2007-0104.diff b/graphics/kdegraphics3/files/patch-post-3.5.5-kdegraphics-CVE-2007-0104.diff deleted file mode 100644 index 092cf67f360b..000000000000 --- a/graphics/kdegraphics3/files/patch-post-3.5.5-kdegraphics-CVE-2007-0104.diff +++ /dev/null @@ -1,61 +0,0 @@ ---- kpdf/xpdf/xpdf/Catalog.cc -+++ kpdf/xpdf/xpdf/Catalog.cc -@@ -26,6 +26,12 @@ - #include "UGString.h" - #include "Catalog.h" - -+// This define is used to limit the depth of recursive readPageTree calls -+// This is needed because the page tree nodes can reference their parents -+// leaving us in an infinite loop -+// Most sane pdf documents don't have a call depth higher than 10 -+#define MAX_CALL_DEPTH 1000 -+ - //------------------------------------------------------------------------ - // Catalog - //------------------------------------------------------------------------ -@@ -76,7 +82,7 @@ Catalog::Catalog(XRef *xrefA) { - pageRefs[i].num = -1; - pageRefs[i].gen = -1; - } -- numPages = readPageTree(pagesDict.getDict(), NULL, 0); -+ numPages = readPageTree(pagesDict.getDict(), NULL, 0, 0); - if (numPages != numPages0) { - error(-1, "Page count in top-level pages object is incorrect"); - } -@@ -191,7 +197,7 @@ GString *Catalog::readMetadata() { - return s; - } - --int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start) { -+int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start, int callDepth) { - Object kids; - Object kid; - Object kidRef; -@@ -236,9 +242,13 @@ int Catalog::readPageTree(Dict *pagesDic - // This should really be isDict("Pages"), but I've seen at least one - // PDF file where the /Type entry is missing. - } else if (kid.isDict()) { -- if ((start = readPageTree(kid.getDict(), attrs1, start)) -- < 0) -- goto err2; -+ if (callDepth > MAX_CALL_DEPTH) { -+ error(-1, "Limit of %d recursive calls reached while reading the page tree. If your document is correct and not a test to try to force a crash, please report a bug.", MAX_CALL_DEPTH); -+ } else { -+ if ((start = readPageTree(kid.getDict(), attrs1, start, callDepth + 1)) -+ < 0) -+ goto err2; -+ } - } else { - error(-1, "Kid object (page %d) is wrong type (%s)", - start+1, kid.getTypeName()); ---- kpdf/xpdf/xpdf/Catalog.h -+++ kpdf/xpdf/xpdf/Catalog.h -@@ -128,7 +128,7 @@ private: - Object acroForm; // AcroForm dictionary - GBool ok; // true if catalog is valid - -- int readPageTree(Dict *pages, PageAttrs *attrs, int start); -+ int readPageTree(Dict *pages, PageAttrs *attrs, int start, int callDepth); - Object *findDestInTree(Object *tree, GString *name, Object *obj); - }; - diff --git a/graphics/kdegraphics3/files/patch-post-3.5.5-kdegraphics.diff b/graphics/kdegraphics3/files/patch-post-3.5.5-kdegraphics.diff deleted file mode 100644 index 881b81757ab4..000000000000 --- a/graphics/kdegraphics3/files/patch-post-3.5.5-kdegraphics.diff +++ /dev/null @@ -1,134 +0,0 @@ ---- kfile-plugins/jpeg/exif.h -+++ kfile-plugins/jpeg/exif.h -@@ -72,7 +72,8 @@ - int Get32s(void * Long); - unsigned Get32u(void * Long); - double ConvertAnyFormat(void * ValuePtr, int Format); -- void ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, unsigned ExifLength); -+ void ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, unsigned ExifLength, -+ unsigned NestingLevel); - void process_COM (const uchar * Data, int length); - void process_SOFn (const uchar * Data, int marker); - int Get16m(const void * Short); ---- kfile-plugins/jpeg/exif.cpp -+++ kfile-plugins/jpeg/exif.cpp -@@ -446,7 +446,7 @@ - //-------------------------------------------------------------------------- - // Process one of the nested EXIF directories. - //-------------------------------------------------------------------------- --void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, unsigned ExifLength) -+void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, unsigned ExifLength, unsigned NestingLevel) - { - int de; - int a; -@@ -454,6 +454,9 @@ - unsigned ThumbnailOffset = 0; - unsigned ThumbnailSize = 0; - -+ if ( NestingLevel > 4) -+ throw FatalError("Maximum directory nesting exceeded (corrupt exif header)"); -+ - NumDirEntries = Get16u(DirStart); - #define DIR_ENTRY_ADDR(Start, Entry) (Start+2+12*(Entry)) - -@@ -476,7 +479,7 @@ - for (de=0;de<NumDirEntries;de++){ - int Tag, Format, Components; - unsigned char * ValuePtr; -- int ByteCount; -+ unsigned ByteCount; - char * DirEntry; - DirEntry = (char *)DIR_ENTRY_ADDR(DirStart, de); - -@@ -489,6 +492,11 @@ - throw FatalError("Illegal format code in EXIF dir"); - } - -+ if ((unsigned)Components > 0x10000) { -+ throw FatalError("Illegal number of components for tag"); -+ continue; -+ } -+ - ByteCount = Components * BytesPerFormat[Format]; - - if (ByteCount > 4){ -@@ -517,11 +525,11 @@ - switch(Tag){ - - case TAG_MAKE: -- ExifData::CameraMake = QString((char*)ValuePtr); -+ ExifData::CameraMake = QString::fromLatin1((const char*)ValuePtr, 31); - break; - - case TAG_MODEL: -- ExifData::CameraModel = QString((char*)ValuePtr); -+ ExifData::CameraModel = QString::fromLatin1((const char*)ValuePtr, 39); - break; - - case TAG_ORIENTATION: -@@ -529,7 +537,7 @@ - break; - - case TAG_DATETIME_ORIGINAL: -- DateTime = QString((char*)ValuePtr); -+ DateTime = QString::fromLatin1((const char*)ValuePtr, 19); - break; - - case TAG_USERCOMMENT: -@@ -550,14 +558,12 @@ - int c; - c = (ValuePtr)[a]; - if (c != '\0' && c != ' '){ -- //strncpy(ImageInfo.Comments, (const char*)(a+ValuePtr), 199); -- UserComment.sprintf("%s", (const char*)(a+ValuePtr)); -+ UserComment = QString::fromLatin1((const char*)(a+ValuePtr), 199); - break; - } - } - }else{ -- //strncpy(ImageInfo.Comments, (const char*)ValuePtr, 199); -- UserComment.sprintf("%s", (const char*)ValuePtr); -+ UserComment = QString::fromLatin1((const char*)ValuePtr, 199); - } - break; - -@@ -676,10 +682,10 @@ - if (Tag == TAG_EXIF_OFFSET || Tag == TAG_INTEROP_OFFSET){ - unsigned char * SubdirStart; - SubdirStart = OffsetBase + Get32u(ValuePtr); -- if (SubdirStart < OffsetBase || SubdirStart > OffsetBase+ExifLength){ -+ if (SubdirStart <= OffsetBase || SubdirStart >= OffsetBase+ExifLength){ - throw FatalError("Illegal subdirectory link"); - } -- ProcessExifDir(SubdirStart, OffsetBase, ExifLength); -+ ProcessExifDir(SubdirStart, OffsetBase, ExifLength, NestingLevel+1); - continue; - } - } -@@ -709,7 +715,7 @@ - } - }else{ - if (SubdirStart <= OffsetBase+ExifLength){ -- ProcessExifDir(SubdirStart, OffsetBase, ExifLength); -+ ProcessExifDir(SubdirStart, OffsetBase, ExifLength, NestingLevel+1); - } - } - } -@@ -719,7 +725,7 @@ - } - - if (ThumbnailSize && ThumbnailOffset){ -- if (ThumbnailSize + ThumbnailOffset <= ExifLength){ -+ if (ThumbnailSize + ThumbnailOffset < ExifLength){ - // The thumbnail pointer appears to be valid. Store it. - Thumbnail.loadFromData(OffsetBase + ThumbnailOffset, ThumbnailSize, "JPEG"); - } -@@ -810,7 +816,7 @@ - LastExifRefd = CharBuf; - - // First directory starts 16 bytes in. Offsets start at 8 bytes in. -- ProcessExifDir(CharBuf+16, CharBuf+8, length-6); -+ ProcessExifDir(CharBuf+16, CharBuf+8, length-6, 0); - - // This is how far the interesting (non thumbnail) part of the exif went. - ExifSettingsLength = LastExifRefd - CharBuf; diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile index e316a72b0b35..abe09d60e488 100644 --- a/graphics/kdegraphics4/Makefile +++ b/graphics/kdegraphics4/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdegraphics PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src diff --git a/graphics/kdegraphics4/distinfo b/graphics/kdegraphics4/distinfo index 3ec4b021f4d2..f464c51b95e6 100644 --- a/graphics/kdegraphics4/distinfo +++ b/graphics/kdegraphics4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdegraphics-3.5.5.tar.bz2) = cdbe15afc01c5da7af9557e803bbb7e6 -SHA256 (KDE/kdegraphics-3.5.5.tar.bz2) = b6706d37568686e1ca4b4bb2cf1f79c027b94a512f6fe1156b7c7b7f79336f16 -SIZE (KDE/kdegraphics-3.5.5.tar.bz2) = 7334117 +MD5 (KDE/kdegraphics-3.5.6.tar.bz2) = 79a1ffb7ae89bede1410411a30be3210 +SHA256 (KDE/kdegraphics-3.5.6.tar.bz2) = 2c397f3c524b7c465e6d9289944aa8ed2acc43c8bafb983eb3f252aba7a19a1f +SIZE (KDE/kdegraphics-3.5.6.tar.bz2) = 7332938 diff --git a/graphics/kdegraphics4/files/patch-post-3.5.5-kdegraphics-CVE-2007-0104.diff b/graphics/kdegraphics4/files/patch-post-3.5.5-kdegraphics-CVE-2007-0104.diff deleted file mode 100644 index 092cf67f360b..000000000000 --- a/graphics/kdegraphics4/files/patch-post-3.5.5-kdegraphics-CVE-2007-0104.diff +++ /dev/null @@ -1,61 +0,0 @@ ---- kpdf/xpdf/xpdf/Catalog.cc -+++ kpdf/xpdf/xpdf/Catalog.cc -@@ -26,6 +26,12 @@ - #include "UGString.h" - #include "Catalog.h" - -+// This define is used to limit the depth of recursive readPageTree calls -+// This is needed because the page tree nodes can reference their parents -+// leaving us in an infinite loop -+// Most sane pdf documents don't have a call depth higher than 10 -+#define MAX_CALL_DEPTH 1000 -+ - //------------------------------------------------------------------------ - // Catalog - //------------------------------------------------------------------------ -@@ -76,7 +82,7 @@ Catalog::Catalog(XRef *xrefA) { - pageRefs[i].num = -1; - pageRefs[i].gen = -1; - } -- numPages = readPageTree(pagesDict.getDict(), NULL, 0); -+ numPages = readPageTree(pagesDict.getDict(), NULL, 0, 0); - if (numPages != numPages0) { - error(-1, "Page count in top-level pages object is incorrect"); - } -@@ -191,7 +197,7 @@ GString *Catalog::readMetadata() { - return s; - } - --int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start) { -+int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start, int callDepth) { - Object kids; - Object kid; - Object kidRef; -@@ -236,9 +242,13 @@ int Catalog::readPageTree(Dict *pagesDic - // This should really be isDict("Pages"), but I've seen at least one - // PDF file where the /Type entry is missing. - } else if (kid.isDict()) { -- if ((start = readPageTree(kid.getDict(), attrs1, start)) -- < 0) -- goto err2; -+ if (callDepth > MAX_CALL_DEPTH) { -+ error(-1, "Limit of %d recursive calls reached while reading the page tree. If your document is correct and not a test to try to force a crash, please report a bug.", MAX_CALL_DEPTH); -+ } else { -+ if ((start = readPageTree(kid.getDict(), attrs1, start, callDepth + 1)) -+ < 0) -+ goto err2; -+ } - } else { - error(-1, "Kid object (page %d) is wrong type (%s)", - start+1, kid.getTypeName()); ---- kpdf/xpdf/xpdf/Catalog.h -+++ kpdf/xpdf/xpdf/Catalog.h -@@ -128,7 +128,7 @@ private: - Object acroForm; // AcroForm dictionary - GBool ok; // true if catalog is valid - -- int readPageTree(Dict *pages, PageAttrs *attrs, int start); -+ int readPageTree(Dict *pages, PageAttrs *attrs, int start, int callDepth); - Object *findDestInTree(Object *tree, GString *name, Object *obj); - }; - diff --git a/graphics/kdegraphics4/files/patch-post-3.5.5-kdegraphics.diff b/graphics/kdegraphics4/files/patch-post-3.5.5-kdegraphics.diff deleted file mode 100644 index 881b81757ab4..000000000000 --- a/graphics/kdegraphics4/files/patch-post-3.5.5-kdegraphics.diff +++ /dev/null @@ -1,134 +0,0 @@ ---- kfile-plugins/jpeg/exif.h -+++ kfile-plugins/jpeg/exif.h -@@ -72,7 +72,8 @@ - int Get32s(void * Long); - unsigned Get32u(void * Long); - double ConvertAnyFormat(void * ValuePtr, int Format); -- void ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, unsigned ExifLength); -+ void ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, unsigned ExifLength, -+ unsigned NestingLevel); - void process_COM (const uchar * Data, int length); - void process_SOFn (const uchar * Data, int marker); - int Get16m(const void * Short); ---- kfile-plugins/jpeg/exif.cpp -+++ kfile-plugins/jpeg/exif.cpp -@@ -446,7 +446,7 @@ - //-------------------------------------------------------------------------- - // Process one of the nested EXIF directories. - //-------------------------------------------------------------------------- --void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, unsigned ExifLength) -+void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, unsigned ExifLength, unsigned NestingLevel) - { - int de; - int a; -@@ -454,6 +454,9 @@ - unsigned ThumbnailOffset = 0; - unsigned ThumbnailSize = 0; - -+ if ( NestingLevel > 4) -+ throw FatalError("Maximum directory nesting exceeded (corrupt exif header)"); -+ - NumDirEntries = Get16u(DirStart); - #define DIR_ENTRY_ADDR(Start, Entry) (Start+2+12*(Entry)) - -@@ -476,7 +479,7 @@ - for (de=0;de<NumDirEntries;de++){ - int Tag, Format, Components; - unsigned char * ValuePtr; -- int ByteCount; -+ unsigned ByteCount; - char * DirEntry; - DirEntry = (char *)DIR_ENTRY_ADDR(DirStart, de); - -@@ -489,6 +492,11 @@ - throw FatalError("Illegal format code in EXIF dir"); - } - -+ if ((unsigned)Components > 0x10000) { -+ throw FatalError("Illegal number of components for tag"); -+ continue; -+ } -+ - ByteCount = Components * BytesPerFormat[Format]; - - if (ByteCount > 4){ -@@ -517,11 +525,11 @@ - switch(Tag){ - - case TAG_MAKE: -- ExifData::CameraMake = QString((char*)ValuePtr); -+ ExifData::CameraMake = QString::fromLatin1((const char*)ValuePtr, 31); - break; - - case TAG_MODEL: -- ExifData::CameraModel = QString((char*)ValuePtr); -+ ExifData::CameraModel = QString::fromLatin1((const char*)ValuePtr, 39); - break; - - case TAG_ORIENTATION: -@@ -529,7 +537,7 @@ - break; - - case TAG_DATETIME_ORIGINAL: -- DateTime = QString((char*)ValuePtr); -+ DateTime = QString::fromLatin1((const char*)ValuePtr, 19); - break; - - case TAG_USERCOMMENT: -@@ -550,14 +558,12 @@ - int c; - c = (ValuePtr)[a]; - if (c != '\0' && c != ' '){ -- //strncpy(ImageInfo.Comments, (const char*)(a+ValuePtr), 199); -- UserComment.sprintf("%s", (const char*)(a+ValuePtr)); -+ UserComment = QString::fromLatin1((const char*)(a+ValuePtr), 199); - break; - } - } - }else{ -- //strncpy(ImageInfo.Comments, (const char*)ValuePtr, 199); -- UserComment.sprintf("%s", (const char*)ValuePtr); -+ UserComment = QString::fromLatin1((const char*)ValuePtr, 199); - } - break; - -@@ -676,10 +682,10 @@ - if (Tag == TAG_EXIF_OFFSET || Tag == TAG_INTEROP_OFFSET){ - unsigned char * SubdirStart; - SubdirStart = OffsetBase + Get32u(ValuePtr); -- if (SubdirStart < OffsetBase || SubdirStart > OffsetBase+ExifLength){ -+ if (SubdirStart <= OffsetBase || SubdirStart >= OffsetBase+ExifLength){ - throw FatalError("Illegal subdirectory link"); - } -- ProcessExifDir(SubdirStart, OffsetBase, ExifLength); -+ ProcessExifDir(SubdirStart, OffsetBase, ExifLength, NestingLevel+1); - continue; - } - } -@@ -709,7 +715,7 @@ - } - }else{ - if (SubdirStart <= OffsetBase+ExifLength){ -- ProcessExifDir(SubdirStart, OffsetBase, ExifLength); -+ ProcessExifDir(SubdirStart, OffsetBase, ExifLength, NestingLevel+1); - } - } - } -@@ -719,7 +725,7 @@ - } - - if (ThumbnailSize && ThumbnailOffset){ -- if (ThumbnailSize + ThumbnailOffset <= ExifLength){ -+ if (ThumbnailSize + ThumbnailOffset < ExifLength){ - // The thumbnail pointer appears to be valid. Store it. - Thumbnail.loadFromData(OffsetBase + ThumbnailOffset, ThumbnailSize, "JPEG"); - } -@@ -810,7 +816,7 @@ - LastExifRefd = CharBuf; - - // First directory starts 16 bytes in. Offsets start at 8 bytes in. -- ProcessExifDir(CharBuf+16, CharBuf+8, length-6); -+ ProcessExifDir(CharBuf+16, CharBuf+8, length-6, 0); - - // This is how far the interesting (non thumbnail) part of the exif went. - ExifSettingsLength = LastExifRefd - CharBuf; diff --git a/graphics/kooka/Makefile b/graphics/kooka/Makefile index 539ae36a54e7..c2b414a39eed 100644 --- a/graphics/kooka/Makefile +++ b/graphics/kooka/Makefile @@ -29,7 +29,7 @@ USE_BZIP2= yes USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes WRKSRC= ${WRKDIR}/kdegraphics-${PORTVERSION} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes pre-configure: ${ECHO_CMD} libkscan ${PORTNAME} doc > ${WRKSRC}/inst-apps diff --git a/graphics/kooka/distinfo b/graphics/kooka/distinfo index 3ec4b021f4d2..f464c51b95e6 100644 --- a/graphics/kooka/distinfo +++ b/graphics/kooka/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdegraphics-3.5.5.tar.bz2) = cdbe15afc01c5da7af9557e803bbb7e6 -SHA256 (KDE/kdegraphics-3.5.5.tar.bz2) = b6706d37568686e1ca4b4bb2cf1f79c027b94a512f6fe1156b7c7b7f79336f16 -SIZE (KDE/kdegraphics-3.5.5.tar.bz2) = 7334117 +MD5 (KDE/kdegraphics-3.5.6.tar.bz2) = 79a1ffb7ae89bede1410411a30be3210 +SHA256 (KDE/kdegraphics-3.5.6.tar.bz2) = 2c397f3c524b7c465e6d9289944aa8ed2acc43c8bafb983eb3f252aba7a19a1f +SIZE (KDE/kdegraphics-3.5.6.tar.bz2) = 7332938 diff --git a/graphics/kuickshow-kde4/Makefile b/graphics/kuickshow-kde4/Makefile index 8f1d4ecb92a5..2d31f68d4fd9 100644 --- a/graphics/kuickshow-kde4/Makefile +++ b/graphics/kuickshow-kde4/Makefile @@ -26,7 +26,7 @@ USE_BZIP2= yes USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes WRKSRC= ${WRKDIR}/kdegraphics-${PORTVERSION} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_GNOME= imlib diff --git a/graphics/kuickshow-kde4/distinfo b/graphics/kuickshow-kde4/distinfo index 3ec4b021f4d2..f464c51b95e6 100644 --- a/graphics/kuickshow-kde4/distinfo +++ b/graphics/kuickshow-kde4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdegraphics-3.5.5.tar.bz2) = cdbe15afc01c5da7af9557e803bbb7e6 -SHA256 (KDE/kdegraphics-3.5.5.tar.bz2) = b6706d37568686e1ca4b4bb2cf1f79c027b94a512f6fe1156b7c7b7f79336f16 -SIZE (KDE/kdegraphics-3.5.5.tar.bz2) = 7334117 +MD5 (KDE/kdegraphics-3.5.6.tar.bz2) = 79a1ffb7ae89bede1410411a30be3210 +SHA256 (KDE/kdegraphics-3.5.6.tar.bz2) = 2c397f3c524b7c465e6d9289944aa8ed2acc43c8bafb983eb3f252aba7a19a1f +SIZE (KDE/kdegraphics-3.5.6.tar.bz2) = 7332938 diff --git a/graphics/kuickshow/Makefile b/graphics/kuickshow/Makefile index 8f1d4ecb92a5..2d31f68d4fd9 100644 --- a/graphics/kuickshow/Makefile +++ b/graphics/kuickshow/Makefile @@ -26,7 +26,7 @@ USE_BZIP2= yes USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes WRKSRC= ${WRKDIR}/kdegraphics-${PORTVERSION} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_GNOME= imlib diff --git a/graphics/kuickshow/distinfo b/graphics/kuickshow/distinfo index 3ec4b021f4d2..f464c51b95e6 100644 --- a/graphics/kuickshow/distinfo +++ b/graphics/kuickshow/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdegraphics-3.5.5.tar.bz2) = cdbe15afc01c5da7af9557e803bbb7e6 -SHA256 (KDE/kdegraphics-3.5.5.tar.bz2) = b6706d37568686e1ca4b4bb2cf1f79c027b94a512f6fe1156b7c7b7f79336f16 -SIZE (KDE/kdegraphics-3.5.5.tar.bz2) = 7334117 +MD5 (KDE/kdegraphics-3.5.6.tar.bz2) = 79a1ffb7ae89bede1410411a30be3210 +SHA256 (KDE/kdegraphics-3.5.6.tar.bz2) = 2c397f3c524b7c465e6d9289944aa8ed2acc43c8bafb983eb3f252aba7a19a1f +SIZE (KDE/kdegraphics-3.5.6.tar.bz2) = 7332938 diff --git a/hebrew/kde3-i18n/distinfo b/hebrew/kde3-i18n/distinfo index 18b0099355f4..f9580620cccb 100644 --- a/hebrew/kde3-i18n/distinfo +++ b/hebrew/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-he-3.5.5.tar.bz2) = 2099f23192fe79f1e94c0da2184871c0 -SHA256 (KDE/kde-i18n/kde-i18n-he-3.5.5.tar.bz2) = c82ec2cc67f652612b18cb9e90e4707cdb23729198b802068b25bde7a8aa4321 -SIZE (KDE/kde-i18n/kde-i18n-he-3.5.5.tar.bz2) = 2152893 +MD5 (KDE/kde-i18n/kde-i18n-he-3.5.6.tar.bz2) = b416073a3503a01056e14107fc797dae +SHA256 (KDE/kde-i18n/kde-i18n-he-3.5.6.tar.bz2) = 510c70f6d36bf62c8a903dee34418d03d588fc113086aadfac4915706406a9bd +SIZE (KDE/kde-i18n/kde-i18n-he-3.5.6.tar.bz2) = 2157895 diff --git a/hebrew/kde3-i18n/pkg-plist b/hebrew/kde3-i18n/pkg-plist index f86601db0917..26e73b9f9751 100644 --- a/hebrew/kde3-i18n/pkg-plist +++ b/hebrew/kde3-i18n/pkg-plist @@ -286,6 +286,7 @@ share/locale/he/LC_MESSAGES/kfile_sid.mo share/locale/he/LC_MESSAGES/kfile_tga.mo share/locale/he/LC_MESSAGES/kfile_theora.mo share/locale/he/LC_MESSAGES/kfile_tiff.mo +share/locale/he/LC_MESSAGES/kfile_torrent.mo share/locale/he/LC_MESSAGES/kfile_ts.mo share/locale/he/LC_MESSAGES/kfile_txt.mo share/locale/he/LC_MESSAGES/kfile_vcf.mo @@ -343,6 +344,7 @@ share/locale/he/LC_MESSAGES/kio_smtp.mo share/locale/he/LC_MESSAGES/kio_svn.mo share/locale/he/LC_MESSAGES/kio_system.mo share/locale/he/LC_MESSAGES/kio_tar.mo +share/locale/he/LC_MESSAGES/kio_thumbnail.mo share/locale/he/LC_MESSAGES/kio_trash.mo share/locale/he/LC_MESSAGES/kioexec.mo share/locale/he/LC_MESSAGES/kjobviewer.mo diff --git a/hebrew/kde4-l10n/distinfo b/hebrew/kde4-l10n/distinfo index 18b0099355f4..f9580620cccb 100644 --- a/hebrew/kde4-l10n/distinfo +++ b/hebrew/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-he-3.5.5.tar.bz2) = 2099f23192fe79f1e94c0da2184871c0 -SHA256 (KDE/kde-i18n/kde-i18n-he-3.5.5.tar.bz2) = c82ec2cc67f652612b18cb9e90e4707cdb23729198b802068b25bde7a8aa4321 -SIZE (KDE/kde-i18n/kde-i18n-he-3.5.5.tar.bz2) = 2152893 +MD5 (KDE/kde-i18n/kde-i18n-he-3.5.6.tar.bz2) = b416073a3503a01056e14107fc797dae +SHA256 (KDE/kde-i18n/kde-i18n-he-3.5.6.tar.bz2) = 510c70f6d36bf62c8a903dee34418d03d588fc113086aadfac4915706406a9bd +SIZE (KDE/kde-i18n/kde-i18n-he-3.5.6.tar.bz2) = 2157895 diff --git a/hebrew/kde4-l10n/pkg-plist b/hebrew/kde4-l10n/pkg-plist index f86601db0917..26e73b9f9751 100644 --- a/hebrew/kde4-l10n/pkg-plist +++ b/hebrew/kde4-l10n/pkg-plist @@ -286,6 +286,7 @@ share/locale/he/LC_MESSAGES/kfile_sid.mo share/locale/he/LC_MESSAGES/kfile_tga.mo share/locale/he/LC_MESSAGES/kfile_theora.mo share/locale/he/LC_MESSAGES/kfile_tiff.mo +share/locale/he/LC_MESSAGES/kfile_torrent.mo share/locale/he/LC_MESSAGES/kfile_ts.mo share/locale/he/LC_MESSAGES/kfile_txt.mo share/locale/he/LC_MESSAGES/kfile_vcf.mo @@ -343,6 +344,7 @@ share/locale/he/LC_MESSAGES/kio_smtp.mo share/locale/he/LC_MESSAGES/kio_svn.mo share/locale/he/LC_MESSAGES/kio_system.mo share/locale/he/LC_MESSAGES/kio_tar.mo +share/locale/he/LC_MESSAGES/kio_thumbnail.mo share/locale/he/LC_MESSAGES/kio_trash.mo share/locale/he/LC_MESSAGES/kioexec.mo share/locale/he/LC_MESSAGES/kjobviewer.mo diff --git a/hungarian/kde3-i18n/distinfo b/hungarian/kde3-i18n/distinfo index cfaf8a726bf8..d0a8a94bb34b 100644 --- a/hungarian/kde3-i18n/distinfo +++ b/hungarian/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-hu-3.5.5.tar.bz2) = 9638821a380cf7a8697b03dca2f3513d -SHA256 (KDE/kde-i18n/kde-i18n-hu-3.5.5.tar.bz2) = 68726fb3261558cffa08c160c08274b7fee743ab0200769bdc6c3a2ed577317b -SIZE (KDE/kde-i18n/kde-i18n-hu-3.5.5.tar.bz2) = 2980243 +MD5 (KDE/kde-i18n/kde-i18n-hu-3.5.6.tar.bz2) = 575734a98fa2984f47adb49d6c023cc0 +SHA256 (KDE/kde-i18n/kde-i18n-hu-3.5.6.tar.bz2) = 2b0dd5807f80a7dc2d189f0ca185914e2862128fbeb59799b4cb81f8df9b75bd +SIZE (KDE/kde-i18n/kde-i18n-hu-3.5.6.tar.bz2) = 2979093 diff --git a/hungarian/kde3-i18n/pkg-plist b/hungarian/kde3-i18n/pkg-plist index 23a289effd23..0179a6816bcd 100644 --- a/hungarian/kde3-i18n/pkg-plist +++ b/hungarian/kde3-i18n/pkg-plist @@ -649,6 +649,7 @@ share/locale/hu/LC_MESSAGES/khotkeys.mo share/locale/hu/LC_MESSAGES/khtmlkttsd.mo share/locale/hu/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/hu/LC_MESSAGES/kicker.mo +share/locale/hu/LC_MESSAGES/kickermenu_kate.mo share/locale/hu/LC_MESSAGES/kiconedit.mo share/locale/hu/LC_MESSAGES/kig.mo share/locale/hu/LC_MESSAGES/kimagemapeditor.mo diff --git a/hungarian/kde4-l10n/distinfo b/hungarian/kde4-l10n/distinfo index cfaf8a726bf8..d0a8a94bb34b 100644 --- a/hungarian/kde4-l10n/distinfo +++ b/hungarian/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-hu-3.5.5.tar.bz2) = 9638821a380cf7a8697b03dca2f3513d -SHA256 (KDE/kde-i18n/kde-i18n-hu-3.5.5.tar.bz2) = 68726fb3261558cffa08c160c08274b7fee743ab0200769bdc6c3a2ed577317b -SIZE (KDE/kde-i18n/kde-i18n-hu-3.5.5.tar.bz2) = 2980243 +MD5 (KDE/kde-i18n/kde-i18n-hu-3.5.6.tar.bz2) = 575734a98fa2984f47adb49d6c023cc0 +SHA256 (KDE/kde-i18n/kde-i18n-hu-3.5.6.tar.bz2) = 2b0dd5807f80a7dc2d189f0ca185914e2862128fbeb59799b4cb81f8df9b75bd +SIZE (KDE/kde-i18n/kde-i18n-hu-3.5.6.tar.bz2) = 2979093 diff --git a/hungarian/kde4-l10n/pkg-plist b/hungarian/kde4-l10n/pkg-plist index 23a289effd23..0179a6816bcd 100644 --- a/hungarian/kde4-l10n/pkg-plist +++ b/hungarian/kde4-l10n/pkg-plist @@ -649,6 +649,7 @@ share/locale/hu/LC_MESSAGES/khotkeys.mo share/locale/hu/LC_MESSAGES/khtmlkttsd.mo share/locale/hu/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/hu/LC_MESSAGES/kicker.mo +share/locale/hu/LC_MESSAGES/kickermenu_kate.mo share/locale/hu/LC_MESSAGES/kiconedit.mo share/locale/hu/LC_MESSAGES/kig.mo share/locale/hu/LC_MESSAGES/kimagemapeditor.mo diff --git a/hungarian/koffice-i18n/Makefile b/hungarian/koffice-i18n/Makefile index e25e0b67fd35..39ee94f7a245 100644 --- a/hungarian/koffice-i18n/Makefile +++ b/hungarian/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= hungarian kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/hungarian/koffice-i18n/distinfo b/hungarian/koffice-i18n/distinfo index aa1fc0e064ee..dd986b90a4cc 100644 --- a/hungarian/koffice-i18n/distinfo +++ b/hungarian/koffice-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-hu-1.6.1.tar.bz2) = 406eef87386bea965c9d0ec224b0a6aa -SHA256 (KDE/kde-i18n/koffice-l10n-hu-1.6.1.tar.bz2) = bbb9c6dd0c8cb799469c3ce86b9fb30e4d9cb8b0566855f5899a581306d421bd -SIZE (KDE/kde-i18n/koffice-l10n-hu-1.6.1.tar.bz2) = 379271 +MD5 (KDE/kde-i18n/koffice-l10n-hu-1.6.2.tar.bz2) = 6e5789a140283e98e3240cc1ca516ce8 +SHA256 (KDE/kde-i18n/koffice-l10n-hu-1.6.2.tar.bz2) = 7ce5196894b003db64258cf0570f628313d4e11066e7d01a674b5f67d0324c54 +SIZE (KDE/kde-i18n/koffice-l10n-hu-1.6.2.tar.bz2) = 379688 diff --git a/hungarian/koffice-i18n/pkg-plist b/hungarian/koffice-i18n/pkg-plist index f8f919a9cfc4..414549d32b67 100644 --- a/hungarian/koffice-i18n/pkg-plist +++ b/hungarian/koffice-i18n/pkg-plist @@ -3,7 +3,6 @@ share/locale/hu/LC_MESSAGES/desktop_koffice.mo share/locale/hu/LC_MESSAGES/example.mo share/locale/hu/LC_MESSAGES/karbon.mo share/locale/hu/LC_MESSAGES/kchart.mo -share/locale/hu/LC_MESSAGES/kdgantt.mo share/locale/hu/LC_MESSAGES/kexi.mo share/locale/hu/LC_MESSAGES/kfile_abiword.mo share/locale/hu/LC_MESSAGES/kfile_gnumeric.mo diff --git a/japanese/kde3-i18n/distinfo b/japanese/kde3-i18n/distinfo index c42703656cc3..804ba5e1ed9f 100644 --- a/japanese/kde3-i18n/distinfo +++ b/japanese/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ja-3.5.5.tar.bz2) = 3b89aa140388f7b0e3beb80ef2b8b247 -SHA256 (KDE/kde-i18n/kde-i18n-ja-3.5.5.tar.bz2) = 8ec25e54c9d13ef78cd49f630cf8f79671027f7574c9820241976e04d6d61c4b -SIZE (KDE/kde-i18n/kde-i18n-ja-3.5.5.tar.bz2) = 2395539 +MD5 (KDE/kde-i18n/kde-i18n-ja-3.5.6.tar.bz2) = 79b62e00ae4bbcc0d874588ccba177be +SHA256 (KDE/kde-i18n/kde-i18n-ja-3.5.6.tar.bz2) = 3fc1fe257592e05fd7ca05e743bd2c5830dcf8e968f0746c995bdf76ca568beb +SIZE (KDE/kde-i18n/kde-i18n-ja-3.5.6.tar.bz2) = 2390563 diff --git a/japanese/kde3-i18n/pkg-plist b/japanese/kde3-i18n/pkg-plist index 0b12e3a2e0a4..63a5c39df7ba 100644 --- a/japanese/kde3-i18n/pkg-plist +++ b/japanese/kde3-i18n/pkg-plist @@ -446,6 +446,7 @@ share/locale/ja/LC_MESSAGES/khotkeys.mo share/locale/ja/LC_MESSAGES/khtmlkttsd.mo share/locale/ja/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/ja/LC_MESSAGES/kicker.mo +share/locale/ja/LC_MESSAGES/kickermenu_kate.mo share/locale/ja/LC_MESSAGES/kiconedit.mo share/locale/ja/LC_MESSAGES/kig.mo share/locale/ja/LC_MESSAGES/kimagemapeditor.mo @@ -686,6 +687,7 @@ share/locale/ja/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/ja/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/ja/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/ja/LC_MESSAGES/libkickermenu_tom.mo +share/locale/ja/LC_MESSAGES/libkitchensync.mo share/locale/ja/LC_MESSAGES/libkleopatra.mo share/locale/ja/LC_MESSAGES/libkmime.mo share/locale/ja/LC_MESSAGES/libkonq.mo diff --git a/japanese/kde4-l10n/distinfo b/japanese/kde4-l10n/distinfo index c42703656cc3..804ba5e1ed9f 100644 --- a/japanese/kde4-l10n/distinfo +++ b/japanese/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ja-3.5.5.tar.bz2) = 3b89aa140388f7b0e3beb80ef2b8b247 -SHA256 (KDE/kde-i18n/kde-i18n-ja-3.5.5.tar.bz2) = 8ec25e54c9d13ef78cd49f630cf8f79671027f7574c9820241976e04d6d61c4b -SIZE (KDE/kde-i18n/kde-i18n-ja-3.5.5.tar.bz2) = 2395539 +MD5 (KDE/kde-i18n/kde-i18n-ja-3.5.6.tar.bz2) = 79b62e00ae4bbcc0d874588ccba177be +SHA256 (KDE/kde-i18n/kde-i18n-ja-3.5.6.tar.bz2) = 3fc1fe257592e05fd7ca05e743bd2c5830dcf8e968f0746c995bdf76ca568beb +SIZE (KDE/kde-i18n/kde-i18n-ja-3.5.6.tar.bz2) = 2390563 diff --git a/japanese/kde4-l10n/pkg-plist b/japanese/kde4-l10n/pkg-plist index 0b12e3a2e0a4..63a5c39df7ba 100644 --- a/japanese/kde4-l10n/pkg-plist +++ b/japanese/kde4-l10n/pkg-plist @@ -446,6 +446,7 @@ share/locale/ja/LC_MESSAGES/khotkeys.mo share/locale/ja/LC_MESSAGES/khtmlkttsd.mo share/locale/ja/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/ja/LC_MESSAGES/kicker.mo +share/locale/ja/LC_MESSAGES/kickermenu_kate.mo share/locale/ja/LC_MESSAGES/kiconedit.mo share/locale/ja/LC_MESSAGES/kig.mo share/locale/ja/LC_MESSAGES/kimagemapeditor.mo @@ -686,6 +687,7 @@ share/locale/ja/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/ja/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/ja/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/ja/LC_MESSAGES/libkickermenu_tom.mo +share/locale/ja/LC_MESSAGES/libkitchensync.mo share/locale/ja/LC_MESSAGES/libkleopatra.mo share/locale/ja/LC_MESSAGES/libkmime.mo share/locale/ja/LC_MESSAGES/libkonq.mo diff --git a/japanese/koffice-i18n/Makefile b/japanese/koffice-i18n/Makefile index 6ecc72c0c4de..66bbd983d184 100644 --- a/japanese/koffice-i18n/Makefile +++ b/japanese/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= japanese kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/japanese/koffice-i18n/distinfo b/japanese/koffice-i18n/distinfo index 803afe0f73b2..74ca1b1741f0 100644 --- a/japanese/koffice-i18n/distinfo +++ b/japanese/koffice-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ja-1.6.1.tar.bz2) = 39ba5b3618221ee6fa896aa16aa9f6a9 -SHA256 (KDE/kde-i18n/koffice-l10n-ja-1.6.1.tar.bz2) = 547292119e33e560aec4e2224bff22a376358485a90f2acd6057fbf0fc8cfd57 -SIZE (KDE/kde-i18n/koffice-l10n-ja-1.6.1.tar.bz2) = 355377 +MD5 (KDE/kde-i18n/koffice-l10n-ja-1.6.2.tar.bz2) = d77a310c8563318dc4ced31c9fe2f2ce +SHA256 (KDE/kde-i18n/koffice-l10n-ja-1.6.2.tar.bz2) = 598c0d8bec980c28ce9d889a02fa453f8cc74454865d048f69f7ab238be9207d +SIZE (KDE/kde-i18n/koffice-l10n-ja-1.6.2.tar.bz2) = 356007 diff --git a/japanese/koffice-i18n/pkg-plist b/japanese/koffice-i18n/pkg-plist index 543e5552a3ed..0c56a506f727 100644 --- a/japanese/koffice-i18n/pkg-plist +++ b/japanese/koffice-i18n/pkg-plist @@ -2,7 +2,6 @@ share/locale/ja/LC_MESSAGES/desktop_koffice.mo share/locale/ja/LC_MESSAGES/example.mo share/locale/ja/LC_MESSAGES/karbon.mo share/locale/ja/LC_MESSAGES/kchart.mo -share/locale/ja/LC_MESSAGES/kdgantt.mo share/locale/ja/LC_MESSAGES/kexi.mo share/locale/ja/LC_MESSAGES/kfile_abiword.mo share/locale/ja/LC_MESSAGES/kfile_gnumeric.mo diff --git a/japanese/koffice-kde4-l10n/Makefile b/japanese/koffice-kde4-l10n/Makefile index 6ecc72c0c4de..66bbd983d184 100644 --- a/japanese/koffice-kde4-l10n/Makefile +++ b/japanese/koffice-kde4-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= japanese kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/japanese/koffice-kde4-l10n/distinfo b/japanese/koffice-kde4-l10n/distinfo index 803afe0f73b2..74ca1b1741f0 100644 --- a/japanese/koffice-kde4-l10n/distinfo +++ b/japanese/koffice-kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ja-1.6.1.tar.bz2) = 39ba5b3618221ee6fa896aa16aa9f6a9 -SHA256 (KDE/kde-i18n/koffice-l10n-ja-1.6.1.tar.bz2) = 547292119e33e560aec4e2224bff22a376358485a90f2acd6057fbf0fc8cfd57 -SIZE (KDE/kde-i18n/koffice-l10n-ja-1.6.1.tar.bz2) = 355377 +MD5 (KDE/kde-i18n/koffice-l10n-ja-1.6.2.tar.bz2) = d77a310c8563318dc4ced31c9fe2f2ce +SHA256 (KDE/kde-i18n/koffice-l10n-ja-1.6.2.tar.bz2) = 598c0d8bec980c28ce9d889a02fa453f8cc74454865d048f69f7ab238be9207d +SIZE (KDE/kde-i18n/koffice-l10n-ja-1.6.2.tar.bz2) = 356007 diff --git a/japanese/koffice-kde4-l10n/pkg-plist b/japanese/koffice-kde4-l10n/pkg-plist index 543e5552a3ed..0c56a506f727 100644 --- a/japanese/koffice-kde4-l10n/pkg-plist +++ b/japanese/koffice-kde4-l10n/pkg-plist @@ -2,7 +2,6 @@ share/locale/ja/LC_MESSAGES/desktop_koffice.mo share/locale/ja/LC_MESSAGES/example.mo share/locale/ja/LC_MESSAGES/karbon.mo share/locale/ja/LC_MESSAGES/kchart.mo -share/locale/ja/LC_MESSAGES/kdgantt.mo share/locale/ja/LC_MESSAGES/kexi.mo share/locale/ja/LC_MESSAGES/kfile_abiword.mo share/locale/ja/LC_MESSAGES/kfile_gnumeric.mo diff --git a/korean/kde3-i18n/distinfo b/korean/kde3-i18n/distinfo index 99a4bb515dad..139a63d6c111 100644 --- a/korean/kde3-i18n/distinfo +++ b/korean/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ko-3.5.5.tar.bz2) = 7a364e95e894e9c58d56054edab21142 -SHA256 (KDE/kde-i18n/kde-i18n-ko-3.5.5.tar.bz2) = 20dd325d8d20aab8e4022404533dd3cd808cd6e3e3e86fb8349c261398efc3e6 -SIZE (KDE/kde-i18n/kde-i18n-ko-3.5.5.tar.bz2) = 1063228 +MD5 (KDE/kde-i18n/kde-i18n-ko-3.5.6.tar.bz2) = eb47d4c6f46c161835c5255f399e1ac9 +SHA256 (KDE/kde-i18n/kde-i18n-ko-3.5.6.tar.bz2) = 9ca6ab3467cc8a0599090032bc2194a58e8d30aa20f01f863c63754c98d03ff0 +SIZE (KDE/kde-i18n/kde-i18n-ko-3.5.6.tar.bz2) = 1063786 diff --git a/korean/kde4-l10n/distinfo b/korean/kde4-l10n/distinfo index 99a4bb515dad..139a63d6c111 100644 --- a/korean/kde4-l10n/distinfo +++ b/korean/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ko-3.5.5.tar.bz2) = 7a364e95e894e9c58d56054edab21142 -SHA256 (KDE/kde-i18n/kde-i18n-ko-3.5.5.tar.bz2) = 20dd325d8d20aab8e4022404533dd3cd808cd6e3e3e86fb8349c261398efc3e6 -SIZE (KDE/kde-i18n/kde-i18n-ko-3.5.5.tar.bz2) = 1063228 +MD5 (KDE/kde-i18n/kde-i18n-ko-3.5.6.tar.bz2) = eb47d4c6f46c161835c5255f399e1ac9 +SHA256 (KDE/kde-i18n/kde-i18n-ko-3.5.6.tar.bz2) = 9ca6ab3467cc8a0599090032bc2194a58e8d30aa20f01f863c63754c98d03ff0 +SIZE (KDE/kde-i18n/kde-i18n-ko-3.5.6.tar.bz2) = 1063786 diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile index b686c7c02ca1..d2a8b1c1613f 100644 --- a/math/kcalc/Makefile +++ b/math/kcalc/Makefile @@ -7,7 +7,6 @@ PORTNAME= kdeutils PORTVERSION= ${KDE_VERSION} -PORTREVISION= 3 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -18,7 +17,7 @@ COMMENT= Utilities for the KDE integrated X11 desktop LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4 \ netsnmp:${PORTSDIR}/net-mgmt/net-snmp -RUN_DEPENDS= gpgv:${PORTSDIR}/security/gnupg1 +RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg CONFLICTS= kgpg-[0-9]* superkaramba-[0-9]* @@ -35,7 +34,7 @@ DO_NOT_COMPILE+=klaptopdaemon kmilo CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}" CONFIGURE_ARGS+=--with-pythondir=${LOCALBASE} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/math/kcalc/distinfo b/math/kcalc/distinfo index cdaf81b48169..eecf40517f6e 100644 --- a/math/kcalc/distinfo +++ b/math/kcalc/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.5.tar.bz2) = a20a732284a3dcb735665e45f5be532e -SHA256 (KDE/kdeutils-3.5.5.tar.bz2) = 38914c84c8829ba7beb8a0e0c0ef8b4c7eee29b588c6529ff39c0bc0370f0457 -SIZE (KDE/kdeutils-3.5.5.tar.bz2) = 2988542 +MD5 (KDE/kdeutils-3.5.6.tar.bz2) = e0ea2c15ccf2bd3d8be5f2bf57cfe14a +SHA256 (KDE/kdeutils-3.5.6.tar.bz2) = 7efc558fca536a0b86abd51d7b0b9ca168e8364c222115e29424662acb0e473b +SIZE (KDE/kdeutils-3.5.6.tar.bz2) = 2989659 diff --git a/math/kcalc/pkg-plist b/math/kcalc/pkg-plist index bcd5d9ba088a..782d19b830c1 100644 --- a/math/kcalc/pkg-plist +++ b/math/kcalc/pkg-plist @@ -123,7 +123,6 @@ share/applications/kde/kdf.desktop share/applications/kde/kgpg.desktop share/applications/kde/khexedit.desktop share/applications/kde/kregexpeditor.desktop -share/applications/kde/ksim.desktop share/applications/kde/ktimer.desktop share/applications/kde/kwalletconfig.desktop share/applications/kde/kwalletmanager-kwalletd.desktop diff --git a/misc/Makefile b/misc/Makefile index d5b8c4f5cb5b..cf54a08a2116 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -254,10 +254,12 @@ SUBDIR += koffice-i18n-fa SUBDIR += koffice-i18n-fi SUBDIR += koffice-i18n-ga + SUBDIR += koffice-i18n-gl SUBDIR += koffice-i18n-hi SUBDIR += koffice-i18n-hsb SUBDIR += koffice-i18n-is SUBDIR += koffice-i18n-it + SUBDIR += koffice-i18n-km SUBDIR += koffice-i18n-lo SUBDIR += koffice-i18n-lt SUBDIR += koffice-i18n-lv diff --git a/misc/kaddressbook-plugins/Makefile b/misc/kaddressbook-plugins/Makefile index 0d924b0a3d01..83b4fbb63ac9 100644 --- a/misc/kaddressbook-plugins/Makefile +++ b/misc/kaddressbook-plugins/Makefile @@ -29,7 +29,7 @@ PREFIX= ${KDE_PREFIX} USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/misc/kaddressbook-plugins/distinfo b/misc/kaddressbook-plugins/distinfo index b86dc7b77b7f..5a84efd83781 100644 --- a/misc/kaddressbook-plugins/distinfo +++ b/misc/kaddressbook-plugins/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.5.tar.bz2) = 71c0a690abf8ad0f43135fa887d0b40c -SHA256 (KDE/kdeaddons-3.5.5.tar.bz2) = 1db58293a8b967d254a39c9bdb0c5dfb3759a7d067280dd3d637e2423beb632c -SIZE (KDE/kdeaddons-3.5.5.tar.bz2) = 1663195 +MD5 (KDE/kdeaddons-3.5.6.tar.bz2) = 96d6d2a76da2a5232b3b46318456a5bc +SHA256 (KDE/kdeaddons-3.5.6.tar.bz2) = dec71f341631beb1f3e112083af11e3ef1618ed80394cf4939c662f8c5a3d807 +SIZE (KDE/kdeaddons-3.5.6.tar.bz2) = 1667731 diff --git a/misc/kaddressbook-plugins/pkg-plist b/misc/kaddressbook-plugins/pkg-plist index 3d2f5df32f8a..aa315984c46a 100644 --- a/misc/kaddressbook-plugins/pkg-plist +++ b/misc/kaddressbook-plugins/pkg-plist @@ -4,7 +4,7 @@ lib/kde3/libkaddrbk_geo_xxport.so lib/kde3/libkaddrbk_gmx_xxport.a lib/kde3/libkaddrbk_gmx_xxport.la lib/kde3/libkaddrbk_gmx_xxport.so -share/applications/kdeaddons-kaddressbook-plugins-3.5.5 +share/applications/kdeaddons-kaddressbook-plugins-3.5.6 share/apps/kaddressbook/geo_xxportui.rc share/apps/kaddressbook/gmx_xxportui.rc share/services/kaddressbook/geo_xxport.desktop diff --git a/misc/kde3-i18n-af/distinfo b/misc/kde3-i18n-af/distinfo index 857af4e6afac..7f192785c542 100644 --- a/misc/kde3-i18n-af/distinfo +++ b/misc/kde3-i18n-af/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-af-3.5.5.tar.bz2) = 3de24c2c32aba906b9e2cea304b151be -SHA256 (KDE/kde-i18n/kde-i18n-af-3.5.5.tar.bz2) = e516767fe1282cace605f1383fdf448c34c38a03f900a20606408bc55941cdee -SIZE (KDE/kde-i18n/kde-i18n-af-3.5.5.tar.bz2) = 1542197 +MD5 (KDE/kde-i18n/kde-i18n-af-3.5.6.tar.bz2) = 7771bdb76b76323a68da4700bd5eaf26 +SHA256 (KDE/kde-i18n/kde-i18n-af-3.5.6.tar.bz2) = 9b17881d5d1194d7996b1db86a39d3570c8b628ac6b407fa3110345e5b78a909 +SIZE (KDE/kde-i18n/kde-i18n-af-3.5.6.tar.bz2) = 1544269 diff --git a/misc/kde3-i18n-af/pkg-plist b/misc/kde3-i18n-af/pkg-plist index c5568c134456..5750e8c30efa 100644 --- a/misc/kde3-i18n-af/pkg-plist +++ b/misc/kde3-i18n-af/pkg-plist @@ -258,6 +258,7 @@ share/locale/af/LC_MESSAGES/konqsidebar_mediaplayer.mo share/locale/af/LC_MESSAGES/konqueror.mo share/locale/af/LC_MESSAGES/konquest.mo share/locale/af/LC_MESSAGES/konsole.mo +share/locale/af/LC_MESSAGES/kontact.mo share/locale/af/LC_MESSAGES/kooka.mo share/locale/af/LC_MESSAGES/korganizer.mo share/locale/af/LC_MESSAGES/korn.mo diff --git a/misc/kde3-i18n-az/distinfo b/misc/kde3-i18n-az/distinfo index f02ceaaf1186..642ee35d68de 100644 --- a/misc/kde3-i18n-az/distinfo +++ b/misc/kde3-i18n-az/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-az-3.5.5.tar.bz2) = c63e0b5e0682571498b168e6f6707caf -SHA256 (KDE/kde-i18n/kde-i18n-az-3.5.5.tar.bz2) = d7b9934408e5de0b2785f62cb13b7baaa11934f6b8ed3a88da4d3817d473d635 -SIZE (KDE/kde-i18n/kde-i18n-az-3.5.5.tar.bz2) = 1579852 +MD5 (KDE/kde-i18n/kde-i18n-az-3.5.6.tar.bz2) = 416e628f6c3d27a334d26f1c5bd83406 +SHA256 (KDE/kde-i18n/kde-i18n-az-3.5.6.tar.bz2) = 49290aeeb02e79f63f3fa0105cf1c424dead8c699a0aea9bf4f0fd364a78bebc +SIZE (KDE/kde-i18n/kde-i18n-az-3.5.6.tar.bz2) = 1581977 diff --git a/misc/kde3-i18n-bg/distinfo b/misc/kde3-i18n-bg/distinfo index 6f10ba16fe36..fde473a05b37 100644 --- a/misc/kde3-i18n-bg/distinfo +++ b/misc/kde3-i18n-bg/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-bg-3.5.5.tar.bz2) = 28871147d247f33072a278f0d16a96be -SHA256 (KDE/kde-i18n/kde-i18n-bg-3.5.5.tar.bz2) = a860a8e8f917b3b84546a8f761bddd20ebb52950e7cedbf51b9cbd7fa7f0f361 -SIZE (KDE/kde-i18n/kde-i18n-bg-3.5.5.tar.bz2) = 1729850 +MD5 (KDE/kde-i18n/kde-i18n-bg-3.5.6.tar.bz2) = a34d5e307d418fc87bcbb6ab150bc046 +SHA256 (KDE/kde-i18n/kde-i18n-bg-3.5.6.tar.bz2) = 46971928afba923e891779f2bac6715f54267fb777c6a23a132615cc2b6b0d73 +SIZE (KDE/kde-i18n/kde-i18n-bg-3.5.6.tar.bz2) = 1728507 diff --git a/misc/kde3-i18n-bn/distinfo b/misc/kde3-i18n-bn/distinfo index 11f2120aa044..649db63093eb 100644 --- a/misc/kde3-i18n-bn/distinfo +++ b/misc/kde3-i18n-bn/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-bn-3.5.5.tar.bz2) = bfd5159743442c47a02ee5af4bd17c68 -SHA256 (KDE/kde-i18n/kde-i18n-bn-3.5.5.tar.bz2) = 3540e560359518f8f32e4b14f467ca91832dc78b0c345c55f2a4d5e5171f41fe -SIZE (KDE/kde-i18n/kde-i18n-bn-3.5.5.tar.bz2) = 834225 +MD5 (KDE/kde-i18n/kde-i18n-bn-3.5.6.tar.bz2) = f5153ad329e8d7305aefa12f7ddfdfa3 +SHA256 (KDE/kde-i18n/kde-i18n-bn-3.5.6.tar.bz2) = e49a1c4faefa774e889273f6d5ae2a95f8f3c9c7a7381a9cb8a6801c35538fa8 +SIZE (KDE/kde-i18n/kde-i18n-bn-3.5.6.tar.bz2) = 837980 diff --git a/misc/kde3-i18n-br/distinfo b/misc/kde3-i18n-br/distinfo index e80478cad8b8..657eddc648fe 100644 --- a/misc/kde3-i18n-br/distinfo +++ b/misc/kde3-i18n-br/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-br-3.5.5.tar.bz2) = f96e07c3b9f4905dc3f37eb829feba89 -SHA256 (KDE/kde-i18n/kde-i18n-br-3.5.5.tar.bz2) = c5b9a6e4d63880bf40bf4b9fd7f5a213f8f4cb06e14a0aaf837a018c2d95dac6 -SIZE (KDE/kde-i18n/kde-i18n-br-3.5.5.tar.bz2) = 1713238 +MD5 (KDE/kde-i18n/kde-i18n-br-3.5.6.tar.bz2) = 5c4ae705596f83ac2ee5df83a7900e5b +SHA256 (KDE/kde-i18n/kde-i18n-br-3.5.6.tar.bz2) = 4ee2debb4eba743d63e3951d96ff5ca9f887dad6ed9bddc67f0bc71bb95893e9 +SIZE (KDE/kde-i18n/kde-i18n-br-3.5.6.tar.bz2) = 1713145 diff --git a/misc/kde3-i18n-bs/distinfo b/misc/kde3-i18n-bs/distinfo index 2f9344b6cafc..77ef10c99a0a 100644 --- a/misc/kde3-i18n-bs/distinfo +++ b/misc/kde3-i18n-bs/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-bs-3.5.5.tar.bz2) = 8441891d28b9785504ab1151a603d8f4 -SHA256 (KDE/kde-i18n/kde-i18n-bs-3.5.5.tar.bz2) = a47732bd03379bfc96a9f18694d673feef1242f98f9807b4686976dc32eb614e -SIZE (KDE/kde-i18n/kde-i18n-bs-3.5.5.tar.bz2) = 1725587 +MD5 (KDE/kde-i18n/kde-i18n-bs-3.5.6.tar.bz2) = df40c6f49ebbc00155eea55f913d1600 +SHA256 (KDE/kde-i18n/kde-i18n-bs-3.5.6.tar.bz2) = 64df7effc0525fe59a3addf518cbd146bc206de6e0b5b4cee035fd2a21e436a8 +SIZE (KDE/kde-i18n/kde-i18n-bs-3.5.6.tar.bz2) = 1730037 diff --git a/misc/kde3-i18n-ca/distinfo b/misc/kde3-i18n-ca/distinfo index 18a1395ac0e9..8f946feb7e45 100644 --- a/misc/kde3-i18n-ca/distinfo +++ b/misc/kde3-i18n-ca/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ca-3.5.5.tar.bz2) = fec16708dc8c3e9a864d5ad9e45f06b8 -SHA256 (KDE/kde-i18n/kde-i18n-ca-3.5.5.tar.bz2) = 4141d21cbc7d6a3f039afc43532061e5fc8c5b874b3768e8c0ed1919bb9b6a57 -SIZE (KDE/kde-i18n/kde-i18n-ca-3.5.5.tar.bz2) = 6787316 +MD5 (KDE/kde-i18n/kde-i18n-ca-3.5.6.tar.bz2) = 84b3a011b9d594ce26fdee77cccdfb52 +SHA256 (KDE/kde-i18n/kde-i18n-ca-3.5.6.tar.bz2) = 7fae776e4f6b23514e97cecf661b61de4b54634dc89332c010174479be091be3 +SIZE (KDE/kde-i18n/kde-i18n-ca-3.5.6.tar.bz2) = 6993381 diff --git a/misc/kde3-i18n-ca/pkg-plist b/misc/kde3-i18n-ca/pkg-plist index 84eec115a90c..7a47f62b2414 100644 --- a/misc/kde3-i18n-ca/pkg-plist +++ b/misc/kde3-i18n-ca/pkg-plist @@ -311,6 +311,9 @@ share/doc/HTML/ca/kfind/man-kfind.1.docbook share/doc/HTML/ca/kgeography/common share/doc/HTML/ca/kgeography/index.cache.bz2 share/doc/HTML/ca/kgeography/index.docbook +share/doc/HTML/ca/kget/common +share/doc/HTML/ca/kget/index.cache.bz2 +share/doc/HTML/ca/kget/index.docbook share/doc/HTML/ca/kgpg/common share/doc/HTML/ca/kgpg/index.cache.bz2 share/doc/HTML/ca/kgpg/index.docbook @@ -364,6 +367,7 @@ share/doc/HTML/ca/khelpcenter/userguide/common share/doc/HTML/ca/khelpcenter/userguide/control-center.docbook share/doc/HTML/ca/khelpcenter/userguide/creating-graphics.docbook share/doc/HTML/ca/khelpcenter/userguide/credits-and-license.docbook +share/doc/HTML/ca/khelpcenter/userguide/customizing-desktop.docbook share/doc/HTML/ca/khelpcenter/userguide/email.docbook share/doc/HTML/ca/khelpcenter/userguide/extragear-applications.docbook share/doc/HTML/ca/khelpcenter/userguide/file-sharing.docbook @@ -434,6 +438,9 @@ share/doc/HTML/ca/kicker/index.cache.bz2 share/doc/HTML/ca/kicker/index.docbook share/doc/HTML/ca/kicker/man-appletproxy.1.docbook share/doc/HTML/ca/kicker/man-kicker.1.docbook +share/doc/HTML/ca/kig/common +share/doc/HTML/ca/kig/index.cache.bz2 +share/doc/HTML/ca/kig/index.docbook share/doc/HTML/ca/kinfocenter/blockdevices/common share/doc/HTML/ca/kinfocenter/blockdevices/index.cache.bz2 share/doc/HTML/ca/kinfocenter/blockdevices/index.docbook @@ -790,9 +797,14 @@ share/doc/HTML/ca/ktimer/index.docbook share/doc/HTML/ca/ktnef/common share/doc/HTML/ca/ktnef/index.cache.bz2 share/doc/HTML/ca/ktnef/index.docbook +share/doc/HTML/ca/ktouch/color_options.png share/doc/HTML/ca/ktouch/common +share/doc/HTML/ca/ktouch/general_options.png share/doc/HTML/ca/ktouch/index.cache.bz2 share/doc/HTML/ca/ktouch/index.docbook +share/doc/HTML/ca/ktouch/keyboard_options.png +share/doc/HTML/ca/ktouch/man-ktouch.1.docbook +share/doc/HTML/ca/ktouch/training_options.png share/doc/HTML/ca/kttsd/common share/doc/HTML/ca/kttsd/index.cache.bz2 share/doc/HTML/ca/kttsd/index.docbook @@ -1143,6 +1155,7 @@ share/locale/ca/LC_MESSAGES/khotkeys.mo share/locale/ca/LC_MESSAGES/khtmlkttsd.mo share/locale/ca/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/ca/LC_MESSAGES/kicker.mo +share/locale/ca/LC_MESSAGES/kickermenu_kate.mo share/locale/ca/LC_MESSAGES/kiconedit.mo share/locale/ca/LC_MESSAGES/kig.mo share/locale/ca/LC_MESSAGES/kimagemapeditor.mo @@ -1180,6 +1193,7 @@ share/locale/ca/LC_MESSAGES/kio_thumbnail.mo share/locale/ca/LC_MESSAGES/kio_trash.mo share/locale/ca/LC_MESSAGES/kio_zeroconf.mo share/locale/ca/LC_MESSAGES/kioexec.mo +share/locale/ca/LC_MESSAGES/kitchensync.mo share/locale/ca/LC_MESSAGES/kiten.mo share/locale/ca/LC_MESSAGES/kjobviewer.mo share/locale/ca/LC_MESSAGES/kjots.mo @@ -1383,6 +1397,7 @@ share/locale/ca/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/ca/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/ca/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/ca/LC_MESSAGES/libkickermenu_tom.mo +share/locale/ca/LC_MESSAGES/libkitchensync.mo share/locale/ca/LC_MESSAGES/libkleopatra.mo share/locale/ca/LC_MESSAGES/libkmime.mo share/locale/ca/LC_MESSAGES/libkonq.mo @@ -1518,6 +1533,7 @@ share/locale/ca/flag.png @dirrm share/doc/HTML/ca/kinfocenter/cdinfo @dirrm share/doc/HTML/ca/kinfocenter/blockdevices @dirrm share/doc/HTML/ca/kinfocenter +@dirrm share/doc/HTML/ca/kig @dirrm share/doc/HTML/ca/kicker-applets @dirrm share/doc/HTML/ca/kicker @dirrm share/doc/HTML/ca/khelpcenter/visualdict @@ -1528,6 +1544,7 @@ share/locale/ca/flag.png @dirrm share/doc/HTML/ca/khelpcenter @dirrm share/doc/HTML/ca/khangman @dirrm share/doc/HTML/ca/kgpg +@dirrm share/doc/HTML/ca/kget @dirrm share/doc/HTML/ca/kgeography @dirrm share/doc/HTML/ca/kfind @dirrm share/doc/HTML/ca/keduca diff --git a/misc/kde3-i18n-cs/distinfo b/misc/kde3-i18n-cs/distinfo index dca2d63d179d..298e20d6646e 100644 --- a/misc/kde3-i18n-cs/distinfo +++ b/misc/kde3-i18n-cs/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-cs-3.5.5.tar.bz2) = aaace6da2097b2f98f163a5da7667752 -SHA256 (KDE/kde-i18n/kde-i18n-cs-3.5.5.tar.bz2) = b37f0c24a4efe08d7f79bf73971208bcded3cb42905d381865cb74be4cb72a1d -SIZE (KDE/kde-i18n/kde-i18n-cs-3.5.5.tar.bz2) = 3383764 +MD5 (KDE/kde-i18n/kde-i18n-cs-3.5.6.tar.bz2) = b2dab45ea572efbb2569781211c2a7fc +SHA256 (KDE/kde-i18n/kde-i18n-cs-3.5.6.tar.bz2) = ee36715293d54f6dc41424e36e7d560d612c8c5c9311598b1de9ecaeeb712d52 +SIZE (KDE/kde-i18n/kde-i18n-cs-3.5.6.tar.bz2) = 3377426 diff --git a/misc/kde3-i18n-cs/pkg-plist b/misc/kde3-i18n-cs/pkg-plist index 042a5f981bb0..3ab0010bd870 100644 --- a/misc/kde3-i18n-cs/pkg-plist +++ b/misc/kde3-i18n-cs/pkg-plist @@ -230,7 +230,6 @@ share/locale/cs/LC_MESSAGES/kasbarextension.mo share/locale/cs/LC_MESSAGES/kasteroids.mo share/locale/cs/LC_MESSAGES/kate.mo share/locale/cs/LC_MESSAGES/katecppsymbolviewer.mo -share/locale/cs/LC_MESSAGES/katedefaultproject.mo share/locale/cs/LC_MESSAGES/katefiletemplates.mo share/locale/cs/LC_MESSAGES/katefll_initplugin.mo share/locale/cs/LC_MESSAGES/katefll_plugin.mo @@ -238,12 +237,10 @@ share/locale/cs/LC_MESSAGES/katehelloworld.mo share/locale/cs/LC_MESSAGES/katehtmltools.mo share/locale/cs/LC_MESSAGES/kateinsertcommand.mo share/locale/cs/LC_MESSAGES/katekjswrapper.mo -share/locale/cs/LC_MESSAGES/katekttsd.mo share/locale/cs/LC_MESSAGES/katemake.mo share/locale/cs/LC_MESSAGES/katemodeline.mo share/locale/cs/LC_MESSAGES/kateopenheader.mo share/locale/cs/LC_MESSAGES/katepart.mo -share/locale/cs/LC_MESSAGES/katepartkttsd.mo share/locale/cs/LC_MESSAGES/katepybrowse.mo share/locale/cs/LC_MESSAGES/katesnippets.mo share/locale/cs/LC_MESSAGES/katetabbarextension.mo @@ -303,7 +300,6 @@ share/locale/cs/LC_MESSAGES/kcmkonqhtml.mo share/locale/cs/LC_MESSAGES/kcmkonsole.mo share/locale/cs/LC_MESSAGES/kcmkontactnt.mo share/locale/cs/LC_MESSAGES/kcmktalkd.mo -share/locale/cs/LC_MESSAGES/kcmkttsd.mo share/locale/cs/LC_MESSAGES/kcmkuick.mo share/locale/cs/LC_MESSAGES/kcmkurifilt.mo share/locale/cs/LC_MESSAGES/kcmkvaio.mo @@ -328,7 +324,6 @@ share/locale/cs/LC_MESSAGES/kcmscreensaver.mo share/locale/cs/LC_MESSAGES/kcmshell.mo share/locale/cs/LC_MESSAGES/kcmsmartcard.mo share/locale/cs/LC_MESSAGES/kcmsmserver.mo -share/locale/cs/LC_MESSAGES/kcmsocks.mo share/locale/cs/LC_MESSAGES/kcmspellchecking.mo share/locale/cs/LC_MESSAGES/kcmstyle.mo share/locale/cs/LC_MESSAGES/kcmtaskbar.mo @@ -364,7 +359,6 @@ share/locale/cs/LC_MESSAGES/kdialog.mo share/locale/cs/LC_MESSAGES/kdict.mo share/locale/cs/LC_MESSAGES/kdictapplet.mo share/locale/cs/LC_MESSAGES/kdjview.mo -share/locale/cs/LC_MESSAGES/kdmchooser.mo share/locale/cs/LC_MESSAGES/kdmconfig.mo share/locale/cs/LC_MESSAGES/kdmgreet.mo share/locale/cs/LC_MESSAGES/kdvi.mo @@ -491,7 +485,6 @@ share/locale/cs/LC_MESSAGES/kjots.mo share/locale/cs/LC_MESSAGES/kjumpingcube.mo share/locale/cs/LC_MESSAGES/klaptopdaemon.mo share/locale/cs/LC_MESSAGES/klatin.mo -share/locale/cs/LC_MESSAGES/klegacyimport.mo share/locale/cs/LC_MESSAGES/kleopatra.mo share/locale/cs/LC_MESSAGES/klettres.mo share/locale/cs/LC_MESSAGES/klickety.mo @@ -506,7 +499,6 @@ share/locale/cs/LC_MESSAGES/kmail_text_calendar_plugin.mo share/locale/cs/LC_MESSAGES/kmail_text_vcard_plugin.mo share/locale/cs/LC_MESSAGES/kmailcvt.mo share/locale/cs/LC_MESSAGES/kmathapplet.mo -share/locale/cs/LC_MESSAGES/kmathtool.mo share/locale/cs/LC_MESSAGES/kmcop.mo share/locale/cs/LC_MESSAGES/kmenuapplet.mo share/locale/cs/LC_MESSAGES/kmenuedit.mo @@ -559,7 +551,6 @@ share/locale/cs/LC_MESSAGES/korganizer.mo share/locale/cs/LC_MESSAGES/korn.mo share/locale/cs/LC_MESSAGES/kpackage.mo share/locale/cs/LC_MESSAGES/kpager.mo -share/locale/cs/LC_MESSAGES/kpartapp.mo share/locale/cs/LC_MESSAGES/kpartsaver.mo share/locale/cs/LC_MESSAGES/kpat.mo share/locale/cs/LC_MESSAGES/kpdf.mo @@ -623,14 +614,12 @@ share/locale/cs/LC_MESSAGES/ksysguard.mo share/locale/cs/LC_MESSAGES/ksystemtrayapplet.mo share/locale/cs/LC_MESSAGES/ksystraycmd.mo share/locale/cs/LC_MESSAGES/ksysv.mo -share/locale/cs/LC_MESSAGES/ktaskbarapplet.mo share/locale/cs/LC_MESSAGES/kteatime.mo share/locale/cs/LC_MESSAGES/ktexteditor_autobookmarker.mo share/locale/cs/LC_MESSAGES/ktexteditor_docwordcompletion.mo share/locale/cs/LC_MESSAGES/ktexteditor_insertfile.mo share/locale/cs/LC_MESSAGES/ktexteditor_isearch.mo share/locale/cs/LC_MESSAGES/ktexteditor_kdatatool.mo -share/locale/cs/LC_MESSAGES/ktexteditor_kttsd.mo share/locale/cs/LC_MESSAGES/kthememanager.mo share/locale/cs/LC_MESSAGES/ktimemon.mo share/locale/cs/LC_MESSAGES/ktimer.mo @@ -639,18 +628,6 @@ share/locale/cs/LC_MESSAGES/ktnef.mo share/locale/cs/LC_MESSAGES/ktouch.mo share/locale/cs/LC_MESSAGES/ktron.mo share/locale/cs/LC_MESSAGES/kttsd.mo -share/locale/cs/LC_MESSAGES/kttsd_commandplugin.mo -share/locale/cs/LC_MESSAGES/kttsd_eposplugin.mo -share/locale/cs/LC_MESSAGES/kttsd_festivalintplugin.mo -share/locale/cs/LC_MESSAGES/kttsd_fliteplugin.mo -share/locale/cs/LC_MESSAGES/kttsd_freettsplugin.mo -share/locale/cs/LC_MESSAGES/kttsd_hadifixplugin.mo -share/locale/cs/LC_MESSAGES/kttsd_sbdplugin.mo -share/locale/cs/LC_MESSAGES/kttsd_stringreplacerplugin.mo -share/locale/cs/LC_MESSAGES/kttsd_talkerchooserplugin.mo -share/locale/cs/LC_MESSAGES/kttsd_xmltransformerplugin.mo -share/locale/cs/LC_MESSAGES/kttsjobmgr.mo -share/locale/cs/LC_MESSAGES/kttsmgr.mo share/locale/cs/LC_MESSAGES/ktuberling.mo share/locale/cs/LC_MESSAGES/kturtle.mo share/locale/cs/LC_MESSAGES/ktux.mo @@ -740,7 +717,6 @@ share/locale/cs/LC_MESSAGES/secpolicy.mo share/locale/cs/LC_MESSAGES/spy.mo share/locale/cs/LC_MESSAGES/superkaramba.mo share/locale/cs/LC_MESSAGES/synaescope.mo -share/locale/cs/LC_MESSAGES/taskbarextension.mo share/locale/cs/LC_MESSAGES/timezones.mo share/locale/cs/LC_MESSAGES/tippecanoe.mo share/locale/cs/LC_MESSAGES/trashapplet.mo diff --git a/misc/kde3-i18n-cy/distinfo b/misc/kde3-i18n-cy/distinfo index 3b12eeffde44..c2adbebe54dd 100644 --- a/misc/kde3-i18n-cy/distinfo +++ b/misc/kde3-i18n-cy/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-cy-3.5.5.tar.bz2) = fae86d2ffa550c4d831eeb9a5a3ecdb2 -SHA256 (KDE/kde-i18n/kde-i18n-cy-3.5.5.tar.bz2) = a8eaafc56a7fe70d4f293534e5c0f3b87b99fda49fa82eec35736eaecc4d503c -SIZE (KDE/kde-i18n/kde-i18n-cy-3.5.5.tar.bz2) = 1916577 +MD5 (KDE/kde-i18n/kde-i18n-cy-3.5.6.tar.bz2) = 3d3ddcd729b5ade752b498a42aeac39c +SHA256 (KDE/kde-i18n/kde-i18n-cy-3.5.6.tar.bz2) = 69879d97e967d6448c75ff1191e7a7810a871de79cf18dc985d061fb2b24646f +SIZE (KDE/kde-i18n/kde-i18n-cy-3.5.6.tar.bz2) = 1919594 diff --git a/misc/kde3-i18n-da/distinfo b/misc/kde3-i18n-da/distinfo index f2c96eff350f..3aa816e99232 100644 --- a/misc/kde3-i18n-da/distinfo +++ b/misc/kde3-i18n-da/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-da-3.5.5.tar.bz2) = 70c041ca96330834c6f988255d7bd6ae -SHA256 (KDE/kde-i18n/kde-i18n-da-3.5.5.tar.bz2) = 72def6d70d3ff623bba05a106d66935b18ae9775d7ba4a4f70e8142eb04027ce -SIZE (KDE/kde-i18n/kde-i18n-da-3.5.5.tar.bz2) = 12308598 +MD5 (KDE/kde-i18n/kde-i18n-da-3.5.6.tar.bz2) = 913550e6604b9423cea605d95a8a664f +SHA256 (KDE/kde-i18n/kde-i18n-da-3.5.6.tar.bz2) = ad0ddeaeda754ee5fd47896feb75c5c416033cc08433408926b4db9a1575eba0 +SIZE (KDE/kde-i18n/kde-i18n-da-3.5.6.tar.bz2) = 12319303 diff --git a/misc/kde3-i18n-da/pkg-plist b/misc/kde3-i18n-da/pkg-plist index 904c58d3b45d..4244abe3e819 100644 --- a/misc/kde3-i18n-da/pkg-plist +++ b/misc/kde3-i18n-da/pkg-plist @@ -139,6 +139,9 @@ share/doc/HTML/da/docs/common/gpl-translated.html share/doc/HTML/da/docs/common/kde-localised.css share/doc/HTML/da/docs/common/lgpl-translated.html share/doc/HTML/da/docs/common/logotp3.png +share/doc/HTML/da/irkick/common +share/doc/HTML/da/irkick/index.cache.bz2 +share/doc/HTML/da/irkick/index.docbook share/doc/HTML/da/juk/common share/doc/HTML/da/juk/index.cache.bz2 share/doc/HTML/da/juk/index.docbook @@ -255,6 +258,9 @@ share/doc/HTML/da/kcalc/index.docbook share/doc/HTML/da/kcharselect/common share/doc/HTML/da/kcharselect/index.cache.bz2 share/doc/HTML/da/kcharselect/index.docbook +share/doc/HTML/da/kcmlirc/common +share/doc/HTML/da/kcmlirc/index.cache.bz2 +share/doc/HTML/da/kcmlirc/index.docbook share/doc/HTML/da/kcoloredit/common share/doc/HTML/da/kcoloredit/index.cache.bz2 share/doc/HTML/da/kcoloredit/index.docbook @@ -449,12 +455,6 @@ share/doc/HTML/da/kdelibs/man-dcop.1.docbook share/doc/HTML/da/kdelibs/man-kbuildsycoca.8.docbook share/doc/HTML/da/kdelibs/man-kdeoptions.7.docbook share/doc/HTML/da/kdelibs/man-qtoptions.7.docbook -share/doc/HTML/da/kdelirc/irkick/common -share/doc/HTML/da/kdelirc/irkick/index.cache.bz2 -share/doc/HTML/da/kdelirc/irkick/index.docbook -share/doc/HTML/da/kdelirc/kcmlirc/common -share/doc/HTML/da/kdelirc/kcmlirc/index.cache.bz2 -share/doc/HTML/da/kdelirc/kcmlirc/index.docbook share/doc/HTML/da/kdeprint/add-printer-wiz.docbook share/doc/HTML/da/kdeprint/common share/doc/HTML/da/kdeprint/cups-config.docbook @@ -617,6 +617,7 @@ share/doc/HTML/da/khelpcenter/userguide/common share/doc/HTML/da/khelpcenter/userguide/control-center.docbook share/doc/HTML/da/khelpcenter/userguide/creating-graphics.docbook share/doc/HTML/da/khelpcenter/userguide/credits-and-license.docbook +share/doc/HTML/da/khelpcenter/userguide/customizing-desktop.docbook share/doc/HTML/da/khelpcenter/userguide/email.docbook share/doc/HTML/da/khelpcenter/userguide/extragear-applications.docbook share/doc/HTML/da/khelpcenter/userguide/file-sharing.docbook @@ -1069,6 +1070,7 @@ share/doc/HTML/da/kontact/index.docbook share/doc/HTML/da/kooka/common share/doc/HTML/da/kooka/index.cache.bz2 share/doc/HTML/da/kooka/index.docbook +share/doc/HTML/da/kopete/chatstyle.docbook share/doc/HTML/da/kopete/common share/doc/HTML/da/kopete/index.cache.bz2 share/doc/HTML/da/kopete/index.docbook @@ -1761,6 +1763,7 @@ share/locale/da/LC_MESSAGES/khotkeys.mo share/locale/da/LC_MESSAGES/khtmlkttsd.mo share/locale/da/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/da/LC_MESSAGES/kicker.mo +share/locale/da/LC_MESSAGES/kickermenu_kate.mo share/locale/da/LC_MESSAGES/kiconedit.mo share/locale/da/LC_MESSAGES/kig.mo share/locale/da/LC_MESSAGES/kimagemapeditor.mo @@ -1798,6 +1801,7 @@ share/locale/da/LC_MESSAGES/kio_thumbnail.mo share/locale/da/LC_MESSAGES/kio_trash.mo share/locale/da/LC_MESSAGES/kio_zeroconf.mo share/locale/da/LC_MESSAGES/kioexec.mo +share/locale/da/LC_MESSAGES/kitchensync.mo share/locale/da/LC_MESSAGES/kiten.mo share/locale/da/LC_MESSAGES/kjobviewer.mo share/locale/da/LC_MESSAGES/kjots.mo @@ -2001,6 +2005,7 @@ share/locale/da/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/da/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/da/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/da/LC_MESSAGES/libkickermenu_tom.mo +share/locale/da/LC_MESSAGES/libkitchensync.mo share/locale/da/LC_MESSAGES/libkleopatra.mo share/locale/da/LC_MESSAGES/libkmime.mo share/locale/da/LC_MESSAGES/libkonq.mo @@ -2225,9 +2230,6 @@ share/locale/da/flag.png @dirrm share/doc/HTML/da/kdesvn-build @dirrm share/doc/HTML/da/kdesu @dirrm share/doc/HTML/da/kdeprint -@dirrm share/doc/HTML/da/kdelirc/kcmlirc -@dirrm share/doc/HTML/da/kdelirc/irkick -@dirrm share/doc/HTML/da/kdelirc @dirrm share/doc/HTML/da/kdelibs @dirrm share/doc/HTML/da/kdebugdialog @dirrm share/doc/HTML/da/kdearch @@ -2288,6 +2290,7 @@ share/locale/da/flag.png @dirrm share/doc/HTML/da/kcontrol/arts @dirrm share/doc/HTML/da/kcontrol @dirrm share/doc/HTML/da/kcoloredit +@dirrm share/doc/HTML/da/kcmlirc @dirrm share/doc/HTML/da/kcharselect @dirrm share/doc/HTML/da/kcalc @dirrm share/doc/HTML/da/kcachegrind @@ -2314,6 +2317,7 @@ share/locale/da/flag.png @dirrm share/doc/HTML/da/kaddressbook @dirrm share/doc/HTML/da/kaboodle @dirrm share/doc/HTML/da/juk +@dirrm share/doc/HTML/da/irkick @dirrm share/doc/HTML/da/docs/common @dirrm share/doc/HTML/da/docs @dirrm share/doc/HTML/da/cervisia diff --git a/misc/kde3-i18n-el/distinfo b/misc/kde3-i18n-el/distinfo index 47334624cc33..f1359573b714 100644 --- a/misc/kde3-i18n-el/distinfo +++ b/misc/kde3-i18n-el/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-el-3.5.5.tar.bz2) = a2cb7afd4c5883bc2eb5d9c8a96d04c0 -SHA256 (KDE/kde-i18n/kde-i18n-el-3.5.5.tar.bz2) = 2ccb85695fa1c5c8b5e8db659d868c6934522c5f6bb4c5ea6fb3a8f646cc59cd -SIZE (KDE/kde-i18n/kde-i18n-el-3.5.5.tar.bz2) = 2267715 +MD5 (KDE/kde-i18n/kde-i18n-el-3.5.6.tar.bz2) = f395db170010c2a4ee9a7e27b1c8772e +SHA256 (KDE/kde-i18n/kde-i18n-el-3.5.6.tar.bz2) = 2ac607e93181659ad793c7e19c2a31305c8b209da60222edd225eec92633595d +SIZE (KDE/kde-i18n/kde-i18n-el-3.5.6.tar.bz2) = 2268782 diff --git a/misc/kde3-i18n-el/pkg-plist b/misc/kde3-i18n-el/pkg-plist index b0af05eb46f9..b7ec4cdf1f57 100644 --- a/misc/kde3-i18n-el/pkg-plist +++ b/misc/kde3-i18n-el/pkg-plist @@ -272,6 +272,7 @@ share/locale/el/LC_MESSAGES/khotkeys.mo share/locale/el/LC_MESSAGES/khtmlkttsd.mo share/locale/el/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/el/LC_MESSAGES/kicker.mo +share/locale/el/LC_MESSAGES/kickermenu_kate.mo share/locale/el/LC_MESSAGES/kiconedit.mo share/locale/el/LC_MESSAGES/kig.mo share/locale/el/LC_MESSAGES/kimagemapeditor.mo @@ -309,6 +310,7 @@ share/locale/el/LC_MESSAGES/kio_thumbnail.mo share/locale/el/LC_MESSAGES/kio_trash.mo share/locale/el/LC_MESSAGES/kio_zeroconf.mo share/locale/el/LC_MESSAGES/kioexec.mo +share/locale/el/LC_MESSAGES/kitchensync.mo share/locale/el/LC_MESSAGES/kiten.mo share/locale/el/LC_MESSAGES/kjobviewer.mo share/locale/el/LC_MESSAGES/kjots.mo @@ -512,6 +514,7 @@ share/locale/el/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/el/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/el/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/el/LC_MESSAGES/libkickermenu_tom.mo +share/locale/el/LC_MESSAGES/libkitchensync.mo share/locale/el/LC_MESSAGES/libkleopatra.mo share/locale/el/LC_MESSAGES/libkmime.mo share/locale/el/LC_MESSAGES/libkonq.mo diff --git a/misc/kde3-i18n-en_GB/distinfo b/misc/kde3-i18n-en_GB/distinfo index 64142e03cac8..2113e0ea9fc1 100644 --- a/misc/kde3-i18n-en_GB/distinfo +++ b/misc/kde3-i18n-en_GB/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-en_GB-3.5.5.tar.bz2) = 50af460c4b69e5cd91b820ed656f99bd -SHA256 (KDE/kde-i18n/kde-i18n-en_GB-3.5.5.tar.bz2) = 77b44d25f2d569dc7e36e26ff7d518134f632263d44ad6dfb4b12a23ec3ce37d -SIZE (KDE/kde-i18n/kde-i18n-en_GB-3.5.5.tar.bz2) = 3701881 +MD5 (KDE/kde-i18n/kde-i18n-en_GB-3.5.6.tar.bz2) = 6b81bfa733c5e1c8ae4d16208093f648 +SHA256 (KDE/kde-i18n/kde-i18n-en_GB-3.5.6.tar.bz2) = 427d2e60b8d06b62ea6cd73e119bdf7ade656958ddbb25ef2a78f4b839ff98ca +SIZE (KDE/kde-i18n/kde-i18n-en_GB-3.5.6.tar.bz2) = 4368113 diff --git a/misc/kde3-i18n-en_GB/pkg-plist b/misc/kde3-i18n-en_GB/pkg-plist index 481031a55747..e14ac2194700 100644 --- a/misc/kde3-i18n-en_GB/pkg-plist +++ b/misc/kde3-i18n-en_GB/pkg-plist @@ -1,4 +1,54 @@ share/apps/katepart/syntax/logohighlightstyle.en_GB.xml +share/apps/klettres/en_GB/alpha/a.ogg +share/apps/klettres/en_GB/alpha/b.ogg +share/apps/klettres/en_GB/alpha/c.ogg +share/apps/klettres/en_GB/alpha/d.ogg +share/apps/klettres/en_GB/alpha/e.ogg +share/apps/klettres/en_GB/alpha/f.ogg +share/apps/klettres/en_GB/alpha/g.ogg +share/apps/klettres/en_GB/alpha/h.ogg +share/apps/klettres/en_GB/alpha/i.ogg +share/apps/klettres/en_GB/alpha/j.ogg +share/apps/klettres/en_GB/alpha/k.ogg +share/apps/klettres/en_GB/alpha/l.ogg +share/apps/klettres/en_GB/alpha/m.ogg +share/apps/klettres/en_GB/alpha/n.ogg +share/apps/klettres/en_GB/alpha/o.ogg +share/apps/klettres/en_GB/alpha/p.ogg +share/apps/klettres/en_GB/alpha/q.ogg +share/apps/klettres/en_GB/alpha/r.ogg +share/apps/klettres/en_GB/alpha/s.ogg +share/apps/klettres/en_GB/alpha/t.ogg +share/apps/klettres/en_GB/alpha/u.ogg +share/apps/klettres/en_GB/alpha/v.ogg +share/apps/klettres/en_GB/alpha/w.ogg +share/apps/klettres/en_GB/alpha/x.ogg +share/apps/klettres/en_GB/alpha/y.ogg +share/apps/klettres/en_GB/alpha/z.ogg +share/apps/klettres/en_GB/sounds.xml +share/apps/klettres/en_GB/syllab/arm.ogg +share/apps/klettres/en_GB/syllab/ball.ogg +share/apps/klettres/en_GB/syllab/car.ogg +share/apps/klettres/en_GB/syllab/dog.ogg +share/apps/klettres/en_GB/syllab/ear.ogg +share/apps/klettres/en_GB/syllab/fix.ogg +share/apps/klettres/en_GB/syllab/gas.ogg +share/apps/klettres/en_GB/syllab/gem.ogg +share/apps/klettres/en_GB/syllab/hot.ogg +share/apps/klettres/en_GB/syllab/hut.ogg +share/apps/klettres/en_GB/syllab/jet.ogg +share/apps/klettres/en_GB/syllab/key.ogg +share/apps/klettres/en_GB/syllab/me.ogg +share/apps/klettres/en_GB/syllab/my.ogg +share/apps/klettres/en_GB/syllab/no.ogg +share/apps/klettres/en_GB/syllab/or.ogg +share/apps/klettres/en_GB/syllab/pet.ogg +share/apps/klettres/en_GB/syllab/saw.ogg +share/apps/klettres/en_GB/syllab/say.ogg +share/apps/klettres/en_GB/syllab/sit.ogg +share/apps/klettres/en_GB/syllab/sky.ogg +share/apps/klettres/en_GB/syllab/the.ogg +share/apps/klettres/en_GB/syllab/well.ogg share/apps/kturtle/data/logokeywords.en_GB.xml share/apps/kturtle/examples/en_GB/curly.logo share/apps/kturtle/examples/en_GB/example1.logo @@ -1257,3 +1307,7 @@ share/locale/en_GB/flag.png @dirrm share/apps/kturtle/examples @dirrm share/apps/kturtle/data @dirrm share/apps/kturtle +@dirrm share/apps/klettres/en_GB/syllab +@dirrm share/apps/klettres/en_GB/alpha +@dirrm share/apps/klettres/en_GB +@dirrm share/apps/klettres diff --git a/misc/kde3-i18n-eo/distinfo b/misc/kde3-i18n-eo/distinfo index f0f1edb1a313..38752cb90d83 100644 --- a/misc/kde3-i18n-eo/distinfo +++ b/misc/kde3-i18n-eo/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-eo-3.5.5.tar.bz2) = c55c9ae0c001e5214f1ad97f4b6d02a1 -SHA256 (KDE/kde-i18n/kde-i18n-eo-3.5.5.tar.bz2) = 3247c97e52a098660c0e892f7db4d46e047330508a7f714e2e3e7e3226620cef -SIZE (KDE/kde-i18n/kde-i18n-eo-3.5.5.tar.bz2) = 1271107 +MD5 (KDE/kde-i18n/kde-i18n-eo-3.5.6.tar.bz2) = 7f17faa2bda08f31e1f33a3242f0b960 +SHA256 (KDE/kde-i18n/kde-i18n-eo-3.5.6.tar.bz2) = 5304aa2c1f08679a7e679f286479cf4406fb93178b2ab3fcdfdd5ebfa0ee3bcd +SIZE (KDE/kde-i18n/kde-i18n-eo-3.5.6.tar.bz2) = 1272068 diff --git a/misc/kde3-i18n-es/distinfo b/misc/kde3-i18n-es/distinfo index 82f2f7e3dc1f..a3a6361c1bcd 100644 --- a/misc/kde3-i18n-es/distinfo +++ b/misc/kde3-i18n-es/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-es-3.5.5.tar.bz2) = d8dc649138fe136c57a808eac1fdd719 -SHA256 (KDE/kde-i18n/kde-i18n-es-3.5.5.tar.bz2) = adde40b9a1aa7774ded2e2c6bb3e092fd33ad5806660c04aae21be9b0874b0c7 -SIZE (KDE/kde-i18n/kde-i18n-es-3.5.5.tar.bz2) = 36641045 +MD5 (KDE/kde-i18n/kde-i18n-es-3.5.6.tar.bz2) = 75f2b236131bcf89b6f2302c1fb8780f +SHA256 (KDE/kde-i18n/kde-i18n-es-3.5.6.tar.bz2) = 3a2a2a62520805419d792bf2422b662146caccd3b9d3ddb9b9e58124dc402399 +SIZE (KDE/kde-i18n/kde-i18n-es-3.5.6.tar.bz2) = 34360868 diff --git a/misc/kde3-i18n-es/pkg-plist b/misc/kde3-i18n-es/pkg-plist index 0f039b55f64b..94884a42b0cd 100644 --- a/misc/kde3-i18n-es/pkg-plist +++ b/misc/kde3-i18n-es/pkg-plist @@ -202,9 +202,27 @@ share/doc/HTML/es/KRegExpEditor/text.png share/doc/HTML/es/KRegExpEditor/texttool.png share/doc/HTML/es/KRegExpEditor/theEditor.png share/doc/HTML/es/KRegExpEditor/wordboundary.png +share/doc/HTML/es/akregator/add-feed.png +share/doc/HTML/es/akregator/add-feed2.png +share/doc/HTML/es/akregator/add-folder.png +share/doc/HTML/es/akregator/add-folder2.png +share/doc/HTML/es/akregator/advanced-tab.png +share/doc/HTML/es/akregator/appearance-tab.png +share/doc/HTML/es/akregator/archive-tab.png +share/doc/HTML/es/akregator/browser-tab.png share/doc/HTML/es/akregator/common +share/doc/HTML/es/akregator/general-tab.png share/doc/HTML/es/akregator/index.cache.bz2 share/doc/HTML/es/akregator/index.docbook +share/doc/HTML/es/akregator/konq.png +share/doc/HTML/es/akregator/konq2.png +share/doc/HTML/es/akregator/main-window.png +share/doc/HTML/es/akregator/main-window2.png +share/doc/HTML/es/akregator/main-window3.png +share/doc/HTML/es/akregator/main-window4.png +share/doc/HTML/es/akregator/quick-filter.png +share/doc/HTML/es/akregator/rss.png +share/doc/HTML/es/akregator/rss3.png share/doc/HTML/es/amor/billy.png share/doc/HTML/es/amor/bonhomme.png share/doc/HTML/es/amor/bsd.png @@ -336,9 +354,12 @@ share/doc/HTML/es/blinken/index.docbook share/doc/HTML/es/cervisia/annotate.png share/doc/HTML/es/cervisia/checkout.png share/doc/HTML/es/cervisia/commit.png +share/doc/HTML/es/cervisia/common share/doc/HTML/es/cervisia/diff.png share/doc/HTML/es/cervisia/history.png share/doc/HTML/es/cervisia/import.png +share/doc/HTML/es/cervisia/index.cache.bz2 +share/doc/HTML/es/cervisia/index.docbook share/doc/HTML/es/cervisia/logtree.png share/doc/HTML/es/cervisia/mainview.png share/doc/HTML/es/cervisia/patch.png @@ -352,6 +373,9 @@ share/doc/HTML/es/docs/common/kde-localised.css share/doc/HTML/es/docs/common/kde_logo.png share/doc/HTML/es/docs/common/lgpl-translated.html share/doc/HTML/es/docs/common/logotp3.png +share/doc/HTML/es/irkick/common +share/doc/HTML/es/irkick/index.cache.bz2 +share/doc/HTML/es/irkick/index.docbook share/doc/HTML/es/juk/common share/doc/HTML/es/juk/history-playlist.png share/doc/HTML/es/juk/index.cache.bz2 @@ -602,6 +626,9 @@ share/doc/HTML/es/kcalc/index.docbook share/doc/HTML/es/kcharselect/common share/doc/HTML/es/kcharselect/index.cache.bz2 share/doc/HTML/es/kcharselect/index.docbook +share/doc/HTML/es/kcmlirc/common +share/doc/HTML/es/kcmlirc/index.cache.bz2 +share/doc/HTML/es/kcmlirc/index.docbook share/doc/HTML/es/kcoloredit/common share/doc/HTML/es/kcoloredit/index.cache.bz2 share/doc/HTML/es/kcoloredit/index.docbook @@ -816,12 +843,6 @@ share/doc/HTML/es/kdelibs/man-dcop.1.docbook share/doc/HTML/es/kdelibs/man-kbuildsycoca.8.docbook share/doc/HTML/es/kdelibs/man-kdeoptions.7.docbook share/doc/HTML/es/kdelibs/man-qtoptions.7.docbook -share/doc/HTML/es/kdelirc/irkick/common -share/doc/HTML/es/kdelirc/irkick/index.cache.bz2 -share/doc/HTML/es/kdelirc/irkick/index.docbook -share/doc/HTML/es/kdelirc/kcmlirc/common -share/doc/HTML/es/kdelirc/kcmlirc/index.cache.bz2 -share/doc/HTML/es/kdelirc/kcmlirc/index.docbook share/doc/HTML/es/kdeprint/add-printer-wiz.docbook share/doc/HTML/es/kdeprint/common share/doc/HTML/es/kdeprint/cr32-action-wizard.png @@ -3019,6 +3040,7 @@ share/locale/es/LC_MESSAGES/kio_thumbnail.mo share/locale/es/LC_MESSAGES/kio_trash.mo share/locale/es/LC_MESSAGES/kio_zeroconf.mo share/locale/es/LC_MESSAGES/kioexec.mo +share/locale/es/LC_MESSAGES/kitchensync.mo share/locale/es/LC_MESSAGES/kiten.mo share/locale/es/LC_MESSAGES/kjobviewer.mo share/locale/es/LC_MESSAGES/kjots.mo @@ -3222,6 +3244,7 @@ share/locale/es/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/es/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/es/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/es/LC_MESSAGES/libkickermenu_tom.mo +share/locale/es/LC_MESSAGES/libkitchensync.mo share/locale/es/LC_MESSAGES/libkleopatra.mo share/locale/es/LC_MESSAGES/libkmime.mo share/locale/es/LC_MESSAGES/libkonq.mo @@ -3450,9 +3473,6 @@ share/locale/es/flag.png @dirrm share/doc/HTML/es/kdesvn-build @dirrm share/doc/HTML/es/kdesu @dirrm share/doc/HTML/es/kdeprint -@dirrm share/doc/HTML/es/kdelirc/kcmlirc -@dirrm share/doc/HTML/es/kdelirc/irkick -@dirrm share/doc/HTML/es/kdelirc @dirrm share/doc/HTML/es/kdelibs @dirrm share/doc/HTML/es/kdebugdialog @dirrm share/doc/HTML/es/kdearch @@ -3514,6 +3534,7 @@ share/locale/es/flag.png @dirrm share/doc/HTML/es/kcontrol/arts @dirrm share/doc/HTML/es/kcontrol @dirrm share/doc/HTML/es/kcoloredit +@dirrm share/doc/HTML/es/kcmlirc @dirrm share/doc/HTML/es/kcharselect @dirrm share/doc/HTML/es/kcalc @dirrm share/doc/HTML/es/kcachegrind @@ -3540,6 +3561,7 @@ share/locale/es/flag.png @dirrm share/doc/HTML/es/kaddressbook @dirrm share/doc/HTML/es/kaboodle @dirrm share/doc/HTML/es/juk +@dirrm share/doc/HTML/es/irkick @dirrm share/doc/HTML/es/docs/common @dirrm share/doc/HTML/es/docs @dirrm share/doc/HTML/es/cervisia diff --git a/misc/kde3-i18n-et/distinfo b/misc/kde3-i18n-et/distinfo index 32c2ef8509d7..126ca32c894a 100644 --- a/misc/kde3-i18n-et/distinfo +++ b/misc/kde3-i18n-et/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-et-3.5.5.tar.bz2) = d3065d66591fa0ea4e304e9bcbb6dc10 -SHA256 (KDE/kde-i18n/kde-i18n-et-3.5.5.tar.bz2) = 5b16805308aefb3e0fa79c9df4d89b92ff407406b91ce2a68ef9a3bf01c6ae54 -SIZE (KDE/kde-i18n/kde-i18n-et-3.5.5.tar.bz2) = 10540364 +MD5 (KDE/kde-i18n/kde-i18n-et-3.5.6.tar.bz2) = 55647fdaf91b9626618015017be954b4 +SHA256 (KDE/kde-i18n/kde-i18n-et-3.5.6.tar.bz2) = 83dd00865027eca51cfa9ab8715986634282ca7706367b5a5133e6d0814cfe60 +SIZE (KDE/kde-i18n/kde-i18n-et-3.5.6.tar.bz2) = 10526717 diff --git a/misc/kde3-i18n-et/pkg-plist b/misc/kde3-i18n-et/pkg-plist index 67c7989c1d19..b286b28b3ad1 100644 --- a/misc/kde3-i18n-et/pkg-plist +++ b/misc/kde3-i18n-et/pkg-plist @@ -49,6 +49,9 @@ share/doc/HTML/et/docs/common/logotp3.png share/doc/HTML/et/flashkard/common share/doc/HTML/et/flashkard/index.cache.bz2 share/doc/HTML/et/flashkard/index.docbook +share/doc/HTML/et/irkick/common +share/doc/HTML/et/irkick/index.cache.bz2 +share/doc/HTML/et/irkick/index.docbook share/doc/HTML/et/juk/common share/doc/HTML/et/juk/index.cache.bz2 share/doc/HTML/et/juk/index.docbook @@ -157,6 +160,9 @@ share/doc/HTML/et/kcalc/index.docbook share/doc/HTML/et/kcharselect/common share/doc/HTML/et/kcharselect/index.cache.bz2 share/doc/HTML/et/kcharselect/index.docbook +share/doc/HTML/et/kcmlirc/common +share/doc/HTML/et/kcmlirc/index.cache.bz2 +share/doc/HTML/et/kcmlirc/index.docbook share/doc/HTML/et/kcoloredit/common share/doc/HTML/et/kcoloredit/index.cache.bz2 share/doc/HTML/et/kcoloredit/index.docbook @@ -352,12 +358,6 @@ share/doc/HTML/et/kdelibs/man-dcop.1.docbook share/doc/HTML/et/kdelibs/man-kbuildsycoca.8.docbook share/doc/HTML/et/kdelibs/man-kdeoptions.7.docbook share/doc/HTML/et/kdelibs/man-qtoptions.7.docbook -share/doc/HTML/et/kdelirc/irkick/common -share/doc/HTML/et/kdelirc/irkick/index.cache.bz2 -share/doc/HTML/et/kdelirc/irkick/index.docbook -share/doc/HTML/et/kdelirc/kcmlirc/common -share/doc/HTML/et/kdelirc/kcmlirc/index.cache.bz2 -share/doc/HTML/et/kdelirc/kcmlirc/index.docbook share/doc/HTML/et/kdeprint/add-printer-wiz.docbook share/doc/HTML/et/kdeprint/common share/doc/HTML/et/kdeprint/cups-config.docbook @@ -518,6 +518,7 @@ share/doc/HTML/et/khelpcenter/userguide/common share/doc/HTML/et/khelpcenter/userguide/control-center.docbook share/doc/HTML/et/khelpcenter/userguide/creating-graphics.docbook share/doc/HTML/et/khelpcenter/userguide/credits-and-license.docbook +share/doc/HTML/et/khelpcenter/userguide/customizing-desktop.docbook share/doc/HTML/et/khelpcenter/userguide/desktop.png share/doc/HTML/et/khelpcenter/userguide/email.docbook share/doc/HTML/et/khelpcenter/userguide/extragear-applications.docbook @@ -1630,6 +1631,7 @@ share/locale/et/LC_MESSAGES/khotkeys.mo share/locale/et/LC_MESSAGES/khtmlkttsd.mo share/locale/et/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/et/LC_MESSAGES/kicker.mo +share/locale/et/LC_MESSAGES/kickermenu_kate.mo share/locale/et/LC_MESSAGES/kiconedit.mo share/locale/et/LC_MESSAGES/kig.mo share/locale/et/LC_MESSAGES/kimagemapeditor.mo @@ -1667,6 +1669,7 @@ share/locale/et/LC_MESSAGES/kio_thumbnail.mo share/locale/et/LC_MESSAGES/kio_trash.mo share/locale/et/LC_MESSAGES/kio_zeroconf.mo share/locale/et/LC_MESSAGES/kioexec.mo +share/locale/et/LC_MESSAGES/kitchensync.mo share/locale/et/LC_MESSAGES/kiten.mo share/locale/et/LC_MESSAGES/kjobviewer.mo share/locale/et/LC_MESSAGES/kjots.mo @@ -1870,6 +1873,7 @@ share/locale/et/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/et/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/et/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/et/LC_MESSAGES/libkickermenu_tom.mo +share/locale/et/LC_MESSAGES/libkitchensync.mo share/locale/et/LC_MESSAGES/libkleopatra.mo share/locale/et/LC_MESSAGES/libkmime.mo share/locale/et/LC_MESSAGES/libkonq.mo @@ -2096,9 +2100,6 @@ share/locale/et/flag.png @dirrm share/doc/HTML/et/kdesvn-build @dirrm share/doc/HTML/et/kdesu @dirrm share/doc/HTML/et/kdeprint -@dirrm share/doc/HTML/et/kdelirc/kcmlirc -@dirrm share/doc/HTML/et/kdelirc/irkick -@dirrm share/doc/HTML/et/kdelirc @dirrm share/doc/HTML/et/kdelibs @dirrm share/doc/HTML/et/kdebugdialog @dirrm share/doc/HTML/et/kdearch @@ -2162,6 +2163,7 @@ share/locale/et/flag.png @dirrm share/doc/HTML/et/kcontrol/arts @dirrm share/doc/HTML/et/kcontrol @dirrm share/doc/HTML/et/kcoloredit +@dirrm share/doc/HTML/et/kcmlirc @dirrm share/doc/HTML/et/kcharselect @dirrm share/doc/HTML/et/kcalc @dirrm share/doc/HTML/et/kcachegrind @@ -2188,6 +2190,7 @@ share/locale/et/flag.png @dirrm share/doc/HTML/et/kaddressbook @dirrm share/doc/HTML/et/kaboodle @dirrm share/doc/HTML/et/juk +@dirrm share/doc/HTML/et/irkick @dirrm share/doc/HTML/et/flashkard @dirrm share/doc/HTML/et/docs/common @dirrm share/doc/HTML/et/docs diff --git a/misc/kde3-i18n-eu/distinfo b/misc/kde3-i18n-eu/distinfo index 30c41eab5537..5625eabb1153 100644 --- a/misc/kde3-i18n-eu/distinfo +++ b/misc/kde3-i18n-eu/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-eu-3.5.5.tar.bz2) = 45a4361f11c14b8cbc0a5bb29ab18edb -SHA256 (KDE/kde-i18n/kde-i18n-eu-3.5.5.tar.bz2) = ad6c905811d6659541735a5d6a0d5f2ea4d140c7ac6aafe32e3d1bf1a81ea884 -SIZE (KDE/kde-i18n/kde-i18n-eu-3.5.5.tar.bz2) = 2236745 +MD5 (KDE/kde-i18n/kde-i18n-eu-3.5.6.tar.bz2) = 6413e62d868721be5b269e50e979d4b1 +SHA256 (KDE/kde-i18n/kde-i18n-eu-3.5.6.tar.bz2) = 00b9a6be862a721305232209e5b64dbbc6f1d720dab785dc0f9c7cdcac2b064d +SIZE (KDE/kde-i18n/kde-i18n-eu-3.5.6.tar.bz2) = 2240360 diff --git a/misc/kde3-i18n-fa/distinfo b/misc/kde3-i18n-fa/distinfo index d936fe74a798..38056098447c 100644 --- a/misc/kde3-i18n-fa/distinfo +++ b/misc/kde3-i18n-fa/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-fa-3.5.5.tar.bz2) = e55d8c8d06097b3daaa71eb499114e3d -SHA256 (KDE/kde-i18n/kde-i18n-fa-3.5.5.tar.bz2) = bd52e15b9dd1267f9766713222dab0ca2a881fddfbdb8f52a32f97d3d102bb6e -SIZE (KDE/kde-i18n/kde-i18n-fa-3.5.5.tar.bz2) = 2188743 +MD5 (KDE/kde-i18n/kde-i18n-fa-3.5.6.tar.bz2) = be881e4b7be80e289b9dcdf00753ce79 +SHA256 (KDE/kde-i18n/kde-i18n-fa-3.5.6.tar.bz2) = 5b16e19c2710fb2b3b4fa796060e134a0913bf74438f9853e18d423618803d0a +SIZE (KDE/kde-i18n/kde-i18n-fa-3.5.6.tar.bz2) = 2173096 diff --git a/misc/kde3-i18n-fi/distinfo b/misc/kde3-i18n-fi/distinfo index 17f97ba15edc..0acb8b1ae806 100644 --- a/misc/kde3-i18n-fi/distinfo +++ b/misc/kde3-i18n-fi/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-fi-3.5.5.tar.bz2) = 5693b184f6d3e2d79c78248a9506ba11 -SHA256 (KDE/kde-i18n/kde-i18n-fi-3.5.5.tar.bz2) = 9f709a0ff8403da6137c0e48b172c79ff8c875ebf04500a4c586bcdf37a4054e -SIZE (KDE/kde-i18n/kde-i18n-fi-3.5.5.tar.bz2) = 2400361 +MD5 (KDE/kde-i18n/kde-i18n-fi-3.5.6.tar.bz2) = 227d47ad0232daf190653b4f8d9cd508 +SHA256 (KDE/kde-i18n/kde-i18n-fi-3.5.6.tar.bz2) = 9f7513596914504425918e92e27dac7bd6e67993256dafd5fec4bddefaadbb30 +SIZE (KDE/kde-i18n/kde-i18n-fi-3.5.6.tar.bz2) = 2407391 diff --git a/misc/kde3-i18n-fi/pkg-plist b/misc/kde3-i18n-fi/pkg-plist index 89a1db17cd45..7727577d2453 100644 --- a/misc/kde3-i18n-fi/pkg-plist +++ b/misc/kde3-i18n-fi/pkg-plist @@ -297,6 +297,7 @@ share/locale/fi/LC_MESSAGES/khotkeys.mo share/locale/fi/LC_MESSAGES/khtmlkttsd.mo share/locale/fi/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/fi/LC_MESSAGES/kicker.mo +share/locale/fi/LC_MESSAGES/kickermenu_kate.mo share/locale/fi/LC_MESSAGES/kiconedit.mo share/locale/fi/LC_MESSAGES/kig.mo share/locale/fi/LC_MESSAGES/kimagemapeditor.mo diff --git a/misc/kde3-i18n-fy/distinfo b/misc/kde3-i18n-fy/distinfo index 0b098fa7c814..538b9c33868d 100644 --- a/misc/kde3-i18n-fy/distinfo +++ b/misc/kde3-i18n-fy/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-fy-3.5.5.tar.bz2) = 98a3bbe04e82b89c8ab2a821741ffc34 -SHA256 (KDE/kde-i18n/kde-i18n-fy-3.5.5.tar.bz2) = 1cf20414172ad6b4b3578777190f4db5ff3f437fce5b1619fc62738a38f5cc7f -SIZE (KDE/kde-i18n/kde-i18n-fy-3.5.5.tar.bz2) = 691937 +MD5 (KDE/kde-i18n/kde-i18n-fy-3.5.6.tar.bz2) = f69c07af129e084a4166cdfb3e5db173 +SHA256 (KDE/kde-i18n/kde-i18n-fy-3.5.6.tar.bz2) = 35b7dae2c0f8b4848c057af0d0b42a6b04b0d5dc0ecdb737a7f8316195801ae3 +SIZE (KDE/kde-i18n/kde-i18n-fy-3.5.6.tar.bz2) = 692661 diff --git a/misc/kde3-i18n-fy/pkg-plist b/misc/kde3-i18n-fy/pkg-plist index 0b35e177ec6f..70812abe3744 100644 --- a/misc/kde3-i18n-fy/pkg-plist +++ b/misc/kde3-i18n-fy/pkg-plist @@ -94,6 +94,7 @@ share/locale/fy/LC_MESSAGES/khelpcenter.mo share/locale/fy/LC_MESSAGES/khotkeys.mo share/locale/fy/LC_MESSAGES/khtmlkttsd.mo share/locale/fy/LC_MESSAGES/kicker.mo +share/locale/fy/LC_MESSAGES/kickermenu_kate.mo share/locale/fy/LC_MESSAGES/kio.mo share/locale/fy/LC_MESSAGES/kio_finger.mo share/locale/fy/LC_MESSAGES/kio_fish.mo diff --git a/misc/kde3-i18n-ga/distinfo b/misc/kde3-i18n-ga/distinfo index 5f5825de146e..bb7cbc29abcd 100644 --- a/misc/kde3-i18n-ga/distinfo +++ b/misc/kde3-i18n-ga/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ga-3.5.5.tar.bz2) = e82a3ff13cb0f8d73578f1a3770a119c -SHA256 (KDE/kde-i18n/kde-i18n-ga-3.5.5.tar.bz2) = ec9bc93828a5a690bfd9ec8d93ffe9f8fee0ee4d36b7bd1da8ac27b757c05336 -SIZE (KDE/kde-i18n/kde-i18n-ga-3.5.5.tar.bz2) = 1698887 +MD5 (KDE/kde-i18n/kde-i18n-ga-3.5.6.tar.bz2) = 0ffdca99a102c4e1320916de3bf35adb +SHA256 (KDE/kde-i18n/kde-i18n-ga-3.5.6.tar.bz2) = 2df03cef1b55c6c90c799e0b4fd02c855f6f849c7e88df89c8f59449e2795093 +SIZE (KDE/kde-i18n/kde-i18n-ga-3.5.6.tar.bz2) = 1693323 diff --git a/misc/kde3-i18n-gl/distinfo b/misc/kde3-i18n-gl/distinfo index f319b6d332d8..cbb083aa75ad 100644 --- a/misc/kde3-i18n-gl/distinfo +++ b/misc/kde3-i18n-gl/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-gl-3.5.5.tar.bz2) = bf3ad88fea56ded7fd451cc83826e4c5 -SHA256 (KDE/kde-i18n/kde-i18n-gl-3.5.5.tar.bz2) = f997219bd0382843ed7be7b3ef9a18fc672a476b1c9321b730cbfeb16d5a406f -SIZE (KDE/kde-i18n/kde-i18n-gl-3.5.5.tar.bz2) = 1354712 +MD5 (KDE/kde-i18n/kde-i18n-gl-3.5.6.tar.bz2) = 590bd015071b21ba0dcd55fc2955ca55 +SHA256 (KDE/kde-i18n/kde-i18n-gl-3.5.6.tar.bz2) = 66edc840e7a4dff922b43895a341cf23b97516c84b65c84f9ae0143a29b4f890 +SIZE (KDE/kde-i18n/kde-i18n-gl-3.5.6.tar.bz2) = 1862274 diff --git a/misc/kde3-i18n-gl/pkg-plist b/misc/kde3-i18n-gl/pkg-plist index 4a2c8a85dfcc..c1dad0ef48c1 100644 --- a/misc/kde3-i18n-gl/pkg-plist +++ b/misc/kde3-i18n-gl/pkg-plist @@ -1,10 +1,16 @@ +share/locale/gl/LC_MESSAGES/akregator.mo +share/locale/gl/LC_MESSAGES/akregator_konqplugin.mo share/locale/gl/LC_MESSAGES/alsaplayerui.mo share/locale/gl/LC_MESSAGES/amor.mo share/locale/gl/LC_MESSAGES/appletproxy.mo share/locale/gl/LC_MESSAGES/ark.mo share/locale/gl/LC_MESSAGES/ark_plugin.mo +share/locale/gl/LC_MESSAGES/artsbuilder.mo share/locale/gl/LC_MESSAGES/artscontrol.mo +share/locale/gl/LC_MESSAGES/artsmodules.mo share/locale/gl/LC_MESSAGES/atlantikdesigner.mo +share/locale/gl/LC_MESSAGES/audiocd_encoder_lame.mo +share/locale/gl/LC_MESSAGES/audiocd_encoder_vorbis.mo share/locale/gl/LC_MESSAGES/audiorename_plugin.mo share/locale/gl/LC_MESSAGES/autorefresh.mo share/locale/gl/LC_MESSAGES/babelfish.mo @@ -19,37 +25,70 @@ share/locale/gl/LC_MESSAGES/display.mo share/locale/gl/LC_MESSAGES/dockbarextension.mo share/locale/gl/LC_MESSAGES/domtreeviewer.mo share/locale/gl/LC_MESSAGES/drkonqi.mo +share/locale/gl/LC_MESSAGES/dub.mo share/locale/gl/LC_MESSAGES/extensionproxy.mo +share/locale/gl/LC_MESSAGES/ffrs.mo share/locale/gl/LC_MESSAGES/filetypes.mo +share/locale/gl/LC_MESSAGES/fsview.mo share/locale/gl/LC_MESSAGES/htmlsearch.mo share/locale/gl/LC_MESSAGES/imagerename_plugin.mo +share/locale/gl/LC_MESSAGES/imgalleryplugin.mo +share/locale/gl/LC_MESSAGES/irkick.mo share/locale/gl/LC_MESSAGES/joystick.mo +share/locale/gl/LC_MESSAGES/juk.mo +share/locale/gl/LC_MESSAGES/kabc2mutt.mo share/locale/gl/LC_MESSAGES/kabc_dir.mo share/locale/gl/LC_MESSAGES/kabc_file.mo share/locale/gl/LC_MESSAGES/kabc_ldapkio.mo share/locale/gl/LC_MESSAGES/kabc_net.mo +share/locale/gl/LC_MESSAGES/kabc_slox.mo share/locale/gl/LC_MESSAGES/kabc_sql.mo share/locale/gl/LC_MESSAGES/kabcformat_binary.mo share/locale/gl/LC_MESSAGES/kaboodle.mo share/locale/gl/LC_MESSAGES/kaccess.mo share/locale/gl/LC_MESSAGES/kaddressbook.mo +share/locale/gl/LC_MESSAGES/kalarm.mo share/locale/gl/LC_MESSAGES/kalzium.mo +share/locale/gl/LC_MESSAGES/kanagram.mo share/locale/gl/LC_MESSAGES/kandy.mo share/locale/gl/LC_MESSAGES/kappfinder.mo +share/locale/gl/LC_MESSAGES/karm.mo share/locale/gl/LC_MESSAGES/kasbarextension.mo share/locale/gl/LC_MESSAGES/kasteroids.mo share/locale/gl/LC_MESSAGES/kate.mo +share/locale/gl/LC_MESSAGES/katecppsymbolviewer.mo +share/locale/gl/LC_MESSAGES/katefiletemplates.mo +share/locale/gl/LC_MESSAGES/katefll_initplugin.mo +share/locale/gl/LC_MESSAGES/katefll_plugin.mo share/locale/gl/LC_MESSAGES/katehelloworld.mo +share/locale/gl/LC_MESSAGES/katehtmltools.mo +share/locale/gl/LC_MESSAGES/kateinsertcommand.mo +share/locale/gl/LC_MESSAGES/katekjswrapper.mo share/locale/gl/LC_MESSAGES/katemake.mo +share/locale/gl/LC_MESSAGES/katemodeline.mo +share/locale/gl/LC_MESSAGES/kateopenheader.mo share/locale/gl/LC_MESSAGES/katepart.mo +share/locale/gl/LC_MESSAGES/katepybrowse.mo +share/locale/gl/LC_MESSAGES/katesnippets.mo +share/locale/gl/LC_MESSAGES/katetabbarextension.mo +share/locale/gl/LC_MESSAGES/katetextfilter.mo +share/locale/gl/LC_MESSAGES/katexmlcheck.mo +share/locale/gl/LC_MESSAGES/katexmltools.mo share/locale/gl/LC_MESSAGES/katomic.mo share/locale/gl/LC_MESSAGES/kaudiocreator.mo share/locale/gl/LC_MESSAGES/kay.mo share/locale/gl/LC_MESSAGES/kbabel.mo share/locale/gl/LC_MESSAGES/kbattleship.mo +share/locale/gl/LC_MESSAGES/kbinaryclock.mo +share/locale/gl/LC_MESSAGES/kblackbox.mo share/locale/gl/LC_MESSAGES/kbounce.mo share/locale/gl/LC_MESSAGES/kbruch.mo +share/locale/gl/LC_MESSAGES/kbstateapplet.mo share/locale/gl/LC_MESSAGES/kcalc.mo +share/locale/gl/LC_MESSAGES/kcharselect.mo +share/locale/gl/LC_MESSAGES/kcharselectapplet.mo +share/locale/gl/LC_MESSAGES/kcm_krfb.mo +share/locale/gl/LC_MESSAGES/kcm_kviewcanvasconfig.mo share/locale/gl/LC_MESSAGES/kcm_kviewgeneralconfig.mo share/locale/gl/LC_MESSAGES/kcm_kviewpluginsconfig.mo share/locale/gl/LC_MESSAGES/kcm_kviewviewerpluginsconfig.mo @@ -72,6 +111,7 @@ share/locale/gl/LC_MESSAGES/kcmicons.mo share/locale/gl/LC_MESSAGES/kcminfo.mo share/locale/gl/LC_MESSAGES/kcminput.mo share/locale/gl/LC_MESSAGES/kcmioslaveinfo.mo +share/locale/gl/LC_MESSAGES/kcmkabconfig.mo share/locale/gl/LC_MESSAGES/kcmkamera.mo share/locale/gl/LC_MESSAGES/kcmkclock.mo share/locale/gl/LC_MESSAGES/kcmkded.mo @@ -84,7 +124,10 @@ share/locale/gl/LC_MESSAGES/kcmkonqhtml.mo share/locale/gl/LC_MESSAGES/kcmkonsole.mo share/locale/gl/LC_MESSAGES/kcmkontactnt.mo share/locale/gl/LC_MESSAGES/kcmktalkd.mo +share/locale/gl/LC_MESSAGES/kcmkuick.mo +share/locale/gl/LC_MESSAGES/kcmkurifilt.mo share/locale/gl/LC_MESSAGES/kcmkvaio.mo +share/locale/gl/LC_MESSAGES/kcmkwallet.mo share/locale/gl/LC_MESSAGES/kcmkwindecoration.mo share/locale/gl/LC_MESSAGES/kcmkwinrules.mo share/locale/gl/LC_MESSAGES/kcmkwm.mo @@ -92,7 +135,9 @@ share/locale/gl/LC_MESSAGES/kcmlanbrowser.mo share/locale/gl/LC_MESSAGES/kcmlaptop.mo share/locale/gl/LC_MESSAGES/kcmlaunch.mo share/locale/gl/LC_MESSAGES/kcmlayout.mo +share/locale/gl/LC_MESSAGES/kcmlilo.mo share/locale/gl/LC_MESSAGES/kcmlocale.mo +share/locale/gl/LC_MESSAGES/kcmmedia.mo share/locale/gl/LC_MESSAGES/kcmnic.mo share/locale/gl/LC_MESSAGES/kcmnotify.mo share/locale/gl/LC_MESSAGES/kcmperformance.mo @@ -107,15 +152,19 @@ share/locale/gl/LC_MESSAGES/kcmstyle.mo share/locale/gl/LC_MESSAGES/kcmtaskbar.mo share/locale/gl/LC_MESSAGES/kcmusb.mo share/locale/gl/LC_MESSAGES/kcmview1394.mo +share/locale/gl/LC_MESSAGES/kcmwifi.mo share/locale/gl/LC_MESSAGES/kcmxinerama.mo share/locale/gl/LC_MESSAGES/kcoloredit.mo share/locale/gl/LC_MESSAGES/kcontrol.mo +share/locale/gl/LC_MESSAGES/kcron.mo share/locale/gl/LC_MESSAGES/kdat.mo share/locale/gl/LC_MESSAGES/kdcop.mo share/locale/gl/LC_MESSAGES/kdebugdialog.mo share/locale/gl/LC_MESSAGES/kdelibs.mo share/locale/gl/LC_MESSAGES/kdelibs_colors.mo share/locale/gl/LC_MESSAGES/kdepasswd.mo +share/locale/gl/LC_MESSAGES/kdepimresources.mo +share/locale/gl/LC_MESSAGES/kdepimwizards.mo share/locale/gl/LC_MESSAGES/kdeprint.mo share/locale/gl/LC_MESSAGES/kdeprint_part.mo share/locale/gl/LC_MESSAGES/kdeprintfax.mo @@ -123,7 +172,11 @@ share/locale/gl/LC_MESSAGES/kdesktop.mo share/locale/gl/LC_MESSAGES/kdesu.mo share/locale/gl/LC_MESSAGES/kdesud.mo share/locale/gl/LC_MESSAGES/kdf.mo +share/locale/gl/LC_MESSAGES/kdgantt.mo share/locale/gl/LC_MESSAGES/kdialog.mo +share/locale/gl/LC_MESSAGES/kdict.mo +share/locale/gl/LC_MESSAGES/kdictapplet.mo +share/locale/gl/LC_MESSAGES/kdjview.mo share/locale/gl/LC_MESSAGES/kdmconfig.mo share/locale/gl/LC_MESSAGES/kdmgreet.mo share/locale/gl/LC_MESSAGES/kdvi.mo @@ -131,43 +184,56 @@ share/locale/gl/LC_MESSAGES/kedit.mo share/locale/gl/LC_MESSAGES/keduca.mo share/locale/gl/LC_MESSAGES/kenolaba.mo share/locale/gl/LC_MESSAGES/kfax.mo +share/locale/gl/LC_MESSAGES/kfaxview.mo share/locale/gl/LC_MESSAGES/kfifteenapplet.mo share/locale/gl/LC_MESSAGES/kfile_au.mo share/locale/gl/LC_MESSAGES/kfile_avi.mo share/locale/gl/LC_MESSAGES/kfile_bmp.mo +share/locale/gl/LC_MESSAGES/kfile_cert.mo share/locale/gl/LC_MESSAGES/kfile_cpp.mo +share/locale/gl/LC_MESSAGES/kfile_dds.mo share/locale/gl/LC_MESSAGES/kfile_deb.mo share/locale/gl/LC_MESSAGES/kfile_desktop.mo share/locale/gl/LC_MESSAGES/kfile_diff.mo share/locale/gl/LC_MESSAGES/kfile_drgeo.mo share/locale/gl/LC_MESSAGES/kfile_dvi.mo +share/locale/gl/LC_MESSAGES/kfile_exr.mo share/locale/gl/LC_MESSAGES/kfile_flac.mo share/locale/gl/LC_MESSAGES/kfile_folder.mo share/locale/gl/LC_MESSAGES/kfile_gif.mo share/locale/gl/LC_MESSAGES/kfile_html.mo share/locale/gl/LC_MESSAGES/kfile_ico.mo +share/locale/gl/LC_MESSAGES/kfile_ics.mo share/locale/gl/LC_MESSAGES/kfile_jpeg.mo share/locale/gl/LC_MESSAGES/kfile_kig.mo share/locale/gl/LC_MESSAGES/kfile_lnk.mo share/locale/gl/LC_MESSAGES/kfile_m3u.mo +share/locale/gl/LC_MESSAGES/kfile_mhtml.mo share/locale/gl/LC_MESSAGES/kfile_mp3.mo share/locale/gl/LC_MESSAGES/kfile_mpc.mo +share/locale/gl/LC_MESSAGES/kfile_mpeg.mo share/locale/gl/LC_MESSAGES/kfile_ogg.mo +share/locale/gl/LC_MESSAGES/kfile_palm.mo share/locale/gl/LC_MESSAGES/kfile_pcx.mo share/locale/gl/LC_MESSAGES/kfile_pdf.mo share/locale/gl/LC_MESSAGES/kfile_png.mo share/locale/gl/LC_MESSAGES/kfile_pnm.mo share/locale/gl/LC_MESSAGES/kfile_po.mo share/locale/gl/LC_MESSAGES/kfile_ps.mo +share/locale/gl/LC_MESSAGES/kfile_rfc822.mo share/locale/gl/LC_MESSAGES/kfile_rgb.mo share/locale/gl/LC_MESSAGES/kfile_rpm.mo share/locale/gl/LC_MESSAGES/kfile_sid.mo share/locale/gl/LC_MESSAGES/kfile_tga.mo +share/locale/gl/LC_MESSAGES/kfile_theora.mo share/locale/gl/LC_MESSAGES/kfile_tiff.mo +share/locale/gl/LC_MESSAGES/kfile_torrent.mo share/locale/gl/LC_MESSAGES/kfile_ts.mo share/locale/gl/LC_MESSAGES/kfile_txt.mo +share/locale/gl/LC_MESSAGES/kfile_vcf.mo share/locale/gl/LC_MESSAGES/kfile_wav.mo share/locale/gl/LC_MESSAGES/kfile_xbm.mo +share/locale/gl/LC_MESSAGES/kfile_xpm.mo share/locale/gl/LC_MESSAGES/kfileaudiopreview.mo share/locale/gl/LC_MESSAGES/kfilereplace.mo share/locale/gl/LC_MESSAGES/kfindpart.mo @@ -176,25 +242,36 @@ share/locale/gl/LC_MESSAGES/kfmclient.mo share/locale/gl/LC_MESSAGES/kfontinst.mo share/locale/gl/LC_MESSAGES/kfouleggs.mo share/locale/gl/LC_MESSAGES/kgamma.mo +share/locale/gl/LC_MESSAGES/kgantt.mo share/locale/gl/LC_MESSAGES/kgeography.mo share/locale/gl/LC_MESSAGES/kget.mo share/locale/gl/LC_MESSAGES/kghostview.mo +share/locale/gl/LC_MESSAGES/kgoldrunner.mo share/locale/gl/LC_MESSAGES/kgpg.mo share/locale/gl/LC_MESSAGES/kgreet_classic.mo +share/locale/gl/LC_MESSAGES/kgreet_winbind.mo share/locale/gl/LC_MESSAGES/khangman.mo share/locale/gl/LC_MESSAGES/khelpcenter.mo share/locale/gl/LC_MESSAGES/khotkeys.mo +share/locale/gl/LC_MESSAGES/khtmlkttsd.mo share/locale/gl/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/gl/LC_MESSAGES/kicker.mo +share/locale/gl/LC_MESSAGES/kickermenu_kate.mo share/locale/gl/LC_MESSAGES/kiconedit.mo +share/locale/gl/LC_MESSAGES/kig.mo +share/locale/gl/LC_MESSAGES/kinetd.mo share/locale/gl/LC_MESSAGES/kio.mo share/locale/gl/LC_MESSAGES/kio_audiocd.mo share/locale/gl/LC_MESSAGES/kio_finger.mo share/locale/gl/LC_MESSAGES/kio_fish.mo share/locale/gl/LC_MESSAGES/kio_floppy.mo +share/locale/gl/LC_MESSAGES/kio_groupwise.mo share/locale/gl/LC_MESSAGES/kio_help.mo +share/locale/gl/LC_MESSAGES/kio_home.mo share/locale/gl/LC_MESSAGES/kio_imap4.mo +share/locale/gl/LC_MESSAGES/kio_jabberdisco.mo share/locale/gl/LC_MESSAGES/kio_lan.mo +share/locale/gl/LC_MESSAGES/kio_ldap.mo share/locale/gl/LC_MESSAGES/kio_mac.mo share/locale/gl/LC_MESSAGES/kio_man.mo share/locale/gl/LC_MESSAGES/kio_media.mo @@ -203,10 +280,15 @@ share/locale/gl/LC_MESSAGES/kio_nfs.mo share/locale/gl/LC_MESSAGES/kio_nntp.mo share/locale/gl/LC_MESSAGES/kio_pop3.mo share/locale/gl/LC_MESSAGES/kio_print.mo +share/locale/gl/LC_MESSAGES/kio_remote.mo share/locale/gl/LC_MESSAGES/kio_settings.mo share/locale/gl/LC_MESSAGES/kio_sftp.mo +share/locale/gl/LC_MESSAGES/kio_sieve.mo share/locale/gl/LC_MESSAGES/kio_smb.mo share/locale/gl/LC_MESSAGES/kio_smtp.mo +share/locale/gl/LC_MESSAGES/kio_system.mo +share/locale/gl/LC_MESSAGES/kio_tar.mo +share/locale/gl/LC_MESSAGES/kio_thumbnail.mo share/locale/gl/LC_MESSAGES/kio_trash.mo share/locale/gl/LC_MESSAGES/kio_zeroconf.mo share/locale/gl/LC_MESSAGES/kioexec.mo @@ -215,12 +297,19 @@ share/locale/gl/LC_MESSAGES/kjobviewer.mo share/locale/gl/LC_MESSAGES/kjots.mo share/locale/gl/LC_MESSAGES/klaptopdaemon.mo share/locale/gl/LC_MESSAGES/klatin.mo +share/locale/gl/LC_MESSAGES/kleopatra.mo share/locale/gl/LC_MESSAGES/klettres.mo share/locale/gl/LC_MESSAGES/klickety.mo share/locale/gl/LC_MESSAGES/klines.mo +share/locale/gl/LC_MESSAGES/klinkstatus.mo share/locale/gl/LC_MESSAGES/klipper.mo +share/locale/gl/LC_MESSAGES/klock.mo share/locale/gl/LC_MESSAGES/kmag.mo share/locale/gl/LC_MESSAGES/kmail.mo +share/locale/gl/LC_MESSAGES/kmail_text_calendar_plugin.mo +share/locale/gl/LC_MESSAGES/kmail_text_vcard_plugin.mo +share/locale/gl/LC_MESSAGES/kmailcvt.mo +share/locale/gl/LC_MESSAGES/kmathapplet.mo share/locale/gl/LC_MESSAGES/kmcop.mo share/locale/gl/LC_MESSAGES/kmenuapplet.mo share/locale/gl/LC_MESSAGES/kmenuedit.mo @@ -228,8 +317,15 @@ share/locale/gl/LC_MESSAGES/kmid.mo share/locale/gl/LC_MESSAGES/kmines.mo share/locale/gl/LC_MESSAGES/kminipagerapplet.mo share/locale/gl/LC_MESSAGES/kmix.mo +share/locale/gl/LC_MESSAGES/kmobile.mo share/locale/gl/LC_MESSAGES/kmoon.mo share/locale/gl/LC_MESSAGES/kmousetool.mo +share/locale/gl/LC_MESSAGES/kmouth.mo +share/locale/gl/LC_MESSAGES/kmplot.mo +share/locale/gl/LC_MESSAGES/kmrml.mo +share/locale/gl/LC_MESSAGES/knetattach.mo +share/locale/gl/LC_MESSAGES/knetworkconf.mo +share/locale/gl/LC_MESSAGES/knewsticker.mo share/locale/gl/LC_MESSAGES/knode.mo share/locale/gl/LC_MESSAGES/knotes.mo share/locale/gl/LC_MESSAGES/knotify.mo @@ -237,13 +333,24 @@ share/locale/gl/LC_MESSAGES/kodo.mo share/locale/gl/LC_MESSAGES/kolf.mo share/locale/gl/LC_MESSAGES/kolourpaint.mo share/locale/gl/LC_MESSAGES/kolourpicker.mo +share/locale/gl/LC_MESSAGES/konnector_dummy.mo +share/locale/gl/LC_MESSAGES/konnector_kabc.mo +share/locale/gl/LC_MESSAGES/konnector_kcal.mo +share/locale/gl/LC_MESSAGES/konnector_local.mo +share/locale/gl/LC_MESSAGES/konnector_qtopia.mo +share/locale/gl/LC_MESSAGES/konnector_remote.mo +share/locale/gl/LC_MESSAGES/konqsidebar_delicious.mo share/locale/gl/LC_MESSAGES/konqsidebar_mediaplayer.mo +share/locale/gl/LC_MESSAGES/konqsidebar_metabar.mo +share/locale/gl/LC_MESSAGES/konqsidebar_news.mo share/locale/gl/LC_MESSAGES/konqueror.mo share/locale/gl/LC_MESSAGES/konsole.mo +share/locale/gl/LC_MESSAGES/konsolekalendar.mo share/locale/gl/LC_MESSAGES/kontact.mo share/locale/gl/LC_MESSAGES/kooka.mo share/locale/gl/LC_MESSAGES/kopete.mo share/locale/gl/LC_MESSAGES/korganizer.mo +share/locale/gl/LC_MESSAGES/korn.mo share/locale/gl/LC_MESSAGES/kpackage.mo share/locale/gl/LC_MESSAGES/kpager.mo share/locale/gl/LC_MESSAGES/kpartsaver.mo @@ -251,6 +358,8 @@ share/locale/gl/LC_MESSAGES/kpat.mo share/locale/gl/LC_MESSAGES/kpdf.mo share/locale/gl/LC_MESSAGES/kpercentage.mo share/locale/gl/LC_MESSAGES/kpersonalizer.mo +share/locale/gl/LC_MESSAGES/kpf.mo +share/locale/gl/LC_MESSAGES/kpilot.mo share/locale/gl/LC_MESSAGES/kpoker.mo share/locale/gl/LC_MESSAGES/kpovmodeler.mo share/locale/gl/LC_MESSAGES/kppp.mo @@ -259,15 +368,28 @@ share/locale/gl/LC_MESSAGES/krandr.mo share/locale/gl/LC_MESSAGES/krdb.mo share/locale/gl/LC_MESSAGES/kreadconfig.mo share/locale/gl/LC_MESSAGES/krec.mo +share/locale/gl/LC_MESSAGES/kres_birthday.mo +share/locale/gl/LC_MESSAGES/kres_blogging.mo +share/locale/gl/LC_MESSAGES/kres_exchange.mo +share/locale/gl/LC_MESSAGES/kres_featureplan.mo +share/locale/gl/LC_MESSAGES/kres_groupware.mo +share/locale/gl/LC_MESSAGES/kres_groupwise.mo +share/locale/gl/LC_MESSAGES/kres_kolab.mo +share/locale/gl/LC_MESSAGES/kres_remote.mo +share/locale/gl/LC_MESSAGES/kres_tvanytime.mo +share/locale/gl/LC_MESSAGES/kres_xmlrpc.mo share/locale/gl/LC_MESSAGES/kreversi.mo +share/locale/gl/LC_MESSAGES/krfb.mo share/locale/gl/LC_MESSAGES/kruler.mo share/locale/gl/LC_MESSAGES/krunapplet.mo share/locale/gl/LC_MESSAGES/ksame.mo +share/locale/gl/LC_MESSAGES/ksayit.mo share/locale/gl/LC_MESSAGES/kscd.mo share/locale/gl/LC_MESSAGES/kscreensaver.mo share/locale/gl/LC_MESSAGES/kshisen.mo share/locale/gl/LC_MESSAGES/ksig.mo share/locale/gl/LC_MESSAGES/ksim.mo +share/locale/gl/LC_MESSAGES/ksirtet.mo share/locale/gl/LC_MESSAGES/ksmiletris.mo share/locale/gl/LC_MESSAGES/ksmserver.mo share/locale/gl/LC_MESSAGES/ksnake.mo @@ -276,71 +398,127 @@ share/locale/gl/LC_MESSAGES/ksokoban.mo share/locale/gl/LC_MESSAGES/kspaceduel.mo share/locale/gl/LC_MESSAGES/ksplash.mo share/locale/gl/LC_MESSAGES/ksplashthemes.mo +share/locale/gl/LC_MESSAGES/kstars.mo share/locale/gl/LC_MESSAGES/kstart.mo +share/locale/gl/LC_MESSAGES/kstartperf.mo +share/locale/gl/LC_MESSAGES/kstyle_highcontrast_config.mo share/locale/gl/LC_MESSAGES/kstyle_keramik_config.mo +share/locale/gl/LC_MESSAGES/kstyle_phase_config.mo share/locale/gl/LC_MESSAGES/kstyle_plastik_config.mo share/locale/gl/LC_MESSAGES/ksvgplugin.mo +share/locale/gl/LC_MESSAGES/ksync.mo share/locale/gl/LC_MESSAGES/ksysguard.mo share/locale/gl/LC_MESSAGES/ksystemtrayapplet.mo share/locale/gl/LC_MESSAGES/ksystraycmd.mo share/locale/gl/LC_MESSAGES/ksysv.mo share/locale/gl/LC_MESSAGES/kteatime.mo +share/locale/gl/LC_MESSAGES/ktexteditor_autobookmarker.mo share/locale/gl/LC_MESSAGES/ktexteditor_docwordcompletion.mo share/locale/gl/LC_MESSAGES/ktexteditor_insertfile.mo share/locale/gl/LC_MESSAGES/ktexteditor_isearch.mo share/locale/gl/LC_MESSAGES/ktexteditor_kdatatool.mo +share/locale/gl/LC_MESSAGES/kthememanager.mo +share/locale/gl/LC_MESSAGES/ktimemon.mo share/locale/gl/LC_MESSAGES/ktimer.mo share/locale/gl/LC_MESSAGES/ktip.mo +share/locale/gl/LC_MESSAGES/ktnef.mo +share/locale/gl/LC_MESSAGES/ktouch.mo share/locale/gl/LC_MESSAGES/ktron.mo +share/locale/gl/LC_MESSAGES/kttsd.mo +share/locale/gl/LC_MESSAGES/ktuberling.mo share/locale/gl/LC_MESSAGES/kturtle.mo share/locale/gl/LC_MESSAGES/ktux.mo share/locale/gl/LC_MESSAGES/kuick_plugin.mo share/locale/gl/LC_MESSAGES/kuickshow.mo +share/locale/gl/LC_MESSAGES/kuiviewer.mo share/locale/gl/LC_MESSAGES/kuser.mo share/locale/gl/LC_MESSAGES/kverbos.mo share/locale/gl/LC_MESSAGES/kview.mo +share/locale/gl/LC_MESSAGES/kview_scale.mo share/locale/gl/LC_MESSAGES/kviewbrowserplugin.mo +share/locale/gl/LC_MESSAGES/kviewcanvas.mo share/locale/gl/LC_MESSAGES/kvieweffectsplugin.mo share/locale/gl/LC_MESSAGES/kviewpresenterplugin.mo share/locale/gl/LC_MESSAGES/kviewscannerplugin.mo +share/locale/gl/LC_MESSAGES/kviewshell.mo share/locale/gl/LC_MESSAGES/kviewviewer.mo +share/locale/gl/LC_MESSAGES/kvoctrain.mo share/locale/gl/LC_MESSAGES/kwalletmanager.mo +share/locale/gl/LC_MESSAGES/kwatchgnupg.mo share/locale/gl/LC_MESSAGES/kweather.mo +share/locale/gl/LC_MESSAGES/kwifimanager.mo share/locale/gl/LC_MESSAGES/kwin.mo share/locale/gl/LC_MESSAGES/kwin_art_clients.mo +share/locale/gl/LC_MESSAGES/kwin_clients.mo +share/locale/gl/LC_MESSAGES/kwin_lib.mo share/locale/gl/LC_MESSAGES/kwireless.mo share/locale/gl/LC_MESSAGES/kwordquiz.mo share/locale/gl/LC_MESSAGES/kworldclock.mo share/locale/gl/LC_MESSAGES/kwriteconfig.mo share/locale/gl/LC_MESSAGES/kxkb.mo +share/locale/gl/LC_MESSAGES/kxsconfig.mo +share/locale/gl/LC_MESSAGES/libKTTSD.mo +share/locale/gl/LC_MESSAGES/libdmctl.mo +share/locale/gl/LC_MESSAGES/libkaddrbk_geo_xxport.mo +share/locale/gl/LC_MESSAGES/libkaddrbk_gmx_xxport.mo +share/locale/gl/LC_MESSAGES/libkcal.mo share/locale/gl/LC_MESSAGES/libkcddb.mo +share/locale/gl/LC_MESSAGES/libkdeedu.mo share/locale/gl/LC_MESSAGES/libkdegames.mo +share/locale/gl/LC_MESSAGES/libkdepim.mo +share/locale/gl/LC_MESSAGES/libkfaximgage.mo +share/locale/gl/LC_MESSAGES/libkholidays.mo share/locale/gl/LC_MESSAGES/libkicker.mo share/locale/gl/LC_MESSAGES/libkickermenu_kdeprint.mo share/locale/gl/LC_MESSAGES/libkickermenu_konsole.mo share/locale/gl/LC_MESSAGES/libkickermenu_prefmenu.mo share/locale/gl/LC_MESSAGES/libkickermenu_recentdocs.mo +share/locale/gl/LC_MESSAGES/libkickermenu_remotemenu.mo +share/locale/gl/LC_MESSAGES/libkickermenu_systemmenu.mo +share/locale/gl/LC_MESSAGES/libkickermenu_tom.mo +share/locale/gl/LC_MESSAGES/libkleopatra.mo +share/locale/gl/LC_MESSAGES/libkmime.mo share/locale/gl/LC_MESSAGES/libkonq.mo +share/locale/gl/LC_MESSAGES/libkpgp.mo +share/locale/gl/LC_MESSAGES/libkpimexchange.mo share/locale/gl/LC_MESSAGES/libkscan.mo share/locale/gl/LC_MESSAGES/libkscreensaver.mo +share/locale/gl/LC_MESSAGES/libksieve.mo share/locale/gl/LC_MESSAGES/libksirtet.mo +share/locale/gl/LC_MESSAGES/libksync.mo share/locale/gl/LC_MESSAGES/libtaskbar.mo share/locale/gl/LC_MESSAGES/libtaskmanager.mo share/locale/gl/LC_MESSAGES/lockout.mo +share/locale/gl/LC_MESSAGES/lyrics.mo share/locale/gl/LC_MESSAGES/mediaapplet.mo +share/locale/gl/LC_MESSAGES/mediacontrol.mo +share/locale/gl/LC_MESSAGES/mf_konqplugin.mo +share/locale/gl/LC_MESSAGES/minitoolsplugin.mo +share/locale/gl/LC_MESSAGES/multisynk.mo share/locale/gl/LC_MESSAGES/naughtyapplet.mo +share/locale/gl/LC_MESSAGES/nexscope.mo share/locale/gl/LC_MESSAGES/noatun.mo share/locale/gl/LC_MESSAGES/nsplugin.mo +share/locale/gl/LC_MESSAGES/pitchablespeed.mo share/locale/gl/LC_MESSAGES/ppdtranslations.mo share/locale/gl/LC_MESSAGES/privacy.mo share/locale/gl/LC_MESSAGES/quanta.mo share/locale/gl/LC_MESSAGES/quicklauncher.mo +share/locale/gl/LC_MESSAGES/rellinks.mo +share/locale/gl/LC_MESSAGES/searchbarplugin.mo share/locale/gl/LC_MESSAGES/secpolicy.mo share/locale/gl/LC_MESSAGES/spy.mo +share/locale/gl/LC_MESSAGES/superkaramba.mo +share/locale/gl/LC_MESSAGES/synaescope.mo share/locale/gl/LC_MESSAGES/timezones.mo +share/locale/gl/LC_MESSAGES/tippecanoe.mo share/locale/gl/LC_MESSAGES/trashapplet.mo +share/locale/gl/LC_MESSAGES/tyler.mo share/locale/gl/LC_MESSAGES/uachangerplugin.mo share/locale/gl/LC_MESSAGES/useraccount.mo +share/locale/gl/LC_MESSAGES/validatorsplugin.mo +share/locale/gl/LC_MESSAGES/wakeup.mo +share/locale/gl/LC_MESSAGES/wavecapture.mo share/locale/gl/LC_MESSAGES/webarchiver.mo share/locale/gl/charset share/locale/gl/entry.desktop diff --git a/misc/kde3-i18n-hi/distinfo b/misc/kde3-i18n-hi/distinfo index 4738d5ef7845..204a2081e060 100644 --- a/misc/kde3-i18n-hi/distinfo +++ b/misc/kde3-i18n-hi/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-hi-3.5.5.tar.bz2) = a046a16fd6575ee67a9086702414bac1 -SHA256 (KDE/kde-i18n/kde-i18n-hi-3.5.5.tar.bz2) = d5bc830048aafa372cfdce66fe48edc1e798b7e660162cd559e4c50dbf43708a -SIZE (KDE/kde-i18n/kde-i18n-hi-3.5.5.tar.bz2) = 1663837 +MD5 (KDE/kde-i18n/kde-i18n-hi-3.5.6.tar.bz2) = 25f0b08c99c952f443f32a86d5d4d4ad +SHA256 (KDE/kde-i18n/kde-i18n-hi-3.5.6.tar.bz2) = 725786b42b83e053e6b82998d72d1d145813469fb64fa8d0e05d0f41f4c60fd9 +SIZE (KDE/kde-i18n/kde-i18n-hi-3.5.6.tar.bz2) = 1664336 diff --git a/misc/kde3-i18n-hr/distinfo b/misc/kde3-i18n-hr/distinfo index 30f5d74c4d87..4e4ac2755d16 100644 --- a/misc/kde3-i18n-hr/distinfo +++ b/misc/kde3-i18n-hr/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-hr-3.5.5.tar.bz2) = 486262b00bab42965aa0d25c86d65f84 -SHA256 (KDE/kde-i18n/kde-i18n-hr-3.5.5.tar.bz2) = bcd08af577aa07f0e43c390edbf1762d783f668cac52af6bb63750ef11daaa17 -SIZE (KDE/kde-i18n/kde-i18n-hr-3.5.5.tar.bz2) = 1704629 +MD5 (KDE/kde-i18n/kde-i18n-hr-3.5.6.tar.bz2) = 99a94e8fc1fcdf1837f7030760c3deeb +SHA256 (KDE/kde-i18n/kde-i18n-hr-3.5.6.tar.bz2) = 569c6331eb4ecac9000040ce7ccbcbd30ba366d967ae4c9fea28fde347c5a2ea +SIZE (KDE/kde-i18n/kde-i18n-hr-3.5.6.tar.bz2) = 1737539 diff --git a/misc/kde3-i18n-hr/pkg-plist b/misc/kde3-i18n-hr/pkg-plist index dcbe490efa79..8b8f2577ab66 100644 --- a/misc/kde3-i18n-hr/pkg-plist +++ b/misc/kde3-i18n-hr/pkg-plist @@ -13,6 +13,7 @@ share/locale/hr/LC_MESSAGES/atlantikdesigner.mo share/locale/hr/LC_MESSAGES/audiorename_plugin.mo share/locale/hr/LC_MESSAGES/autorefresh.mo share/locale/hr/LC_MESSAGES/babelfish.mo +share/locale/hr/LC_MESSAGES/blinken.mo share/locale/hr/LC_MESSAGES/cervisia.mo share/locale/hr/LC_MESSAGES/charlatanui.mo share/locale/hr/LC_MESSAGES/clockapplet.mo @@ -76,6 +77,7 @@ share/locale/hr/LC_MESSAGES/kay.mo share/locale/hr/LC_MESSAGES/kbabel.mo share/locale/hr/LC_MESSAGES/kbackgammon.mo share/locale/hr/LC_MESSAGES/kbattleship.mo +share/locale/hr/LC_MESSAGES/kbinaryclock.mo share/locale/hr/LC_MESSAGES/kblackbox.mo share/locale/hr/LC_MESSAGES/kbounce.mo share/locale/hr/LC_MESSAGES/kbruch.mo @@ -175,13 +177,19 @@ share/locale/hr/LC_MESSAGES/kfifteenapplet.mo share/locale/hr/LC_MESSAGES/kfile_au.mo share/locale/hr/LC_MESSAGES/kfile_avi.mo share/locale/hr/LC_MESSAGES/kfile_bmp.mo +share/locale/hr/LC_MESSAGES/kfile_cert.mo share/locale/hr/LC_MESSAGES/kfile_cpp.mo share/locale/hr/LC_MESSAGES/kfile_deb.mo +share/locale/hr/LC_MESSAGES/kfile_desktop.mo share/locale/hr/LC_MESSAGES/kfile_diff.mo +share/locale/hr/LC_MESSAGES/kfile_drgeo.mo share/locale/hr/LC_MESSAGES/kfile_dvi.mo +share/locale/hr/LC_MESSAGES/kfile_folder.mo share/locale/hr/LC_MESSAGES/kfile_gif.mo +share/locale/hr/LC_MESSAGES/kfile_html.mo share/locale/hr/LC_MESSAGES/kfile_ico.mo share/locale/hr/LC_MESSAGES/kfile_jpeg.mo +share/locale/hr/LC_MESSAGES/kfile_kig.mo share/locale/hr/LC_MESSAGES/kfile_m3u.mo share/locale/hr/LC_MESSAGES/kfile_mp3.mo share/locale/hr/LC_MESSAGES/kfile_ogg.mo @@ -206,6 +214,7 @@ share/locale/hr/LC_MESSAGES/kfontinst.mo share/locale/hr/LC_MESSAGES/kfouleggs.mo share/locale/hr/LC_MESSAGES/kgamma.mo share/locale/hr/LC_MESSAGES/kgantt.mo +share/locale/hr/LC_MESSAGES/kgeography.mo share/locale/hr/LC_MESSAGES/kget.mo share/locale/hr/LC_MESSAGES/kghostview.mo share/locale/hr/LC_MESSAGES/kgoldrunner.mo @@ -368,6 +377,7 @@ share/locale/hr/LC_MESSAGES/kxkb.mo share/locale/hr/LC_MESSAGES/kxsconfig.mo share/locale/hr/LC_MESSAGES/libdmctl.mo share/locale/hr/LC_MESSAGES/libkcal.mo +share/locale/hr/LC_MESSAGES/libkdeedu.mo share/locale/hr/LC_MESSAGES/libkdegames.mo share/locale/hr/LC_MESSAGES/libkdepim.mo share/locale/hr/LC_MESSAGES/libkicker.mo diff --git a/misc/kde3-i18n-is/distinfo b/misc/kde3-i18n-is/distinfo index d8817e5cd3f5..eafecfc98d1d 100644 --- a/misc/kde3-i18n-is/distinfo +++ b/misc/kde3-i18n-is/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-is-3.5.5.tar.bz2) = 4bdd95af464b36e7d52b4848291c9717 -SHA256 (KDE/kde-i18n/kde-i18n-is-3.5.5.tar.bz2) = 139faf5c75268314195bf861d4042ce22a3434a84513d72de3755326cee1f056 -SIZE (KDE/kde-i18n/kde-i18n-is-3.5.5.tar.bz2) = 2101713 +MD5 (KDE/kde-i18n/kde-i18n-is-3.5.6.tar.bz2) = f41752647ef59cb9fd179e2e1f77738c +SHA256 (KDE/kde-i18n/kde-i18n-is-3.5.6.tar.bz2) = a36f81bd8ca3e262525072eaa838cee9af5f1af3fac4952945e8767667834a94 +SIZE (KDE/kde-i18n/kde-i18n-is-3.5.6.tar.bz2) = 2105501 diff --git a/misc/kde3-i18n-it/distinfo b/misc/kde3-i18n-it/distinfo index 8264fd14e9cc..aae1ff6d6f13 100644 --- a/misc/kde3-i18n-it/distinfo +++ b/misc/kde3-i18n-it/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-it-3.5.5.tar.bz2) = a69220e5a700a277238924a3675d9dbd -SHA256 (KDE/kde-i18n/kde-i18n-it-3.5.5.tar.bz2) = 235702d3f8ad96edd820f01588554dfd1c4d5ac1a7bb3103c7a17922af08cedd -SIZE (KDE/kde-i18n/kde-i18n-it-3.5.5.tar.bz2) = 15749338 +MD5 (KDE/kde-i18n/kde-i18n-it-3.5.6.tar.bz2) = 3a9bea48fb5ac7d3703abfdaa8a50c3c +SHA256 (KDE/kde-i18n/kde-i18n-it-3.5.6.tar.bz2) = 621c233a2df9061098f9e8c11f784125d751723f406b413386cdc6346bb4cb37 +SIZE (KDE/kde-i18n/kde-i18n-it-3.5.6.tar.bz2) = 16226794 diff --git a/misc/kde3-i18n-it/pkg-plist b/misc/kde3-i18n-it/pkg-plist index 6fbf37275330..74eed45cd708 100644 --- a/misc/kde3-i18n-it/pkg-plist +++ b/misc/kde3-i18n-it/pkg-plist @@ -194,6 +194,9 @@ share/doc/HTML/it/docs/common/gpl-translated.html share/doc/HTML/it/docs/common/kde-localised.css share/doc/HTML/it/docs/common/lgpl-translated.html share/doc/HTML/it/docs/common/logotp3.png +share/doc/HTML/it/irkick/common +share/doc/HTML/it/irkick/index.cache.bz2 +share/doc/HTML/it/irkick/index.docbook share/doc/HTML/it/juk/common share/doc/HTML/it/juk/index.cache.bz2 share/doc/HTML/it/juk/index.docbook @@ -263,10 +266,18 @@ share/doc/HTML/it/kate-plugins/textfilter.docbook share/doc/HTML/it/kate-plugins/xmlcheck.docbook share/doc/HTML/it/kate-plugins/xmltools.docbook share/doc/HTML/it/kate/advanced.docbook +share/doc/HTML/it/kate/common share/doc/HTML/it/kate/configuring.docbook share/doc/HTML/it/kate/fundamentals.docbook +share/doc/HTML/it/kate/highlighting.docbook +share/doc/HTML/it/kate/index.cache.bz2 +share/doc/HTML/it/kate/index.docbook +share/doc/HTML/it/kate/man-kate.1.docbook share/doc/HTML/it/kate/mdi.docbook +share/doc/HTML/it/kate/menus.docbook +share/doc/HTML/it/kate/part.docbook share/doc/HTML/it/kate/plugins.docbook +share/doc/HTML/it/kate/regular-expressions.docbook share/doc/HTML/it/katomic/common share/doc/HTML/it/katomic/index.cache.bz2 share/doc/HTML/it/katomic/index.docbook @@ -311,6 +322,9 @@ share/doc/HTML/it/kcalc/index.docbook share/doc/HTML/it/kcharselect/common share/doc/HTML/it/kcharselect/index.cache.bz2 share/doc/HTML/it/kcharselect/index.docbook +share/doc/HTML/it/kcmlirc/common +share/doc/HTML/it/kcmlirc/index.cache.bz2 +share/doc/HTML/it/kcmlirc/index.docbook share/doc/HTML/it/kcoloredit/common share/doc/HTML/it/kcoloredit/index.cache.bz2 share/doc/HTML/it/kcoloredit/index.docbook @@ -482,6 +496,9 @@ share/doc/HTML/it/kcron/index.docbook share/doc/HTML/it/kdat/common share/doc/HTML/it/kdat/index.cache.bz2 share/doc/HTML/it/kdat/index.docbook +share/doc/HTML/it/kdcop/common +share/doc/HTML/it/kdcop/index.cache.bz2 +share/doc/HTML/it/kdcop/index.docbook share/doc/HTML/it/kde_app_devel/common share/doc/HTML/it/kde_app_devel/index.cache.bz2 share/doc/HTML/it/kde_app_devel/index.docbook @@ -497,12 +514,6 @@ share/doc/HTML/it/kdelibs/man-dcop.1.docbook share/doc/HTML/it/kdelibs/man-kbuildsycoca.8.docbook share/doc/HTML/it/kdelibs/man-kdeoptions.7.docbook share/doc/HTML/it/kdelibs/man-qtoptions.7.docbook -share/doc/HTML/it/kdelirc/irkick/common -share/doc/HTML/it/kdelirc/irkick/index.cache.bz2 -share/doc/HTML/it/kdelirc/irkick/index.docbook -share/doc/HTML/it/kdelirc/kcmlirc/common -share/doc/HTML/it/kdelirc/kcmlirc/index.cache.bz2 -share/doc/HTML/it/kdelirc/kcmlirc/index.docbook share/doc/HTML/it/kdeprint/add-printer-wiz.docbook share/doc/HTML/it/kdeprint/cups-config.docbook share/doc/HTML/it/kdeprint/cupsaddprinterwizard1.png @@ -605,6 +616,10 @@ share/doc/HTML/it/kdevelop/unixdev.docbook share/doc/HTML/it/kdf/common share/doc/HTML/it/kdf/index.cache.bz2 share/doc/HTML/it/kdf/index.docbook +share/doc/HTML/it/kdm/common +share/doc/HTML/it/kdm/index.cache.bz2 +share/doc/HTML/it/kdm/index.docbook +share/doc/HTML/it/kdm/kdmrc-ref.docbook share/doc/HTML/it/kdvi/common share/doc/HTML/it/kdvi/index.cache.bz2 share/doc/HTML/it/kdvi/index.docbook @@ -706,6 +721,7 @@ share/doc/HTML/it/khelpcenter/userguide/burning-cds.docbook share/doc/HTML/it/khelpcenter/userguide/control-center.docbook share/doc/HTML/it/khelpcenter/userguide/creating-graphics.docbook share/doc/HTML/it/khelpcenter/userguide/credits-and-license.docbook +share/doc/HTML/it/khelpcenter/userguide/email.docbook share/doc/HTML/it/khelpcenter/userguide/file-sharing.docbook share/doc/HTML/it/khelpcenter/userguide/first-impressions.docbook share/doc/HTML/it/khelpcenter/userguide/font-installation.docbook @@ -760,6 +776,9 @@ share/doc/HTML/it/khelpcenter/visualdict/index.cache.bz2 share/doc/HTML/it/khelpcenter/visualdict/index.docbook share/doc/HTML/it/khelpcenter/welcome.docbook share/doc/HTML/it/khelpcenter/whatiskde.docbook +share/doc/HTML/it/khexedit/common +share/doc/HTML/it/khexedit/index.cache.bz2 +share/doc/HTML/it/khexedit/index.docbook share/doc/HTML/it/kicker-applets/common share/doc/HTML/it/kicker-applets/index.cache.bz2 share/doc/HTML/it/kicker-applets/index.docbook @@ -976,17 +995,28 @@ share/doc/HTML/it/kmplot/man-kmplot.1.docbook share/doc/HTML/it/kmplot/menu.docbook share/doc/HTML/it/kmplot/reference.docbook share/doc/HTML/it/kmplot/using.docbook +share/doc/HTML/it/knetattach/common +share/doc/HTML/it/knetattach/index.cache.bz2 +share/doc/HTML/it/knetattach/index.docbook share/doc/HTML/it/knetworkconf/common share/doc/HTML/it/knetworkconf/index.cache.bz2 share/doc/HTML/it/knetworkconf/index.docbook +share/doc/HTML/it/knewsticker/common +share/doc/HTML/it/knewsticker/index.cache.bz2 +share/doc/HTML/it/knewsticker/index.docbook share/doc/HTML/it/knode/commands.docbook +share/doc/HTML/it/knode/common share/doc/HTML/it/knode/credits.docbook share/doc/HTML/it/knode/faq.docbook share/doc/HTML/it/knode/gloss.docbook +share/doc/HTML/it/knode/index.cache.bz2 +share/doc/HTML/it/knode/index.docbook share/doc/HTML/it/knode/install.docbook share/doc/HTML/it/knode/introduction.docbook share/doc/HTML/it/knode/journey.docbook share/doc/HTML/it/knode/more.docbook +share/doc/HTML/it/knode/using-firststart.docbook +share/doc/HTML/it/knode/using-morefeatures.docbook share/doc/HTML/it/knode/using-subscribing.docbook share/doc/HTML/it/knotes/common share/doc/HTML/it/knotes/index.cache.bz2 @@ -1019,6 +1049,9 @@ share/doc/HTML/it/kommander/widgets.docbook share/doc/HTML/it/kompare/common share/doc/HTML/it/kompare/index.cache.bz2 share/doc/HTML/it/kompare/index.docbook +share/doc/HTML/it/kompmgr/common +share/doc/HTML/it/kompmgr/index.cache.bz2 +share/doc/HTML/it/kompmgr/index.docbook share/doc/HTML/it/konq-plugins/babel/common share/doc/HTML/it/konq-plugins/babel/index.cache.bz2 share/doc/HTML/it/konq-plugins/babel/index.docbook @@ -1103,6 +1136,7 @@ share/doc/HTML/it/kooka/shortcut1.png share/doc/HTML/it/kooka/toolbar.png share/doc/HTML/it/kooka/toolbar1.png share/doc/HTML/it/kooka/toolbar2.png +share/doc/HTML/it/kopete/chatstyle.docbook share/doc/HTML/it/kopete/common share/doc/HTML/it/kopete/index.cache.bz2 share/doc/HTML/it/kopete/index.docbook @@ -1185,9 +1219,15 @@ share/doc/HTML/it/kpoker/index.docbook share/doc/HTML/it/kppp/accounting.docbook share/doc/HTML/it/kppp/callback.docbook share/doc/HTML/it/kppp/chap.docbook +share/doc/HTML/it/kppp/common +share/doc/HTML/it/kppp/dialog-setup.docbook share/doc/HTML/it/kppp/getting-online.docbook share/doc/HTML/it/kppp/global-settings.docbook +share/doc/HTML/it/kppp/hayes.docbook +share/doc/HTML/it/kppp/index.cache.bz2 +share/doc/HTML/it/kppp/index.docbook share/doc/HTML/it/kppp/kppp-dialler-tab.png +share/doc/HTML/it/kppp/kppp-faq.docbook share/doc/HTML/it/kppp/kppp-wizard.png share/doc/HTML/it/kppp/security.docbook share/doc/HTML/it/kppp/tricks.docbook @@ -1240,6 +1280,9 @@ share/doc/HTML/it/kshisen/index.docbook share/doc/HTML/it/ksim/common share/doc/HTML/it/ksim/index.cache.bz2 share/doc/HTML/it/ksim/index.docbook +share/doc/HTML/it/ksirc/common +share/doc/HTML/it/ksirc/index.cache.bz2 +share/doc/HTML/it/ksirc/index.docbook share/doc/HTML/it/ksirtet/common share/doc/HTML/it/ksirtet/index.cache.bz2 share/doc/HTML/it/ksirtet/index.docbook @@ -1559,6 +1602,7 @@ share/doc/HTML/it/umbrello/other_features.docbook share/doc/HTML/it/umbrello/uml_basics.docbook share/doc/HTML/it/umbrello/working_with_umbrello.docbook share/doc/HTML/it/xsldbg/credits.docbook +share/doc/HTML/it/xsldbg/introduction.docbook share/doc/HTML/it/xsldbg/usage.docbook share/locale/it/LC_MESSAGES/akregator.mo share/locale/it/LC_MESSAGES/akregator_konqplugin.mo @@ -1834,6 +1878,7 @@ share/locale/it/LC_MESSAGES/khotkeys.mo share/locale/it/LC_MESSAGES/khtmlkttsd.mo share/locale/it/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/it/LC_MESSAGES/kicker.mo +share/locale/it/LC_MESSAGES/kickermenu_kate.mo share/locale/it/LC_MESSAGES/kiconedit.mo share/locale/it/LC_MESSAGES/kig.mo share/locale/it/LC_MESSAGES/kimagemapeditor.mo @@ -1871,6 +1916,7 @@ share/locale/it/LC_MESSAGES/kio_thumbnail.mo share/locale/it/LC_MESSAGES/kio_trash.mo share/locale/it/LC_MESSAGES/kio_zeroconf.mo share/locale/it/LC_MESSAGES/kioexec.mo +share/locale/it/LC_MESSAGES/kitchensync.mo share/locale/it/LC_MESSAGES/kiten.mo share/locale/it/LC_MESSAGES/kjobviewer.mo share/locale/it/LC_MESSAGES/kjots.mo @@ -2074,6 +2120,7 @@ share/locale/it/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/it/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/it/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/it/LC_MESSAGES/libkickermenu_tom.mo +share/locale/it/LC_MESSAGES/libkitchensync.mo share/locale/it/LC_MESSAGES/libkleopatra.mo share/locale/it/LC_MESSAGES/libkmime.mo share/locale/it/LC_MESSAGES/libkonq.mo @@ -2169,6 +2216,7 @@ share/locale/it/flag.png @dirrm share/doc/HTML/it/ksnake @dirrm share/doc/HTML/it/ksmiletris @dirrm share/doc/HTML/it/ksirtet +@dirrm share/doc/HTML/it/ksirc @dirrm share/doc/HTML/it/ksim @dirrm share/doc/HTML/it/kshisen @dirrm share/doc/HTML/it/kscd @@ -2210,6 +2258,7 @@ share/locale/it/flag.png @dirrm share/doc/HTML/it/konq-plugins/crashes @dirrm share/doc/HTML/it/konq-plugins/babel @dirrm share/doc/HTML/it/konq-plugins +@dirrm share/doc/HTML/it/kompmgr @dirrm share/doc/HTML/it/kompare @dirrm share/doc/HTML/it/kommander @dirrm share/doc/HTML/it/kolourpaint @@ -2217,7 +2266,9 @@ share/locale/it/flag.png @dirrm share/doc/HTML/it/kodo @dirrm share/doc/HTML/it/knotes @dirrm share/doc/HTML/it/knode +@dirrm share/doc/HTML/it/knewsticker @dirrm share/doc/HTML/it/knetworkconf +@dirrm share/doc/HTML/it/knetattach @dirrm share/doc/HTML/it/kmplot @dirrm share/doc/HTML/it/kmouth @dirrm share/doc/HTML/it/kmousetool @@ -2264,6 +2315,7 @@ share/locale/it/flag.png @dirrm share/doc/HTML/it/kiconedit @dirrm share/doc/HTML/it/kicker-applets @dirrm share/doc/HTML/it/kicker +@dirrm share/doc/HTML/it/khexedit @dirrm share/doc/HTML/it/khelpcenter/visualdict @dirrm share/doc/HTML/it/khelpcenter/userguide @dirrm share/doc/HTML/it/khelpcenter/quickstart @@ -2285,17 +2337,16 @@ share/locale/it/flag.png @dirrm share/doc/HTML/it/keduca @dirrm share/doc/HTML/it/kedit @dirrm share/doc/HTML/it/kdvi +@dirrm share/doc/HTML/it/kdm @dirrm share/doc/HTML/it/kdf @dirrm share/doc/HTML/it/kdevelop @dirrm share/doc/HTML/it/kdesu @dirrm share/doc/HTML/it/kdeprint -@dirrm share/doc/HTML/it/kdelirc/kcmlirc -@dirrm share/doc/HTML/it/kdelirc/irkick -@dirrm share/doc/HTML/it/kdelirc @dirrm share/doc/HTML/it/kdelibs @dirrm share/doc/HTML/it/kdebugdialog @dirrm share/doc/HTML/it/kdearch @dirrm share/doc/HTML/it/kde_app_devel +@dirrm share/doc/HTML/it/kdcop @dirrm share/doc/HTML/it/kdat @dirrm share/doc/HTML/it/kcron @dirrm share/doc/HTML/it/kcontrol/windowmanagement @@ -2352,6 +2403,7 @@ share/locale/it/flag.png @dirrm share/doc/HTML/it/kcontrol/arts @dirrm share/doc/HTML/it/kcontrol @dirrm share/doc/HTML/it/kcoloredit +@dirrm share/doc/HTML/it/kcmlirc @dirrm share/doc/HTML/it/kcharselect @dirrm share/doc/HTML/it/kcalc @dirrm share/doc/HTML/it/kbugbuster @@ -2376,6 +2428,7 @@ share/locale/it/flag.png @dirrm share/doc/HTML/it/kaddressbook @dirrm share/doc/HTML/it/kaboodle @dirrm share/doc/HTML/it/juk +@dirrm share/doc/HTML/it/irkick @dirrm share/doc/HTML/it/docs/common @dirrm share/doc/HTML/it/docs @dirrm share/doc/HTML/it/blinken diff --git a/misc/kde3-i18n-kk/distinfo b/misc/kde3-i18n-kk/distinfo index fa45a31807ec..6f5e9b58e67a 100644 --- a/misc/kde3-i18n-kk/distinfo +++ b/misc/kde3-i18n-kk/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-kk-3.5.5.tar.bz2) = a0811b606aecac2a854af9f27ce7e716 -SHA256 (KDE/kde-i18n/kde-i18n-kk-3.5.5.tar.bz2) = d700f7b53f9faba130246191669ffe553ce864bad2f35338ab1d9799e57f4e09 -SIZE (KDE/kde-i18n/kde-i18n-kk-3.5.5.tar.bz2) = 926318 +MD5 (KDE/kde-i18n/kde-i18n-kk-3.5.6.tar.bz2) = f878ce771f32ea800c285e5a813b17e7 +SHA256 (KDE/kde-i18n/kde-i18n-kk-3.5.6.tar.bz2) = 853f716c10c7d67f92b0c83dc898a1ddd44ae1407de89da42bd483e4b14d971b +SIZE (KDE/kde-i18n/kde-i18n-kk-3.5.6.tar.bz2) = 1029999 diff --git a/misc/kde3-i18n-kk/pkg-plist b/misc/kde3-i18n-kk/pkg-plist index cdde694d51eb..707be0d9342e 100644 --- a/misc/kde3-i18n-kk/pkg-plist +++ b/misc/kde3-i18n-kk/pkg-plist @@ -3,7 +3,12 @@ share/locale/kk/LC_MESSAGES/alsaplayerui.mo share/locale/kk/LC_MESSAGES/appletproxy.mo share/locale/kk/LC_MESSAGES/ark.mo share/locale/kk/LC_MESSAGES/ark_plugin.mo +share/locale/kk/LC_MESSAGES/artsbuilder.mo +share/locale/kk/LC_MESSAGES/artscontrol.mo +share/locale/kk/LC_MESSAGES/artsmodules.mo share/locale/kk/LC_MESSAGES/atlantikdesigner.mo +share/locale/kk/LC_MESSAGES/audiocd_encoder_lame.mo +share/locale/kk/LC_MESSAGES/audiocd_encoder_vorbis.mo share/locale/kk/LC_MESSAGES/audiorename_plugin.mo share/locale/kk/LC_MESSAGES/autorefresh.mo share/locale/kk/LC_MESSAGES/babelfish.mo @@ -27,12 +32,14 @@ share/locale/kk/LC_MESSAGES/imagerename_plugin.mo share/locale/kk/LC_MESSAGES/imgalleryplugin.mo share/locale/kk/LC_MESSAGES/irkick.mo share/locale/kk/LC_MESSAGES/joystick.mo +share/locale/kk/LC_MESSAGES/juk.mo share/locale/kk/LC_MESSAGES/kabc_dir.mo share/locale/kk/LC_MESSAGES/kabc_file.mo share/locale/kk/LC_MESSAGES/kabc_ldapkio.mo share/locale/kk/LC_MESSAGES/kabc_net.mo share/locale/kk/LC_MESSAGES/kabc_sql.mo share/locale/kk/LC_MESSAGES/kabcformat_binary.mo +share/locale/kk/LC_MESSAGES/kaboodle.mo share/locale/kk/LC_MESSAGES/kaccess.mo share/locale/kk/LC_MESSAGES/kappfinder.mo share/locale/kk/LC_MESSAGES/kasbarextension.mo @@ -55,7 +62,9 @@ share/locale/kk/LC_MESSAGES/katetabbarextension.mo share/locale/kk/LC_MESSAGES/katetextfilter.mo share/locale/kk/LC_MESSAGES/katexmlcheck.mo share/locale/kk/LC_MESSAGES/katexmltools.mo +share/locale/kk/LC_MESSAGES/kaudiocreator.mo share/locale/kk/LC_MESSAGES/kay.mo +share/locale/kk/LC_MESSAGES/kbabel.mo share/locale/kk/LC_MESSAGES/kbinaryclock.mo share/locale/kk/LC_MESSAGES/kcalc.mo share/locale/kk/LC_MESSAGES/kcharselect.mo @@ -64,8 +73,10 @@ share/locale/kk/LC_MESSAGES/kcm_krfb.mo share/locale/kk/LC_MESSAGES/kcmaccess.mo share/locale/kk/LC_MESSAGES/kcmaccessibility.mo share/locale/kk/LC_MESSAGES/kcmarts.mo +share/locale/kk/LC_MESSAGES/kcmaudiocd.mo share/locale/kk/LC_MESSAGES/kcmbackground.mo share/locale/kk/LC_MESSAGES/kcmbell.mo +share/locale/kk/LC_MESSAGES/kcmcddb.mo share/locale/kk/LC_MESSAGES/kcmcgi.mo share/locale/kk/LC_MESSAGES/kcmcolors.mo share/locale/kk/LC_MESSAGES/kcmcomponentchooser.mo @@ -143,22 +154,34 @@ share/locale/kk/LC_MESSAGES/kdictapplet.mo share/locale/kk/LC_MESSAGES/kdmconfig.mo share/locale/kk/LC_MESSAGES/kdmgreet.mo share/locale/kk/LC_MESSAGES/kedit.mo +share/locale/kk/LC_MESSAGES/kfile_au.mo +share/locale/kk/LC_MESSAGES/kfile_avi.mo share/locale/kk/LC_MESSAGES/kfile_cert.mo share/locale/kk/LC_MESSAGES/kfile_deb.mo share/locale/kk/LC_MESSAGES/kfile_desktop.mo +share/locale/kk/LC_MESSAGES/kfile_flac.mo share/locale/kk/LC_MESSAGES/kfile_folder.mo share/locale/kk/LC_MESSAGES/kfile_html.mo share/locale/kk/LC_MESSAGES/kfile_lnk.mo +share/locale/kk/LC_MESSAGES/kfile_m3u.mo share/locale/kk/LC_MESSAGES/kfile_mhtml.mo +share/locale/kk/LC_MESSAGES/kfile_mp3.mo +share/locale/kk/LC_MESSAGES/kfile_mpc.mo +share/locale/kk/LC_MESSAGES/kfile_mpeg.mo +share/locale/kk/LC_MESSAGES/kfile_ogg.mo share/locale/kk/LC_MESSAGES/kfile_rpm.mo +share/locale/kk/LC_MESSAGES/kfile_sid.mo +share/locale/kk/LC_MESSAGES/kfile_theora.mo share/locale/kk/LC_MESSAGES/kfile_torrent.mo share/locale/kk/LC_MESSAGES/kfile_txt.mo +share/locale/kk/LC_MESSAGES/kfile_wav.mo share/locale/kk/LC_MESSAGES/kfileaudiopreview.mo share/locale/kk/LC_MESSAGES/kfileshare.mo share/locale/kk/LC_MESSAGES/kfindpart.mo share/locale/kk/LC_MESSAGES/kfloppy.mo share/locale/kk/LC_MESSAGES/kfmclient.mo share/locale/kk/LC_MESSAGES/kfontinst.mo +share/locale/kk/LC_MESSAGES/kget.mo share/locale/kk/LC_MESSAGES/kgpg.mo share/locale/kk/LC_MESSAGES/kgreet_classic.mo share/locale/kk/LC_MESSAGES/kgreet_winbind.mo @@ -171,6 +194,7 @@ share/locale/kk/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/kk/LC_MESSAGES/kicker.mo share/locale/kk/LC_MESSAGES/kinetd.mo share/locale/kk/LC_MESSAGES/kio.mo +share/locale/kk/LC_MESSAGES/kio_audiocd.mo share/locale/kk/LC_MESSAGES/kio_finger.mo share/locale/kk/LC_MESSAGES/kio_fish.mo share/locale/kk/LC_MESSAGES/kio_floppy.mo @@ -205,6 +229,7 @@ share/locale/kk/LC_MESSAGES/kmathapplet.mo share/locale/kk/LC_MESSAGES/kmcop.mo share/locale/kk/LC_MESSAGES/kmenuapplet.mo share/locale/kk/LC_MESSAGES/kmenuedit.mo +share/locale/kk/LC_MESSAGES/kmid.mo share/locale/kk/LC_MESSAGES/kmilo_delli8k.mo share/locale/kk/LC_MESSAGES/kmilo_generic.mo share/locale/kk/LC_MESSAGES/kmilo_kvaio.mo @@ -213,6 +238,7 @@ share/locale/kk/LC_MESSAGES/kmilo_thinkpad.mo share/locale/kk/LC_MESSAGES/kmilod.mo share/locale/kk/LC_MESSAGES/kmines.mo share/locale/kk/LC_MESSAGES/kminipagerapplet.mo +share/locale/kk/LC_MESSAGES/kmix.mo share/locale/kk/LC_MESSAGES/knetattach.mo share/locale/kk/LC_MESSAGES/knetworkconf.mo share/locale/kk/LC_MESSAGES/knewsticker.mo @@ -228,15 +254,19 @@ share/locale/kk/LC_MESSAGES/kopete.mo share/locale/kk/LC_MESSAGES/kpackage.mo share/locale/kk/LC_MESSAGES/kpager.mo share/locale/kk/LC_MESSAGES/kpersonalizer.mo +share/locale/kk/LC_MESSAGES/kpf.mo share/locale/kk/LC_MESSAGES/kppp.mo share/locale/kk/LC_MESSAGES/kppplogview.mo share/locale/kk/LC_MESSAGES/kprinter.mo share/locale/kk/LC_MESSAGES/krandr.mo share/locale/kk/LC_MESSAGES/krdb.mo +share/locale/kk/LC_MESSAGES/krdc.mo share/locale/kk/LC_MESSAGES/kreadconfig.mo +share/locale/kk/LC_MESSAGES/krec.mo share/locale/kk/LC_MESSAGES/kregexpeditor.mo share/locale/kk/LC_MESSAGES/krfb.mo share/locale/kk/LC_MESSAGES/krunapplet.mo +share/locale/kk/LC_MESSAGES/kscd.mo share/locale/kk/LC_MESSAGES/kscreensaver.mo share/locale/kk/LC_MESSAGES/ksig.mo share/locale/kk/LC_MESSAGES/ksim.mo @@ -274,6 +304,7 @@ share/locale/kk/LC_MESSAGES/kxkb.mo share/locale/kk/LC_MESSAGES/libdmctl.mo share/locale/kk/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/kk/LC_MESSAGES/libkaddrbk_gmx_xxport.mo +share/locale/kk/LC_MESSAGES/libkcddb.mo share/locale/kk/LC_MESSAGES/libkicker.mo share/locale/kk/LC_MESSAGES/libkickermenu_kdeprint.mo share/locale/kk/LC_MESSAGES/libkickermenu_konsole.mo @@ -294,6 +325,7 @@ share/locale/kk/LC_MESSAGES/mf_konqplugin.mo share/locale/kk/LC_MESSAGES/minitoolsplugin.mo share/locale/kk/LC_MESSAGES/naughtyapplet.mo share/locale/kk/LC_MESSAGES/nexscope.mo +share/locale/kk/LC_MESSAGES/noatun.mo share/locale/kk/LC_MESSAGES/nsplugin.mo share/locale/kk/LC_MESSAGES/pitchablespeed.mo share/locale/kk/LC_MESSAGES/ppdtranslations.mo diff --git a/misc/kde3-i18n-km/distinfo b/misc/kde3-i18n-km/distinfo index a8113e46c0f1..89c6c5e9fb56 100644 --- a/misc/kde3-i18n-km/distinfo +++ b/misc/kde3-i18n-km/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-km-3.5.5.tar.bz2) = c11c4653c9e211deb4c16bf346bd03ad -SHA256 (KDE/kde-i18n/kde-i18n-km-3.5.5.tar.bz2) = 818b3be6a18afeb99771f0746b0c1b593f1abc31438dae3bc18a796b4700bd61 -SIZE (KDE/kde-i18n/kde-i18n-km-3.5.5.tar.bz2) = 1656443 +MD5 (KDE/kde-i18n/kde-i18n-km-3.5.6.tar.bz2) = 2f83f915e5ee4932ce8c7f26abb8b542 +SHA256 (KDE/kde-i18n/kde-i18n-km-3.5.6.tar.bz2) = 6062a8c5136bf4ce2ec882f2b65e0e40452e467300eecc5869bb5f8fcbaccbbd +SIZE (KDE/kde-i18n/kde-i18n-km-3.5.6.tar.bz2) = 1761505 diff --git a/misc/kde3-i18n-km/pkg-plist b/misc/kde3-i18n-km/pkg-plist index 799943d795dc..467538c5acb1 100644 --- a/misc/kde3-i18n-km/pkg-plist +++ b/misc/kde3-i18n-km/pkg-plist @@ -37,6 +37,7 @@ share/locale/km/LC_MESSAGES/imgalleryplugin.mo share/locale/km/LC_MESSAGES/irkick.mo share/locale/km/LC_MESSAGES/jefferson.mo share/locale/km/LC_MESSAGES/joystick.mo +share/locale/km/LC_MESSAGES/juk.mo share/locale/km/LC_MESSAGES/kabc2mutt.mo share/locale/km/LC_MESSAGES/kabc_dir.mo share/locale/km/LC_MESSAGES/kabc_file.mo @@ -340,6 +341,7 @@ share/locale/km/LC_MESSAGES/kmplot.mo share/locale/km/LC_MESSAGES/kmrml.mo share/locale/km/LC_MESSAGES/knetattach.mo share/locale/km/LC_MESSAGES/knetwalk.mo +share/locale/km/LC_MESSAGES/knewsticker.mo share/locale/km/LC_MESSAGES/knode.mo share/locale/km/LC_MESSAGES/knotes.mo share/locale/km/LC_MESSAGES/knotify.mo @@ -377,6 +379,7 @@ share/locale/km/LC_MESSAGES/kpf.mo share/locale/km/LC_MESSAGES/kpilot.mo share/locale/km/LC_MESSAGES/kpoker.mo share/locale/km/LC_MESSAGES/kpovmodeler.mo +share/locale/km/LC_MESSAGES/kppp.mo share/locale/km/LC_MESSAGES/kppplogview.mo share/locale/km/LC_MESSAGES/kprinter.mo share/locale/km/LC_MESSAGES/krandr.mo @@ -406,6 +409,7 @@ share/locale/km/LC_MESSAGES/kscreensaver.mo share/locale/km/LC_MESSAGES/kshisen.mo share/locale/km/LC_MESSAGES/ksig.mo share/locale/km/LC_MESSAGES/ksim.mo +share/locale/km/LC_MESSAGES/ksirc.mo share/locale/km/LC_MESSAGES/ksirtet.mo share/locale/km/LC_MESSAGES/ksmiletris.mo share/locale/km/LC_MESSAGES/ksmserver.mo @@ -441,6 +445,7 @@ share/locale/km/LC_MESSAGES/ktip.mo share/locale/km/LC_MESSAGES/ktnef.mo share/locale/km/LC_MESSAGES/ktouch.mo share/locale/km/LC_MESSAGES/ktron.mo +share/locale/km/LC_MESSAGES/kttsd.mo share/locale/km/LC_MESSAGES/kttsd_commandplugin.mo share/locale/km/LC_MESSAGES/kttsd_eposplugin.mo share/locale/km/LC_MESSAGES/kttsd_fliteplugin.mo @@ -527,6 +532,7 @@ share/locale/km/LC_MESSAGES/nexscope.mo share/locale/km/LC_MESSAGES/noatun.mo share/locale/km/LC_MESSAGES/nsplugin.mo share/locale/km/LC_MESSAGES/pitchablespeed.mo +share/locale/km/LC_MESSAGES/ppdtranslations.mo share/locale/km/LC_MESSAGES/privacy.mo share/locale/km/LC_MESSAGES/quanta.mo share/locale/km/LC_MESSAGES/quicklauncher.mo diff --git a/misc/kde3-i18n-lt/distinfo b/misc/kde3-i18n-lt/distinfo index 77afcbf9f51c..2d55526f8def 100644 --- a/misc/kde3-i18n-lt/distinfo +++ b/misc/kde3-i18n-lt/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-lt-3.5.5.tar.bz2) = aa799b8fac440c0b70188e0f9df16350 -SHA256 (KDE/kde-i18n/kde-i18n-lt-3.5.5.tar.bz2) = d55c4f4ff50dc2b2f3b365594bae75a491a57c32aa251a565fa6a4699304d866 -SIZE (KDE/kde-i18n/kde-i18n-lt-3.5.5.tar.bz2) = 1888636 +MD5 (KDE/kde-i18n/kde-i18n-lt-3.5.6.tar.bz2) = 2769c90376add2e49addcaa2f39df577 +SHA256 (KDE/kde-i18n/kde-i18n-lt-3.5.6.tar.bz2) = db50b2c475a31cee69532bfbd916f140fcdb40f06f812589695c97ae0a79c3f4 +SIZE (KDE/kde-i18n/kde-i18n-lt-3.5.6.tar.bz2) = 1886064 diff --git a/misc/kde3-i18n-lt/pkg-plist b/misc/kde3-i18n-lt/pkg-plist index f9016c382835..0803a17a2740 100644 --- a/misc/kde3-i18n-lt/pkg-plist +++ b/misc/kde3-i18n-lt/pkg-plist @@ -272,6 +272,7 @@ share/locale/lt/LC_MESSAGES/khotkeys.mo share/locale/lt/LC_MESSAGES/khtmlkttsd.mo share/locale/lt/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/lt/LC_MESSAGES/kicker.mo +share/locale/lt/LC_MESSAGES/kickermenu_kate.mo share/locale/lt/LC_MESSAGES/kiconedit.mo share/locale/lt/LC_MESSAGES/kig.mo share/locale/lt/LC_MESSAGES/kimagemapeditor.mo @@ -309,6 +310,7 @@ share/locale/lt/LC_MESSAGES/kio_thumbnail.mo share/locale/lt/LC_MESSAGES/kio_trash.mo share/locale/lt/LC_MESSAGES/kio_zeroconf.mo share/locale/lt/LC_MESSAGES/kioexec.mo +share/locale/lt/LC_MESSAGES/kitchensync.mo share/locale/lt/LC_MESSAGES/kiten.mo share/locale/lt/LC_MESSAGES/kjobviewer.mo share/locale/lt/LC_MESSAGES/kjots.mo @@ -511,6 +513,7 @@ share/locale/lt/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/lt/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/lt/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/lt/LC_MESSAGES/libkickermenu_tom.mo +share/locale/lt/LC_MESSAGES/libkitchensync.mo share/locale/lt/LC_MESSAGES/libkleopatra.mo share/locale/lt/LC_MESSAGES/libkmime.mo share/locale/lt/LC_MESSAGES/libkonq.mo diff --git a/misc/kde3-i18n-lv/distinfo b/misc/kde3-i18n-lv/distinfo index 3df0e3c0fe72..cdeda7d4c2cd 100644 --- a/misc/kde3-i18n-lv/distinfo +++ b/misc/kde3-i18n-lv/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-lv-3.5.5.tar.bz2) = f541bb2957e1f0469d76711cc86ba851 -SHA256 (KDE/kde-i18n/kde-i18n-lv-3.5.5.tar.bz2) = d99b0d080abc56c53b2fc3058a0ad945f971e891870b995c7bced4dfdbabe437 -SIZE (KDE/kde-i18n/kde-i18n-lv-3.5.5.tar.bz2) = 1352071 +MD5 (KDE/kde-i18n/kde-i18n-lv-3.5.6.tar.bz2) = c3f7cca71708d2894510bdd30b264bff +SHA256 (KDE/kde-i18n/kde-i18n-lv-3.5.6.tar.bz2) = e22d229a1b19b47a5a36e075ba4315b18b01d3407de15bce55fee3e4c97b7261 +SIZE (KDE/kde-i18n/kde-i18n-lv-3.5.6.tar.bz2) = 1356698 diff --git a/misc/kde3-i18n-lv/pkg-plist b/misc/kde3-i18n-lv/pkg-plist index 57999f50d42e..dfdb2ad36d99 100644 --- a/misc/kde3-i18n-lv/pkg-plist +++ b/misc/kde3-i18n-lv/pkg-plist @@ -99,6 +99,7 @@ share/locale/lv/LC_MESSAGES/kdelibs.mo share/locale/lv/LC_MESSAGES/kdelibs_colors.mo share/locale/lv/LC_MESSAGES/kdepasswd.mo share/locale/lv/LC_MESSAGES/kdeprint.mo +share/locale/lv/LC_MESSAGES/kdeprint_part.mo share/locale/lv/LC_MESSAGES/kdeprintfax.mo share/locale/lv/LC_MESSAGES/kdesktop.mo share/locale/lv/LC_MESSAGES/kdessh.mo @@ -155,6 +156,8 @@ share/locale/lv/LC_MESSAGES/kio_sftp.mo share/locale/lv/LC_MESSAGES/kio_smb.mo share/locale/lv/LC_MESSAGES/kio_smtp.mo share/locale/lv/LC_MESSAGES/kio_system.mo +share/locale/lv/LC_MESSAGES/kio_tar.mo +share/locale/lv/LC_MESSAGES/kio_trash.mo share/locale/lv/LC_MESSAGES/kioexec.mo share/locale/lv/LC_MESSAGES/kiten.mo share/locale/lv/LC_MESSAGES/kjobviewer.mo @@ -225,6 +228,7 @@ share/locale/lv/LC_MESSAGES/ksplash.mo share/locale/lv/LC_MESSAGES/kstars.mo share/locale/lv/LC_MESSAGES/kstart.mo share/locale/lv/LC_MESSAGES/kstartperf.mo +share/locale/lv/LC_MESSAGES/kstyle_keramik_config.mo share/locale/lv/LC_MESSAGES/ksync.mo share/locale/lv/LC_MESSAGES/ksysguard.mo share/locale/lv/LC_MESSAGES/ksystemtrayapplet.mo @@ -265,6 +269,7 @@ share/locale/lv/LC_MESSAGES/libtaskbar.mo share/locale/lv/LC_MESSAGES/libtaskmanager.mo share/locale/lv/LC_MESSAGES/lockout.mo share/locale/lv/LC_MESSAGES/lskat.mo +share/locale/lv/LC_MESSAGES/mediaapplet.mo share/locale/lv/LC_MESSAGES/naughtyapplet.mo share/locale/lv/LC_MESSAGES/noatun.mo share/locale/lv/LC_MESSAGES/nsplugin.mo diff --git a/misc/kde3-i18n-mk/distinfo b/misc/kde3-i18n-mk/distinfo index ae3676d8bd8e..e3db799c783d 100644 --- a/misc/kde3-i18n-mk/distinfo +++ b/misc/kde3-i18n-mk/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-mk-3.5.5.tar.bz2) = 014b290f599e808ff3b885c50d150fe5 -SHA256 (KDE/kde-i18n/kde-i18n-mk-3.5.5.tar.bz2) = 6c19733a4c6304441427a58f4e0de71d0d064e2fb4618edc05c2cd271aa5ff39 -SIZE (KDE/kde-i18n/kde-i18n-mk-3.5.5.tar.bz2) = 1734951 +MD5 (KDE/kde-i18n/kde-i18n-mk-3.5.6.tar.bz2) = 2e374c32eb02a6421b2076ac305926a2 +SHA256 (KDE/kde-i18n/kde-i18n-mk-3.5.6.tar.bz2) = 809cbf1a36d67419061133ade41d81cbfbe4c7754ed3665208ac05ab32ac6513 +SIZE (KDE/kde-i18n/kde-i18n-mk-3.5.6.tar.bz2) = 1794476 diff --git a/misc/kde3-i18n-mk/pkg-plist b/misc/kde3-i18n-mk/pkg-plist index 9178ea3526e6..0bb98408a288 100644 --- a/misc/kde3-i18n-mk/pkg-plist +++ b/misc/kde3-i18n-mk/pkg-plist @@ -52,6 +52,7 @@ share/locale/mk/LC_MESSAGES/kaddressbook.mo share/locale/mk/LC_MESSAGES/kalarm.mo share/locale/mk/LC_MESSAGES/kalzium.mo share/locale/mk/LC_MESSAGES/kanagram.mo +share/locale/mk/LC_MESSAGES/kandy.mo share/locale/mk/LC_MESSAGES/kappfinder.mo share/locale/mk/LC_MESSAGES/karm.mo share/locale/mk/LC_MESSAGES/kasbarextension.mo @@ -113,6 +114,7 @@ share/locale/mk/LC_MESSAGES/kcmicons.mo share/locale/mk/LC_MESSAGES/kcminfo.mo share/locale/mk/LC_MESSAGES/kcminput.mo share/locale/mk/LC_MESSAGES/kcmioslaveinfo.mo +share/locale/mk/LC_MESSAGES/kcmkabconfig.mo share/locale/mk/LC_MESSAGES/kcmkamera.mo share/locale/mk/LC_MESSAGES/kcmkclock.mo share/locale/mk/LC_MESSAGES/kcmkded.mo @@ -123,6 +125,7 @@ share/locale/mk/LC_MESSAGES/kcmkio.mo share/locale/mk/LC_MESSAGES/kcmkonq.mo share/locale/mk/LC_MESSAGES/kcmkonqhtml.mo share/locale/mk/LC_MESSAGES/kcmkonsole.mo +share/locale/mk/LC_MESSAGES/kcmkontactnt.mo share/locale/mk/LC_MESSAGES/kcmktalkd.mo share/locale/mk/LC_MESSAGES/kcmkuick.mo share/locale/mk/LC_MESSAGES/kcmkurifilt.mo @@ -166,6 +169,8 @@ share/locale/mk/LC_MESSAGES/kdelibs.mo share/locale/mk/LC_MESSAGES/kdelibs_colors.mo share/locale/mk/LC_MESSAGES/kdelirc.mo share/locale/mk/LC_MESSAGES/kdepasswd.mo +share/locale/mk/LC_MESSAGES/kdepimresources.mo +share/locale/mk/LC_MESSAGES/kdepimwizards.mo share/locale/mk/LC_MESSAGES/kdeprint.mo share/locale/mk/LC_MESSAGES/kdeprint_part.mo share/locale/mk/LC_MESSAGES/kdeprintfax.mo @@ -174,6 +179,7 @@ share/locale/mk/LC_MESSAGES/kdessh.mo share/locale/mk/LC_MESSAGES/kdesu.mo share/locale/mk/LC_MESSAGES/kdesud.mo share/locale/mk/LC_MESSAGES/kdf.mo +share/locale/mk/LC_MESSAGES/kdgantt.mo share/locale/mk/LC_MESSAGES/kdialog.mo share/locale/mk/LC_MESSAGES/kdict.mo share/locale/mk/LC_MESSAGES/kdictapplet.mo @@ -196,6 +202,7 @@ share/locale/mk/LC_MESSAGES/kfile_dds.mo share/locale/mk/LC_MESSAGES/kfile_deb.mo share/locale/mk/LC_MESSAGES/kfile_desktop.mo share/locale/mk/LC_MESSAGES/kfile_diff.mo +share/locale/mk/LC_MESSAGES/kfile_drgeo.mo share/locale/mk/LC_MESSAGES/kfile_dvi.mo share/locale/mk/LC_MESSAGES/kfile_exr.mo share/locale/mk/LC_MESSAGES/kfile_flac.mo @@ -205,6 +212,7 @@ share/locale/mk/LC_MESSAGES/kfile_html.mo share/locale/mk/LC_MESSAGES/kfile_ico.mo share/locale/mk/LC_MESSAGES/kfile_ics.mo share/locale/mk/LC_MESSAGES/kfile_jpeg.mo +share/locale/mk/LC_MESSAGES/kfile_kig.mo share/locale/mk/LC_MESSAGES/kfile_lnk.mo share/locale/mk/LC_MESSAGES/kfile_m3u.mo share/locale/mk/LC_MESSAGES/kfile_mhtml.mo @@ -241,6 +249,7 @@ share/locale/mk/LC_MESSAGES/kfmclient.mo share/locale/mk/LC_MESSAGES/kfontinst.mo share/locale/mk/LC_MESSAGES/kfouleggs.mo share/locale/mk/LC_MESSAGES/kgamma.mo +share/locale/mk/LC_MESSAGES/kgantt.mo share/locale/mk/LC_MESSAGES/kgeography.mo share/locale/mk/LC_MESSAGES/kget.mo share/locale/mk/LC_MESSAGES/kghostview.mo @@ -264,6 +273,7 @@ share/locale/mk/LC_MESSAGES/kio_audiocd.mo share/locale/mk/LC_MESSAGES/kio_finger.mo share/locale/mk/LC_MESSAGES/kio_fish.mo share/locale/mk/LC_MESSAGES/kio_floppy.mo +share/locale/mk/LC_MESSAGES/kio_groupwise.mo share/locale/mk/LC_MESSAGES/kio_help.mo share/locale/mk/LC_MESSAGES/kio_home.mo share/locale/mk/LC_MESSAGES/kio_imap4.mo @@ -281,6 +291,7 @@ share/locale/mk/LC_MESSAGES/kio_print.mo share/locale/mk/LC_MESSAGES/kio_remote.mo share/locale/mk/LC_MESSAGES/kio_settings.mo share/locale/mk/LC_MESSAGES/kio_sftp.mo +share/locale/mk/LC_MESSAGES/kio_sieve.mo share/locale/mk/LC_MESSAGES/kio_smb.mo share/locale/mk/LC_MESSAGES/kio_smtp.mo share/locale/mk/LC_MESSAGES/kio_system.mo @@ -295,6 +306,7 @@ share/locale/mk/LC_MESSAGES/kjots.mo share/locale/mk/LC_MESSAGES/kjumpingcube.mo share/locale/mk/LC_MESSAGES/klaptopdaemon.mo share/locale/mk/LC_MESSAGES/klatin.mo +share/locale/mk/LC_MESSAGES/kleopatra.mo share/locale/mk/LC_MESSAGES/klettres.mo share/locale/mk/LC_MESSAGES/klickety.mo share/locale/mk/LC_MESSAGES/klines.mo @@ -320,6 +332,7 @@ share/locale/mk/LC_MESSAGES/kmilod.mo share/locale/mk/LC_MESSAGES/kmines.mo share/locale/mk/LC_MESSAGES/kminipagerapplet.mo share/locale/mk/LC_MESSAGES/kmix.mo +share/locale/mk/LC_MESSAGES/kmobile.mo share/locale/mk/LC_MESSAGES/kmoon.mo share/locale/mk/LC_MESSAGES/kmousetool.mo share/locale/mk/LC_MESSAGES/kmouth.mo @@ -355,6 +368,7 @@ share/locale/mk/LC_MESSAGES/kontact.mo share/locale/mk/LC_MESSAGES/kooka.mo share/locale/mk/LC_MESSAGES/kopete.mo share/locale/mk/LC_MESSAGES/korganizer.mo +share/locale/mk/LC_MESSAGES/korn.mo share/locale/mk/LC_MESSAGES/kpackage.mo share/locale/mk/LC_MESSAGES/kpager.mo share/locale/mk/LC_MESSAGES/kpartsaver.mo @@ -415,6 +429,7 @@ share/locale/mk/LC_MESSAGES/kstyle_keramik_config.mo share/locale/mk/LC_MESSAGES/kstyle_phase_config.mo share/locale/mk/LC_MESSAGES/kstyle_plastik_config.mo share/locale/mk/LC_MESSAGES/ksvgplugin.mo +share/locale/mk/LC_MESSAGES/ksync.mo share/locale/mk/LC_MESSAGES/ksysguard.mo share/locale/mk/LC_MESSAGES/ksystemtrayapplet.mo share/locale/mk/LC_MESSAGES/ksystraycmd.mo @@ -429,6 +444,7 @@ share/locale/mk/LC_MESSAGES/kthememanager.mo share/locale/mk/LC_MESSAGES/ktimemon.mo share/locale/mk/LC_MESSAGES/ktimer.mo share/locale/mk/LC_MESSAGES/ktip.mo +share/locale/mk/LC_MESSAGES/ktnef.mo share/locale/mk/LC_MESSAGES/ktouch.mo share/locale/mk/LC_MESSAGES/ktron.mo share/locale/mk/LC_MESSAGES/kttsd.mo @@ -451,6 +467,7 @@ share/locale/mk/LC_MESSAGES/kviewshell.mo share/locale/mk/LC_MESSAGES/kviewviewer.mo share/locale/mk/LC_MESSAGES/kvoctrain.mo share/locale/mk/LC_MESSAGES/kwalletmanager.mo +share/locale/mk/LC_MESSAGES/kwatchgnupg.mo share/locale/mk/LC_MESSAGES/kweather.mo share/locale/mk/LC_MESSAGES/kwifimanager.mo share/locale/mk/LC_MESSAGES/kwin.mo @@ -459,6 +476,7 @@ share/locale/mk/LC_MESSAGES/kwin_art_clients.mo share/locale/mk/LC_MESSAGES/kwin_clients.mo share/locale/mk/LC_MESSAGES/kwin_lib.mo share/locale/mk/LC_MESSAGES/kwireless.mo +share/locale/mk/LC_MESSAGES/kwordquiz.mo share/locale/mk/LC_MESSAGES/kworldclock.mo share/locale/mk/LC_MESSAGES/kwriteconfig.mo share/locale/mk/LC_MESSAGES/kxkb.mo @@ -473,6 +491,7 @@ share/locale/mk/LC_MESSAGES/libkdeedu.mo share/locale/mk/LC_MESSAGES/libkdegames.mo share/locale/mk/LC_MESSAGES/libkdepim.mo share/locale/mk/LC_MESSAGES/libkfaximgage.mo +share/locale/mk/LC_MESSAGES/libkholidays.mo share/locale/mk/LC_MESSAGES/libkicker.mo share/locale/mk/LC_MESSAGES/libkickermenu_kdeprint.mo share/locale/mk/LC_MESSAGES/libkickermenu_konsole.mo @@ -481,10 +500,14 @@ share/locale/mk/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/mk/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/mk/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/mk/LC_MESSAGES/libkickermenu_tom.mo +share/locale/mk/LC_MESSAGES/libkleopatra.mo +share/locale/mk/LC_MESSAGES/libkmime.mo share/locale/mk/LC_MESSAGES/libkonq.mo +share/locale/mk/LC_MESSAGES/libkpgp.mo share/locale/mk/LC_MESSAGES/libkpimexchange.mo share/locale/mk/LC_MESSAGES/libkscan.mo share/locale/mk/LC_MESSAGES/libkscreensaver.mo +share/locale/mk/LC_MESSAGES/libksieve.mo share/locale/mk/LC_MESSAGES/libksirtet.mo share/locale/mk/LC_MESSAGES/libksync.mo share/locale/mk/LC_MESSAGES/libtaskbar.mo @@ -496,6 +519,7 @@ share/locale/mk/LC_MESSAGES/mediaapplet.mo share/locale/mk/LC_MESSAGES/mediacontrol.mo share/locale/mk/LC_MESSAGES/mf_konqplugin.mo share/locale/mk/LC_MESSAGES/minitoolsplugin.mo +share/locale/mk/LC_MESSAGES/multisynk.mo share/locale/mk/LC_MESSAGES/naughtyapplet.mo share/locale/mk/LC_MESSAGES/nexscope.mo share/locale/mk/LC_MESSAGES/noatun.mo diff --git a/misc/kde3-i18n-mn/distinfo b/misc/kde3-i18n-mn/distinfo index 103c9f441df8..ce7c0decf49d 100644 --- a/misc/kde3-i18n-mn/distinfo +++ b/misc/kde3-i18n-mn/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-mn-3.5.5.tar.bz2) = 67fb64745786c2ef908b192432e51040 -SHA256 (KDE/kde-i18n/kde-i18n-mn-3.5.5.tar.bz2) = 6e3d571159821a84305fea88d86ab8816cb5ede99884765d1bdaccdddb9f4841 -SIZE (KDE/kde-i18n/kde-i18n-mn-3.5.5.tar.bz2) = 675863 +MD5 (KDE/kde-i18n/kde-i18n-mn-3.5.6.tar.bz2) = 7158b53fec42b7ed43525bacfa57e0e4 +SHA256 (KDE/kde-i18n/kde-i18n-mn-3.5.6.tar.bz2) = 08994c047eadf3d77a1248bd0a8dbc43e7940bfd69a099c39b4513d959f99f2d +SIZE (KDE/kde-i18n/kde-i18n-mn-3.5.6.tar.bz2) = 675757 diff --git a/misc/kde3-i18n-ms/distinfo b/misc/kde3-i18n-ms/distinfo index c869ac912ca3..87937ab6b3d2 100644 --- a/misc/kde3-i18n-ms/distinfo +++ b/misc/kde3-i18n-ms/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ms-3.5.5.tar.bz2) = 2757eb622ace8a2f231dda1bd5cd454d -SHA256 (KDE/kde-i18n/kde-i18n-ms-3.5.5.tar.bz2) = b60c33b2b7881d8dd7109a78a62b1542d97e408d4b550300e778456384d75a35 -SIZE (KDE/kde-i18n/kde-i18n-ms-3.5.5.tar.bz2) = 1783197 +MD5 (KDE/kde-i18n/kde-i18n-ms-3.5.6.tar.bz2) = edeaa43311fc0935d0a5b79b5db8f39e +SHA256 (KDE/kde-i18n/kde-i18n-ms-3.5.6.tar.bz2) = 63729d5b13050f6f84b0c8c9de69029c60432725ad51fae79efca5dd19b1f4a1 +SIZE (KDE/kde-i18n/kde-i18n-ms-3.5.6.tar.bz2) = 1877123 diff --git a/misc/kde3-i18n-ms/pkg-plist b/misc/kde3-i18n-ms/pkg-plist index 12933710ffb7..584c0fac2df8 100644 --- a/misc/kde3-i18n-ms/pkg-plist +++ b/misc/kde3-i18n-ms/pkg-plist @@ -84,6 +84,8 @@ share/locale/ms/LC_MESSAGES/kblackbox.mo share/locale/ms/LC_MESSAGES/kbounce.mo share/locale/ms/LC_MESSAGES/kbruch.mo share/locale/ms/LC_MESSAGES/kbstateapplet.mo +share/locale/ms/LC_MESSAGES/kbugbuster.mo +share/locale/ms/LC_MESSAGES/kcachegrind.mo share/locale/ms/LC_MESSAGES/kcalc.mo share/locale/ms/LC_MESSAGES/kcharselect.mo share/locale/ms/LC_MESSAGES/kcharselectapplet.mo @@ -196,6 +198,7 @@ share/locale/ms/LC_MESSAGES/kfile_au.mo share/locale/ms/LC_MESSAGES/kfile_avi.mo share/locale/ms/LC_MESSAGES/kfile_bmp.mo share/locale/ms/LC_MESSAGES/kfile_cert.mo +share/locale/ms/LC_MESSAGES/kfile_cpp.mo share/locale/ms/LC_MESSAGES/kfile_dds.mo share/locale/ms/LC_MESSAGES/kfile_deb.mo share/locale/ms/LC_MESSAGES/kfile_desktop.mo @@ -366,9 +369,11 @@ share/locale/ms/LC_MESSAGES/kpf.mo share/locale/ms/LC_MESSAGES/kpilot.mo share/locale/ms/LC_MESSAGES/kpovmodeler.mo share/locale/ms/LC_MESSAGES/kppp.mo +share/locale/ms/LC_MESSAGES/kppplogview.mo share/locale/ms/LC_MESSAGES/kprinter.mo share/locale/ms/LC_MESSAGES/krandr.mo share/locale/ms/LC_MESSAGES/krdb.mo +share/locale/ms/LC_MESSAGES/krdc.mo share/locale/ms/LC_MESSAGES/kreadconfig.mo share/locale/ms/LC_MESSAGES/krec.mo share/locale/ms/LC_MESSAGES/kregexpeditor.mo @@ -380,6 +385,7 @@ share/locale/ms/LC_MESSAGES/kres_groupwise.mo share/locale/ms/LC_MESSAGES/kres_kolab.mo share/locale/ms/LC_MESSAGES/kres_remote.mo share/locale/ms/LC_MESSAGES/kres_xmlrpc.mo +share/locale/ms/LC_MESSAGES/krfb.mo share/locale/ms/LC_MESSAGES/kruler.mo share/locale/ms/LC_MESSAGES/krunapplet.mo share/locale/ms/LC_MESSAGES/ksame.mo @@ -388,6 +394,7 @@ share/locale/ms/LC_MESSAGES/kscd.mo share/locale/ms/LC_MESSAGES/kscreensaver.mo share/locale/ms/LC_MESSAGES/ksig.mo share/locale/ms/LC_MESSAGES/ksim.mo +share/locale/ms/LC_MESSAGES/ksirc.mo share/locale/ms/LC_MESSAGES/ksmiletris.mo share/locale/ms/LC_MESSAGES/ksmserver.mo share/locale/ms/LC_MESSAGES/ksnake.mo @@ -440,10 +447,12 @@ share/locale/ms/LC_MESSAGES/kvoctrain.mo share/locale/ms/LC_MESSAGES/kwalletmanager.mo share/locale/ms/LC_MESSAGES/kwatchgnupg.mo share/locale/ms/LC_MESSAGES/kweather.mo +share/locale/ms/LC_MESSAGES/kwifimanager.mo share/locale/ms/LC_MESSAGES/kwin.mo share/locale/ms/LC_MESSAGES/kwin_art_clients.mo share/locale/ms/LC_MESSAGES/kwin_clients.mo share/locale/ms/LC_MESSAGES/kwin_lib.mo +share/locale/ms/LC_MESSAGES/kwireless.mo share/locale/ms/LC_MESSAGES/kwordquiz.mo share/locale/ms/LC_MESSAGES/kworldclock.mo share/locale/ms/LC_MESSAGES/kwriteconfig.mo @@ -494,6 +503,7 @@ share/locale/ms/LC_MESSAGES/pitchablespeed.mo share/locale/ms/LC_MESSAGES/ppdtranslations.mo share/locale/ms/LC_MESSAGES/privacy.mo share/locale/ms/LC_MESSAGES/qeditor.mo +share/locale/ms/LC_MESSAGES/quanta.mo share/locale/ms/LC_MESSAGES/quicklauncher.mo share/locale/ms/LC_MESSAGES/rellinks.mo share/locale/ms/LC_MESSAGES/searchbarplugin.mo diff --git a/misc/kde3-i18n-nb/distinfo b/misc/kde3-i18n-nb/distinfo index fdbc558d11af..197df926be01 100644 --- a/misc/kde3-i18n-nb/distinfo +++ b/misc/kde3-i18n-nb/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-nb-3.5.5.tar.bz2) = 1b3edcfa11bb648e98bab07f93e898a9 -SHA256 (KDE/kde-i18n/kde-i18n-nb-3.5.5.tar.bz2) = cdcb4dd7a73daa6cda4eff2c44e36c749b1dfefe69cd2ee05b5b066cd75b2fd3 -SIZE (KDE/kde-i18n/kde-i18n-nb-3.5.5.tar.bz2) = 2153235 +MD5 (KDE/kde-i18n/kde-i18n-nb-3.5.6.tar.bz2) = bf087b3c116770dcffa008da74e767e2 +SHA256 (KDE/kde-i18n/kde-i18n-nb-3.5.6.tar.bz2) = a449720dbd52756f950655563cbcc19376a0019bd83a35da26a70928ced76d63 +SIZE (KDE/kde-i18n/kde-i18n-nb-3.5.6.tar.bz2) = 2153589 diff --git a/misc/kde3-i18n-nds/distinfo b/misc/kde3-i18n-nds/distinfo index 49e954321a7d..60433faf15b5 100644 --- a/misc/kde3-i18n-nds/distinfo +++ b/misc/kde3-i18n-nds/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-nds-3.5.5.tar.bz2) = f159dd39c2385403a0f95c0b102ef67b -SHA256 (KDE/kde-i18n/kde-i18n-nds-3.5.5.tar.bz2) = 2f88b016ca70522a934244a076ecaae3a1886974f62b9f1adf217057cc6c4374 -SIZE (KDE/kde-i18n/kde-i18n-nds-3.5.5.tar.bz2) = 2044198 +MD5 (KDE/kde-i18n/kde-i18n-nds-3.5.6.tar.bz2) = a12623e0d68f3737447b663e070e3f61 +SHA256 (KDE/kde-i18n/kde-i18n-nds-3.5.6.tar.bz2) = de1316354b09e2a37686d0ce5c4004a025d9d92ff4b1224b07a03879132c8f2b +SIZE (KDE/kde-i18n/kde-i18n-nds-3.5.6.tar.bz2) = 2263416 diff --git a/misc/kde3-i18n-nds/pkg-plist b/misc/kde3-i18n-nds/pkg-plist index 796972738f54..3f7f0a6ffabf 100644 --- a/misc/kde3-i18n-nds/pkg-plist +++ b/misc/kde3-i18n-nds/pkg-plist @@ -42,6 +42,7 @@ share/locale/nds/LC_MESSAGES/audiocd_encoder_vorbis.mo share/locale/nds/LC_MESSAGES/audiorename_plugin.mo share/locale/nds/LC_MESSAGES/autorefresh.mo share/locale/nds/LC_MESSAGES/babelfish.mo +share/locale/nds/LC_MESSAGES/blinken.mo share/locale/nds/LC_MESSAGES/cervisia.mo share/locale/nds/LC_MESSAGES/charlatanui.mo share/locale/nds/LC_MESSAGES/clockapplet.mo @@ -77,6 +78,8 @@ share/locale/nds/LC_MESSAGES/kaboodle.mo share/locale/nds/LC_MESSAGES/kaccess.mo share/locale/nds/LC_MESSAGES/kaddressbook.mo share/locale/nds/LC_MESSAGES/kalarm.mo +share/locale/nds/LC_MESSAGES/kalzium.mo +share/locale/nds/LC_MESSAGES/kanagram.mo share/locale/nds/LC_MESSAGES/kandy.mo share/locale/nds/LC_MESSAGES/kappfinder.mo share/locale/nds/LC_MESSAGES/karm.mo @@ -110,6 +113,7 @@ share/locale/nds/LC_MESSAGES/kbattleship.mo share/locale/nds/LC_MESSAGES/kbinaryclock.mo share/locale/nds/LC_MESSAGES/kblackbox.mo share/locale/nds/LC_MESSAGES/kbounce.mo +share/locale/nds/LC_MESSAGES/kbruch.mo share/locale/nds/LC_MESSAGES/kbstateapplet.mo share/locale/nds/LC_MESSAGES/kbugbuster.mo share/locale/nds/LC_MESSAGES/kcachegrind.mo @@ -215,23 +219,33 @@ share/locale/nds/LC_MESSAGES/kdictapplet.mo share/locale/nds/LC_MESSAGES/kdjview.mo share/locale/nds/LC_MESSAGES/kdmconfig.mo share/locale/nds/LC_MESSAGES/kdmgreet.mo +share/locale/nds/LC_MESSAGES/kdvi.mo share/locale/nds/LC_MESSAGES/kedit.mo +share/locale/nds/LC_MESSAGES/keduca.mo share/locale/nds/LC_MESSAGES/kenolaba.mo +share/locale/nds/LC_MESSAGES/kfax.mo +share/locale/nds/LC_MESSAGES/kfaxview.mo share/locale/nds/LC_MESSAGES/kfifteenapplet.mo share/locale/nds/LC_MESSAGES/kfile_au.mo share/locale/nds/LC_MESSAGES/kfile_avi.mo +share/locale/nds/LC_MESSAGES/kfile_bmp.mo share/locale/nds/LC_MESSAGES/kfile_cert.mo share/locale/nds/LC_MESSAGES/kfile_cpp.mo +share/locale/nds/LC_MESSAGES/kfile_dds.mo share/locale/nds/LC_MESSAGES/kfile_deb.mo share/locale/nds/LC_MESSAGES/kfile_desktop.mo share/locale/nds/LC_MESSAGES/kfile_diff.mo +share/locale/nds/LC_MESSAGES/kfile_drgeo.mo share/locale/nds/LC_MESSAGES/kfile_dvi.mo +share/locale/nds/LC_MESSAGES/kfile_exr.mo share/locale/nds/LC_MESSAGES/kfile_flac.mo share/locale/nds/LC_MESSAGES/kfile_folder.mo share/locale/nds/LC_MESSAGES/kfile_gif.mo share/locale/nds/LC_MESSAGES/kfile_html.mo share/locale/nds/LC_MESSAGES/kfile_ico.mo share/locale/nds/LC_MESSAGES/kfile_ics.mo +share/locale/nds/LC_MESSAGES/kfile_jpeg.mo +share/locale/nds/LC_MESSAGES/kfile_kig.mo share/locale/nds/LC_MESSAGES/kfile_lnk.mo share/locale/nds/LC_MESSAGES/kfile_m3u.mo share/locale/nds/LC_MESSAGES/kfile_mhtml.mo @@ -242,14 +256,17 @@ share/locale/nds/LC_MESSAGES/kfile_ogg.mo share/locale/nds/LC_MESSAGES/kfile_palm.mo share/locale/nds/LC_MESSAGES/kfile_pcx.mo share/locale/nds/LC_MESSAGES/kfile_pdf.mo +share/locale/nds/LC_MESSAGES/kfile_png.mo share/locale/nds/LC_MESSAGES/kfile_pnm.mo share/locale/nds/LC_MESSAGES/kfile_po.mo share/locale/nds/LC_MESSAGES/kfile_ps.mo share/locale/nds/LC_MESSAGES/kfile_rfc822.mo +share/locale/nds/LC_MESSAGES/kfile_rgb.mo share/locale/nds/LC_MESSAGES/kfile_rpm.mo share/locale/nds/LC_MESSAGES/kfile_sid.mo share/locale/nds/LC_MESSAGES/kfile_tga.mo share/locale/nds/LC_MESSAGES/kfile_theora.mo +share/locale/nds/LC_MESSAGES/kfile_tiff.mo share/locale/nds/LC_MESSAGES/kfile_torrent.mo share/locale/nds/LC_MESSAGES/kfile_ts.mo share/locale/nds/LC_MESSAGES/kfile_txt.mo @@ -264,13 +281,16 @@ share/locale/nds/LC_MESSAGES/kfloppy.mo share/locale/nds/LC_MESSAGES/kfmclient.mo share/locale/nds/LC_MESSAGES/kfontinst.mo share/locale/nds/LC_MESSAGES/kfouleggs.mo +share/locale/nds/LC_MESSAGES/kgamma.mo share/locale/nds/LC_MESSAGES/kgantt.mo share/locale/nds/LC_MESSAGES/kgeography.mo share/locale/nds/LC_MESSAGES/kget.mo +share/locale/nds/LC_MESSAGES/kghostview.mo share/locale/nds/LC_MESSAGES/kgoldrunner.mo share/locale/nds/LC_MESSAGES/kgpg.mo share/locale/nds/LC_MESSAGES/kgreet_classic.mo share/locale/nds/LC_MESSAGES/kgreet_winbind.mo +share/locale/nds/LC_MESSAGES/khangman.mo share/locale/nds/LC_MESSAGES/khelpcenter.mo share/locale/nds/LC_MESSAGES/khexedit.mo share/locale/nds/LC_MESSAGES/khexedit2part.mo @@ -278,6 +298,9 @@ share/locale/nds/LC_MESSAGES/khotkeys.mo share/locale/nds/LC_MESSAGES/khtmlkttsd.mo share/locale/nds/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/nds/LC_MESSAGES/kicker.mo +share/locale/nds/LC_MESSAGES/kickermenu_kate.mo +share/locale/nds/LC_MESSAGES/kiconedit.mo +share/locale/nds/LC_MESSAGES/kig.mo share/locale/nds/LC_MESSAGES/kinetd.mo share/locale/nds/LC_MESSAGES/kio.mo share/locale/nds/LC_MESSAGES/kio_audiocd.mo @@ -312,11 +335,15 @@ share/locale/nds/LC_MESSAGES/kio_thumbnail.mo share/locale/nds/LC_MESSAGES/kio_trash.mo share/locale/nds/LC_MESSAGES/kio_zeroconf.mo share/locale/nds/LC_MESSAGES/kioexec.mo +share/locale/nds/LC_MESSAGES/kitchensync.mo +share/locale/nds/LC_MESSAGES/kiten.mo share/locale/nds/LC_MESSAGES/kjobviewer.mo share/locale/nds/LC_MESSAGES/kjots.mo share/locale/nds/LC_MESSAGES/kjumpingcube.mo share/locale/nds/LC_MESSAGES/klaptopdaemon.mo +share/locale/nds/LC_MESSAGES/klatin.mo share/locale/nds/LC_MESSAGES/kleopatra.mo +share/locale/nds/LC_MESSAGES/klettres.mo share/locale/nds/LC_MESSAGES/klickety.mo share/locale/nds/LC_MESSAGES/klines.mo share/locale/nds/LC_MESSAGES/klipper.mo @@ -345,6 +372,7 @@ share/locale/nds/LC_MESSAGES/kmobile.mo share/locale/nds/LC_MESSAGES/kmoon.mo share/locale/nds/LC_MESSAGES/kmousetool.mo share/locale/nds/LC_MESSAGES/kmouth.mo +share/locale/nds/LC_MESSAGES/kmrml.mo share/locale/nds/LC_MESSAGES/knetattach.mo share/locale/nds/LC_MESSAGES/knetwalk.mo share/locale/nds/LC_MESSAGES/knetworkconf.mo @@ -354,6 +382,7 @@ share/locale/nds/LC_MESSAGES/knotes.mo share/locale/nds/LC_MESSAGES/knotify.mo share/locale/nds/LC_MESSAGES/kodo.mo share/locale/nds/LC_MESSAGES/kolf.mo +share/locale/nds/LC_MESSAGES/kolourpaint.mo share/locale/nds/LC_MESSAGES/kolourpicker.mo share/locale/nds/LC_MESSAGES/kompare.mo share/locale/nds/LC_MESSAGES/konnector_dummy.mo @@ -371,6 +400,7 @@ share/locale/nds/LC_MESSAGES/konquest.mo share/locale/nds/LC_MESSAGES/konsole.mo share/locale/nds/LC_MESSAGES/konsolekalendar.mo share/locale/nds/LC_MESSAGES/kontact.mo +share/locale/nds/LC_MESSAGES/kooka.mo share/locale/nds/LC_MESSAGES/kopete.mo share/locale/nds/LC_MESSAGES/korganizer.mo share/locale/nds/LC_MESSAGES/korn.mo @@ -378,10 +408,12 @@ share/locale/nds/LC_MESSAGES/kpackage.mo share/locale/nds/LC_MESSAGES/kpager.mo share/locale/nds/LC_MESSAGES/kpartsaver.mo share/locale/nds/LC_MESSAGES/kpat.mo +share/locale/nds/LC_MESSAGES/kpdf.mo share/locale/nds/LC_MESSAGES/kpersonalizer.mo share/locale/nds/LC_MESSAGES/kpf.mo share/locale/nds/LC_MESSAGES/kpilot.mo share/locale/nds/LC_MESSAGES/kpoker.mo +share/locale/nds/LC_MESSAGES/kpovmodeler.mo share/locale/nds/LC_MESSAGES/kppp.mo share/locale/nds/LC_MESSAGES/kppplogview.mo share/locale/nds/LC_MESSAGES/kprinter.mo @@ -418,6 +450,7 @@ share/locale/nds/LC_MESSAGES/ksirtet.mo share/locale/nds/LC_MESSAGES/ksmiletris.mo share/locale/nds/LC_MESSAGES/ksmserver.mo share/locale/nds/LC_MESSAGES/ksnake.mo +share/locale/nds/LC_MESSAGES/ksnapshot.mo share/locale/nds/LC_MESSAGES/ksokoban.mo share/locale/nds/LC_MESSAGES/kspaceduel.mo share/locale/nds/LC_MESSAGES/ksplash.mo @@ -429,6 +462,7 @@ share/locale/nds/LC_MESSAGES/kstyle_highcontrast_config.mo share/locale/nds/LC_MESSAGES/kstyle_keramik_config.mo share/locale/nds/LC_MESSAGES/kstyle_phase_config.mo share/locale/nds/LC_MESSAGES/kstyle_plastik_config.mo +share/locale/nds/LC_MESSAGES/ksvgplugin.mo share/locale/nds/LC_MESSAGES/ksync.mo share/locale/nds/LC_MESSAGES/ksysguard.mo share/locale/nds/LC_MESSAGES/ksystemtrayapplet.mo @@ -446,15 +480,23 @@ share/locale/nds/LC_MESSAGES/ktimer.mo share/locale/nds/LC_MESSAGES/ktip.mo share/locale/nds/LC_MESSAGES/ktnef.mo share/locale/nds/LC_MESSAGES/ktron.mo +share/locale/nds/LC_MESSAGES/kttsd.mo share/locale/nds/LC_MESSAGES/ktuberling.mo share/locale/nds/LC_MESSAGES/ktux.mo share/locale/nds/LC_MESSAGES/kuick_plugin.mo +share/locale/nds/LC_MESSAGES/kuickshow.mo share/locale/nds/LC_MESSAGES/kuiviewer.mo share/locale/nds/LC_MESSAGES/kuser.mo share/locale/nds/LC_MESSAGES/kview.mo +share/locale/nds/LC_MESSAGES/kview_scale.mo share/locale/nds/LC_MESSAGES/kviewbrowserplugin.mo share/locale/nds/LC_MESSAGES/kviewcanvas.mo +share/locale/nds/LC_MESSAGES/kvieweffectsplugin.mo +share/locale/nds/LC_MESSAGES/kviewpresenterplugin.mo share/locale/nds/LC_MESSAGES/kviewscannerplugin.mo +share/locale/nds/LC_MESSAGES/kviewshell.mo +share/locale/nds/LC_MESSAGES/kviewviewer.mo +share/locale/nds/LC_MESSAGES/kvoctrain.mo share/locale/nds/LC_MESSAGES/kwalletmanager.mo share/locale/nds/LC_MESSAGES/kwatchgnupg.mo share/locale/nds/LC_MESSAGES/kweather.mo @@ -465,6 +507,7 @@ share/locale/nds/LC_MESSAGES/kwin_art_clients.mo share/locale/nds/LC_MESSAGES/kwin_clients.mo share/locale/nds/LC_MESSAGES/kwin_lib.mo share/locale/nds/LC_MESSAGES/kwireless.mo +share/locale/nds/LC_MESSAGES/kwordquiz.mo share/locale/nds/LC_MESSAGES/kworldclock.mo share/locale/nds/LC_MESSAGES/kwriteconfig.mo share/locale/nds/LC_MESSAGES/kxkb.mo @@ -475,8 +518,10 @@ share/locale/nds/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/nds/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/nds/LC_MESSAGES/libkcal.mo share/locale/nds/LC_MESSAGES/libkcddb.mo +share/locale/nds/LC_MESSAGES/libkdeedu.mo share/locale/nds/LC_MESSAGES/libkdegames.mo share/locale/nds/LC_MESSAGES/libkdepim.mo +share/locale/nds/LC_MESSAGES/libkfaximgage.mo share/locale/nds/LC_MESSAGES/libkholidays.mo share/locale/nds/LC_MESSAGES/libkicker.mo share/locale/nds/LC_MESSAGES/libkickermenu_kdeprint.mo @@ -486,11 +531,13 @@ share/locale/nds/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/nds/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/nds/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/nds/LC_MESSAGES/libkickermenu_tom.mo +share/locale/nds/LC_MESSAGES/libkitchensync.mo share/locale/nds/LC_MESSAGES/libkleopatra.mo share/locale/nds/LC_MESSAGES/libkmime.mo share/locale/nds/LC_MESSAGES/libkonq.mo share/locale/nds/LC_MESSAGES/libkpgp.mo share/locale/nds/LC_MESSAGES/libkpimexchange.mo +share/locale/nds/LC_MESSAGES/libkscan.mo share/locale/nds/LC_MESSAGES/libkscreensaver.mo share/locale/nds/LC_MESSAGES/libksieve.mo share/locale/nds/LC_MESSAGES/libksirtet.mo diff --git a/misc/kde3-i18n-nl/distinfo b/misc/kde3-i18n-nl/distinfo index 76ff1c5fc412..dcf4f102b975 100644 --- a/misc/kde3-i18n-nl/distinfo +++ b/misc/kde3-i18n-nl/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-nl-3.5.5.tar.bz2) = 44b404fc4d0b9d12714fdf2357fa3f56 -SHA256 (KDE/kde-i18n/kde-i18n-nl-3.5.5.tar.bz2) = dfd23221fd9498438d8aa53e9d3899bac53a990ab549caaff506100c29bae17c -SIZE (KDE/kde-i18n/kde-i18n-nl-3.5.5.tar.bz2) = 10207419 +MD5 (KDE/kde-i18n/kde-i18n-nl-3.5.6.tar.bz2) = 6f4eea25839984463e70d1c635813a11 +SHA256 (KDE/kde-i18n/kde-i18n-nl-3.5.6.tar.bz2) = 91879ae585aef96e8f01cf10c06a53957b099913e0f431fbeb0a9d45039048ee +SIZE (KDE/kde-i18n/kde-i18n-nl-3.5.6.tar.bz2) = 10661847 diff --git a/misc/kde3-i18n-nl/pkg-plist b/misc/kde3-i18n-nl/pkg-plist index 6b939ed9933a..e9c4122c4a28 100644 --- a/misc/kde3-i18n-nl/pkg-plist +++ b/misc/kde3-i18n-nl/pkg-plist @@ -104,6 +104,9 @@ share/doc/HTML/nl/docs/common/gpl-translated.html share/doc/HTML/nl/docs/common/kde-localised.css share/doc/HTML/nl/docs/common/lgpl-translated.html share/doc/HTML/nl/docs/common/logotp3.png +share/doc/HTML/nl/irkick/common +share/doc/HTML/nl/irkick/index.cache.bz2 +share/doc/HTML/nl/irkick/index.docbook share/doc/HTML/nl/juk/common share/doc/HTML/nl/juk/index.cache.bz2 share/doc/HTML/nl/juk/index.docbook @@ -194,6 +197,9 @@ share/doc/HTML/nl/kcalc/index.docbook share/doc/HTML/nl/kcharselect/common share/doc/HTML/nl/kcharselect/index.cache.bz2 share/doc/HTML/nl/kcharselect/index.docbook +share/doc/HTML/nl/kcmlirc/common +share/doc/HTML/nl/kcmlirc/index.cache.bz2 +share/doc/HTML/nl/kcmlirc/index.docbook share/doc/HTML/nl/kcoloredit/common share/doc/HTML/nl/kcoloredit/index.cache.bz2 share/doc/HTML/nl/kcoloredit/index.docbook @@ -383,12 +389,6 @@ share/doc/HTML/nl/kdcop/index.docbook share/doc/HTML/nl/kdebugdialog/common share/doc/HTML/nl/kdebugdialog/index.cache.bz2 share/doc/HTML/nl/kdebugdialog/index.docbook -share/doc/HTML/nl/kdelirc/irkick/common -share/doc/HTML/nl/kdelirc/irkick/index.cache.bz2 -share/doc/HTML/nl/kdelirc/irkick/index.docbook -share/doc/HTML/nl/kdelirc/kcmlirc/common -share/doc/HTML/nl/kdelirc/kcmlirc/index.cache.bz2 -share/doc/HTML/nl/kdelirc/kcmlirc/index.docbook share/doc/HTML/nl/kdeprint/add-printer-wiz.docbook share/doc/HTML/nl/kdeprint/common share/doc/HTML/nl/kdeprint/cups-config.docbook @@ -414,6 +414,10 @@ share/doc/HTML/nl/kdf/index.cache.bz2 share/doc/HTML/nl/kdf/index.docbook share/doc/HTML/nl/kdf/kdf.png share/doc/HTML/nl/kdf/kdf_config.png +share/doc/HTML/nl/kdm/common +share/doc/HTML/nl/kdm/index.cache.bz2 +share/doc/HTML/nl/kdm/index.docbook +share/doc/HTML/nl/kdm/kdmrc-ref.docbook share/doc/HTML/nl/kdvi/common share/doc/HTML/nl/kdvi/index.cache.bz2 share/doc/HTML/nl/kdvi/index.docbook @@ -423,9 +427,35 @@ share/doc/HTML/nl/keduca/index.docbook share/doc/HTML/nl/kenolaba/common share/doc/HTML/nl/kenolaba/index.cache.bz2 share/doc/HTML/nl/kenolaba/index.docbook +share/doc/HTML/nl/kfilereplace/addstringsdialog_window.png +share/doc/HTML/nl/kfilereplace/backup_option.png +share/doc/HTML/nl/kfilereplace/casesensitive_option.png +share/doc/HTML/nl/kfilereplace/command_option.png share/doc/HTML/nl/kfilereplace/common +share/doc/HTML/nl/kfilereplace/edit.png +share/doc/HTML/nl/kfilereplace/edit_add.png +share/doc/HTML/nl/kfilereplace/edit_remove.png +share/doc/HTML/nl/kfilereplace/eraser.png +share/doc/HTML/nl/kfilereplace/filereplace.png +share/doc/HTML/nl/kfilereplace/filesearch.png +share/doc/HTML/nl/kfilereplace/filesimulate.png share/doc/HTML/nl/kfilereplace/index.cache.bz2 share/doc/HTML/nl/kfilereplace/index.docbook +share/doc/HTML/nl/kfilereplace/invert.png +share/doc/HTML/nl/kfilereplace/kfr_standalone_main_window_1.png +share/doc/HTML/nl/kfilereplace/optionsdialog_main_window_1.png +share/doc/HTML/nl/kfilereplace/optionsdialog_main_window_2.png +share/doc/HTML/nl/kfilereplace/project.png +share/doc/HTML/nl/kfilereplace/projectdialog_main_window_1.png +share/doc/HTML/nl/kfilereplace/projectdialog_main_window_2.png +share/doc/HTML/nl/kfilereplace/recursive_option.png +share/doc/HTML/nl/kfilereplace/regularexpression_option.png +share/doc/HTML/nl/kfilereplace/report_example.png +share/doc/HTML/nl/kfilereplace/results_view.png +share/doc/HTML/nl/kfilereplace/stop.png +share/doc/HTML/nl/kfilereplace/strings_view.png +share/doc/HTML/nl/kfilereplace/toolbar.png +share/doc/HTML/nl/kfilereplace/unsortedList.png share/doc/HTML/nl/kfind/common share/doc/HTML/nl/kfind/index.cache.bz2 share/doc/HTML/nl/kfind/index.docbook @@ -501,7 +531,6 @@ share/doc/HTML/nl/khelpcenter/userguide/accessibility.docbook share/doc/HTML/nl/khelpcenter/userguide/base-kde-applications.docbook share/doc/HTML/nl/khelpcenter/userguide/browser-fine-tuning.docbook share/doc/HTML/nl/khelpcenter/userguide/burning-cds.docbook -share/doc/HTML/nl/khelpcenter/userguide/common share/doc/HTML/nl/khelpcenter/userguide/control-center.docbook share/doc/HTML/nl/khelpcenter/userguide/creating-graphics.docbook share/doc/HTML/nl/khelpcenter/userguide/credits-and-license.docbook @@ -515,8 +544,6 @@ share/doc/HTML/nl/khelpcenter/userguide/getting-started.docbook share/doc/HTML/nl/khelpcenter/userguide/glossary.docbook share/doc/HTML/nl/khelpcenter/userguide/groupware-kontact.docbook share/doc/HTML/nl/khelpcenter/userguide/history.docbook -share/doc/HTML/nl/khelpcenter/userguide/index.cache.bz2 -share/doc/HTML/nl/khelpcenter/userguide/index.docbook share/doc/HTML/nl/khelpcenter/userguide/installation.docbook share/doc/HTML/nl/khelpcenter/userguide/internet-shortcuts.docbook share/doc/HTML/nl/khelpcenter/userguide/intro.docbook @@ -787,6 +814,9 @@ share/doc/HTML/nl/kmplot/man-kmplot.1.docbook share/doc/HTML/nl/kmplot/menu.docbook share/doc/HTML/nl/kmplot/reference.docbook share/doc/HTML/nl/kmplot/using.docbook +share/doc/HTML/nl/knetattach/common +share/doc/HTML/nl/knetattach/index.cache.bz2 +share/doc/HTML/nl/knetattach/index.docbook share/doc/HTML/nl/knode/commands.docbook share/doc/HTML/nl/knode/common share/doc/HTML/nl/knode/credits.docbook @@ -829,6 +859,9 @@ share/doc/HTML/nl/kommander/widgets.docbook share/doc/HTML/nl/kompare/common share/doc/HTML/nl/kompare/index.cache.bz2 share/doc/HTML/nl/kompare/index.docbook +share/doc/HTML/nl/kompmgr/common +share/doc/HTML/nl/kompmgr/index.cache.bz2 +share/doc/HTML/nl/kompmgr/index.docbook share/doc/HTML/nl/konq-plugins/babel/common share/doc/HTML/nl/konq-plugins/babel/index.cache.bz2 share/doc/HTML/nl/konq-plugins/babel/index.docbook @@ -1547,6 +1580,7 @@ share/locale/nl/LC_MESSAGES/khotkeys.mo share/locale/nl/LC_MESSAGES/khtmlkttsd.mo share/locale/nl/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/nl/LC_MESSAGES/kicker.mo +share/locale/nl/LC_MESSAGES/kickermenu_kate.mo share/locale/nl/LC_MESSAGES/kiconedit.mo share/locale/nl/LC_MESSAGES/kig.mo share/locale/nl/LC_MESSAGES/kimagemapeditor.mo @@ -1584,6 +1618,7 @@ share/locale/nl/LC_MESSAGES/kio_thumbnail.mo share/locale/nl/LC_MESSAGES/kio_trash.mo share/locale/nl/LC_MESSAGES/kio_zeroconf.mo share/locale/nl/LC_MESSAGES/kioexec.mo +share/locale/nl/LC_MESSAGES/kitchensync.mo share/locale/nl/LC_MESSAGES/kiten.mo share/locale/nl/LC_MESSAGES/kjobviewer.mo share/locale/nl/LC_MESSAGES/kjots.mo @@ -1787,6 +1822,7 @@ share/locale/nl/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/nl/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/nl/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/nl/LC_MESSAGES/libkickermenu_tom.mo +share/locale/nl/LC_MESSAGES/libkitchensync.mo share/locale/nl/LC_MESSAGES/libkleopatra.mo share/locale/nl/LC_MESSAGES/libkmime.mo share/locale/nl/LC_MESSAGES/libkonq.mo @@ -1907,12 +1943,14 @@ share/locale/nl/flag.png @dirrm share/doc/HTML/nl/konq-plugins/crashes @dirrm share/doc/HTML/nl/konq-plugins/babel @dirrm share/doc/HTML/nl/konq-plugins +@dirrm share/doc/HTML/nl/kompmgr @dirrm share/doc/HTML/nl/kompare @dirrm share/doc/HTML/nl/kommander @dirrm share/doc/HTML/nl/kolf @dirrm share/doc/HTML/nl/kodo @dirrm share/doc/HTML/nl/knotes @dirrm share/doc/HTML/nl/knode +@dirrm share/doc/HTML/nl/knetattach @dirrm share/doc/HTML/nl/kmplot @dirrm share/doc/HTML/nl/kmouth @dirrm share/doc/HTML/nl/kmousetool @@ -1976,12 +2014,10 @@ share/locale/nl/flag.png @dirrm share/doc/HTML/nl/kenolaba @dirrm share/doc/HTML/nl/keduca @dirrm share/doc/HTML/nl/kdvi +@dirrm share/doc/HTML/nl/kdm @dirrm share/doc/HTML/nl/kdf @dirrm share/doc/HTML/nl/kdesu @dirrm share/doc/HTML/nl/kdeprint -@dirrm share/doc/HTML/nl/kdelirc/kcmlirc -@dirrm share/doc/HTML/nl/kdelirc/irkick -@dirrm share/doc/HTML/nl/kdelirc @dirrm share/doc/HTML/nl/kdebugdialog @dirrm share/doc/HTML/nl/kdcop @dirrm share/doc/HTML/nl/kdat @@ -2042,6 +2078,7 @@ share/locale/nl/flag.png @dirrm share/doc/HTML/nl/kcontrol/arts @dirrm share/doc/HTML/nl/kcontrol @dirrm share/doc/HTML/nl/kcoloredit +@dirrm share/doc/HTML/nl/kcmlirc @dirrm share/doc/HTML/nl/kcharselect @dirrm share/doc/HTML/nl/kcalc @dirrm share/doc/HTML/nl/kbugbuster @@ -2062,6 +2099,7 @@ share/locale/nl/flag.png @dirrm share/doc/HTML/nl/kaddressbook @dirrm share/doc/HTML/nl/kaboodle @dirrm share/doc/HTML/nl/juk +@dirrm share/doc/HTML/nl/irkick @dirrm share/doc/HTML/nl/docs/common @dirrm share/doc/HTML/nl/docs @dirrm share/doc/HTML/nl/atlantik diff --git a/misc/kde3-i18n-nn/distinfo b/misc/kde3-i18n-nn/distinfo index 4afe999dd24e..0f89e1ad790c 100644 --- a/misc/kde3-i18n-nn/distinfo +++ b/misc/kde3-i18n-nn/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-nn-3.5.5.tar.bz2) = 964c91710f2b28cdde7b8cdfef961791 -SHA256 (KDE/kde-i18n/kde-i18n-nn-3.5.5.tar.bz2) = d5e9ca40cb03bcbeb49f9441bfa79458db373fb55117c135cf27651a82fd3057 -SIZE (KDE/kde-i18n/kde-i18n-nn-3.5.5.tar.bz2) = 1877259 +MD5 (KDE/kde-i18n/kde-i18n-nn-3.5.6.tar.bz2) = 9dc810b75c2cb7c864ec5bf82a2bed2f +SHA256 (KDE/kde-i18n/kde-i18n-nn-3.5.6.tar.bz2) = 01a4a1c830d87637cff9f118c4c660d4d124dabb6bd3d578d10d3deced9194f9 +SIZE (KDE/kde-i18n/kde-i18n-nn-3.5.6.tar.bz2) = 1873894 diff --git a/misc/kde3-i18n-pa/distinfo b/misc/kde3-i18n-pa/distinfo index 3372b8304ffb..e67c349ba67a 100644 --- a/misc/kde3-i18n-pa/distinfo +++ b/misc/kde3-i18n-pa/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-pa-3.5.5.tar.bz2) = 1881a7e5b1fc6b75ca74dc4c504ad16d -SHA256 (KDE/kde-i18n/kde-i18n-pa-3.5.5.tar.bz2) = c6819eb7d6dfeef7b8c06f96a77db9af08a68680f915b50fc22ffee5bb4c10e6 -SIZE (KDE/kde-i18n/kde-i18n-pa-3.5.5.tar.bz2) = 1282232 +MD5 (KDE/kde-i18n/kde-i18n-pa-3.5.6.tar.bz2) = 6a9be2176930ceb07600913cbee525e3 +SHA256 (KDE/kde-i18n/kde-i18n-pa-3.5.6.tar.bz2) = 50e07a49009dfbe80573c57d255b5673b63255af7c2524b5742362ed513b4b96 +SIZE (KDE/kde-i18n/kde-i18n-pa-3.5.6.tar.bz2) = 1278462 diff --git a/misc/kde3-i18n-pa/pkg-plist b/misc/kde3-i18n-pa/pkg-plist index 8dab0cae9924..e64ba6ad902e 100644 --- a/misc/kde3-i18n-pa/pkg-plist +++ b/misc/kde3-i18n-pa/pkg-plist @@ -175,7 +175,6 @@ share/locale/pa/LC_MESSAGES/kdialog.mo share/locale/pa/LC_MESSAGES/kdict.mo share/locale/pa/LC_MESSAGES/kdictapplet.mo share/locale/pa/LC_MESSAGES/kdjview.mo -share/locale/pa/LC_MESSAGES/kdmchooser.mo share/locale/pa/LC_MESSAGES/kdmconfig.mo share/locale/pa/LC_MESSAGES/kdmgreet.mo share/locale/pa/LC_MESSAGES/kedit.mo diff --git a/misc/kde3-i18n-ro/distinfo b/misc/kde3-i18n-ro/distinfo index 1e6e3aa806c3..9038579bb41a 100644 --- a/misc/kde3-i18n-ro/distinfo +++ b/misc/kde3-i18n-ro/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ro-3.5.5.tar.bz2) = b31d031cbf2deae408c94a665677dfd2 -SHA256 (KDE/kde-i18n/kde-i18n-ro-3.5.5.tar.bz2) = 457b694d0f33904d17ed09245af0787bcc7b110f6966ef04accdb360dce35986 -SIZE (KDE/kde-i18n/kde-i18n-ro-3.5.5.tar.bz2) = 3154718 +MD5 (KDE/kde-i18n/kde-i18n-ro-3.5.6.tar.bz2) = af2fc2dbc745614c7286a430a7874a54 +SHA256 (KDE/kde-i18n/kde-i18n-ro-3.5.6.tar.bz2) = ca19c0245dfd604694a4a2308c7da1fa3f58401e9b7ef0d17a750eeff0215df5 +SIZE (KDE/kde-i18n/kde-i18n-ro-3.5.6.tar.bz2) = 3169518 diff --git a/misc/kde3-i18n-rw/distinfo b/misc/kde3-i18n-rw/distinfo index ccbd0d302fe9..6d97f8e6824c 100644 --- a/misc/kde3-i18n-rw/distinfo +++ b/misc/kde3-i18n-rw/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-rw-3.5.5.tar.bz2) = b94681f15ccb61cd9760e2e7830e7592 -SHA256 (KDE/kde-i18n/kde-i18n-rw-3.5.5.tar.bz2) = 4c28560b2d3b4f25292ccf06ff77a11b780bb99e1f849441e9906811379045c5 -SIZE (KDE/kde-i18n/kde-i18n-rw-3.5.5.tar.bz2) = 2013489 +MD5 (KDE/kde-i18n/kde-i18n-rw-3.5.6.tar.bz2) = 8d07d207bb2e933a7b0130e593313842 +SHA256 (KDE/kde-i18n/kde-i18n-rw-3.5.6.tar.bz2) = 2e7dd0875eb0e16cc4269acfed2be0eb02c9a80e267eb8d0850f3ba181d19f3b +SIZE (KDE/kde-i18n/kde-i18n-rw-3.5.6.tar.bz2) = 2020663 diff --git a/misc/kde3-i18n-se/distinfo b/misc/kde3-i18n-se/distinfo index 7ed87521492b..df096ba59488 100644 --- a/misc/kde3-i18n-se/distinfo +++ b/misc/kde3-i18n-se/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-se-3.5.5.tar.bz2) = 4492ee7304d4539b3dfd4d1349c6a838 -SHA256 (KDE/kde-i18n/kde-i18n-se-3.5.5.tar.bz2) = 7b84611f6aa6550d7cf198d384e43d8d4c7465b9bbf2889c27c70453f0a41a3e -SIZE (KDE/kde-i18n/kde-i18n-se-3.5.5.tar.bz2) = 980658 +MD5 (KDE/kde-i18n/kde-i18n-se-3.5.6.tar.bz2) = 11d5888678814a442589c995d6307cd8 +SHA256 (KDE/kde-i18n/kde-i18n-se-3.5.6.tar.bz2) = da546ae6e50587085937e57c3c23253a38d132f5d3054314d45a18c4422be903 +SIZE (KDE/kde-i18n/kde-i18n-se-3.5.6.tar.bz2) = 984655 diff --git a/misc/kde3-i18n-sk/distinfo b/misc/kde3-i18n-sk/distinfo index 0e40edf024b4..fa5d6764c349 100644 --- a/misc/kde3-i18n-sk/distinfo +++ b/misc/kde3-i18n-sk/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-sk-3.5.5.tar.bz2) = 0a1bccde30cf25cf37974362585b118a -SHA256 (KDE/kde-i18n/kde-i18n-sk-3.5.5.tar.bz2) = 5597e59e2b8e4895e473b097048edaab6603ed1fe614f12cb9b373d48de2b533 -SIZE (KDE/kde-i18n/kde-i18n-sk-3.5.5.tar.bz2) = 5729936 +MD5 (KDE/kde-i18n/kde-i18n-sk-3.5.6.tar.bz2) = 3a7b1b8bd44c92713d5e4db52655915b +SHA256 (KDE/kde-i18n/kde-i18n-sk-3.5.6.tar.bz2) = 72307acdb9ad9b5e98be0c8bc898b6f1eda87669badedd6b6450671d9b60e070 +SIZE (KDE/kde-i18n/kde-i18n-sk-3.5.6.tar.bz2) = 5763980 diff --git a/misc/kde3-i18n-sk/pkg-plist b/misc/kde3-i18n-sk/pkg-plist index 3aa924aa4cb6..798ec9077aff 100644 --- a/misc/kde3-i18n-sk/pkg-plist +++ b/misc/kde3-i18n-sk/pkg-plist @@ -1,3 +1,4 @@ +share/apps/katepart/syntax/logohighlightstyle.sk.xml share/apps/klettres/sk/alpha/a-0.ogg share/apps/klettres/sk/alpha/a-1.ogg share/apps/klettres/sk/alpha/a-10.ogg @@ -132,6 +133,20 @@ share/apps/ktuberling/sounds/sk/okuliare.wav share/apps/ktuberling/sounds/sk/slnecneokuliare.wav share/apps/ktuberling/sounds/sk/ucho.wav share/apps/ktuberling/sounds/sk/usta.wav +share/apps/kturtle/data/logokeywords.sk.xml +share/apps/kturtle/examples/sk/farbenieplatna.logo +share/apps/kturtle/examples/sk/kde.logo +share/apps/kturtle/examples/sk/kvet.logo +share/apps/kturtle/examples/sk/nahodnemeno.logo +share/apps/kturtle/examples/sk/nasobilka.logo +share/apps/kturtle/examples/sk/reklama.logo +share/apps/kturtle/examples/sk/sipka.logo +share/apps/kturtle/examples/sk/spirala.logo +share/apps/kturtle/examples/sk/spiraly.logo +share/apps/kturtle/examples/sk/stvorce.logo +share/apps/kturtle/examples/sk/stvorec.logo +share/apps/kturtle/examples/sk/trojuholnik.logo +share/apps/kturtle/examples/sk/trojuholniky.logo share/doc/HTML/sk/amor/common share/doc/HTML/sk/amor/index.cache.bz2 share/doc/HTML/sk/amor/index.docbook @@ -1055,6 +1070,7 @@ share/locale/sk/LC_MESSAGES/khotkeys.mo share/locale/sk/LC_MESSAGES/khtmlkttsd.mo share/locale/sk/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/sk/LC_MESSAGES/kicker.mo +share/locale/sk/LC_MESSAGES/kickermenu_kate.mo share/locale/sk/LC_MESSAGES/kiconedit.mo share/locale/sk/LC_MESSAGES/kig.mo share/locale/sk/LC_MESSAGES/kimagemapeditor.mo @@ -1092,6 +1108,7 @@ share/locale/sk/LC_MESSAGES/kio_thumbnail.mo share/locale/sk/LC_MESSAGES/kio_trash.mo share/locale/sk/LC_MESSAGES/kio_zeroconf.mo share/locale/sk/LC_MESSAGES/kioexec.mo +share/locale/sk/LC_MESSAGES/kitchensync.mo share/locale/sk/LC_MESSAGES/kiten.mo share/locale/sk/LC_MESSAGES/kjobviewer.mo share/locale/sk/LC_MESSAGES/kjots.mo @@ -1295,6 +1312,7 @@ share/locale/sk/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/sk/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/sk/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/sk/LC_MESSAGES/libkickermenu_tom.mo +share/locale/sk/LC_MESSAGES/libkitchensync.mo share/locale/sk/LC_MESSAGES/libkleopatra.mo share/locale/sk/LC_MESSAGES/libkmime.mo share/locale/sk/LC_MESSAGES/libkonq.mo @@ -1499,6 +1517,10 @@ share/locale/sk/flag.png @dirrm share/doc/HTML/sk/docs @dirrm share/doc/HTML/sk/atlantik @dirrm share/doc/HTML/sk/amor +@dirrm share/apps/kturtle/examples/sk +@dirrm share/apps/kturtle/examples +@dirrm share/apps/kturtle/data +@dirrm share/apps/kturtle @dirrm share/apps/ktuberling/sounds/sk @dirrm share/apps/ktuberling/sounds @dirrm share/apps/ktuberling diff --git a/misc/kde3-i18n-sl/distinfo b/misc/kde3-i18n-sl/distinfo index 451f996a8bb8..4484ed3345e3 100644 --- a/misc/kde3-i18n-sl/distinfo +++ b/misc/kde3-i18n-sl/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-sl-3.5.5.tar.bz2) = 3574861dc47aa09ada8cc6c7bca2307e -SHA256 (KDE/kde-i18n/kde-i18n-sl-3.5.5.tar.bz2) = 9bc04643fea3cd750a05898c882e36c9e9e49892a7e0a11e8531238f47a58c0e -SIZE (KDE/kde-i18n/kde-i18n-sl-3.5.5.tar.bz2) = 4483401 +MD5 (KDE/kde-i18n/kde-i18n-sl-3.5.6.tar.bz2) = 2064f33c3f76ee60ddf1aef010d92399 +SHA256 (KDE/kde-i18n/kde-i18n-sl-3.5.6.tar.bz2) = 09291f9fc22838263ce5fa79654ddef4ed105a2779eca31ed970ecf5210a770e +SIZE (KDE/kde-i18n/kde-i18n-sl-3.5.6.tar.bz2) = 4487494 diff --git a/misc/kde3-i18n-sl/pkg-plist b/misc/kde3-i18n-sl/pkg-plist index d59a8173525c..420b07e7891d 100644 --- a/misc/kde3-i18n-sl/pkg-plist +++ b/misc/kde3-i18n-sl/pkg-plist @@ -350,6 +350,7 @@ share/locale/sl/LC_MESSAGES/kaccess.mo share/locale/sl/LC_MESSAGES/kaddressbook.mo share/locale/sl/LC_MESSAGES/kalarm.mo share/locale/sl/LC_MESSAGES/kalzium.mo +share/locale/sl/LC_MESSAGES/kanagram.mo share/locale/sl/LC_MESSAGES/kandy.mo share/locale/sl/LC_MESSAGES/kappfinder.mo share/locale/sl/LC_MESSAGES/karm.mo @@ -569,6 +570,7 @@ share/locale/sl/LC_MESSAGES/khotkeys.mo share/locale/sl/LC_MESSAGES/khtmlkttsd.mo share/locale/sl/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/sl/LC_MESSAGES/kicker.mo +share/locale/sl/LC_MESSAGES/kickermenu_kate.mo share/locale/sl/LC_MESSAGES/kiconedit.mo share/locale/sl/LC_MESSAGES/kig.mo share/locale/sl/LC_MESSAGES/kimagemapeditor.mo @@ -606,6 +608,7 @@ share/locale/sl/LC_MESSAGES/kio_thumbnail.mo share/locale/sl/LC_MESSAGES/kio_trash.mo share/locale/sl/LC_MESSAGES/kio_zeroconf.mo share/locale/sl/LC_MESSAGES/kioexec.mo +share/locale/sl/LC_MESSAGES/kitchensync.mo share/locale/sl/LC_MESSAGES/kiten.mo share/locale/sl/LC_MESSAGES/kjobviewer.mo share/locale/sl/LC_MESSAGES/kjots.mo @@ -647,6 +650,7 @@ share/locale/sl/LC_MESSAGES/kmplot.mo share/locale/sl/LC_MESSAGES/kmrml.mo share/locale/sl/LC_MESSAGES/knetattach.mo share/locale/sl/LC_MESSAGES/knetwalk.mo +share/locale/sl/LC_MESSAGES/knetworkconf.mo share/locale/sl/LC_MESSAGES/knewsticker.mo share/locale/sl/LC_MESSAGES/knode.mo share/locale/sl/LC_MESSAGES/knotes.mo @@ -808,6 +812,7 @@ share/locale/sl/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/sl/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/sl/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/sl/LC_MESSAGES/libkickermenu_tom.mo +share/locale/sl/LC_MESSAGES/libkitchensync.mo share/locale/sl/LC_MESSAGES/libkleopatra.mo share/locale/sl/LC_MESSAGES/libkmime.mo share/locale/sl/LC_MESSAGES/libkonq.mo diff --git a/misc/kde3-i18n-sr/distinfo b/misc/kde3-i18n-sr/distinfo index d18ee9691cb2..4a94a70ce93c 100644 --- a/misc/kde3-i18n-sr/distinfo +++ b/misc/kde3-i18n-sr/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-sr-3.5.5.tar.bz2) = e308f4f37c5509bd5583f7fcd90bcb32 -SHA256 (KDE/kde-i18n/kde-i18n-sr-3.5.5.tar.bz2) = 9d7cac3b05f17385941bbbc3d05ca792717bf50a92b9d32e318d1f2f11ed78c9 -SIZE (KDE/kde-i18n/kde-i18n-sr-3.5.5.tar.bz2) = 2641104 +MD5 (KDE/kde-i18n/kde-i18n-sr-3.5.6.tar.bz2) = e38ff9abe6f68bc69e0df5891e7bce69 +SHA256 (KDE/kde-i18n/kde-i18n-sr-3.5.6.tar.bz2) = eb4ba6f0e98f62b4a1e6bf6e712f54918974a8bb0f8951f319fd03d8cca4bab5 +SIZE (KDE/kde-i18n/kde-i18n-sr-3.5.6.tar.bz2) = 2645423 diff --git a/misc/kde3-i18n-sr/pkg-plist b/misc/kde3-i18n-sr/pkg-plist index f8130eeaf076..2dcb9b4d7d37 100644 --- a/misc/kde3-i18n-sr/pkg-plist +++ b/misc/kde3-i18n-sr/pkg-plist @@ -304,6 +304,7 @@ share/locale/sr/LC_MESSAGES/khotkeys.mo share/locale/sr/LC_MESSAGES/khtmlkttsd.mo share/locale/sr/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/sr/LC_MESSAGES/kicker.mo +share/locale/sr/LC_MESSAGES/kickermenu_kate.mo share/locale/sr/LC_MESSAGES/kiconedit.mo share/locale/sr/LC_MESSAGES/kig.mo share/locale/sr/LC_MESSAGES/kimagemapeditor.mo @@ -341,6 +342,7 @@ share/locale/sr/LC_MESSAGES/kio_thumbnail.mo share/locale/sr/LC_MESSAGES/kio_trash.mo share/locale/sr/LC_MESSAGES/kio_zeroconf.mo share/locale/sr/LC_MESSAGES/kioexec.mo +share/locale/sr/LC_MESSAGES/kitchensync.mo share/locale/sr/LC_MESSAGES/kiten.mo share/locale/sr/LC_MESSAGES/kjobviewer.mo share/locale/sr/LC_MESSAGES/kjots.mo @@ -544,6 +546,7 @@ share/locale/sr/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/sr/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/sr/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/sr/LC_MESSAGES/libkickermenu_tom.mo +share/locale/sr/LC_MESSAGES/libkitchensync.mo share/locale/sr/LC_MESSAGES/libkleopatra.mo share/locale/sr/LC_MESSAGES/libkmime.mo share/locale/sr/LC_MESSAGES/libkonq.mo diff --git a/misc/kde3-i18n-sr@Latn/distinfo b/misc/kde3-i18n-sr@Latn/distinfo index a57061cf1583..79af948e449f 100644 --- a/misc/kde3-i18n-sr@Latn/distinfo +++ b/misc/kde3-i18n-sr@Latn/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-sr@Latn-3.5.5.tar.bz2) = 0e3d6ba65882faadc89791c3691b19b6 -SHA256 (KDE/kde-i18n/kde-i18n-sr@Latn-3.5.5.tar.bz2) = 146e9ec5682bbeee82f88ab256a931729fb3b90ca1fb3aa99ccf0deff5d8eca0 -SIZE (KDE/kde-i18n/kde-i18n-sr@Latn-3.5.5.tar.bz2) = 2645661 +MD5 (KDE/kde-i18n/kde-i18n-sr@Latn-3.5.6.tar.bz2) = 9dcf67d0837f8ad2448d07c3ba3d5015 +SHA256 (KDE/kde-i18n/kde-i18n-sr@Latn-3.5.6.tar.bz2) = fa29b1e8b1d05b364685da9e6207ff4746f5106e5868af0538ecadbed3c5bd23 +SIZE (KDE/kde-i18n/kde-i18n-sr@Latn-3.5.6.tar.bz2) = 2645904 diff --git a/misc/kde3-i18n-sr@Latn/pkg-plist b/misc/kde3-i18n-sr@Latn/pkg-plist index 07193f4cb435..d0cb376d9b79 100644 --- a/misc/kde3-i18n-sr@Latn/pkg-plist +++ b/misc/kde3-i18n-sr@Latn/pkg-plist @@ -297,6 +297,7 @@ share/locale/sr@Latn/LC_MESSAGES/khotkeys.mo share/locale/sr@Latn/LC_MESSAGES/khtmlkttsd.mo share/locale/sr@Latn/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/sr@Latn/LC_MESSAGES/kicker.mo +share/locale/sr@Latn/LC_MESSAGES/kickermenu_kate.mo share/locale/sr@Latn/LC_MESSAGES/kiconedit.mo share/locale/sr@Latn/LC_MESSAGES/kig.mo share/locale/sr@Latn/LC_MESSAGES/kimagemapeditor.mo @@ -334,6 +335,7 @@ share/locale/sr@Latn/LC_MESSAGES/kio_thumbnail.mo share/locale/sr@Latn/LC_MESSAGES/kio_trash.mo share/locale/sr@Latn/LC_MESSAGES/kio_zeroconf.mo share/locale/sr@Latn/LC_MESSAGES/kioexec.mo +share/locale/sr@Latn/LC_MESSAGES/kitchensync.mo share/locale/sr@Latn/LC_MESSAGES/kiten.mo share/locale/sr@Latn/LC_MESSAGES/kjobviewer.mo share/locale/sr@Latn/LC_MESSAGES/kjots.mo @@ -537,6 +539,7 @@ share/locale/sr@Latn/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/sr@Latn/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/sr@Latn/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/sr@Latn/LC_MESSAGES/libkickermenu_tom.mo +share/locale/sr@Latn/LC_MESSAGES/libkitchensync.mo share/locale/sr@Latn/LC_MESSAGES/libkleopatra.mo share/locale/sr@Latn/LC_MESSAGES/libkmime.mo share/locale/sr@Latn/LC_MESSAGES/libkonq.mo diff --git a/misc/kde3-i18n-sr_Latn/distinfo b/misc/kde3-i18n-sr_Latn/distinfo index a57061cf1583..79af948e449f 100644 --- a/misc/kde3-i18n-sr_Latn/distinfo +++ b/misc/kde3-i18n-sr_Latn/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-sr@Latn-3.5.5.tar.bz2) = 0e3d6ba65882faadc89791c3691b19b6 -SHA256 (KDE/kde-i18n/kde-i18n-sr@Latn-3.5.5.tar.bz2) = 146e9ec5682bbeee82f88ab256a931729fb3b90ca1fb3aa99ccf0deff5d8eca0 -SIZE (KDE/kde-i18n/kde-i18n-sr@Latn-3.5.5.tar.bz2) = 2645661 +MD5 (KDE/kde-i18n/kde-i18n-sr@Latn-3.5.6.tar.bz2) = 9dcf67d0837f8ad2448d07c3ba3d5015 +SHA256 (KDE/kde-i18n/kde-i18n-sr@Latn-3.5.6.tar.bz2) = fa29b1e8b1d05b364685da9e6207ff4746f5106e5868af0538ecadbed3c5bd23 +SIZE (KDE/kde-i18n/kde-i18n-sr@Latn-3.5.6.tar.bz2) = 2645904 diff --git a/misc/kde3-i18n-sr_Latn/pkg-plist b/misc/kde3-i18n-sr_Latn/pkg-plist index 07193f4cb435..d0cb376d9b79 100644 --- a/misc/kde3-i18n-sr_Latn/pkg-plist +++ b/misc/kde3-i18n-sr_Latn/pkg-plist @@ -297,6 +297,7 @@ share/locale/sr@Latn/LC_MESSAGES/khotkeys.mo share/locale/sr@Latn/LC_MESSAGES/khtmlkttsd.mo share/locale/sr@Latn/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/sr@Latn/LC_MESSAGES/kicker.mo +share/locale/sr@Latn/LC_MESSAGES/kickermenu_kate.mo share/locale/sr@Latn/LC_MESSAGES/kiconedit.mo share/locale/sr@Latn/LC_MESSAGES/kig.mo share/locale/sr@Latn/LC_MESSAGES/kimagemapeditor.mo @@ -334,6 +335,7 @@ share/locale/sr@Latn/LC_MESSAGES/kio_thumbnail.mo share/locale/sr@Latn/LC_MESSAGES/kio_trash.mo share/locale/sr@Latn/LC_MESSAGES/kio_zeroconf.mo share/locale/sr@Latn/LC_MESSAGES/kioexec.mo +share/locale/sr@Latn/LC_MESSAGES/kitchensync.mo share/locale/sr@Latn/LC_MESSAGES/kiten.mo share/locale/sr@Latn/LC_MESSAGES/kjobviewer.mo share/locale/sr@Latn/LC_MESSAGES/kjots.mo @@ -537,6 +539,7 @@ share/locale/sr@Latn/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/sr@Latn/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/sr@Latn/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/sr@Latn/LC_MESSAGES/libkickermenu_tom.mo +share/locale/sr@Latn/LC_MESSAGES/libkitchensync.mo share/locale/sr@Latn/LC_MESSAGES/libkleopatra.mo share/locale/sr@Latn/LC_MESSAGES/libkmime.mo share/locale/sr@Latn/LC_MESSAGES/libkonq.mo diff --git a/misc/kde3-i18n-ss/distinfo b/misc/kde3-i18n-ss/distinfo index 426531db68ac..aafb644bc3cd 100644 --- a/misc/kde3-i18n-ss/distinfo +++ b/misc/kde3-i18n-ss/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ss-3.5.5.tar.bz2) = 8a08733c9cd4d367a42f0c0a69accc8a -SHA256 (KDE/kde-i18n/kde-i18n-ss-3.5.5.tar.bz2) = 8e260046c5864d19e46ad9f56bea9c615dda22dfa69e4ba8a9a97f7b52a074f5 -SIZE (KDE/kde-i18n/kde-i18n-ss-3.5.5.tar.bz2) = 653182 +MD5 (KDE/kde-i18n/kde-i18n-ss-3.5.6.tar.bz2) = 7ecd86abba7c02c73b248ba5452c4bed +SHA256 (KDE/kde-i18n/kde-i18n-ss-3.5.6.tar.bz2) = 472ffd57935a5e2e80bb88d9d4b1756469d11944957d05f28c0301219739cdcf +SIZE (KDE/kde-i18n/kde-i18n-ss-3.5.6.tar.bz2) = 653561 diff --git a/misc/kde3-i18n-sv/distinfo b/misc/kde3-i18n-sv/distinfo index dd6be29006bd..63252549e2df 100644 --- a/misc/kde3-i18n-sv/distinfo +++ b/misc/kde3-i18n-sv/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-sv-3.5.5.tar.bz2) = 0a614fc596f082a1a11d7ee91b1bae2a -SHA256 (KDE/kde-i18n/kde-i18n-sv-3.5.5.tar.bz2) = 0ce57064f077ce362e7b956904a662a0b303c8c7cc2c0131082e1fccc65c0d1e -SIZE (KDE/kde-i18n/kde-i18n-sv-3.5.5.tar.bz2) = 28420728 +MD5 (KDE/kde-i18n/kde-i18n-sv-3.5.6.tar.bz2) = a826fb26b9378b12dae31b15ac22d995 +SHA256 (KDE/kde-i18n/kde-i18n-sv-3.5.6.tar.bz2) = 9171affc9691742605ba789799c1b6655b06751c76222f0e3c5943355cac4166 +SIZE (KDE/kde-i18n/kde-i18n-sv-3.5.6.tar.bz2) = 28655839 diff --git a/misc/kde3-i18n-sv/pkg-plist b/misc/kde3-i18n-sv/pkg-plist index 0ef52760315c..a31146e10807 100644 --- a/misc/kde3-i18n-sv/pkg-plist +++ b/misc/kde3-i18n-sv/pkg-plist @@ -48,9 +48,25 @@ share/doc/HTML/sv/KRegExpEditor/lookaheadtools.png share/doc/HTML/sv/KRegExpEditor/repeattool.png share/doc/HTML/sv/KRegExpEditor/texttool.png share/doc/HTML/sv/KRegExpEditor/theEditor.png +share/doc/HTML/sv/akregator/add-feed.png +share/doc/HTML/sv/akregator/add-feed2.png +share/doc/HTML/sv/akregator/add-folder.png +share/doc/HTML/sv/akregator/add-folder2.png +share/doc/HTML/sv/akregator/advanced-tab.png +share/doc/HTML/sv/akregator/appearance-tab.png +share/doc/HTML/sv/akregator/archive-tab.png +share/doc/HTML/sv/akregator/browser-tab.png share/doc/HTML/sv/akregator/common +share/doc/HTML/sv/akregator/general-tab.png share/doc/HTML/sv/akregator/index.cache.bz2 share/doc/HTML/sv/akregator/index.docbook +share/doc/HTML/sv/akregator/konq.png +share/doc/HTML/sv/akregator/konq2.png +share/doc/HTML/sv/akregator/main-window.png +share/doc/HTML/sv/akregator/main-window2.png +share/doc/HTML/sv/akregator/main-window3.png +share/doc/HTML/sv/akregator/main-window4.png +share/doc/HTML/sv/akregator/quick-filter.png share/doc/HTML/sv/amor/common share/doc/HTML/sv/amor/index.cache.bz2 share/doc/HTML/sv/amor/index.docbook @@ -127,6 +143,9 @@ share/doc/HTML/sv/docs/common/gpl-translated.html share/doc/HTML/sv/docs/common/kde-localised.css share/doc/HTML/sv/docs/common/lgpl-translated.html share/doc/HTML/sv/docs/common/logotp3.png +share/doc/HTML/sv/irkick/common +share/doc/HTML/sv/irkick/index.cache.bz2 +share/doc/HTML/sv/irkick/index.docbook share/doc/HTML/sv/juk/common share/doc/HTML/sv/juk/history-playlist.png share/doc/HTML/sv/juk/index.cache.bz2 @@ -337,6 +356,9 @@ share/doc/HTML/sv/kcalc/index.docbook share/doc/HTML/sv/kcharselect/common share/doc/HTML/sv/kcharselect/index.cache.bz2 share/doc/HTML/sv/kcharselect/index.docbook +share/doc/HTML/sv/kcmlirc/common +share/doc/HTML/sv/kcmlirc/index.cache.bz2 +share/doc/HTML/sv/kcmlirc/index.docbook share/doc/HTML/sv/kcoloredit/common share/doc/HTML/sv/kcoloredit/index.cache.bz2 share/doc/HTML/sv/kcoloredit/index.docbook @@ -543,12 +565,6 @@ share/doc/HTML/sv/kdelibs/man-dcop.1.docbook share/doc/HTML/sv/kdelibs/man-kbuildsycoca.8.docbook share/doc/HTML/sv/kdelibs/man-kdeoptions.7.docbook share/doc/HTML/sv/kdelibs/man-qtoptions.7.docbook -share/doc/HTML/sv/kdelirc/irkick/common -share/doc/HTML/sv/kdelirc/irkick/index.cache.bz2 -share/doc/HTML/sv/kdelirc/irkick/index.docbook -share/doc/HTML/sv/kdelirc/kcmlirc/common -share/doc/HTML/sv/kdelirc/kcmlirc/index.cache.bz2 -share/doc/HTML/sv/kdelirc/kcmlirc/index.docbook share/doc/HTML/sv/kdeprint/add-printer-wiz.docbook share/doc/HTML/sv/kdeprint/common share/doc/HTML/sv/kdeprint/cups-config.docbook @@ -830,6 +846,7 @@ share/doc/HTML/sv/khelpcenter/userguide/common share/doc/HTML/sv/khelpcenter/userguide/control-center.docbook share/doc/HTML/sv/khelpcenter/userguide/creating-graphics.docbook share/doc/HTML/sv/khelpcenter/userguide/credits-and-license.docbook +share/doc/HTML/sv/khelpcenter/userguide/customizing-desktop.docbook share/doc/HTML/sv/khelpcenter/userguide/desktop.png share/doc/HTML/sv/khelpcenter/userguide/email.docbook share/doc/HTML/sv/khelpcenter/userguide/extragear-applications.docbook @@ -894,6 +911,7 @@ share/doc/HTML/sv/khelpcenter/userguide/screen-captures.docbook share/doc/HTML/sv/khelpcenter/userguide/services.png share/doc/HTML/sv/khelpcenter/userguide/shared-sessions.docbook share/doc/HTML/sv/khelpcenter/userguide/shortcuts.docbook +share/doc/HTML/sv/khelpcenter/userguide/splash-screen.png share/doc/HTML/sv/khelpcenter/userguide/staff.docbook share/doc/HTML/sv/khelpcenter/userguide/standard-menu-entries.docbook share/doc/HTML/sv/khelpcenter/userguide/switching-sessions.docbook @@ -908,7 +926,6 @@ share/doc/HTML/sv/khelpcenter/userguide/where-next.docbook share/doc/HTML/sv/khelpcenter/userguide/windows-how-to.docbook share/doc/HTML/sv/khelpcenter/userguide/your-kde-account.docbook share/doc/HTML/sv/khelpcenter/visualdict/common -share/doc/HTML/sv/khelpcenter/visualdict/contextmenu.png share/doc/HTML/sv/khelpcenter/visualdict/index.cache.bz2 share/doc/HTML/sv/khelpcenter/visualdict/index.docbook share/doc/HTML/sv/khelpcenter/visualdict/pict1.png @@ -924,11 +941,15 @@ share/doc/HTML/sv/khelpcenter/visualdict/pict18.png share/doc/HTML/sv/khelpcenter/visualdict/pict19.png share/doc/HTML/sv/khelpcenter/visualdict/pict2.png share/doc/HTML/sv/khelpcenter/visualdict/pict20.png +share/doc/HTML/sv/khelpcenter/visualdict/pict21.png +share/doc/HTML/sv/khelpcenter/visualdict/pict22.png +share/doc/HTML/sv/khelpcenter/visualdict/pict23.png share/doc/HTML/sv/khelpcenter/visualdict/pict3.png share/doc/HTML/sv/khelpcenter/visualdict/pict4.png share/doc/HTML/sv/khelpcenter/visualdict/pict5.png share/doc/HTML/sv/khelpcenter/visualdict/pict6.png share/doc/HTML/sv/khelpcenter/visualdict/pict7.png +share/doc/HTML/sv/khelpcenter/visualdict/pict8.png share/doc/HTML/sv/khelpcenter/welcome.docbook share/doc/HTML/sv/khelpcenter/whatiskde.docbook share/doc/HTML/sv/khexedit/common @@ -2462,6 +2483,7 @@ share/locale/sv/LC_MESSAGES/khotkeys.mo share/locale/sv/LC_MESSAGES/khtmlkttsd.mo share/locale/sv/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/sv/LC_MESSAGES/kicker.mo +share/locale/sv/LC_MESSAGES/kickermenu_kate.mo share/locale/sv/LC_MESSAGES/kiconedit.mo share/locale/sv/LC_MESSAGES/kig.mo share/locale/sv/LC_MESSAGES/kimagemapeditor.mo @@ -2499,6 +2521,7 @@ share/locale/sv/LC_MESSAGES/kio_thumbnail.mo share/locale/sv/LC_MESSAGES/kio_trash.mo share/locale/sv/LC_MESSAGES/kio_zeroconf.mo share/locale/sv/LC_MESSAGES/kioexec.mo +share/locale/sv/LC_MESSAGES/kitchensync.mo share/locale/sv/LC_MESSAGES/kiten.mo share/locale/sv/LC_MESSAGES/kjobviewer.mo share/locale/sv/LC_MESSAGES/kjots.mo @@ -2702,6 +2725,7 @@ share/locale/sv/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/sv/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/sv/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/sv/LC_MESSAGES/libkickermenu_tom.mo +share/locale/sv/LC_MESSAGES/libkitchensync.mo share/locale/sv/LC_MESSAGES/libkleopatra.mo share/locale/sv/LC_MESSAGES/libkmime.mo share/locale/sv/LC_MESSAGES/libkonq.mo @@ -2930,9 +2954,6 @@ share/locale/sv/flag.png @dirrm share/doc/HTML/sv/kdesvn-build @dirrm share/doc/HTML/sv/kdesu @dirrm share/doc/HTML/sv/kdeprint -@dirrm share/doc/HTML/sv/kdelirc/kcmlirc -@dirrm share/doc/HTML/sv/kdelirc/irkick -@dirrm share/doc/HTML/sv/kdelirc @dirrm share/doc/HTML/sv/kdelibs @dirrm share/doc/HTML/sv/kdebugdialog @dirrm share/doc/HTML/sv/kdearch @@ -2996,6 +3017,7 @@ share/locale/sv/flag.png @dirrm share/doc/HTML/sv/kcontrol/arts @dirrm share/doc/HTML/sv/kcontrol @dirrm share/doc/HTML/sv/kcoloredit +@dirrm share/doc/HTML/sv/kcmlirc @dirrm share/doc/HTML/sv/kcharselect @dirrm share/doc/HTML/sv/kcalc @dirrm share/doc/HTML/sv/kcachegrind @@ -3021,6 +3043,7 @@ share/locale/sv/flag.png @dirrm share/doc/HTML/sv/kaddressbook @dirrm share/doc/HTML/sv/kaboodle @dirrm share/doc/HTML/sv/juk +@dirrm share/doc/HTML/sv/irkick @dirrm share/doc/HTML/sv/docs/common @dirrm share/doc/HTML/sv/docs @dirrm share/doc/HTML/sv/cervisia diff --git a/misc/kde3-i18n-ta/distinfo b/misc/kde3-i18n-ta/distinfo index af7159301293..334b9b6742b1 100644 --- a/misc/kde3-i18n-ta/distinfo +++ b/misc/kde3-i18n-ta/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ta-3.5.5.tar.bz2) = 4ab3c05628fc635609218d17cce6d138 -SHA256 (KDE/kde-i18n/kde-i18n-ta-3.5.5.tar.bz2) = 3a60470355f948bf258327a1369962cf1a950fd45dcce17e3cd365546b689cfb -SIZE (KDE/kde-i18n/kde-i18n-ta-3.5.5.tar.bz2) = 2120321 +MD5 (KDE/kde-i18n/kde-i18n-ta-3.5.6.tar.bz2) = 11da7704ec348481c392cfd47af85caa +SHA256 (KDE/kde-i18n/kde-i18n-ta-3.5.6.tar.bz2) = 0ef3123bd8cb3c10dc762f23693edc444c1bba0e3972b7e1c8d9e5c226d1955a +SIZE (KDE/kde-i18n/kde-i18n-ta-3.5.6.tar.bz2) = 2122369 diff --git a/misc/kde3-i18n-tg/distinfo b/misc/kde3-i18n-tg/distinfo index 825e82222f2d..8b916339a817 100644 --- a/misc/kde3-i18n-tg/distinfo +++ b/misc/kde3-i18n-tg/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-tg-3.5.5.tar.bz2) = 135a419bb0d3429dde4bc698d095bf86 -SHA256 (KDE/kde-i18n/kde-i18n-tg-3.5.5.tar.bz2) = 36210149528026f8cf4c0414a0006ff4d7c81f983a78242d1aa682246fb86f56 -SIZE (KDE/kde-i18n/kde-i18n-tg-3.5.5.tar.bz2) = 2137881 +MD5 (KDE/kde-i18n/kde-i18n-tg-3.5.6.tar.bz2) = 33f3b735e9cbd8a736146dae8a764d06 +SHA256 (KDE/kde-i18n/kde-i18n-tg-3.5.6.tar.bz2) = 116f2c0fff6e06e021b6c3fe71b27a9e51f74181bb528d32ad9e6202f2808df0 +SIZE (KDE/kde-i18n/kde-i18n-tg-3.5.6.tar.bz2) = 2135406 diff --git a/misc/kde3-i18n-tr/distinfo b/misc/kde3-i18n-tr/distinfo index 9eb05293d2be..702d38bfefce 100644 --- a/misc/kde3-i18n-tr/distinfo +++ b/misc/kde3-i18n-tr/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-tr-3.5.5.tar.bz2) = 001d5909b3fd8121b1f4f7970d88215b -SHA256 (KDE/kde-i18n/kde-i18n-tr-3.5.5.tar.bz2) = 901fd81fbfd81db73f7f14b07d2db34d54e2bbb04850a4f5bc3b0ca6eb9920d8 -SIZE (KDE/kde-i18n/kde-i18n-tr-3.5.5.tar.bz2) = 2133194 +MD5 (KDE/kde-i18n/kde-i18n-tr-3.5.6.tar.bz2) = b56062b9908ecb6909bc4a7e4c4bb62a +SHA256 (KDE/kde-i18n/kde-i18n-tr-3.5.6.tar.bz2) = e3f1e3d3c70ec635e3ef743787328eb6dde72140c3cdbc91a9e3b190bd44d8b2 +SIZE (KDE/kde-i18n/kde-i18n-tr-3.5.6.tar.bz2) = 2136085 diff --git a/misc/kde3-i18n-uz/distinfo b/misc/kde3-i18n-uz/distinfo index 7e06fa13d22b..3bc717576e8d 100644 --- a/misc/kde3-i18n-uz/distinfo +++ b/misc/kde3-i18n-uz/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-uz-3.5.5.tar.bz2) = b66b574eff1fd2349a9a767098e5430e -SHA256 (KDE/kde-i18n/kde-i18n-uz-3.5.5.tar.bz2) = 93a5c8cbd66c9608d0b564d7e7b9e9019bf61279a62a275f8efa55f00721e740 -SIZE (KDE/kde-i18n/kde-i18n-uz-3.5.5.tar.bz2) = 837135 +MD5 (KDE/kde-i18n/kde-i18n-uz-3.5.6.tar.bz2) = 2208bb14ae419e20f2179d586ba49ff5 +SHA256 (KDE/kde-i18n/kde-i18n-uz-3.5.6.tar.bz2) = 5b2e5934ad48ea21f874936e314ee0750dfa4f91b6863becdf9c3fea7784d03c +SIZE (KDE/kde-i18n/kde-i18n-uz-3.5.6.tar.bz2) = 838530 diff --git a/misc/kde4-i18n-is/distinfo b/misc/kde4-i18n-is/distinfo index d8817e5cd3f5..eafecfc98d1d 100644 --- a/misc/kde4-i18n-is/distinfo +++ b/misc/kde4-i18n-is/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-is-3.5.5.tar.bz2) = 4bdd95af464b36e7d52b4848291c9717 -SHA256 (KDE/kde-i18n/kde-i18n-is-3.5.5.tar.bz2) = 139faf5c75268314195bf861d4042ce22a3434a84513d72de3755326cee1f056 -SIZE (KDE/kde-i18n/kde-i18n-is-3.5.5.tar.bz2) = 2101713 +MD5 (KDE/kde-i18n/kde-i18n-is-3.5.6.tar.bz2) = f41752647ef59cb9fd179e2e1f77738c +SHA256 (KDE/kde-i18n/kde-i18n-is-3.5.6.tar.bz2) = a36f81bd8ca3e262525072eaa838cee9af5f1af3fac4952945e8767667834a94 +SIZE (KDE/kde-i18n/kde-i18n-is-3.5.6.tar.bz2) = 2105501 diff --git a/misc/kde4-l10n-bg/distinfo b/misc/kde4-l10n-bg/distinfo index 6f10ba16fe36..fde473a05b37 100644 --- a/misc/kde4-l10n-bg/distinfo +++ b/misc/kde4-l10n-bg/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-bg-3.5.5.tar.bz2) = 28871147d247f33072a278f0d16a96be -SHA256 (KDE/kde-i18n/kde-i18n-bg-3.5.5.tar.bz2) = a860a8e8f917b3b84546a8f761bddd20ebb52950e7cedbf51b9cbd7fa7f0f361 -SIZE (KDE/kde-i18n/kde-i18n-bg-3.5.5.tar.bz2) = 1729850 +MD5 (KDE/kde-i18n/kde-i18n-bg-3.5.6.tar.bz2) = a34d5e307d418fc87bcbb6ab150bc046 +SHA256 (KDE/kde-i18n/kde-i18n-bg-3.5.6.tar.bz2) = 46971928afba923e891779f2bac6715f54267fb777c6a23a132615cc2b6b0d73 +SIZE (KDE/kde-i18n/kde-i18n-bg-3.5.6.tar.bz2) = 1728507 diff --git a/misc/kde4-l10n-ca/distinfo b/misc/kde4-l10n-ca/distinfo index 18a1395ac0e9..8f946feb7e45 100644 --- a/misc/kde4-l10n-ca/distinfo +++ b/misc/kde4-l10n-ca/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ca-3.5.5.tar.bz2) = fec16708dc8c3e9a864d5ad9e45f06b8 -SHA256 (KDE/kde-i18n/kde-i18n-ca-3.5.5.tar.bz2) = 4141d21cbc7d6a3f039afc43532061e5fc8c5b874b3768e8c0ed1919bb9b6a57 -SIZE (KDE/kde-i18n/kde-i18n-ca-3.5.5.tar.bz2) = 6787316 +MD5 (KDE/kde-i18n/kde-i18n-ca-3.5.6.tar.bz2) = 84b3a011b9d594ce26fdee77cccdfb52 +SHA256 (KDE/kde-i18n/kde-i18n-ca-3.5.6.tar.bz2) = 7fae776e4f6b23514e97cecf661b61de4b54634dc89332c010174479be091be3 +SIZE (KDE/kde-i18n/kde-i18n-ca-3.5.6.tar.bz2) = 6993381 diff --git a/misc/kde4-l10n-ca/pkg-plist b/misc/kde4-l10n-ca/pkg-plist index 84eec115a90c..7a47f62b2414 100644 --- a/misc/kde4-l10n-ca/pkg-plist +++ b/misc/kde4-l10n-ca/pkg-plist @@ -311,6 +311,9 @@ share/doc/HTML/ca/kfind/man-kfind.1.docbook share/doc/HTML/ca/kgeography/common share/doc/HTML/ca/kgeography/index.cache.bz2 share/doc/HTML/ca/kgeography/index.docbook +share/doc/HTML/ca/kget/common +share/doc/HTML/ca/kget/index.cache.bz2 +share/doc/HTML/ca/kget/index.docbook share/doc/HTML/ca/kgpg/common share/doc/HTML/ca/kgpg/index.cache.bz2 share/doc/HTML/ca/kgpg/index.docbook @@ -364,6 +367,7 @@ share/doc/HTML/ca/khelpcenter/userguide/common share/doc/HTML/ca/khelpcenter/userguide/control-center.docbook share/doc/HTML/ca/khelpcenter/userguide/creating-graphics.docbook share/doc/HTML/ca/khelpcenter/userguide/credits-and-license.docbook +share/doc/HTML/ca/khelpcenter/userguide/customizing-desktop.docbook share/doc/HTML/ca/khelpcenter/userguide/email.docbook share/doc/HTML/ca/khelpcenter/userguide/extragear-applications.docbook share/doc/HTML/ca/khelpcenter/userguide/file-sharing.docbook @@ -434,6 +438,9 @@ share/doc/HTML/ca/kicker/index.cache.bz2 share/doc/HTML/ca/kicker/index.docbook share/doc/HTML/ca/kicker/man-appletproxy.1.docbook share/doc/HTML/ca/kicker/man-kicker.1.docbook +share/doc/HTML/ca/kig/common +share/doc/HTML/ca/kig/index.cache.bz2 +share/doc/HTML/ca/kig/index.docbook share/doc/HTML/ca/kinfocenter/blockdevices/common share/doc/HTML/ca/kinfocenter/blockdevices/index.cache.bz2 share/doc/HTML/ca/kinfocenter/blockdevices/index.docbook @@ -790,9 +797,14 @@ share/doc/HTML/ca/ktimer/index.docbook share/doc/HTML/ca/ktnef/common share/doc/HTML/ca/ktnef/index.cache.bz2 share/doc/HTML/ca/ktnef/index.docbook +share/doc/HTML/ca/ktouch/color_options.png share/doc/HTML/ca/ktouch/common +share/doc/HTML/ca/ktouch/general_options.png share/doc/HTML/ca/ktouch/index.cache.bz2 share/doc/HTML/ca/ktouch/index.docbook +share/doc/HTML/ca/ktouch/keyboard_options.png +share/doc/HTML/ca/ktouch/man-ktouch.1.docbook +share/doc/HTML/ca/ktouch/training_options.png share/doc/HTML/ca/kttsd/common share/doc/HTML/ca/kttsd/index.cache.bz2 share/doc/HTML/ca/kttsd/index.docbook @@ -1143,6 +1155,7 @@ share/locale/ca/LC_MESSAGES/khotkeys.mo share/locale/ca/LC_MESSAGES/khtmlkttsd.mo share/locale/ca/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/ca/LC_MESSAGES/kicker.mo +share/locale/ca/LC_MESSAGES/kickermenu_kate.mo share/locale/ca/LC_MESSAGES/kiconedit.mo share/locale/ca/LC_MESSAGES/kig.mo share/locale/ca/LC_MESSAGES/kimagemapeditor.mo @@ -1180,6 +1193,7 @@ share/locale/ca/LC_MESSAGES/kio_thumbnail.mo share/locale/ca/LC_MESSAGES/kio_trash.mo share/locale/ca/LC_MESSAGES/kio_zeroconf.mo share/locale/ca/LC_MESSAGES/kioexec.mo +share/locale/ca/LC_MESSAGES/kitchensync.mo share/locale/ca/LC_MESSAGES/kiten.mo share/locale/ca/LC_MESSAGES/kjobviewer.mo share/locale/ca/LC_MESSAGES/kjots.mo @@ -1383,6 +1397,7 @@ share/locale/ca/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/ca/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/ca/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/ca/LC_MESSAGES/libkickermenu_tom.mo +share/locale/ca/LC_MESSAGES/libkitchensync.mo share/locale/ca/LC_MESSAGES/libkleopatra.mo share/locale/ca/LC_MESSAGES/libkmime.mo share/locale/ca/LC_MESSAGES/libkonq.mo @@ -1518,6 +1533,7 @@ share/locale/ca/flag.png @dirrm share/doc/HTML/ca/kinfocenter/cdinfo @dirrm share/doc/HTML/ca/kinfocenter/blockdevices @dirrm share/doc/HTML/ca/kinfocenter +@dirrm share/doc/HTML/ca/kig @dirrm share/doc/HTML/ca/kicker-applets @dirrm share/doc/HTML/ca/kicker @dirrm share/doc/HTML/ca/khelpcenter/visualdict @@ -1528,6 +1544,7 @@ share/locale/ca/flag.png @dirrm share/doc/HTML/ca/khelpcenter @dirrm share/doc/HTML/ca/khangman @dirrm share/doc/HTML/ca/kgpg +@dirrm share/doc/HTML/ca/kget @dirrm share/doc/HTML/ca/kgeography @dirrm share/doc/HTML/ca/kfind @dirrm share/doc/HTML/ca/keduca diff --git a/misc/kde4-l10n-cs/distinfo b/misc/kde4-l10n-cs/distinfo index dca2d63d179d..298e20d6646e 100644 --- a/misc/kde4-l10n-cs/distinfo +++ b/misc/kde4-l10n-cs/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-cs-3.5.5.tar.bz2) = aaace6da2097b2f98f163a5da7667752 -SHA256 (KDE/kde-i18n/kde-i18n-cs-3.5.5.tar.bz2) = b37f0c24a4efe08d7f79bf73971208bcded3cb42905d381865cb74be4cb72a1d -SIZE (KDE/kde-i18n/kde-i18n-cs-3.5.5.tar.bz2) = 3383764 +MD5 (KDE/kde-i18n/kde-i18n-cs-3.5.6.tar.bz2) = b2dab45ea572efbb2569781211c2a7fc +SHA256 (KDE/kde-i18n/kde-i18n-cs-3.5.6.tar.bz2) = ee36715293d54f6dc41424e36e7d560d612c8c5c9311598b1de9ecaeeb712d52 +SIZE (KDE/kde-i18n/kde-i18n-cs-3.5.6.tar.bz2) = 3377426 diff --git a/misc/kde4-l10n-cs/pkg-plist b/misc/kde4-l10n-cs/pkg-plist index 042a5f981bb0..3ab0010bd870 100644 --- a/misc/kde4-l10n-cs/pkg-plist +++ b/misc/kde4-l10n-cs/pkg-plist @@ -230,7 +230,6 @@ share/locale/cs/LC_MESSAGES/kasbarextension.mo share/locale/cs/LC_MESSAGES/kasteroids.mo share/locale/cs/LC_MESSAGES/kate.mo share/locale/cs/LC_MESSAGES/katecppsymbolviewer.mo -share/locale/cs/LC_MESSAGES/katedefaultproject.mo share/locale/cs/LC_MESSAGES/katefiletemplates.mo share/locale/cs/LC_MESSAGES/katefll_initplugin.mo share/locale/cs/LC_MESSAGES/katefll_plugin.mo @@ -238,12 +237,10 @@ share/locale/cs/LC_MESSAGES/katehelloworld.mo share/locale/cs/LC_MESSAGES/katehtmltools.mo share/locale/cs/LC_MESSAGES/kateinsertcommand.mo share/locale/cs/LC_MESSAGES/katekjswrapper.mo -share/locale/cs/LC_MESSAGES/katekttsd.mo share/locale/cs/LC_MESSAGES/katemake.mo share/locale/cs/LC_MESSAGES/katemodeline.mo share/locale/cs/LC_MESSAGES/kateopenheader.mo share/locale/cs/LC_MESSAGES/katepart.mo -share/locale/cs/LC_MESSAGES/katepartkttsd.mo share/locale/cs/LC_MESSAGES/katepybrowse.mo share/locale/cs/LC_MESSAGES/katesnippets.mo share/locale/cs/LC_MESSAGES/katetabbarextension.mo @@ -303,7 +300,6 @@ share/locale/cs/LC_MESSAGES/kcmkonqhtml.mo share/locale/cs/LC_MESSAGES/kcmkonsole.mo share/locale/cs/LC_MESSAGES/kcmkontactnt.mo share/locale/cs/LC_MESSAGES/kcmktalkd.mo -share/locale/cs/LC_MESSAGES/kcmkttsd.mo share/locale/cs/LC_MESSAGES/kcmkuick.mo share/locale/cs/LC_MESSAGES/kcmkurifilt.mo share/locale/cs/LC_MESSAGES/kcmkvaio.mo @@ -328,7 +324,6 @@ share/locale/cs/LC_MESSAGES/kcmscreensaver.mo share/locale/cs/LC_MESSAGES/kcmshell.mo share/locale/cs/LC_MESSAGES/kcmsmartcard.mo share/locale/cs/LC_MESSAGES/kcmsmserver.mo -share/locale/cs/LC_MESSAGES/kcmsocks.mo share/locale/cs/LC_MESSAGES/kcmspellchecking.mo share/locale/cs/LC_MESSAGES/kcmstyle.mo share/locale/cs/LC_MESSAGES/kcmtaskbar.mo @@ -364,7 +359,6 @@ share/locale/cs/LC_MESSAGES/kdialog.mo share/locale/cs/LC_MESSAGES/kdict.mo share/locale/cs/LC_MESSAGES/kdictapplet.mo share/locale/cs/LC_MESSAGES/kdjview.mo -share/locale/cs/LC_MESSAGES/kdmchooser.mo share/locale/cs/LC_MESSAGES/kdmconfig.mo share/locale/cs/LC_MESSAGES/kdmgreet.mo share/locale/cs/LC_MESSAGES/kdvi.mo @@ -491,7 +485,6 @@ share/locale/cs/LC_MESSAGES/kjots.mo share/locale/cs/LC_MESSAGES/kjumpingcube.mo share/locale/cs/LC_MESSAGES/klaptopdaemon.mo share/locale/cs/LC_MESSAGES/klatin.mo -share/locale/cs/LC_MESSAGES/klegacyimport.mo share/locale/cs/LC_MESSAGES/kleopatra.mo share/locale/cs/LC_MESSAGES/klettres.mo share/locale/cs/LC_MESSAGES/klickety.mo @@ -506,7 +499,6 @@ share/locale/cs/LC_MESSAGES/kmail_text_calendar_plugin.mo share/locale/cs/LC_MESSAGES/kmail_text_vcard_plugin.mo share/locale/cs/LC_MESSAGES/kmailcvt.mo share/locale/cs/LC_MESSAGES/kmathapplet.mo -share/locale/cs/LC_MESSAGES/kmathtool.mo share/locale/cs/LC_MESSAGES/kmcop.mo share/locale/cs/LC_MESSAGES/kmenuapplet.mo share/locale/cs/LC_MESSAGES/kmenuedit.mo @@ -559,7 +551,6 @@ share/locale/cs/LC_MESSAGES/korganizer.mo share/locale/cs/LC_MESSAGES/korn.mo share/locale/cs/LC_MESSAGES/kpackage.mo share/locale/cs/LC_MESSAGES/kpager.mo -share/locale/cs/LC_MESSAGES/kpartapp.mo share/locale/cs/LC_MESSAGES/kpartsaver.mo share/locale/cs/LC_MESSAGES/kpat.mo share/locale/cs/LC_MESSAGES/kpdf.mo @@ -623,14 +614,12 @@ share/locale/cs/LC_MESSAGES/ksysguard.mo share/locale/cs/LC_MESSAGES/ksystemtrayapplet.mo share/locale/cs/LC_MESSAGES/ksystraycmd.mo share/locale/cs/LC_MESSAGES/ksysv.mo -share/locale/cs/LC_MESSAGES/ktaskbarapplet.mo share/locale/cs/LC_MESSAGES/kteatime.mo share/locale/cs/LC_MESSAGES/ktexteditor_autobookmarker.mo share/locale/cs/LC_MESSAGES/ktexteditor_docwordcompletion.mo share/locale/cs/LC_MESSAGES/ktexteditor_insertfile.mo share/locale/cs/LC_MESSAGES/ktexteditor_isearch.mo share/locale/cs/LC_MESSAGES/ktexteditor_kdatatool.mo -share/locale/cs/LC_MESSAGES/ktexteditor_kttsd.mo share/locale/cs/LC_MESSAGES/kthememanager.mo share/locale/cs/LC_MESSAGES/ktimemon.mo share/locale/cs/LC_MESSAGES/ktimer.mo @@ -639,18 +628,6 @@ share/locale/cs/LC_MESSAGES/ktnef.mo share/locale/cs/LC_MESSAGES/ktouch.mo share/locale/cs/LC_MESSAGES/ktron.mo share/locale/cs/LC_MESSAGES/kttsd.mo -share/locale/cs/LC_MESSAGES/kttsd_commandplugin.mo -share/locale/cs/LC_MESSAGES/kttsd_eposplugin.mo -share/locale/cs/LC_MESSAGES/kttsd_festivalintplugin.mo -share/locale/cs/LC_MESSAGES/kttsd_fliteplugin.mo -share/locale/cs/LC_MESSAGES/kttsd_freettsplugin.mo -share/locale/cs/LC_MESSAGES/kttsd_hadifixplugin.mo -share/locale/cs/LC_MESSAGES/kttsd_sbdplugin.mo -share/locale/cs/LC_MESSAGES/kttsd_stringreplacerplugin.mo -share/locale/cs/LC_MESSAGES/kttsd_talkerchooserplugin.mo -share/locale/cs/LC_MESSAGES/kttsd_xmltransformerplugin.mo -share/locale/cs/LC_MESSAGES/kttsjobmgr.mo -share/locale/cs/LC_MESSAGES/kttsmgr.mo share/locale/cs/LC_MESSAGES/ktuberling.mo share/locale/cs/LC_MESSAGES/kturtle.mo share/locale/cs/LC_MESSAGES/ktux.mo @@ -740,7 +717,6 @@ share/locale/cs/LC_MESSAGES/secpolicy.mo share/locale/cs/LC_MESSAGES/spy.mo share/locale/cs/LC_MESSAGES/superkaramba.mo share/locale/cs/LC_MESSAGES/synaescope.mo -share/locale/cs/LC_MESSAGES/taskbarextension.mo share/locale/cs/LC_MESSAGES/timezones.mo share/locale/cs/LC_MESSAGES/tippecanoe.mo share/locale/cs/LC_MESSAGES/trashapplet.mo diff --git a/misc/kde4-l10n-da/distinfo b/misc/kde4-l10n-da/distinfo index f2c96eff350f..3aa816e99232 100644 --- a/misc/kde4-l10n-da/distinfo +++ b/misc/kde4-l10n-da/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-da-3.5.5.tar.bz2) = 70c041ca96330834c6f988255d7bd6ae -SHA256 (KDE/kde-i18n/kde-i18n-da-3.5.5.tar.bz2) = 72def6d70d3ff623bba05a106d66935b18ae9775d7ba4a4f70e8142eb04027ce -SIZE (KDE/kde-i18n/kde-i18n-da-3.5.5.tar.bz2) = 12308598 +MD5 (KDE/kde-i18n/kde-i18n-da-3.5.6.tar.bz2) = 913550e6604b9423cea605d95a8a664f +SHA256 (KDE/kde-i18n/kde-i18n-da-3.5.6.tar.bz2) = ad0ddeaeda754ee5fd47896feb75c5c416033cc08433408926b4db9a1575eba0 +SIZE (KDE/kde-i18n/kde-i18n-da-3.5.6.tar.bz2) = 12319303 diff --git a/misc/kde4-l10n-da/pkg-plist b/misc/kde4-l10n-da/pkg-plist index 904c58d3b45d..4244abe3e819 100644 --- a/misc/kde4-l10n-da/pkg-plist +++ b/misc/kde4-l10n-da/pkg-plist @@ -139,6 +139,9 @@ share/doc/HTML/da/docs/common/gpl-translated.html share/doc/HTML/da/docs/common/kde-localised.css share/doc/HTML/da/docs/common/lgpl-translated.html share/doc/HTML/da/docs/common/logotp3.png +share/doc/HTML/da/irkick/common +share/doc/HTML/da/irkick/index.cache.bz2 +share/doc/HTML/da/irkick/index.docbook share/doc/HTML/da/juk/common share/doc/HTML/da/juk/index.cache.bz2 share/doc/HTML/da/juk/index.docbook @@ -255,6 +258,9 @@ share/doc/HTML/da/kcalc/index.docbook share/doc/HTML/da/kcharselect/common share/doc/HTML/da/kcharselect/index.cache.bz2 share/doc/HTML/da/kcharselect/index.docbook +share/doc/HTML/da/kcmlirc/common +share/doc/HTML/da/kcmlirc/index.cache.bz2 +share/doc/HTML/da/kcmlirc/index.docbook share/doc/HTML/da/kcoloredit/common share/doc/HTML/da/kcoloredit/index.cache.bz2 share/doc/HTML/da/kcoloredit/index.docbook @@ -449,12 +455,6 @@ share/doc/HTML/da/kdelibs/man-dcop.1.docbook share/doc/HTML/da/kdelibs/man-kbuildsycoca.8.docbook share/doc/HTML/da/kdelibs/man-kdeoptions.7.docbook share/doc/HTML/da/kdelibs/man-qtoptions.7.docbook -share/doc/HTML/da/kdelirc/irkick/common -share/doc/HTML/da/kdelirc/irkick/index.cache.bz2 -share/doc/HTML/da/kdelirc/irkick/index.docbook -share/doc/HTML/da/kdelirc/kcmlirc/common -share/doc/HTML/da/kdelirc/kcmlirc/index.cache.bz2 -share/doc/HTML/da/kdelirc/kcmlirc/index.docbook share/doc/HTML/da/kdeprint/add-printer-wiz.docbook share/doc/HTML/da/kdeprint/common share/doc/HTML/da/kdeprint/cups-config.docbook @@ -617,6 +617,7 @@ share/doc/HTML/da/khelpcenter/userguide/common share/doc/HTML/da/khelpcenter/userguide/control-center.docbook share/doc/HTML/da/khelpcenter/userguide/creating-graphics.docbook share/doc/HTML/da/khelpcenter/userguide/credits-and-license.docbook +share/doc/HTML/da/khelpcenter/userguide/customizing-desktop.docbook share/doc/HTML/da/khelpcenter/userguide/email.docbook share/doc/HTML/da/khelpcenter/userguide/extragear-applications.docbook share/doc/HTML/da/khelpcenter/userguide/file-sharing.docbook @@ -1069,6 +1070,7 @@ share/doc/HTML/da/kontact/index.docbook share/doc/HTML/da/kooka/common share/doc/HTML/da/kooka/index.cache.bz2 share/doc/HTML/da/kooka/index.docbook +share/doc/HTML/da/kopete/chatstyle.docbook share/doc/HTML/da/kopete/common share/doc/HTML/da/kopete/index.cache.bz2 share/doc/HTML/da/kopete/index.docbook @@ -1761,6 +1763,7 @@ share/locale/da/LC_MESSAGES/khotkeys.mo share/locale/da/LC_MESSAGES/khtmlkttsd.mo share/locale/da/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/da/LC_MESSAGES/kicker.mo +share/locale/da/LC_MESSAGES/kickermenu_kate.mo share/locale/da/LC_MESSAGES/kiconedit.mo share/locale/da/LC_MESSAGES/kig.mo share/locale/da/LC_MESSAGES/kimagemapeditor.mo @@ -1798,6 +1801,7 @@ share/locale/da/LC_MESSAGES/kio_thumbnail.mo share/locale/da/LC_MESSAGES/kio_trash.mo share/locale/da/LC_MESSAGES/kio_zeroconf.mo share/locale/da/LC_MESSAGES/kioexec.mo +share/locale/da/LC_MESSAGES/kitchensync.mo share/locale/da/LC_MESSAGES/kiten.mo share/locale/da/LC_MESSAGES/kjobviewer.mo share/locale/da/LC_MESSAGES/kjots.mo @@ -2001,6 +2005,7 @@ share/locale/da/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/da/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/da/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/da/LC_MESSAGES/libkickermenu_tom.mo +share/locale/da/LC_MESSAGES/libkitchensync.mo share/locale/da/LC_MESSAGES/libkleopatra.mo share/locale/da/LC_MESSAGES/libkmime.mo share/locale/da/LC_MESSAGES/libkonq.mo @@ -2225,9 +2230,6 @@ share/locale/da/flag.png @dirrm share/doc/HTML/da/kdesvn-build @dirrm share/doc/HTML/da/kdesu @dirrm share/doc/HTML/da/kdeprint -@dirrm share/doc/HTML/da/kdelirc/kcmlirc -@dirrm share/doc/HTML/da/kdelirc/irkick -@dirrm share/doc/HTML/da/kdelirc @dirrm share/doc/HTML/da/kdelibs @dirrm share/doc/HTML/da/kdebugdialog @dirrm share/doc/HTML/da/kdearch @@ -2288,6 +2290,7 @@ share/locale/da/flag.png @dirrm share/doc/HTML/da/kcontrol/arts @dirrm share/doc/HTML/da/kcontrol @dirrm share/doc/HTML/da/kcoloredit +@dirrm share/doc/HTML/da/kcmlirc @dirrm share/doc/HTML/da/kcharselect @dirrm share/doc/HTML/da/kcalc @dirrm share/doc/HTML/da/kcachegrind @@ -2314,6 +2317,7 @@ share/locale/da/flag.png @dirrm share/doc/HTML/da/kaddressbook @dirrm share/doc/HTML/da/kaboodle @dirrm share/doc/HTML/da/juk +@dirrm share/doc/HTML/da/irkick @dirrm share/doc/HTML/da/docs/common @dirrm share/doc/HTML/da/docs @dirrm share/doc/HTML/da/cervisia diff --git a/misc/kde4-l10n-el/distinfo b/misc/kde4-l10n-el/distinfo index 47334624cc33..f1359573b714 100644 --- a/misc/kde4-l10n-el/distinfo +++ b/misc/kde4-l10n-el/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-el-3.5.5.tar.bz2) = a2cb7afd4c5883bc2eb5d9c8a96d04c0 -SHA256 (KDE/kde-i18n/kde-i18n-el-3.5.5.tar.bz2) = 2ccb85695fa1c5c8b5e8db659d868c6934522c5f6bb4c5ea6fb3a8f646cc59cd -SIZE (KDE/kde-i18n/kde-i18n-el-3.5.5.tar.bz2) = 2267715 +MD5 (KDE/kde-i18n/kde-i18n-el-3.5.6.tar.bz2) = f395db170010c2a4ee9a7e27b1c8772e +SHA256 (KDE/kde-i18n/kde-i18n-el-3.5.6.tar.bz2) = 2ac607e93181659ad793c7e19c2a31305c8b209da60222edd225eec92633595d +SIZE (KDE/kde-i18n/kde-i18n-el-3.5.6.tar.bz2) = 2268782 diff --git a/misc/kde4-l10n-el/pkg-plist b/misc/kde4-l10n-el/pkg-plist index b0af05eb46f9..b7ec4cdf1f57 100644 --- a/misc/kde4-l10n-el/pkg-plist +++ b/misc/kde4-l10n-el/pkg-plist @@ -272,6 +272,7 @@ share/locale/el/LC_MESSAGES/khotkeys.mo share/locale/el/LC_MESSAGES/khtmlkttsd.mo share/locale/el/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/el/LC_MESSAGES/kicker.mo +share/locale/el/LC_MESSAGES/kickermenu_kate.mo share/locale/el/LC_MESSAGES/kiconedit.mo share/locale/el/LC_MESSAGES/kig.mo share/locale/el/LC_MESSAGES/kimagemapeditor.mo @@ -309,6 +310,7 @@ share/locale/el/LC_MESSAGES/kio_thumbnail.mo share/locale/el/LC_MESSAGES/kio_trash.mo share/locale/el/LC_MESSAGES/kio_zeroconf.mo share/locale/el/LC_MESSAGES/kioexec.mo +share/locale/el/LC_MESSAGES/kitchensync.mo share/locale/el/LC_MESSAGES/kiten.mo share/locale/el/LC_MESSAGES/kjobviewer.mo share/locale/el/LC_MESSAGES/kjots.mo @@ -512,6 +514,7 @@ share/locale/el/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/el/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/el/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/el/LC_MESSAGES/libkickermenu_tom.mo +share/locale/el/LC_MESSAGES/libkitchensync.mo share/locale/el/LC_MESSAGES/libkleopatra.mo share/locale/el/LC_MESSAGES/libkmime.mo share/locale/el/LC_MESSAGES/libkonq.mo diff --git a/misc/kde4-l10n-en_GB/distinfo b/misc/kde4-l10n-en_GB/distinfo index 64142e03cac8..2113e0ea9fc1 100644 --- a/misc/kde4-l10n-en_GB/distinfo +++ b/misc/kde4-l10n-en_GB/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-en_GB-3.5.5.tar.bz2) = 50af460c4b69e5cd91b820ed656f99bd -SHA256 (KDE/kde-i18n/kde-i18n-en_GB-3.5.5.tar.bz2) = 77b44d25f2d569dc7e36e26ff7d518134f632263d44ad6dfb4b12a23ec3ce37d -SIZE (KDE/kde-i18n/kde-i18n-en_GB-3.5.5.tar.bz2) = 3701881 +MD5 (KDE/kde-i18n/kde-i18n-en_GB-3.5.6.tar.bz2) = 6b81bfa733c5e1c8ae4d16208093f648 +SHA256 (KDE/kde-i18n/kde-i18n-en_GB-3.5.6.tar.bz2) = 427d2e60b8d06b62ea6cd73e119bdf7ade656958ddbb25ef2a78f4b839ff98ca +SIZE (KDE/kde-i18n/kde-i18n-en_GB-3.5.6.tar.bz2) = 4368113 diff --git a/misc/kde4-l10n-en_GB/pkg-plist b/misc/kde4-l10n-en_GB/pkg-plist index 481031a55747..e14ac2194700 100644 --- a/misc/kde4-l10n-en_GB/pkg-plist +++ b/misc/kde4-l10n-en_GB/pkg-plist @@ -1,4 +1,54 @@ share/apps/katepart/syntax/logohighlightstyle.en_GB.xml +share/apps/klettres/en_GB/alpha/a.ogg +share/apps/klettres/en_GB/alpha/b.ogg +share/apps/klettres/en_GB/alpha/c.ogg +share/apps/klettres/en_GB/alpha/d.ogg +share/apps/klettres/en_GB/alpha/e.ogg +share/apps/klettres/en_GB/alpha/f.ogg +share/apps/klettres/en_GB/alpha/g.ogg +share/apps/klettres/en_GB/alpha/h.ogg +share/apps/klettres/en_GB/alpha/i.ogg +share/apps/klettres/en_GB/alpha/j.ogg +share/apps/klettres/en_GB/alpha/k.ogg +share/apps/klettres/en_GB/alpha/l.ogg +share/apps/klettres/en_GB/alpha/m.ogg +share/apps/klettres/en_GB/alpha/n.ogg +share/apps/klettres/en_GB/alpha/o.ogg +share/apps/klettres/en_GB/alpha/p.ogg +share/apps/klettres/en_GB/alpha/q.ogg +share/apps/klettres/en_GB/alpha/r.ogg +share/apps/klettres/en_GB/alpha/s.ogg +share/apps/klettres/en_GB/alpha/t.ogg +share/apps/klettres/en_GB/alpha/u.ogg +share/apps/klettres/en_GB/alpha/v.ogg +share/apps/klettres/en_GB/alpha/w.ogg +share/apps/klettres/en_GB/alpha/x.ogg +share/apps/klettres/en_GB/alpha/y.ogg +share/apps/klettres/en_GB/alpha/z.ogg +share/apps/klettres/en_GB/sounds.xml +share/apps/klettres/en_GB/syllab/arm.ogg +share/apps/klettres/en_GB/syllab/ball.ogg +share/apps/klettres/en_GB/syllab/car.ogg +share/apps/klettres/en_GB/syllab/dog.ogg +share/apps/klettres/en_GB/syllab/ear.ogg +share/apps/klettres/en_GB/syllab/fix.ogg +share/apps/klettres/en_GB/syllab/gas.ogg +share/apps/klettres/en_GB/syllab/gem.ogg +share/apps/klettres/en_GB/syllab/hot.ogg +share/apps/klettres/en_GB/syllab/hut.ogg +share/apps/klettres/en_GB/syllab/jet.ogg +share/apps/klettres/en_GB/syllab/key.ogg +share/apps/klettres/en_GB/syllab/me.ogg +share/apps/klettres/en_GB/syllab/my.ogg +share/apps/klettres/en_GB/syllab/no.ogg +share/apps/klettres/en_GB/syllab/or.ogg +share/apps/klettres/en_GB/syllab/pet.ogg +share/apps/klettres/en_GB/syllab/saw.ogg +share/apps/klettres/en_GB/syllab/say.ogg +share/apps/klettres/en_GB/syllab/sit.ogg +share/apps/klettres/en_GB/syllab/sky.ogg +share/apps/klettres/en_GB/syllab/the.ogg +share/apps/klettres/en_GB/syllab/well.ogg share/apps/kturtle/data/logokeywords.en_GB.xml share/apps/kturtle/examples/en_GB/curly.logo share/apps/kturtle/examples/en_GB/example1.logo @@ -1257,3 +1307,7 @@ share/locale/en_GB/flag.png @dirrm share/apps/kturtle/examples @dirrm share/apps/kturtle/data @dirrm share/apps/kturtle +@dirrm share/apps/klettres/en_GB/syllab +@dirrm share/apps/klettres/en_GB/alpha +@dirrm share/apps/klettres/en_GB +@dirrm share/apps/klettres diff --git a/misc/kde4-l10n-eo/distinfo b/misc/kde4-l10n-eo/distinfo index f0f1edb1a313..38752cb90d83 100644 --- a/misc/kde4-l10n-eo/distinfo +++ b/misc/kde4-l10n-eo/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-eo-3.5.5.tar.bz2) = c55c9ae0c001e5214f1ad97f4b6d02a1 -SHA256 (KDE/kde-i18n/kde-i18n-eo-3.5.5.tar.bz2) = 3247c97e52a098660c0e892f7db4d46e047330508a7f714e2e3e7e3226620cef -SIZE (KDE/kde-i18n/kde-i18n-eo-3.5.5.tar.bz2) = 1271107 +MD5 (KDE/kde-i18n/kde-i18n-eo-3.5.6.tar.bz2) = 7f17faa2bda08f31e1f33a3242f0b960 +SHA256 (KDE/kde-i18n/kde-i18n-eo-3.5.6.tar.bz2) = 5304aa2c1f08679a7e679f286479cf4406fb93178b2ab3fcdfdd5ebfa0ee3bcd +SIZE (KDE/kde-i18n/kde-i18n-eo-3.5.6.tar.bz2) = 1272068 diff --git a/misc/kde4-l10n-es/distinfo b/misc/kde4-l10n-es/distinfo index 82f2f7e3dc1f..a3a6361c1bcd 100644 --- a/misc/kde4-l10n-es/distinfo +++ b/misc/kde4-l10n-es/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-es-3.5.5.tar.bz2) = d8dc649138fe136c57a808eac1fdd719 -SHA256 (KDE/kde-i18n/kde-i18n-es-3.5.5.tar.bz2) = adde40b9a1aa7774ded2e2c6bb3e092fd33ad5806660c04aae21be9b0874b0c7 -SIZE (KDE/kde-i18n/kde-i18n-es-3.5.5.tar.bz2) = 36641045 +MD5 (KDE/kde-i18n/kde-i18n-es-3.5.6.tar.bz2) = 75f2b236131bcf89b6f2302c1fb8780f +SHA256 (KDE/kde-i18n/kde-i18n-es-3.5.6.tar.bz2) = 3a2a2a62520805419d792bf2422b662146caccd3b9d3ddb9b9e58124dc402399 +SIZE (KDE/kde-i18n/kde-i18n-es-3.5.6.tar.bz2) = 34360868 diff --git a/misc/kde4-l10n-es/pkg-plist b/misc/kde4-l10n-es/pkg-plist index 0f039b55f64b..94884a42b0cd 100644 --- a/misc/kde4-l10n-es/pkg-plist +++ b/misc/kde4-l10n-es/pkg-plist @@ -202,9 +202,27 @@ share/doc/HTML/es/KRegExpEditor/text.png share/doc/HTML/es/KRegExpEditor/texttool.png share/doc/HTML/es/KRegExpEditor/theEditor.png share/doc/HTML/es/KRegExpEditor/wordboundary.png +share/doc/HTML/es/akregator/add-feed.png +share/doc/HTML/es/akregator/add-feed2.png +share/doc/HTML/es/akregator/add-folder.png +share/doc/HTML/es/akregator/add-folder2.png +share/doc/HTML/es/akregator/advanced-tab.png +share/doc/HTML/es/akregator/appearance-tab.png +share/doc/HTML/es/akregator/archive-tab.png +share/doc/HTML/es/akregator/browser-tab.png share/doc/HTML/es/akregator/common +share/doc/HTML/es/akregator/general-tab.png share/doc/HTML/es/akregator/index.cache.bz2 share/doc/HTML/es/akregator/index.docbook +share/doc/HTML/es/akregator/konq.png +share/doc/HTML/es/akregator/konq2.png +share/doc/HTML/es/akregator/main-window.png +share/doc/HTML/es/akregator/main-window2.png +share/doc/HTML/es/akregator/main-window3.png +share/doc/HTML/es/akregator/main-window4.png +share/doc/HTML/es/akregator/quick-filter.png +share/doc/HTML/es/akregator/rss.png +share/doc/HTML/es/akregator/rss3.png share/doc/HTML/es/amor/billy.png share/doc/HTML/es/amor/bonhomme.png share/doc/HTML/es/amor/bsd.png @@ -336,9 +354,12 @@ share/doc/HTML/es/blinken/index.docbook share/doc/HTML/es/cervisia/annotate.png share/doc/HTML/es/cervisia/checkout.png share/doc/HTML/es/cervisia/commit.png +share/doc/HTML/es/cervisia/common share/doc/HTML/es/cervisia/diff.png share/doc/HTML/es/cervisia/history.png share/doc/HTML/es/cervisia/import.png +share/doc/HTML/es/cervisia/index.cache.bz2 +share/doc/HTML/es/cervisia/index.docbook share/doc/HTML/es/cervisia/logtree.png share/doc/HTML/es/cervisia/mainview.png share/doc/HTML/es/cervisia/patch.png @@ -352,6 +373,9 @@ share/doc/HTML/es/docs/common/kde-localised.css share/doc/HTML/es/docs/common/kde_logo.png share/doc/HTML/es/docs/common/lgpl-translated.html share/doc/HTML/es/docs/common/logotp3.png +share/doc/HTML/es/irkick/common +share/doc/HTML/es/irkick/index.cache.bz2 +share/doc/HTML/es/irkick/index.docbook share/doc/HTML/es/juk/common share/doc/HTML/es/juk/history-playlist.png share/doc/HTML/es/juk/index.cache.bz2 @@ -602,6 +626,9 @@ share/doc/HTML/es/kcalc/index.docbook share/doc/HTML/es/kcharselect/common share/doc/HTML/es/kcharselect/index.cache.bz2 share/doc/HTML/es/kcharselect/index.docbook +share/doc/HTML/es/kcmlirc/common +share/doc/HTML/es/kcmlirc/index.cache.bz2 +share/doc/HTML/es/kcmlirc/index.docbook share/doc/HTML/es/kcoloredit/common share/doc/HTML/es/kcoloredit/index.cache.bz2 share/doc/HTML/es/kcoloredit/index.docbook @@ -816,12 +843,6 @@ share/doc/HTML/es/kdelibs/man-dcop.1.docbook share/doc/HTML/es/kdelibs/man-kbuildsycoca.8.docbook share/doc/HTML/es/kdelibs/man-kdeoptions.7.docbook share/doc/HTML/es/kdelibs/man-qtoptions.7.docbook -share/doc/HTML/es/kdelirc/irkick/common -share/doc/HTML/es/kdelirc/irkick/index.cache.bz2 -share/doc/HTML/es/kdelirc/irkick/index.docbook -share/doc/HTML/es/kdelirc/kcmlirc/common -share/doc/HTML/es/kdelirc/kcmlirc/index.cache.bz2 -share/doc/HTML/es/kdelirc/kcmlirc/index.docbook share/doc/HTML/es/kdeprint/add-printer-wiz.docbook share/doc/HTML/es/kdeprint/common share/doc/HTML/es/kdeprint/cr32-action-wizard.png @@ -3019,6 +3040,7 @@ share/locale/es/LC_MESSAGES/kio_thumbnail.mo share/locale/es/LC_MESSAGES/kio_trash.mo share/locale/es/LC_MESSAGES/kio_zeroconf.mo share/locale/es/LC_MESSAGES/kioexec.mo +share/locale/es/LC_MESSAGES/kitchensync.mo share/locale/es/LC_MESSAGES/kiten.mo share/locale/es/LC_MESSAGES/kjobviewer.mo share/locale/es/LC_MESSAGES/kjots.mo @@ -3222,6 +3244,7 @@ share/locale/es/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/es/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/es/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/es/LC_MESSAGES/libkickermenu_tom.mo +share/locale/es/LC_MESSAGES/libkitchensync.mo share/locale/es/LC_MESSAGES/libkleopatra.mo share/locale/es/LC_MESSAGES/libkmime.mo share/locale/es/LC_MESSAGES/libkonq.mo @@ -3450,9 +3473,6 @@ share/locale/es/flag.png @dirrm share/doc/HTML/es/kdesvn-build @dirrm share/doc/HTML/es/kdesu @dirrm share/doc/HTML/es/kdeprint -@dirrm share/doc/HTML/es/kdelirc/kcmlirc -@dirrm share/doc/HTML/es/kdelirc/irkick -@dirrm share/doc/HTML/es/kdelirc @dirrm share/doc/HTML/es/kdelibs @dirrm share/doc/HTML/es/kdebugdialog @dirrm share/doc/HTML/es/kdearch @@ -3514,6 +3534,7 @@ share/locale/es/flag.png @dirrm share/doc/HTML/es/kcontrol/arts @dirrm share/doc/HTML/es/kcontrol @dirrm share/doc/HTML/es/kcoloredit +@dirrm share/doc/HTML/es/kcmlirc @dirrm share/doc/HTML/es/kcharselect @dirrm share/doc/HTML/es/kcalc @dirrm share/doc/HTML/es/kcachegrind @@ -3540,6 +3561,7 @@ share/locale/es/flag.png @dirrm share/doc/HTML/es/kaddressbook @dirrm share/doc/HTML/es/kaboodle @dirrm share/doc/HTML/es/juk +@dirrm share/doc/HTML/es/irkick @dirrm share/doc/HTML/es/docs/common @dirrm share/doc/HTML/es/docs @dirrm share/doc/HTML/es/cervisia diff --git a/misc/kde4-l10n-et/distinfo b/misc/kde4-l10n-et/distinfo index 32c2ef8509d7..126ca32c894a 100644 --- a/misc/kde4-l10n-et/distinfo +++ b/misc/kde4-l10n-et/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-et-3.5.5.tar.bz2) = d3065d66591fa0ea4e304e9bcbb6dc10 -SHA256 (KDE/kde-i18n/kde-i18n-et-3.5.5.tar.bz2) = 5b16805308aefb3e0fa79c9df4d89b92ff407406b91ce2a68ef9a3bf01c6ae54 -SIZE (KDE/kde-i18n/kde-i18n-et-3.5.5.tar.bz2) = 10540364 +MD5 (KDE/kde-i18n/kde-i18n-et-3.5.6.tar.bz2) = 55647fdaf91b9626618015017be954b4 +SHA256 (KDE/kde-i18n/kde-i18n-et-3.5.6.tar.bz2) = 83dd00865027eca51cfa9ab8715986634282ca7706367b5a5133e6d0814cfe60 +SIZE (KDE/kde-i18n/kde-i18n-et-3.5.6.tar.bz2) = 10526717 diff --git a/misc/kde4-l10n-et/pkg-plist b/misc/kde4-l10n-et/pkg-plist index 67c7989c1d19..b286b28b3ad1 100644 --- a/misc/kde4-l10n-et/pkg-plist +++ b/misc/kde4-l10n-et/pkg-plist @@ -49,6 +49,9 @@ share/doc/HTML/et/docs/common/logotp3.png share/doc/HTML/et/flashkard/common share/doc/HTML/et/flashkard/index.cache.bz2 share/doc/HTML/et/flashkard/index.docbook +share/doc/HTML/et/irkick/common +share/doc/HTML/et/irkick/index.cache.bz2 +share/doc/HTML/et/irkick/index.docbook share/doc/HTML/et/juk/common share/doc/HTML/et/juk/index.cache.bz2 share/doc/HTML/et/juk/index.docbook @@ -157,6 +160,9 @@ share/doc/HTML/et/kcalc/index.docbook share/doc/HTML/et/kcharselect/common share/doc/HTML/et/kcharselect/index.cache.bz2 share/doc/HTML/et/kcharselect/index.docbook +share/doc/HTML/et/kcmlirc/common +share/doc/HTML/et/kcmlirc/index.cache.bz2 +share/doc/HTML/et/kcmlirc/index.docbook share/doc/HTML/et/kcoloredit/common share/doc/HTML/et/kcoloredit/index.cache.bz2 share/doc/HTML/et/kcoloredit/index.docbook @@ -352,12 +358,6 @@ share/doc/HTML/et/kdelibs/man-dcop.1.docbook share/doc/HTML/et/kdelibs/man-kbuildsycoca.8.docbook share/doc/HTML/et/kdelibs/man-kdeoptions.7.docbook share/doc/HTML/et/kdelibs/man-qtoptions.7.docbook -share/doc/HTML/et/kdelirc/irkick/common -share/doc/HTML/et/kdelirc/irkick/index.cache.bz2 -share/doc/HTML/et/kdelirc/irkick/index.docbook -share/doc/HTML/et/kdelirc/kcmlirc/common -share/doc/HTML/et/kdelirc/kcmlirc/index.cache.bz2 -share/doc/HTML/et/kdelirc/kcmlirc/index.docbook share/doc/HTML/et/kdeprint/add-printer-wiz.docbook share/doc/HTML/et/kdeprint/common share/doc/HTML/et/kdeprint/cups-config.docbook @@ -518,6 +518,7 @@ share/doc/HTML/et/khelpcenter/userguide/common share/doc/HTML/et/khelpcenter/userguide/control-center.docbook share/doc/HTML/et/khelpcenter/userguide/creating-graphics.docbook share/doc/HTML/et/khelpcenter/userguide/credits-and-license.docbook +share/doc/HTML/et/khelpcenter/userguide/customizing-desktop.docbook share/doc/HTML/et/khelpcenter/userguide/desktop.png share/doc/HTML/et/khelpcenter/userguide/email.docbook share/doc/HTML/et/khelpcenter/userguide/extragear-applications.docbook @@ -1630,6 +1631,7 @@ share/locale/et/LC_MESSAGES/khotkeys.mo share/locale/et/LC_MESSAGES/khtmlkttsd.mo share/locale/et/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/et/LC_MESSAGES/kicker.mo +share/locale/et/LC_MESSAGES/kickermenu_kate.mo share/locale/et/LC_MESSAGES/kiconedit.mo share/locale/et/LC_MESSAGES/kig.mo share/locale/et/LC_MESSAGES/kimagemapeditor.mo @@ -1667,6 +1669,7 @@ share/locale/et/LC_MESSAGES/kio_thumbnail.mo share/locale/et/LC_MESSAGES/kio_trash.mo share/locale/et/LC_MESSAGES/kio_zeroconf.mo share/locale/et/LC_MESSAGES/kioexec.mo +share/locale/et/LC_MESSAGES/kitchensync.mo share/locale/et/LC_MESSAGES/kiten.mo share/locale/et/LC_MESSAGES/kjobviewer.mo share/locale/et/LC_MESSAGES/kjots.mo @@ -1870,6 +1873,7 @@ share/locale/et/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/et/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/et/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/et/LC_MESSAGES/libkickermenu_tom.mo +share/locale/et/LC_MESSAGES/libkitchensync.mo share/locale/et/LC_MESSAGES/libkleopatra.mo share/locale/et/LC_MESSAGES/libkmime.mo share/locale/et/LC_MESSAGES/libkonq.mo @@ -2096,9 +2100,6 @@ share/locale/et/flag.png @dirrm share/doc/HTML/et/kdesvn-build @dirrm share/doc/HTML/et/kdesu @dirrm share/doc/HTML/et/kdeprint -@dirrm share/doc/HTML/et/kdelirc/kcmlirc -@dirrm share/doc/HTML/et/kdelirc/irkick -@dirrm share/doc/HTML/et/kdelirc @dirrm share/doc/HTML/et/kdelibs @dirrm share/doc/HTML/et/kdebugdialog @dirrm share/doc/HTML/et/kdearch @@ -2162,6 +2163,7 @@ share/locale/et/flag.png @dirrm share/doc/HTML/et/kcontrol/arts @dirrm share/doc/HTML/et/kcontrol @dirrm share/doc/HTML/et/kcoloredit +@dirrm share/doc/HTML/et/kcmlirc @dirrm share/doc/HTML/et/kcharselect @dirrm share/doc/HTML/et/kcalc @dirrm share/doc/HTML/et/kcachegrind @@ -2188,6 +2190,7 @@ share/locale/et/flag.png @dirrm share/doc/HTML/et/kaddressbook @dirrm share/doc/HTML/et/kaboodle @dirrm share/doc/HTML/et/juk +@dirrm share/doc/HTML/et/irkick @dirrm share/doc/HTML/et/flashkard @dirrm share/doc/HTML/et/docs/common @dirrm share/doc/HTML/et/docs diff --git a/misc/kde4-l10n-eu/distinfo b/misc/kde4-l10n-eu/distinfo index 30c41eab5537..5625eabb1153 100644 --- a/misc/kde4-l10n-eu/distinfo +++ b/misc/kde4-l10n-eu/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-eu-3.5.5.tar.bz2) = 45a4361f11c14b8cbc0a5bb29ab18edb -SHA256 (KDE/kde-i18n/kde-i18n-eu-3.5.5.tar.bz2) = ad6c905811d6659541735a5d6a0d5f2ea4d140c7ac6aafe32e3d1bf1a81ea884 -SIZE (KDE/kde-i18n/kde-i18n-eu-3.5.5.tar.bz2) = 2236745 +MD5 (KDE/kde-i18n/kde-i18n-eu-3.5.6.tar.bz2) = 6413e62d868721be5b269e50e979d4b1 +SHA256 (KDE/kde-i18n/kde-i18n-eu-3.5.6.tar.bz2) = 00b9a6be862a721305232209e5b64dbbc6f1d720dab785dc0f9c7cdcac2b064d +SIZE (KDE/kde-i18n/kde-i18n-eu-3.5.6.tar.bz2) = 2240360 diff --git a/misc/kde4-l10n-fi/distinfo b/misc/kde4-l10n-fi/distinfo index 17f97ba15edc..0acb8b1ae806 100644 --- a/misc/kde4-l10n-fi/distinfo +++ b/misc/kde4-l10n-fi/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-fi-3.5.5.tar.bz2) = 5693b184f6d3e2d79c78248a9506ba11 -SHA256 (KDE/kde-i18n/kde-i18n-fi-3.5.5.tar.bz2) = 9f709a0ff8403da6137c0e48b172c79ff8c875ebf04500a4c586bcdf37a4054e -SIZE (KDE/kde-i18n/kde-i18n-fi-3.5.5.tar.bz2) = 2400361 +MD5 (KDE/kde-i18n/kde-i18n-fi-3.5.6.tar.bz2) = 227d47ad0232daf190653b4f8d9cd508 +SHA256 (KDE/kde-i18n/kde-i18n-fi-3.5.6.tar.bz2) = 9f7513596914504425918e92e27dac7bd6e67993256dafd5fec4bddefaadbb30 +SIZE (KDE/kde-i18n/kde-i18n-fi-3.5.6.tar.bz2) = 2407391 diff --git a/misc/kde4-l10n-fi/pkg-plist b/misc/kde4-l10n-fi/pkg-plist index 89a1db17cd45..7727577d2453 100644 --- a/misc/kde4-l10n-fi/pkg-plist +++ b/misc/kde4-l10n-fi/pkg-plist @@ -297,6 +297,7 @@ share/locale/fi/LC_MESSAGES/khotkeys.mo share/locale/fi/LC_MESSAGES/khtmlkttsd.mo share/locale/fi/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/fi/LC_MESSAGES/kicker.mo +share/locale/fi/LC_MESSAGES/kickermenu_kate.mo share/locale/fi/LC_MESSAGES/kiconedit.mo share/locale/fi/LC_MESSAGES/kig.mo share/locale/fi/LC_MESSAGES/kimagemapeditor.mo diff --git a/misc/kde4-l10n-fy/distinfo b/misc/kde4-l10n-fy/distinfo index 0b098fa7c814..538b9c33868d 100644 --- a/misc/kde4-l10n-fy/distinfo +++ b/misc/kde4-l10n-fy/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-fy-3.5.5.tar.bz2) = 98a3bbe04e82b89c8ab2a821741ffc34 -SHA256 (KDE/kde-i18n/kde-i18n-fy-3.5.5.tar.bz2) = 1cf20414172ad6b4b3578777190f4db5ff3f437fce5b1619fc62738a38f5cc7f -SIZE (KDE/kde-i18n/kde-i18n-fy-3.5.5.tar.bz2) = 691937 +MD5 (KDE/kde-i18n/kde-i18n-fy-3.5.6.tar.bz2) = f69c07af129e084a4166cdfb3e5db173 +SHA256 (KDE/kde-i18n/kde-i18n-fy-3.5.6.tar.bz2) = 35b7dae2c0f8b4848c057af0d0b42a6b04b0d5dc0ecdb737a7f8316195801ae3 +SIZE (KDE/kde-i18n/kde-i18n-fy-3.5.6.tar.bz2) = 692661 diff --git a/misc/kde4-l10n-fy/pkg-plist b/misc/kde4-l10n-fy/pkg-plist index 0b35e177ec6f..70812abe3744 100644 --- a/misc/kde4-l10n-fy/pkg-plist +++ b/misc/kde4-l10n-fy/pkg-plist @@ -94,6 +94,7 @@ share/locale/fy/LC_MESSAGES/khelpcenter.mo share/locale/fy/LC_MESSAGES/khotkeys.mo share/locale/fy/LC_MESSAGES/khtmlkttsd.mo share/locale/fy/LC_MESSAGES/kicker.mo +share/locale/fy/LC_MESSAGES/kickermenu_kate.mo share/locale/fy/LC_MESSAGES/kio.mo share/locale/fy/LC_MESSAGES/kio_finger.mo share/locale/fy/LC_MESSAGES/kio_fish.mo diff --git a/misc/kde4-l10n-ga/distinfo b/misc/kde4-l10n-ga/distinfo index 5f5825de146e..bb7cbc29abcd 100644 --- a/misc/kde4-l10n-ga/distinfo +++ b/misc/kde4-l10n-ga/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ga-3.5.5.tar.bz2) = e82a3ff13cb0f8d73578f1a3770a119c -SHA256 (KDE/kde-i18n/kde-i18n-ga-3.5.5.tar.bz2) = ec9bc93828a5a690bfd9ec8d93ffe9f8fee0ee4d36b7bd1da8ac27b757c05336 -SIZE (KDE/kde-i18n/kde-i18n-ga-3.5.5.tar.bz2) = 1698887 +MD5 (KDE/kde-i18n/kde-i18n-ga-3.5.6.tar.bz2) = 0ffdca99a102c4e1320916de3bf35adb +SHA256 (KDE/kde-i18n/kde-i18n-ga-3.5.6.tar.bz2) = 2df03cef1b55c6c90c799e0b4fd02c855f6f849c7e88df89c8f59449e2795093 +SIZE (KDE/kde-i18n/kde-i18n-ga-3.5.6.tar.bz2) = 1693323 diff --git a/misc/kde4-l10n-gl/distinfo b/misc/kde4-l10n-gl/distinfo index f319b6d332d8..cbb083aa75ad 100644 --- a/misc/kde4-l10n-gl/distinfo +++ b/misc/kde4-l10n-gl/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-gl-3.5.5.tar.bz2) = bf3ad88fea56ded7fd451cc83826e4c5 -SHA256 (KDE/kde-i18n/kde-i18n-gl-3.5.5.tar.bz2) = f997219bd0382843ed7be7b3ef9a18fc672a476b1c9321b730cbfeb16d5a406f -SIZE (KDE/kde-i18n/kde-i18n-gl-3.5.5.tar.bz2) = 1354712 +MD5 (KDE/kde-i18n/kde-i18n-gl-3.5.6.tar.bz2) = 590bd015071b21ba0dcd55fc2955ca55 +SHA256 (KDE/kde-i18n/kde-i18n-gl-3.5.6.tar.bz2) = 66edc840e7a4dff922b43895a341cf23b97516c84b65c84f9ae0143a29b4f890 +SIZE (KDE/kde-i18n/kde-i18n-gl-3.5.6.tar.bz2) = 1862274 diff --git a/misc/kde4-l10n-gl/pkg-plist b/misc/kde4-l10n-gl/pkg-plist index 4a2c8a85dfcc..c1dad0ef48c1 100644 --- a/misc/kde4-l10n-gl/pkg-plist +++ b/misc/kde4-l10n-gl/pkg-plist @@ -1,10 +1,16 @@ +share/locale/gl/LC_MESSAGES/akregator.mo +share/locale/gl/LC_MESSAGES/akregator_konqplugin.mo share/locale/gl/LC_MESSAGES/alsaplayerui.mo share/locale/gl/LC_MESSAGES/amor.mo share/locale/gl/LC_MESSAGES/appletproxy.mo share/locale/gl/LC_MESSAGES/ark.mo share/locale/gl/LC_MESSAGES/ark_plugin.mo +share/locale/gl/LC_MESSAGES/artsbuilder.mo share/locale/gl/LC_MESSAGES/artscontrol.mo +share/locale/gl/LC_MESSAGES/artsmodules.mo share/locale/gl/LC_MESSAGES/atlantikdesigner.mo +share/locale/gl/LC_MESSAGES/audiocd_encoder_lame.mo +share/locale/gl/LC_MESSAGES/audiocd_encoder_vorbis.mo share/locale/gl/LC_MESSAGES/audiorename_plugin.mo share/locale/gl/LC_MESSAGES/autorefresh.mo share/locale/gl/LC_MESSAGES/babelfish.mo @@ -19,37 +25,70 @@ share/locale/gl/LC_MESSAGES/display.mo share/locale/gl/LC_MESSAGES/dockbarextension.mo share/locale/gl/LC_MESSAGES/domtreeviewer.mo share/locale/gl/LC_MESSAGES/drkonqi.mo +share/locale/gl/LC_MESSAGES/dub.mo share/locale/gl/LC_MESSAGES/extensionproxy.mo +share/locale/gl/LC_MESSAGES/ffrs.mo share/locale/gl/LC_MESSAGES/filetypes.mo +share/locale/gl/LC_MESSAGES/fsview.mo share/locale/gl/LC_MESSAGES/htmlsearch.mo share/locale/gl/LC_MESSAGES/imagerename_plugin.mo +share/locale/gl/LC_MESSAGES/imgalleryplugin.mo +share/locale/gl/LC_MESSAGES/irkick.mo share/locale/gl/LC_MESSAGES/joystick.mo +share/locale/gl/LC_MESSAGES/juk.mo +share/locale/gl/LC_MESSAGES/kabc2mutt.mo share/locale/gl/LC_MESSAGES/kabc_dir.mo share/locale/gl/LC_MESSAGES/kabc_file.mo share/locale/gl/LC_MESSAGES/kabc_ldapkio.mo share/locale/gl/LC_MESSAGES/kabc_net.mo +share/locale/gl/LC_MESSAGES/kabc_slox.mo share/locale/gl/LC_MESSAGES/kabc_sql.mo share/locale/gl/LC_MESSAGES/kabcformat_binary.mo share/locale/gl/LC_MESSAGES/kaboodle.mo share/locale/gl/LC_MESSAGES/kaccess.mo share/locale/gl/LC_MESSAGES/kaddressbook.mo +share/locale/gl/LC_MESSAGES/kalarm.mo share/locale/gl/LC_MESSAGES/kalzium.mo +share/locale/gl/LC_MESSAGES/kanagram.mo share/locale/gl/LC_MESSAGES/kandy.mo share/locale/gl/LC_MESSAGES/kappfinder.mo +share/locale/gl/LC_MESSAGES/karm.mo share/locale/gl/LC_MESSAGES/kasbarextension.mo share/locale/gl/LC_MESSAGES/kasteroids.mo share/locale/gl/LC_MESSAGES/kate.mo +share/locale/gl/LC_MESSAGES/katecppsymbolviewer.mo +share/locale/gl/LC_MESSAGES/katefiletemplates.mo +share/locale/gl/LC_MESSAGES/katefll_initplugin.mo +share/locale/gl/LC_MESSAGES/katefll_plugin.mo share/locale/gl/LC_MESSAGES/katehelloworld.mo +share/locale/gl/LC_MESSAGES/katehtmltools.mo +share/locale/gl/LC_MESSAGES/kateinsertcommand.mo +share/locale/gl/LC_MESSAGES/katekjswrapper.mo share/locale/gl/LC_MESSAGES/katemake.mo +share/locale/gl/LC_MESSAGES/katemodeline.mo +share/locale/gl/LC_MESSAGES/kateopenheader.mo share/locale/gl/LC_MESSAGES/katepart.mo +share/locale/gl/LC_MESSAGES/katepybrowse.mo +share/locale/gl/LC_MESSAGES/katesnippets.mo +share/locale/gl/LC_MESSAGES/katetabbarextension.mo +share/locale/gl/LC_MESSAGES/katetextfilter.mo +share/locale/gl/LC_MESSAGES/katexmlcheck.mo +share/locale/gl/LC_MESSAGES/katexmltools.mo share/locale/gl/LC_MESSAGES/katomic.mo share/locale/gl/LC_MESSAGES/kaudiocreator.mo share/locale/gl/LC_MESSAGES/kay.mo share/locale/gl/LC_MESSAGES/kbabel.mo share/locale/gl/LC_MESSAGES/kbattleship.mo +share/locale/gl/LC_MESSAGES/kbinaryclock.mo +share/locale/gl/LC_MESSAGES/kblackbox.mo share/locale/gl/LC_MESSAGES/kbounce.mo share/locale/gl/LC_MESSAGES/kbruch.mo +share/locale/gl/LC_MESSAGES/kbstateapplet.mo share/locale/gl/LC_MESSAGES/kcalc.mo +share/locale/gl/LC_MESSAGES/kcharselect.mo +share/locale/gl/LC_MESSAGES/kcharselectapplet.mo +share/locale/gl/LC_MESSAGES/kcm_krfb.mo +share/locale/gl/LC_MESSAGES/kcm_kviewcanvasconfig.mo share/locale/gl/LC_MESSAGES/kcm_kviewgeneralconfig.mo share/locale/gl/LC_MESSAGES/kcm_kviewpluginsconfig.mo share/locale/gl/LC_MESSAGES/kcm_kviewviewerpluginsconfig.mo @@ -72,6 +111,7 @@ share/locale/gl/LC_MESSAGES/kcmicons.mo share/locale/gl/LC_MESSAGES/kcminfo.mo share/locale/gl/LC_MESSAGES/kcminput.mo share/locale/gl/LC_MESSAGES/kcmioslaveinfo.mo +share/locale/gl/LC_MESSAGES/kcmkabconfig.mo share/locale/gl/LC_MESSAGES/kcmkamera.mo share/locale/gl/LC_MESSAGES/kcmkclock.mo share/locale/gl/LC_MESSAGES/kcmkded.mo @@ -84,7 +124,10 @@ share/locale/gl/LC_MESSAGES/kcmkonqhtml.mo share/locale/gl/LC_MESSAGES/kcmkonsole.mo share/locale/gl/LC_MESSAGES/kcmkontactnt.mo share/locale/gl/LC_MESSAGES/kcmktalkd.mo +share/locale/gl/LC_MESSAGES/kcmkuick.mo +share/locale/gl/LC_MESSAGES/kcmkurifilt.mo share/locale/gl/LC_MESSAGES/kcmkvaio.mo +share/locale/gl/LC_MESSAGES/kcmkwallet.mo share/locale/gl/LC_MESSAGES/kcmkwindecoration.mo share/locale/gl/LC_MESSAGES/kcmkwinrules.mo share/locale/gl/LC_MESSAGES/kcmkwm.mo @@ -92,7 +135,9 @@ share/locale/gl/LC_MESSAGES/kcmlanbrowser.mo share/locale/gl/LC_MESSAGES/kcmlaptop.mo share/locale/gl/LC_MESSAGES/kcmlaunch.mo share/locale/gl/LC_MESSAGES/kcmlayout.mo +share/locale/gl/LC_MESSAGES/kcmlilo.mo share/locale/gl/LC_MESSAGES/kcmlocale.mo +share/locale/gl/LC_MESSAGES/kcmmedia.mo share/locale/gl/LC_MESSAGES/kcmnic.mo share/locale/gl/LC_MESSAGES/kcmnotify.mo share/locale/gl/LC_MESSAGES/kcmperformance.mo @@ -107,15 +152,19 @@ share/locale/gl/LC_MESSAGES/kcmstyle.mo share/locale/gl/LC_MESSAGES/kcmtaskbar.mo share/locale/gl/LC_MESSAGES/kcmusb.mo share/locale/gl/LC_MESSAGES/kcmview1394.mo +share/locale/gl/LC_MESSAGES/kcmwifi.mo share/locale/gl/LC_MESSAGES/kcmxinerama.mo share/locale/gl/LC_MESSAGES/kcoloredit.mo share/locale/gl/LC_MESSAGES/kcontrol.mo +share/locale/gl/LC_MESSAGES/kcron.mo share/locale/gl/LC_MESSAGES/kdat.mo share/locale/gl/LC_MESSAGES/kdcop.mo share/locale/gl/LC_MESSAGES/kdebugdialog.mo share/locale/gl/LC_MESSAGES/kdelibs.mo share/locale/gl/LC_MESSAGES/kdelibs_colors.mo share/locale/gl/LC_MESSAGES/kdepasswd.mo +share/locale/gl/LC_MESSAGES/kdepimresources.mo +share/locale/gl/LC_MESSAGES/kdepimwizards.mo share/locale/gl/LC_MESSAGES/kdeprint.mo share/locale/gl/LC_MESSAGES/kdeprint_part.mo share/locale/gl/LC_MESSAGES/kdeprintfax.mo @@ -123,7 +172,11 @@ share/locale/gl/LC_MESSAGES/kdesktop.mo share/locale/gl/LC_MESSAGES/kdesu.mo share/locale/gl/LC_MESSAGES/kdesud.mo share/locale/gl/LC_MESSAGES/kdf.mo +share/locale/gl/LC_MESSAGES/kdgantt.mo share/locale/gl/LC_MESSAGES/kdialog.mo +share/locale/gl/LC_MESSAGES/kdict.mo +share/locale/gl/LC_MESSAGES/kdictapplet.mo +share/locale/gl/LC_MESSAGES/kdjview.mo share/locale/gl/LC_MESSAGES/kdmconfig.mo share/locale/gl/LC_MESSAGES/kdmgreet.mo share/locale/gl/LC_MESSAGES/kdvi.mo @@ -131,43 +184,56 @@ share/locale/gl/LC_MESSAGES/kedit.mo share/locale/gl/LC_MESSAGES/keduca.mo share/locale/gl/LC_MESSAGES/kenolaba.mo share/locale/gl/LC_MESSAGES/kfax.mo +share/locale/gl/LC_MESSAGES/kfaxview.mo share/locale/gl/LC_MESSAGES/kfifteenapplet.mo share/locale/gl/LC_MESSAGES/kfile_au.mo share/locale/gl/LC_MESSAGES/kfile_avi.mo share/locale/gl/LC_MESSAGES/kfile_bmp.mo +share/locale/gl/LC_MESSAGES/kfile_cert.mo share/locale/gl/LC_MESSAGES/kfile_cpp.mo +share/locale/gl/LC_MESSAGES/kfile_dds.mo share/locale/gl/LC_MESSAGES/kfile_deb.mo share/locale/gl/LC_MESSAGES/kfile_desktop.mo share/locale/gl/LC_MESSAGES/kfile_diff.mo share/locale/gl/LC_MESSAGES/kfile_drgeo.mo share/locale/gl/LC_MESSAGES/kfile_dvi.mo +share/locale/gl/LC_MESSAGES/kfile_exr.mo share/locale/gl/LC_MESSAGES/kfile_flac.mo share/locale/gl/LC_MESSAGES/kfile_folder.mo share/locale/gl/LC_MESSAGES/kfile_gif.mo share/locale/gl/LC_MESSAGES/kfile_html.mo share/locale/gl/LC_MESSAGES/kfile_ico.mo +share/locale/gl/LC_MESSAGES/kfile_ics.mo share/locale/gl/LC_MESSAGES/kfile_jpeg.mo share/locale/gl/LC_MESSAGES/kfile_kig.mo share/locale/gl/LC_MESSAGES/kfile_lnk.mo share/locale/gl/LC_MESSAGES/kfile_m3u.mo +share/locale/gl/LC_MESSAGES/kfile_mhtml.mo share/locale/gl/LC_MESSAGES/kfile_mp3.mo share/locale/gl/LC_MESSAGES/kfile_mpc.mo +share/locale/gl/LC_MESSAGES/kfile_mpeg.mo share/locale/gl/LC_MESSAGES/kfile_ogg.mo +share/locale/gl/LC_MESSAGES/kfile_palm.mo share/locale/gl/LC_MESSAGES/kfile_pcx.mo share/locale/gl/LC_MESSAGES/kfile_pdf.mo share/locale/gl/LC_MESSAGES/kfile_png.mo share/locale/gl/LC_MESSAGES/kfile_pnm.mo share/locale/gl/LC_MESSAGES/kfile_po.mo share/locale/gl/LC_MESSAGES/kfile_ps.mo +share/locale/gl/LC_MESSAGES/kfile_rfc822.mo share/locale/gl/LC_MESSAGES/kfile_rgb.mo share/locale/gl/LC_MESSAGES/kfile_rpm.mo share/locale/gl/LC_MESSAGES/kfile_sid.mo share/locale/gl/LC_MESSAGES/kfile_tga.mo +share/locale/gl/LC_MESSAGES/kfile_theora.mo share/locale/gl/LC_MESSAGES/kfile_tiff.mo +share/locale/gl/LC_MESSAGES/kfile_torrent.mo share/locale/gl/LC_MESSAGES/kfile_ts.mo share/locale/gl/LC_MESSAGES/kfile_txt.mo +share/locale/gl/LC_MESSAGES/kfile_vcf.mo share/locale/gl/LC_MESSAGES/kfile_wav.mo share/locale/gl/LC_MESSAGES/kfile_xbm.mo +share/locale/gl/LC_MESSAGES/kfile_xpm.mo share/locale/gl/LC_MESSAGES/kfileaudiopreview.mo share/locale/gl/LC_MESSAGES/kfilereplace.mo share/locale/gl/LC_MESSAGES/kfindpart.mo @@ -176,25 +242,36 @@ share/locale/gl/LC_MESSAGES/kfmclient.mo share/locale/gl/LC_MESSAGES/kfontinst.mo share/locale/gl/LC_MESSAGES/kfouleggs.mo share/locale/gl/LC_MESSAGES/kgamma.mo +share/locale/gl/LC_MESSAGES/kgantt.mo share/locale/gl/LC_MESSAGES/kgeography.mo share/locale/gl/LC_MESSAGES/kget.mo share/locale/gl/LC_MESSAGES/kghostview.mo +share/locale/gl/LC_MESSAGES/kgoldrunner.mo share/locale/gl/LC_MESSAGES/kgpg.mo share/locale/gl/LC_MESSAGES/kgreet_classic.mo +share/locale/gl/LC_MESSAGES/kgreet_winbind.mo share/locale/gl/LC_MESSAGES/khangman.mo share/locale/gl/LC_MESSAGES/khelpcenter.mo share/locale/gl/LC_MESSAGES/khotkeys.mo +share/locale/gl/LC_MESSAGES/khtmlkttsd.mo share/locale/gl/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/gl/LC_MESSAGES/kicker.mo +share/locale/gl/LC_MESSAGES/kickermenu_kate.mo share/locale/gl/LC_MESSAGES/kiconedit.mo +share/locale/gl/LC_MESSAGES/kig.mo +share/locale/gl/LC_MESSAGES/kinetd.mo share/locale/gl/LC_MESSAGES/kio.mo share/locale/gl/LC_MESSAGES/kio_audiocd.mo share/locale/gl/LC_MESSAGES/kio_finger.mo share/locale/gl/LC_MESSAGES/kio_fish.mo share/locale/gl/LC_MESSAGES/kio_floppy.mo +share/locale/gl/LC_MESSAGES/kio_groupwise.mo share/locale/gl/LC_MESSAGES/kio_help.mo +share/locale/gl/LC_MESSAGES/kio_home.mo share/locale/gl/LC_MESSAGES/kio_imap4.mo +share/locale/gl/LC_MESSAGES/kio_jabberdisco.mo share/locale/gl/LC_MESSAGES/kio_lan.mo +share/locale/gl/LC_MESSAGES/kio_ldap.mo share/locale/gl/LC_MESSAGES/kio_mac.mo share/locale/gl/LC_MESSAGES/kio_man.mo share/locale/gl/LC_MESSAGES/kio_media.mo @@ -203,10 +280,15 @@ share/locale/gl/LC_MESSAGES/kio_nfs.mo share/locale/gl/LC_MESSAGES/kio_nntp.mo share/locale/gl/LC_MESSAGES/kio_pop3.mo share/locale/gl/LC_MESSAGES/kio_print.mo +share/locale/gl/LC_MESSAGES/kio_remote.mo share/locale/gl/LC_MESSAGES/kio_settings.mo share/locale/gl/LC_MESSAGES/kio_sftp.mo +share/locale/gl/LC_MESSAGES/kio_sieve.mo share/locale/gl/LC_MESSAGES/kio_smb.mo share/locale/gl/LC_MESSAGES/kio_smtp.mo +share/locale/gl/LC_MESSAGES/kio_system.mo +share/locale/gl/LC_MESSAGES/kio_tar.mo +share/locale/gl/LC_MESSAGES/kio_thumbnail.mo share/locale/gl/LC_MESSAGES/kio_trash.mo share/locale/gl/LC_MESSAGES/kio_zeroconf.mo share/locale/gl/LC_MESSAGES/kioexec.mo @@ -215,12 +297,19 @@ share/locale/gl/LC_MESSAGES/kjobviewer.mo share/locale/gl/LC_MESSAGES/kjots.mo share/locale/gl/LC_MESSAGES/klaptopdaemon.mo share/locale/gl/LC_MESSAGES/klatin.mo +share/locale/gl/LC_MESSAGES/kleopatra.mo share/locale/gl/LC_MESSAGES/klettres.mo share/locale/gl/LC_MESSAGES/klickety.mo share/locale/gl/LC_MESSAGES/klines.mo +share/locale/gl/LC_MESSAGES/klinkstatus.mo share/locale/gl/LC_MESSAGES/klipper.mo +share/locale/gl/LC_MESSAGES/klock.mo share/locale/gl/LC_MESSAGES/kmag.mo share/locale/gl/LC_MESSAGES/kmail.mo +share/locale/gl/LC_MESSAGES/kmail_text_calendar_plugin.mo +share/locale/gl/LC_MESSAGES/kmail_text_vcard_plugin.mo +share/locale/gl/LC_MESSAGES/kmailcvt.mo +share/locale/gl/LC_MESSAGES/kmathapplet.mo share/locale/gl/LC_MESSAGES/kmcop.mo share/locale/gl/LC_MESSAGES/kmenuapplet.mo share/locale/gl/LC_MESSAGES/kmenuedit.mo @@ -228,8 +317,15 @@ share/locale/gl/LC_MESSAGES/kmid.mo share/locale/gl/LC_MESSAGES/kmines.mo share/locale/gl/LC_MESSAGES/kminipagerapplet.mo share/locale/gl/LC_MESSAGES/kmix.mo +share/locale/gl/LC_MESSAGES/kmobile.mo share/locale/gl/LC_MESSAGES/kmoon.mo share/locale/gl/LC_MESSAGES/kmousetool.mo +share/locale/gl/LC_MESSAGES/kmouth.mo +share/locale/gl/LC_MESSAGES/kmplot.mo +share/locale/gl/LC_MESSAGES/kmrml.mo +share/locale/gl/LC_MESSAGES/knetattach.mo +share/locale/gl/LC_MESSAGES/knetworkconf.mo +share/locale/gl/LC_MESSAGES/knewsticker.mo share/locale/gl/LC_MESSAGES/knode.mo share/locale/gl/LC_MESSAGES/knotes.mo share/locale/gl/LC_MESSAGES/knotify.mo @@ -237,13 +333,24 @@ share/locale/gl/LC_MESSAGES/kodo.mo share/locale/gl/LC_MESSAGES/kolf.mo share/locale/gl/LC_MESSAGES/kolourpaint.mo share/locale/gl/LC_MESSAGES/kolourpicker.mo +share/locale/gl/LC_MESSAGES/konnector_dummy.mo +share/locale/gl/LC_MESSAGES/konnector_kabc.mo +share/locale/gl/LC_MESSAGES/konnector_kcal.mo +share/locale/gl/LC_MESSAGES/konnector_local.mo +share/locale/gl/LC_MESSAGES/konnector_qtopia.mo +share/locale/gl/LC_MESSAGES/konnector_remote.mo +share/locale/gl/LC_MESSAGES/konqsidebar_delicious.mo share/locale/gl/LC_MESSAGES/konqsidebar_mediaplayer.mo +share/locale/gl/LC_MESSAGES/konqsidebar_metabar.mo +share/locale/gl/LC_MESSAGES/konqsidebar_news.mo share/locale/gl/LC_MESSAGES/konqueror.mo share/locale/gl/LC_MESSAGES/konsole.mo +share/locale/gl/LC_MESSAGES/konsolekalendar.mo share/locale/gl/LC_MESSAGES/kontact.mo share/locale/gl/LC_MESSAGES/kooka.mo share/locale/gl/LC_MESSAGES/kopete.mo share/locale/gl/LC_MESSAGES/korganizer.mo +share/locale/gl/LC_MESSAGES/korn.mo share/locale/gl/LC_MESSAGES/kpackage.mo share/locale/gl/LC_MESSAGES/kpager.mo share/locale/gl/LC_MESSAGES/kpartsaver.mo @@ -251,6 +358,8 @@ share/locale/gl/LC_MESSAGES/kpat.mo share/locale/gl/LC_MESSAGES/kpdf.mo share/locale/gl/LC_MESSAGES/kpercentage.mo share/locale/gl/LC_MESSAGES/kpersonalizer.mo +share/locale/gl/LC_MESSAGES/kpf.mo +share/locale/gl/LC_MESSAGES/kpilot.mo share/locale/gl/LC_MESSAGES/kpoker.mo share/locale/gl/LC_MESSAGES/kpovmodeler.mo share/locale/gl/LC_MESSAGES/kppp.mo @@ -259,15 +368,28 @@ share/locale/gl/LC_MESSAGES/krandr.mo share/locale/gl/LC_MESSAGES/krdb.mo share/locale/gl/LC_MESSAGES/kreadconfig.mo share/locale/gl/LC_MESSAGES/krec.mo +share/locale/gl/LC_MESSAGES/kres_birthday.mo +share/locale/gl/LC_MESSAGES/kres_blogging.mo +share/locale/gl/LC_MESSAGES/kres_exchange.mo +share/locale/gl/LC_MESSAGES/kres_featureplan.mo +share/locale/gl/LC_MESSAGES/kres_groupware.mo +share/locale/gl/LC_MESSAGES/kres_groupwise.mo +share/locale/gl/LC_MESSAGES/kres_kolab.mo +share/locale/gl/LC_MESSAGES/kres_remote.mo +share/locale/gl/LC_MESSAGES/kres_tvanytime.mo +share/locale/gl/LC_MESSAGES/kres_xmlrpc.mo share/locale/gl/LC_MESSAGES/kreversi.mo +share/locale/gl/LC_MESSAGES/krfb.mo share/locale/gl/LC_MESSAGES/kruler.mo share/locale/gl/LC_MESSAGES/krunapplet.mo share/locale/gl/LC_MESSAGES/ksame.mo +share/locale/gl/LC_MESSAGES/ksayit.mo share/locale/gl/LC_MESSAGES/kscd.mo share/locale/gl/LC_MESSAGES/kscreensaver.mo share/locale/gl/LC_MESSAGES/kshisen.mo share/locale/gl/LC_MESSAGES/ksig.mo share/locale/gl/LC_MESSAGES/ksim.mo +share/locale/gl/LC_MESSAGES/ksirtet.mo share/locale/gl/LC_MESSAGES/ksmiletris.mo share/locale/gl/LC_MESSAGES/ksmserver.mo share/locale/gl/LC_MESSAGES/ksnake.mo @@ -276,71 +398,127 @@ share/locale/gl/LC_MESSAGES/ksokoban.mo share/locale/gl/LC_MESSAGES/kspaceduel.mo share/locale/gl/LC_MESSAGES/ksplash.mo share/locale/gl/LC_MESSAGES/ksplashthemes.mo +share/locale/gl/LC_MESSAGES/kstars.mo share/locale/gl/LC_MESSAGES/kstart.mo +share/locale/gl/LC_MESSAGES/kstartperf.mo +share/locale/gl/LC_MESSAGES/kstyle_highcontrast_config.mo share/locale/gl/LC_MESSAGES/kstyle_keramik_config.mo +share/locale/gl/LC_MESSAGES/kstyle_phase_config.mo share/locale/gl/LC_MESSAGES/kstyle_plastik_config.mo share/locale/gl/LC_MESSAGES/ksvgplugin.mo +share/locale/gl/LC_MESSAGES/ksync.mo share/locale/gl/LC_MESSAGES/ksysguard.mo share/locale/gl/LC_MESSAGES/ksystemtrayapplet.mo share/locale/gl/LC_MESSAGES/ksystraycmd.mo share/locale/gl/LC_MESSAGES/ksysv.mo share/locale/gl/LC_MESSAGES/kteatime.mo +share/locale/gl/LC_MESSAGES/ktexteditor_autobookmarker.mo share/locale/gl/LC_MESSAGES/ktexteditor_docwordcompletion.mo share/locale/gl/LC_MESSAGES/ktexteditor_insertfile.mo share/locale/gl/LC_MESSAGES/ktexteditor_isearch.mo share/locale/gl/LC_MESSAGES/ktexteditor_kdatatool.mo +share/locale/gl/LC_MESSAGES/kthememanager.mo +share/locale/gl/LC_MESSAGES/ktimemon.mo share/locale/gl/LC_MESSAGES/ktimer.mo share/locale/gl/LC_MESSAGES/ktip.mo +share/locale/gl/LC_MESSAGES/ktnef.mo +share/locale/gl/LC_MESSAGES/ktouch.mo share/locale/gl/LC_MESSAGES/ktron.mo +share/locale/gl/LC_MESSAGES/kttsd.mo +share/locale/gl/LC_MESSAGES/ktuberling.mo share/locale/gl/LC_MESSAGES/kturtle.mo share/locale/gl/LC_MESSAGES/ktux.mo share/locale/gl/LC_MESSAGES/kuick_plugin.mo share/locale/gl/LC_MESSAGES/kuickshow.mo +share/locale/gl/LC_MESSAGES/kuiviewer.mo share/locale/gl/LC_MESSAGES/kuser.mo share/locale/gl/LC_MESSAGES/kverbos.mo share/locale/gl/LC_MESSAGES/kview.mo +share/locale/gl/LC_MESSAGES/kview_scale.mo share/locale/gl/LC_MESSAGES/kviewbrowserplugin.mo +share/locale/gl/LC_MESSAGES/kviewcanvas.mo share/locale/gl/LC_MESSAGES/kvieweffectsplugin.mo share/locale/gl/LC_MESSAGES/kviewpresenterplugin.mo share/locale/gl/LC_MESSAGES/kviewscannerplugin.mo +share/locale/gl/LC_MESSAGES/kviewshell.mo share/locale/gl/LC_MESSAGES/kviewviewer.mo +share/locale/gl/LC_MESSAGES/kvoctrain.mo share/locale/gl/LC_MESSAGES/kwalletmanager.mo +share/locale/gl/LC_MESSAGES/kwatchgnupg.mo share/locale/gl/LC_MESSAGES/kweather.mo +share/locale/gl/LC_MESSAGES/kwifimanager.mo share/locale/gl/LC_MESSAGES/kwin.mo share/locale/gl/LC_MESSAGES/kwin_art_clients.mo +share/locale/gl/LC_MESSAGES/kwin_clients.mo +share/locale/gl/LC_MESSAGES/kwin_lib.mo share/locale/gl/LC_MESSAGES/kwireless.mo share/locale/gl/LC_MESSAGES/kwordquiz.mo share/locale/gl/LC_MESSAGES/kworldclock.mo share/locale/gl/LC_MESSAGES/kwriteconfig.mo share/locale/gl/LC_MESSAGES/kxkb.mo +share/locale/gl/LC_MESSAGES/kxsconfig.mo +share/locale/gl/LC_MESSAGES/libKTTSD.mo +share/locale/gl/LC_MESSAGES/libdmctl.mo +share/locale/gl/LC_MESSAGES/libkaddrbk_geo_xxport.mo +share/locale/gl/LC_MESSAGES/libkaddrbk_gmx_xxport.mo +share/locale/gl/LC_MESSAGES/libkcal.mo share/locale/gl/LC_MESSAGES/libkcddb.mo +share/locale/gl/LC_MESSAGES/libkdeedu.mo share/locale/gl/LC_MESSAGES/libkdegames.mo +share/locale/gl/LC_MESSAGES/libkdepim.mo +share/locale/gl/LC_MESSAGES/libkfaximgage.mo +share/locale/gl/LC_MESSAGES/libkholidays.mo share/locale/gl/LC_MESSAGES/libkicker.mo share/locale/gl/LC_MESSAGES/libkickermenu_kdeprint.mo share/locale/gl/LC_MESSAGES/libkickermenu_konsole.mo share/locale/gl/LC_MESSAGES/libkickermenu_prefmenu.mo share/locale/gl/LC_MESSAGES/libkickermenu_recentdocs.mo +share/locale/gl/LC_MESSAGES/libkickermenu_remotemenu.mo +share/locale/gl/LC_MESSAGES/libkickermenu_systemmenu.mo +share/locale/gl/LC_MESSAGES/libkickermenu_tom.mo +share/locale/gl/LC_MESSAGES/libkleopatra.mo +share/locale/gl/LC_MESSAGES/libkmime.mo share/locale/gl/LC_MESSAGES/libkonq.mo +share/locale/gl/LC_MESSAGES/libkpgp.mo +share/locale/gl/LC_MESSAGES/libkpimexchange.mo share/locale/gl/LC_MESSAGES/libkscan.mo share/locale/gl/LC_MESSAGES/libkscreensaver.mo +share/locale/gl/LC_MESSAGES/libksieve.mo share/locale/gl/LC_MESSAGES/libksirtet.mo +share/locale/gl/LC_MESSAGES/libksync.mo share/locale/gl/LC_MESSAGES/libtaskbar.mo share/locale/gl/LC_MESSAGES/libtaskmanager.mo share/locale/gl/LC_MESSAGES/lockout.mo +share/locale/gl/LC_MESSAGES/lyrics.mo share/locale/gl/LC_MESSAGES/mediaapplet.mo +share/locale/gl/LC_MESSAGES/mediacontrol.mo +share/locale/gl/LC_MESSAGES/mf_konqplugin.mo +share/locale/gl/LC_MESSAGES/minitoolsplugin.mo +share/locale/gl/LC_MESSAGES/multisynk.mo share/locale/gl/LC_MESSAGES/naughtyapplet.mo +share/locale/gl/LC_MESSAGES/nexscope.mo share/locale/gl/LC_MESSAGES/noatun.mo share/locale/gl/LC_MESSAGES/nsplugin.mo +share/locale/gl/LC_MESSAGES/pitchablespeed.mo share/locale/gl/LC_MESSAGES/ppdtranslations.mo share/locale/gl/LC_MESSAGES/privacy.mo share/locale/gl/LC_MESSAGES/quanta.mo share/locale/gl/LC_MESSAGES/quicklauncher.mo +share/locale/gl/LC_MESSAGES/rellinks.mo +share/locale/gl/LC_MESSAGES/searchbarplugin.mo share/locale/gl/LC_MESSAGES/secpolicy.mo share/locale/gl/LC_MESSAGES/spy.mo +share/locale/gl/LC_MESSAGES/superkaramba.mo +share/locale/gl/LC_MESSAGES/synaescope.mo share/locale/gl/LC_MESSAGES/timezones.mo +share/locale/gl/LC_MESSAGES/tippecanoe.mo share/locale/gl/LC_MESSAGES/trashapplet.mo +share/locale/gl/LC_MESSAGES/tyler.mo share/locale/gl/LC_MESSAGES/uachangerplugin.mo share/locale/gl/LC_MESSAGES/useraccount.mo +share/locale/gl/LC_MESSAGES/validatorsplugin.mo +share/locale/gl/LC_MESSAGES/wakeup.mo +share/locale/gl/LC_MESSAGES/wavecapture.mo share/locale/gl/LC_MESSAGES/webarchiver.mo share/locale/gl/charset share/locale/gl/entry.desktop diff --git a/misc/kde4-l10n-hi/distinfo b/misc/kde4-l10n-hi/distinfo index 4738d5ef7845..204a2081e060 100644 --- a/misc/kde4-l10n-hi/distinfo +++ b/misc/kde4-l10n-hi/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-hi-3.5.5.tar.bz2) = a046a16fd6575ee67a9086702414bac1 -SHA256 (KDE/kde-i18n/kde-i18n-hi-3.5.5.tar.bz2) = d5bc830048aafa372cfdce66fe48edc1e798b7e660162cd559e4c50dbf43708a -SIZE (KDE/kde-i18n/kde-i18n-hi-3.5.5.tar.bz2) = 1663837 +MD5 (KDE/kde-i18n/kde-i18n-hi-3.5.6.tar.bz2) = 25f0b08c99c952f443f32a86d5d4d4ad +SHA256 (KDE/kde-i18n/kde-i18n-hi-3.5.6.tar.bz2) = 725786b42b83e053e6b82998d72d1d145813469fb64fa8d0e05d0f41f4c60fd9 +SIZE (KDE/kde-i18n/kde-i18n-hi-3.5.6.tar.bz2) = 1664336 diff --git a/misc/kde4-l10n-is/distinfo b/misc/kde4-l10n-is/distinfo index d8817e5cd3f5..eafecfc98d1d 100644 --- a/misc/kde4-l10n-is/distinfo +++ b/misc/kde4-l10n-is/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-is-3.5.5.tar.bz2) = 4bdd95af464b36e7d52b4848291c9717 -SHA256 (KDE/kde-i18n/kde-i18n-is-3.5.5.tar.bz2) = 139faf5c75268314195bf861d4042ce22a3434a84513d72de3755326cee1f056 -SIZE (KDE/kde-i18n/kde-i18n-is-3.5.5.tar.bz2) = 2101713 +MD5 (KDE/kde-i18n/kde-i18n-is-3.5.6.tar.bz2) = f41752647ef59cb9fd179e2e1f77738c +SHA256 (KDE/kde-i18n/kde-i18n-is-3.5.6.tar.bz2) = a36f81bd8ca3e262525072eaa838cee9af5f1af3fac4952945e8767667834a94 +SIZE (KDE/kde-i18n/kde-i18n-is-3.5.6.tar.bz2) = 2105501 diff --git a/misc/kde4-l10n-it/distinfo b/misc/kde4-l10n-it/distinfo index 8264fd14e9cc..aae1ff6d6f13 100644 --- a/misc/kde4-l10n-it/distinfo +++ b/misc/kde4-l10n-it/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-it-3.5.5.tar.bz2) = a69220e5a700a277238924a3675d9dbd -SHA256 (KDE/kde-i18n/kde-i18n-it-3.5.5.tar.bz2) = 235702d3f8ad96edd820f01588554dfd1c4d5ac1a7bb3103c7a17922af08cedd -SIZE (KDE/kde-i18n/kde-i18n-it-3.5.5.tar.bz2) = 15749338 +MD5 (KDE/kde-i18n/kde-i18n-it-3.5.6.tar.bz2) = 3a9bea48fb5ac7d3703abfdaa8a50c3c +SHA256 (KDE/kde-i18n/kde-i18n-it-3.5.6.tar.bz2) = 621c233a2df9061098f9e8c11f784125d751723f406b413386cdc6346bb4cb37 +SIZE (KDE/kde-i18n/kde-i18n-it-3.5.6.tar.bz2) = 16226794 diff --git a/misc/kde4-l10n-it/pkg-plist b/misc/kde4-l10n-it/pkg-plist index 6fbf37275330..74eed45cd708 100644 --- a/misc/kde4-l10n-it/pkg-plist +++ b/misc/kde4-l10n-it/pkg-plist @@ -194,6 +194,9 @@ share/doc/HTML/it/docs/common/gpl-translated.html share/doc/HTML/it/docs/common/kde-localised.css share/doc/HTML/it/docs/common/lgpl-translated.html share/doc/HTML/it/docs/common/logotp3.png +share/doc/HTML/it/irkick/common +share/doc/HTML/it/irkick/index.cache.bz2 +share/doc/HTML/it/irkick/index.docbook share/doc/HTML/it/juk/common share/doc/HTML/it/juk/index.cache.bz2 share/doc/HTML/it/juk/index.docbook @@ -263,10 +266,18 @@ share/doc/HTML/it/kate-plugins/textfilter.docbook share/doc/HTML/it/kate-plugins/xmlcheck.docbook share/doc/HTML/it/kate-plugins/xmltools.docbook share/doc/HTML/it/kate/advanced.docbook +share/doc/HTML/it/kate/common share/doc/HTML/it/kate/configuring.docbook share/doc/HTML/it/kate/fundamentals.docbook +share/doc/HTML/it/kate/highlighting.docbook +share/doc/HTML/it/kate/index.cache.bz2 +share/doc/HTML/it/kate/index.docbook +share/doc/HTML/it/kate/man-kate.1.docbook share/doc/HTML/it/kate/mdi.docbook +share/doc/HTML/it/kate/menus.docbook +share/doc/HTML/it/kate/part.docbook share/doc/HTML/it/kate/plugins.docbook +share/doc/HTML/it/kate/regular-expressions.docbook share/doc/HTML/it/katomic/common share/doc/HTML/it/katomic/index.cache.bz2 share/doc/HTML/it/katomic/index.docbook @@ -311,6 +322,9 @@ share/doc/HTML/it/kcalc/index.docbook share/doc/HTML/it/kcharselect/common share/doc/HTML/it/kcharselect/index.cache.bz2 share/doc/HTML/it/kcharselect/index.docbook +share/doc/HTML/it/kcmlirc/common +share/doc/HTML/it/kcmlirc/index.cache.bz2 +share/doc/HTML/it/kcmlirc/index.docbook share/doc/HTML/it/kcoloredit/common share/doc/HTML/it/kcoloredit/index.cache.bz2 share/doc/HTML/it/kcoloredit/index.docbook @@ -482,6 +496,9 @@ share/doc/HTML/it/kcron/index.docbook share/doc/HTML/it/kdat/common share/doc/HTML/it/kdat/index.cache.bz2 share/doc/HTML/it/kdat/index.docbook +share/doc/HTML/it/kdcop/common +share/doc/HTML/it/kdcop/index.cache.bz2 +share/doc/HTML/it/kdcop/index.docbook share/doc/HTML/it/kde_app_devel/common share/doc/HTML/it/kde_app_devel/index.cache.bz2 share/doc/HTML/it/kde_app_devel/index.docbook @@ -497,12 +514,6 @@ share/doc/HTML/it/kdelibs/man-dcop.1.docbook share/doc/HTML/it/kdelibs/man-kbuildsycoca.8.docbook share/doc/HTML/it/kdelibs/man-kdeoptions.7.docbook share/doc/HTML/it/kdelibs/man-qtoptions.7.docbook -share/doc/HTML/it/kdelirc/irkick/common -share/doc/HTML/it/kdelirc/irkick/index.cache.bz2 -share/doc/HTML/it/kdelirc/irkick/index.docbook -share/doc/HTML/it/kdelirc/kcmlirc/common -share/doc/HTML/it/kdelirc/kcmlirc/index.cache.bz2 -share/doc/HTML/it/kdelirc/kcmlirc/index.docbook share/doc/HTML/it/kdeprint/add-printer-wiz.docbook share/doc/HTML/it/kdeprint/cups-config.docbook share/doc/HTML/it/kdeprint/cupsaddprinterwizard1.png @@ -605,6 +616,10 @@ share/doc/HTML/it/kdevelop/unixdev.docbook share/doc/HTML/it/kdf/common share/doc/HTML/it/kdf/index.cache.bz2 share/doc/HTML/it/kdf/index.docbook +share/doc/HTML/it/kdm/common +share/doc/HTML/it/kdm/index.cache.bz2 +share/doc/HTML/it/kdm/index.docbook +share/doc/HTML/it/kdm/kdmrc-ref.docbook share/doc/HTML/it/kdvi/common share/doc/HTML/it/kdvi/index.cache.bz2 share/doc/HTML/it/kdvi/index.docbook @@ -706,6 +721,7 @@ share/doc/HTML/it/khelpcenter/userguide/burning-cds.docbook share/doc/HTML/it/khelpcenter/userguide/control-center.docbook share/doc/HTML/it/khelpcenter/userguide/creating-graphics.docbook share/doc/HTML/it/khelpcenter/userguide/credits-and-license.docbook +share/doc/HTML/it/khelpcenter/userguide/email.docbook share/doc/HTML/it/khelpcenter/userguide/file-sharing.docbook share/doc/HTML/it/khelpcenter/userguide/first-impressions.docbook share/doc/HTML/it/khelpcenter/userguide/font-installation.docbook @@ -760,6 +776,9 @@ share/doc/HTML/it/khelpcenter/visualdict/index.cache.bz2 share/doc/HTML/it/khelpcenter/visualdict/index.docbook share/doc/HTML/it/khelpcenter/welcome.docbook share/doc/HTML/it/khelpcenter/whatiskde.docbook +share/doc/HTML/it/khexedit/common +share/doc/HTML/it/khexedit/index.cache.bz2 +share/doc/HTML/it/khexedit/index.docbook share/doc/HTML/it/kicker-applets/common share/doc/HTML/it/kicker-applets/index.cache.bz2 share/doc/HTML/it/kicker-applets/index.docbook @@ -976,17 +995,28 @@ share/doc/HTML/it/kmplot/man-kmplot.1.docbook share/doc/HTML/it/kmplot/menu.docbook share/doc/HTML/it/kmplot/reference.docbook share/doc/HTML/it/kmplot/using.docbook +share/doc/HTML/it/knetattach/common +share/doc/HTML/it/knetattach/index.cache.bz2 +share/doc/HTML/it/knetattach/index.docbook share/doc/HTML/it/knetworkconf/common share/doc/HTML/it/knetworkconf/index.cache.bz2 share/doc/HTML/it/knetworkconf/index.docbook +share/doc/HTML/it/knewsticker/common +share/doc/HTML/it/knewsticker/index.cache.bz2 +share/doc/HTML/it/knewsticker/index.docbook share/doc/HTML/it/knode/commands.docbook +share/doc/HTML/it/knode/common share/doc/HTML/it/knode/credits.docbook share/doc/HTML/it/knode/faq.docbook share/doc/HTML/it/knode/gloss.docbook +share/doc/HTML/it/knode/index.cache.bz2 +share/doc/HTML/it/knode/index.docbook share/doc/HTML/it/knode/install.docbook share/doc/HTML/it/knode/introduction.docbook share/doc/HTML/it/knode/journey.docbook share/doc/HTML/it/knode/more.docbook +share/doc/HTML/it/knode/using-firststart.docbook +share/doc/HTML/it/knode/using-morefeatures.docbook share/doc/HTML/it/knode/using-subscribing.docbook share/doc/HTML/it/knotes/common share/doc/HTML/it/knotes/index.cache.bz2 @@ -1019,6 +1049,9 @@ share/doc/HTML/it/kommander/widgets.docbook share/doc/HTML/it/kompare/common share/doc/HTML/it/kompare/index.cache.bz2 share/doc/HTML/it/kompare/index.docbook +share/doc/HTML/it/kompmgr/common +share/doc/HTML/it/kompmgr/index.cache.bz2 +share/doc/HTML/it/kompmgr/index.docbook share/doc/HTML/it/konq-plugins/babel/common share/doc/HTML/it/konq-plugins/babel/index.cache.bz2 share/doc/HTML/it/konq-plugins/babel/index.docbook @@ -1103,6 +1136,7 @@ share/doc/HTML/it/kooka/shortcut1.png share/doc/HTML/it/kooka/toolbar.png share/doc/HTML/it/kooka/toolbar1.png share/doc/HTML/it/kooka/toolbar2.png +share/doc/HTML/it/kopete/chatstyle.docbook share/doc/HTML/it/kopete/common share/doc/HTML/it/kopete/index.cache.bz2 share/doc/HTML/it/kopete/index.docbook @@ -1185,9 +1219,15 @@ share/doc/HTML/it/kpoker/index.docbook share/doc/HTML/it/kppp/accounting.docbook share/doc/HTML/it/kppp/callback.docbook share/doc/HTML/it/kppp/chap.docbook +share/doc/HTML/it/kppp/common +share/doc/HTML/it/kppp/dialog-setup.docbook share/doc/HTML/it/kppp/getting-online.docbook share/doc/HTML/it/kppp/global-settings.docbook +share/doc/HTML/it/kppp/hayes.docbook +share/doc/HTML/it/kppp/index.cache.bz2 +share/doc/HTML/it/kppp/index.docbook share/doc/HTML/it/kppp/kppp-dialler-tab.png +share/doc/HTML/it/kppp/kppp-faq.docbook share/doc/HTML/it/kppp/kppp-wizard.png share/doc/HTML/it/kppp/security.docbook share/doc/HTML/it/kppp/tricks.docbook @@ -1240,6 +1280,9 @@ share/doc/HTML/it/kshisen/index.docbook share/doc/HTML/it/ksim/common share/doc/HTML/it/ksim/index.cache.bz2 share/doc/HTML/it/ksim/index.docbook +share/doc/HTML/it/ksirc/common +share/doc/HTML/it/ksirc/index.cache.bz2 +share/doc/HTML/it/ksirc/index.docbook share/doc/HTML/it/ksirtet/common share/doc/HTML/it/ksirtet/index.cache.bz2 share/doc/HTML/it/ksirtet/index.docbook @@ -1559,6 +1602,7 @@ share/doc/HTML/it/umbrello/other_features.docbook share/doc/HTML/it/umbrello/uml_basics.docbook share/doc/HTML/it/umbrello/working_with_umbrello.docbook share/doc/HTML/it/xsldbg/credits.docbook +share/doc/HTML/it/xsldbg/introduction.docbook share/doc/HTML/it/xsldbg/usage.docbook share/locale/it/LC_MESSAGES/akregator.mo share/locale/it/LC_MESSAGES/akregator_konqplugin.mo @@ -1834,6 +1878,7 @@ share/locale/it/LC_MESSAGES/khotkeys.mo share/locale/it/LC_MESSAGES/khtmlkttsd.mo share/locale/it/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/it/LC_MESSAGES/kicker.mo +share/locale/it/LC_MESSAGES/kickermenu_kate.mo share/locale/it/LC_MESSAGES/kiconedit.mo share/locale/it/LC_MESSAGES/kig.mo share/locale/it/LC_MESSAGES/kimagemapeditor.mo @@ -1871,6 +1916,7 @@ share/locale/it/LC_MESSAGES/kio_thumbnail.mo share/locale/it/LC_MESSAGES/kio_trash.mo share/locale/it/LC_MESSAGES/kio_zeroconf.mo share/locale/it/LC_MESSAGES/kioexec.mo +share/locale/it/LC_MESSAGES/kitchensync.mo share/locale/it/LC_MESSAGES/kiten.mo share/locale/it/LC_MESSAGES/kjobviewer.mo share/locale/it/LC_MESSAGES/kjots.mo @@ -2074,6 +2120,7 @@ share/locale/it/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/it/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/it/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/it/LC_MESSAGES/libkickermenu_tom.mo +share/locale/it/LC_MESSAGES/libkitchensync.mo share/locale/it/LC_MESSAGES/libkleopatra.mo share/locale/it/LC_MESSAGES/libkmime.mo share/locale/it/LC_MESSAGES/libkonq.mo @@ -2169,6 +2216,7 @@ share/locale/it/flag.png @dirrm share/doc/HTML/it/ksnake @dirrm share/doc/HTML/it/ksmiletris @dirrm share/doc/HTML/it/ksirtet +@dirrm share/doc/HTML/it/ksirc @dirrm share/doc/HTML/it/ksim @dirrm share/doc/HTML/it/kshisen @dirrm share/doc/HTML/it/kscd @@ -2210,6 +2258,7 @@ share/locale/it/flag.png @dirrm share/doc/HTML/it/konq-plugins/crashes @dirrm share/doc/HTML/it/konq-plugins/babel @dirrm share/doc/HTML/it/konq-plugins +@dirrm share/doc/HTML/it/kompmgr @dirrm share/doc/HTML/it/kompare @dirrm share/doc/HTML/it/kommander @dirrm share/doc/HTML/it/kolourpaint @@ -2217,7 +2266,9 @@ share/locale/it/flag.png @dirrm share/doc/HTML/it/kodo @dirrm share/doc/HTML/it/knotes @dirrm share/doc/HTML/it/knode +@dirrm share/doc/HTML/it/knewsticker @dirrm share/doc/HTML/it/knetworkconf +@dirrm share/doc/HTML/it/knetattach @dirrm share/doc/HTML/it/kmplot @dirrm share/doc/HTML/it/kmouth @dirrm share/doc/HTML/it/kmousetool @@ -2264,6 +2315,7 @@ share/locale/it/flag.png @dirrm share/doc/HTML/it/kiconedit @dirrm share/doc/HTML/it/kicker-applets @dirrm share/doc/HTML/it/kicker +@dirrm share/doc/HTML/it/khexedit @dirrm share/doc/HTML/it/khelpcenter/visualdict @dirrm share/doc/HTML/it/khelpcenter/userguide @dirrm share/doc/HTML/it/khelpcenter/quickstart @@ -2285,17 +2337,16 @@ share/locale/it/flag.png @dirrm share/doc/HTML/it/keduca @dirrm share/doc/HTML/it/kedit @dirrm share/doc/HTML/it/kdvi +@dirrm share/doc/HTML/it/kdm @dirrm share/doc/HTML/it/kdf @dirrm share/doc/HTML/it/kdevelop @dirrm share/doc/HTML/it/kdesu @dirrm share/doc/HTML/it/kdeprint -@dirrm share/doc/HTML/it/kdelirc/kcmlirc -@dirrm share/doc/HTML/it/kdelirc/irkick -@dirrm share/doc/HTML/it/kdelirc @dirrm share/doc/HTML/it/kdelibs @dirrm share/doc/HTML/it/kdebugdialog @dirrm share/doc/HTML/it/kdearch @dirrm share/doc/HTML/it/kde_app_devel +@dirrm share/doc/HTML/it/kdcop @dirrm share/doc/HTML/it/kdat @dirrm share/doc/HTML/it/kcron @dirrm share/doc/HTML/it/kcontrol/windowmanagement @@ -2352,6 +2403,7 @@ share/locale/it/flag.png @dirrm share/doc/HTML/it/kcontrol/arts @dirrm share/doc/HTML/it/kcontrol @dirrm share/doc/HTML/it/kcoloredit +@dirrm share/doc/HTML/it/kcmlirc @dirrm share/doc/HTML/it/kcharselect @dirrm share/doc/HTML/it/kcalc @dirrm share/doc/HTML/it/kbugbuster @@ -2376,6 +2428,7 @@ share/locale/it/flag.png @dirrm share/doc/HTML/it/kaddressbook @dirrm share/doc/HTML/it/kaboodle @dirrm share/doc/HTML/it/juk +@dirrm share/doc/HTML/it/irkick @dirrm share/doc/HTML/it/docs/common @dirrm share/doc/HTML/it/docs @dirrm share/doc/HTML/it/blinken diff --git a/misc/kde4-l10n-kk/distinfo b/misc/kde4-l10n-kk/distinfo index fa45a31807ec..6f5e9b58e67a 100644 --- a/misc/kde4-l10n-kk/distinfo +++ b/misc/kde4-l10n-kk/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-kk-3.5.5.tar.bz2) = a0811b606aecac2a854af9f27ce7e716 -SHA256 (KDE/kde-i18n/kde-i18n-kk-3.5.5.tar.bz2) = d700f7b53f9faba130246191669ffe553ce864bad2f35338ab1d9799e57f4e09 -SIZE (KDE/kde-i18n/kde-i18n-kk-3.5.5.tar.bz2) = 926318 +MD5 (KDE/kde-i18n/kde-i18n-kk-3.5.6.tar.bz2) = f878ce771f32ea800c285e5a813b17e7 +SHA256 (KDE/kde-i18n/kde-i18n-kk-3.5.6.tar.bz2) = 853f716c10c7d67f92b0c83dc898a1ddd44ae1407de89da42bd483e4b14d971b +SIZE (KDE/kde-i18n/kde-i18n-kk-3.5.6.tar.bz2) = 1029999 diff --git a/misc/kde4-l10n-kk/pkg-plist b/misc/kde4-l10n-kk/pkg-plist index cdde694d51eb..707be0d9342e 100644 --- a/misc/kde4-l10n-kk/pkg-plist +++ b/misc/kde4-l10n-kk/pkg-plist @@ -3,7 +3,12 @@ share/locale/kk/LC_MESSAGES/alsaplayerui.mo share/locale/kk/LC_MESSAGES/appletproxy.mo share/locale/kk/LC_MESSAGES/ark.mo share/locale/kk/LC_MESSAGES/ark_plugin.mo +share/locale/kk/LC_MESSAGES/artsbuilder.mo +share/locale/kk/LC_MESSAGES/artscontrol.mo +share/locale/kk/LC_MESSAGES/artsmodules.mo share/locale/kk/LC_MESSAGES/atlantikdesigner.mo +share/locale/kk/LC_MESSAGES/audiocd_encoder_lame.mo +share/locale/kk/LC_MESSAGES/audiocd_encoder_vorbis.mo share/locale/kk/LC_MESSAGES/audiorename_plugin.mo share/locale/kk/LC_MESSAGES/autorefresh.mo share/locale/kk/LC_MESSAGES/babelfish.mo @@ -27,12 +32,14 @@ share/locale/kk/LC_MESSAGES/imagerename_plugin.mo share/locale/kk/LC_MESSAGES/imgalleryplugin.mo share/locale/kk/LC_MESSAGES/irkick.mo share/locale/kk/LC_MESSAGES/joystick.mo +share/locale/kk/LC_MESSAGES/juk.mo share/locale/kk/LC_MESSAGES/kabc_dir.mo share/locale/kk/LC_MESSAGES/kabc_file.mo share/locale/kk/LC_MESSAGES/kabc_ldapkio.mo share/locale/kk/LC_MESSAGES/kabc_net.mo share/locale/kk/LC_MESSAGES/kabc_sql.mo share/locale/kk/LC_MESSAGES/kabcformat_binary.mo +share/locale/kk/LC_MESSAGES/kaboodle.mo share/locale/kk/LC_MESSAGES/kaccess.mo share/locale/kk/LC_MESSAGES/kappfinder.mo share/locale/kk/LC_MESSAGES/kasbarextension.mo @@ -55,7 +62,9 @@ share/locale/kk/LC_MESSAGES/katetabbarextension.mo share/locale/kk/LC_MESSAGES/katetextfilter.mo share/locale/kk/LC_MESSAGES/katexmlcheck.mo share/locale/kk/LC_MESSAGES/katexmltools.mo +share/locale/kk/LC_MESSAGES/kaudiocreator.mo share/locale/kk/LC_MESSAGES/kay.mo +share/locale/kk/LC_MESSAGES/kbabel.mo share/locale/kk/LC_MESSAGES/kbinaryclock.mo share/locale/kk/LC_MESSAGES/kcalc.mo share/locale/kk/LC_MESSAGES/kcharselect.mo @@ -64,8 +73,10 @@ share/locale/kk/LC_MESSAGES/kcm_krfb.mo share/locale/kk/LC_MESSAGES/kcmaccess.mo share/locale/kk/LC_MESSAGES/kcmaccessibility.mo share/locale/kk/LC_MESSAGES/kcmarts.mo +share/locale/kk/LC_MESSAGES/kcmaudiocd.mo share/locale/kk/LC_MESSAGES/kcmbackground.mo share/locale/kk/LC_MESSAGES/kcmbell.mo +share/locale/kk/LC_MESSAGES/kcmcddb.mo share/locale/kk/LC_MESSAGES/kcmcgi.mo share/locale/kk/LC_MESSAGES/kcmcolors.mo share/locale/kk/LC_MESSAGES/kcmcomponentchooser.mo @@ -143,22 +154,34 @@ share/locale/kk/LC_MESSAGES/kdictapplet.mo share/locale/kk/LC_MESSAGES/kdmconfig.mo share/locale/kk/LC_MESSAGES/kdmgreet.mo share/locale/kk/LC_MESSAGES/kedit.mo +share/locale/kk/LC_MESSAGES/kfile_au.mo +share/locale/kk/LC_MESSAGES/kfile_avi.mo share/locale/kk/LC_MESSAGES/kfile_cert.mo share/locale/kk/LC_MESSAGES/kfile_deb.mo share/locale/kk/LC_MESSAGES/kfile_desktop.mo +share/locale/kk/LC_MESSAGES/kfile_flac.mo share/locale/kk/LC_MESSAGES/kfile_folder.mo share/locale/kk/LC_MESSAGES/kfile_html.mo share/locale/kk/LC_MESSAGES/kfile_lnk.mo +share/locale/kk/LC_MESSAGES/kfile_m3u.mo share/locale/kk/LC_MESSAGES/kfile_mhtml.mo +share/locale/kk/LC_MESSAGES/kfile_mp3.mo +share/locale/kk/LC_MESSAGES/kfile_mpc.mo +share/locale/kk/LC_MESSAGES/kfile_mpeg.mo +share/locale/kk/LC_MESSAGES/kfile_ogg.mo share/locale/kk/LC_MESSAGES/kfile_rpm.mo +share/locale/kk/LC_MESSAGES/kfile_sid.mo +share/locale/kk/LC_MESSAGES/kfile_theora.mo share/locale/kk/LC_MESSAGES/kfile_torrent.mo share/locale/kk/LC_MESSAGES/kfile_txt.mo +share/locale/kk/LC_MESSAGES/kfile_wav.mo share/locale/kk/LC_MESSAGES/kfileaudiopreview.mo share/locale/kk/LC_MESSAGES/kfileshare.mo share/locale/kk/LC_MESSAGES/kfindpart.mo share/locale/kk/LC_MESSAGES/kfloppy.mo share/locale/kk/LC_MESSAGES/kfmclient.mo share/locale/kk/LC_MESSAGES/kfontinst.mo +share/locale/kk/LC_MESSAGES/kget.mo share/locale/kk/LC_MESSAGES/kgpg.mo share/locale/kk/LC_MESSAGES/kgreet_classic.mo share/locale/kk/LC_MESSAGES/kgreet_winbind.mo @@ -171,6 +194,7 @@ share/locale/kk/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/kk/LC_MESSAGES/kicker.mo share/locale/kk/LC_MESSAGES/kinetd.mo share/locale/kk/LC_MESSAGES/kio.mo +share/locale/kk/LC_MESSAGES/kio_audiocd.mo share/locale/kk/LC_MESSAGES/kio_finger.mo share/locale/kk/LC_MESSAGES/kio_fish.mo share/locale/kk/LC_MESSAGES/kio_floppy.mo @@ -205,6 +229,7 @@ share/locale/kk/LC_MESSAGES/kmathapplet.mo share/locale/kk/LC_MESSAGES/kmcop.mo share/locale/kk/LC_MESSAGES/kmenuapplet.mo share/locale/kk/LC_MESSAGES/kmenuedit.mo +share/locale/kk/LC_MESSAGES/kmid.mo share/locale/kk/LC_MESSAGES/kmilo_delli8k.mo share/locale/kk/LC_MESSAGES/kmilo_generic.mo share/locale/kk/LC_MESSAGES/kmilo_kvaio.mo @@ -213,6 +238,7 @@ share/locale/kk/LC_MESSAGES/kmilo_thinkpad.mo share/locale/kk/LC_MESSAGES/kmilod.mo share/locale/kk/LC_MESSAGES/kmines.mo share/locale/kk/LC_MESSAGES/kminipagerapplet.mo +share/locale/kk/LC_MESSAGES/kmix.mo share/locale/kk/LC_MESSAGES/knetattach.mo share/locale/kk/LC_MESSAGES/knetworkconf.mo share/locale/kk/LC_MESSAGES/knewsticker.mo @@ -228,15 +254,19 @@ share/locale/kk/LC_MESSAGES/kopete.mo share/locale/kk/LC_MESSAGES/kpackage.mo share/locale/kk/LC_MESSAGES/kpager.mo share/locale/kk/LC_MESSAGES/kpersonalizer.mo +share/locale/kk/LC_MESSAGES/kpf.mo share/locale/kk/LC_MESSAGES/kppp.mo share/locale/kk/LC_MESSAGES/kppplogview.mo share/locale/kk/LC_MESSAGES/kprinter.mo share/locale/kk/LC_MESSAGES/krandr.mo share/locale/kk/LC_MESSAGES/krdb.mo +share/locale/kk/LC_MESSAGES/krdc.mo share/locale/kk/LC_MESSAGES/kreadconfig.mo +share/locale/kk/LC_MESSAGES/krec.mo share/locale/kk/LC_MESSAGES/kregexpeditor.mo share/locale/kk/LC_MESSAGES/krfb.mo share/locale/kk/LC_MESSAGES/krunapplet.mo +share/locale/kk/LC_MESSAGES/kscd.mo share/locale/kk/LC_MESSAGES/kscreensaver.mo share/locale/kk/LC_MESSAGES/ksig.mo share/locale/kk/LC_MESSAGES/ksim.mo @@ -274,6 +304,7 @@ share/locale/kk/LC_MESSAGES/kxkb.mo share/locale/kk/LC_MESSAGES/libdmctl.mo share/locale/kk/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/kk/LC_MESSAGES/libkaddrbk_gmx_xxport.mo +share/locale/kk/LC_MESSAGES/libkcddb.mo share/locale/kk/LC_MESSAGES/libkicker.mo share/locale/kk/LC_MESSAGES/libkickermenu_kdeprint.mo share/locale/kk/LC_MESSAGES/libkickermenu_konsole.mo @@ -294,6 +325,7 @@ share/locale/kk/LC_MESSAGES/mf_konqplugin.mo share/locale/kk/LC_MESSAGES/minitoolsplugin.mo share/locale/kk/LC_MESSAGES/naughtyapplet.mo share/locale/kk/LC_MESSAGES/nexscope.mo +share/locale/kk/LC_MESSAGES/noatun.mo share/locale/kk/LC_MESSAGES/nsplugin.mo share/locale/kk/LC_MESSAGES/pitchablespeed.mo share/locale/kk/LC_MESSAGES/ppdtranslations.mo diff --git a/misc/kde4-l10n-km/distinfo b/misc/kde4-l10n-km/distinfo index a8113e46c0f1..89c6c5e9fb56 100644 --- a/misc/kde4-l10n-km/distinfo +++ b/misc/kde4-l10n-km/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-km-3.5.5.tar.bz2) = c11c4653c9e211deb4c16bf346bd03ad -SHA256 (KDE/kde-i18n/kde-i18n-km-3.5.5.tar.bz2) = 818b3be6a18afeb99771f0746b0c1b593f1abc31438dae3bc18a796b4700bd61 -SIZE (KDE/kde-i18n/kde-i18n-km-3.5.5.tar.bz2) = 1656443 +MD5 (KDE/kde-i18n/kde-i18n-km-3.5.6.tar.bz2) = 2f83f915e5ee4932ce8c7f26abb8b542 +SHA256 (KDE/kde-i18n/kde-i18n-km-3.5.6.tar.bz2) = 6062a8c5136bf4ce2ec882f2b65e0e40452e467300eecc5869bb5f8fcbaccbbd +SIZE (KDE/kde-i18n/kde-i18n-km-3.5.6.tar.bz2) = 1761505 diff --git a/misc/kde4-l10n-km/pkg-plist b/misc/kde4-l10n-km/pkg-plist index 799943d795dc..467538c5acb1 100644 --- a/misc/kde4-l10n-km/pkg-plist +++ b/misc/kde4-l10n-km/pkg-plist @@ -37,6 +37,7 @@ share/locale/km/LC_MESSAGES/imgalleryplugin.mo share/locale/km/LC_MESSAGES/irkick.mo share/locale/km/LC_MESSAGES/jefferson.mo share/locale/km/LC_MESSAGES/joystick.mo +share/locale/km/LC_MESSAGES/juk.mo share/locale/km/LC_MESSAGES/kabc2mutt.mo share/locale/km/LC_MESSAGES/kabc_dir.mo share/locale/km/LC_MESSAGES/kabc_file.mo @@ -340,6 +341,7 @@ share/locale/km/LC_MESSAGES/kmplot.mo share/locale/km/LC_MESSAGES/kmrml.mo share/locale/km/LC_MESSAGES/knetattach.mo share/locale/km/LC_MESSAGES/knetwalk.mo +share/locale/km/LC_MESSAGES/knewsticker.mo share/locale/km/LC_MESSAGES/knode.mo share/locale/km/LC_MESSAGES/knotes.mo share/locale/km/LC_MESSAGES/knotify.mo @@ -377,6 +379,7 @@ share/locale/km/LC_MESSAGES/kpf.mo share/locale/km/LC_MESSAGES/kpilot.mo share/locale/km/LC_MESSAGES/kpoker.mo share/locale/km/LC_MESSAGES/kpovmodeler.mo +share/locale/km/LC_MESSAGES/kppp.mo share/locale/km/LC_MESSAGES/kppplogview.mo share/locale/km/LC_MESSAGES/kprinter.mo share/locale/km/LC_MESSAGES/krandr.mo @@ -406,6 +409,7 @@ share/locale/km/LC_MESSAGES/kscreensaver.mo share/locale/km/LC_MESSAGES/kshisen.mo share/locale/km/LC_MESSAGES/ksig.mo share/locale/km/LC_MESSAGES/ksim.mo +share/locale/km/LC_MESSAGES/ksirc.mo share/locale/km/LC_MESSAGES/ksirtet.mo share/locale/km/LC_MESSAGES/ksmiletris.mo share/locale/km/LC_MESSAGES/ksmserver.mo @@ -441,6 +445,7 @@ share/locale/km/LC_MESSAGES/ktip.mo share/locale/km/LC_MESSAGES/ktnef.mo share/locale/km/LC_MESSAGES/ktouch.mo share/locale/km/LC_MESSAGES/ktron.mo +share/locale/km/LC_MESSAGES/kttsd.mo share/locale/km/LC_MESSAGES/kttsd_commandplugin.mo share/locale/km/LC_MESSAGES/kttsd_eposplugin.mo share/locale/km/LC_MESSAGES/kttsd_fliteplugin.mo @@ -527,6 +532,7 @@ share/locale/km/LC_MESSAGES/nexscope.mo share/locale/km/LC_MESSAGES/noatun.mo share/locale/km/LC_MESSAGES/nsplugin.mo share/locale/km/LC_MESSAGES/pitchablespeed.mo +share/locale/km/LC_MESSAGES/ppdtranslations.mo share/locale/km/LC_MESSAGES/privacy.mo share/locale/km/LC_MESSAGES/quanta.mo share/locale/km/LC_MESSAGES/quicklauncher.mo diff --git a/misc/kde4-l10n-lt/distinfo b/misc/kde4-l10n-lt/distinfo index 77afcbf9f51c..2d55526f8def 100644 --- a/misc/kde4-l10n-lt/distinfo +++ b/misc/kde4-l10n-lt/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-lt-3.5.5.tar.bz2) = aa799b8fac440c0b70188e0f9df16350 -SHA256 (KDE/kde-i18n/kde-i18n-lt-3.5.5.tar.bz2) = d55c4f4ff50dc2b2f3b365594bae75a491a57c32aa251a565fa6a4699304d866 -SIZE (KDE/kde-i18n/kde-i18n-lt-3.5.5.tar.bz2) = 1888636 +MD5 (KDE/kde-i18n/kde-i18n-lt-3.5.6.tar.bz2) = 2769c90376add2e49addcaa2f39df577 +SHA256 (KDE/kde-i18n/kde-i18n-lt-3.5.6.tar.bz2) = db50b2c475a31cee69532bfbd916f140fcdb40f06f812589695c97ae0a79c3f4 +SIZE (KDE/kde-i18n/kde-i18n-lt-3.5.6.tar.bz2) = 1886064 diff --git a/misc/kde4-l10n-lt/pkg-plist b/misc/kde4-l10n-lt/pkg-plist index f9016c382835..0803a17a2740 100644 --- a/misc/kde4-l10n-lt/pkg-plist +++ b/misc/kde4-l10n-lt/pkg-plist @@ -272,6 +272,7 @@ share/locale/lt/LC_MESSAGES/khotkeys.mo share/locale/lt/LC_MESSAGES/khtmlkttsd.mo share/locale/lt/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/lt/LC_MESSAGES/kicker.mo +share/locale/lt/LC_MESSAGES/kickermenu_kate.mo share/locale/lt/LC_MESSAGES/kiconedit.mo share/locale/lt/LC_MESSAGES/kig.mo share/locale/lt/LC_MESSAGES/kimagemapeditor.mo @@ -309,6 +310,7 @@ share/locale/lt/LC_MESSAGES/kio_thumbnail.mo share/locale/lt/LC_MESSAGES/kio_trash.mo share/locale/lt/LC_MESSAGES/kio_zeroconf.mo share/locale/lt/LC_MESSAGES/kioexec.mo +share/locale/lt/LC_MESSAGES/kitchensync.mo share/locale/lt/LC_MESSAGES/kiten.mo share/locale/lt/LC_MESSAGES/kjobviewer.mo share/locale/lt/LC_MESSAGES/kjots.mo @@ -511,6 +513,7 @@ share/locale/lt/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/lt/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/lt/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/lt/LC_MESSAGES/libkickermenu_tom.mo +share/locale/lt/LC_MESSAGES/libkitchensync.mo share/locale/lt/LC_MESSAGES/libkleopatra.mo share/locale/lt/LC_MESSAGES/libkmime.mo share/locale/lt/LC_MESSAGES/libkonq.mo diff --git a/misc/kde4-l10n-lv/distinfo b/misc/kde4-l10n-lv/distinfo index 3df0e3c0fe72..cdeda7d4c2cd 100644 --- a/misc/kde4-l10n-lv/distinfo +++ b/misc/kde4-l10n-lv/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-lv-3.5.5.tar.bz2) = f541bb2957e1f0469d76711cc86ba851 -SHA256 (KDE/kde-i18n/kde-i18n-lv-3.5.5.tar.bz2) = d99b0d080abc56c53b2fc3058a0ad945f971e891870b995c7bced4dfdbabe437 -SIZE (KDE/kde-i18n/kde-i18n-lv-3.5.5.tar.bz2) = 1352071 +MD5 (KDE/kde-i18n/kde-i18n-lv-3.5.6.tar.bz2) = c3f7cca71708d2894510bdd30b264bff +SHA256 (KDE/kde-i18n/kde-i18n-lv-3.5.6.tar.bz2) = e22d229a1b19b47a5a36e075ba4315b18b01d3407de15bce55fee3e4c97b7261 +SIZE (KDE/kde-i18n/kde-i18n-lv-3.5.6.tar.bz2) = 1356698 diff --git a/misc/kde4-l10n-lv/pkg-plist b/misc/kde4-l10n-lv/pkg-plist index 57999f50d42e..dfdb2ad36d99 100644 --- a/misc/kde4-l10n-lv/pkg-plist +++ b/misc/kde4-l10n-lv/pkg-plist @@ -99,6 +99,7 @@ share/locale/lv/LC_MESSAGES/kdelibs.mo share/locale/lv/LC_MESSAGES/kdelibs_colors.mo share/locale/lv/LC_MESSAGES/kdepasswd.mo share/locale/lv/LC_MESSAGES/kdeprint.mo +share/locale/lv/LC_MESSAGES/kdeprint_part.mo share/locale/lv/LC_MESSAGES/kdeprintfax.mo share/locale/lv/LC_MESSAGES/kdesktop.mo share/locale/lv/LC_MESSAGES/kdessh.mo @@ -155,6 +156,8 @@ share/locale/lv/LC_MESSAGES/kio_sftp.mo share/locale/lv/LC_MESSAGES/kio_smb.mo share/locale/lv/LC_MESSAGES/kio_smtp.mo share/locale/lv/LC_MESSAGES/kio_system.mo +share/locale/lv/LC_MESSAGES/kio_tar.mo +share/locale/lv/LC_MESSAGES/kio_trash.mo share/locale/lv/LC_MESSAGES/kioexec.mo share/locale/lv/LC_MESSAGES/kiten.mo share/locale/lv/LC_MESSAGES/kjobviewer.mo @@ -225,6 +228,7 @@ share/locale/lv/LC_MESSAGES/ksplash.mo share/locale/lv/LC_MESSAGES/kstars.mo share/locale/lv/LC_MESSAGES/kstart.mo share/locale/lv/LC_MESSAGES/kstartperf.mo +share/locale/lv/LC_MESSAGES/kstyle_keramik_config.mo share/locale/lv/LC_MESSAGES/ksync.mo share/locale/lv/LC_MESSAGES/ksysguard.mo share/locale/lv/LC_MESSAGES/ksystemtrayapplet.mo @@ -265,6 +269,7 @@ share/locale/lv/LC_MESSAGES/libtaskbar.mo share/locale/lv/LC_MESSAGES/libtaskmanager.mo share/locale/lv/LC_MESSAGES/lockout.mo share/locale/lv/LC_MESSAGES/lskat.mo +share/locale/lv/LC_MESSAGES/mediaapplet.mo share/locale/lv/LC_MESSAGES/naughtyapplet.mo share/locale/lv/LC_MESSAGES/noatun.mo share/locale/lv/LC_MESSAGES/nsplugin.mo diff --git a/misc/kde4-l10n-mk/distinfo b/misc/kde4-l10n-mk/distinfo index ae3676d8bd8e..e3db799c783d 100644 --- a/misc/kde4-l10n-mk/distinfo +++ b/misc/kde4-l10n-mk/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-mk-3.5.5.tar.bz2) = 014b290f599e808ff3b885c50d150fe5 -SHA256 (KDE/kde-i18n/kde-i18n-mk-3.5.5.tar.bz2) = 6c19733a4c6304441427a58f4e0de71d0d064e2fb4618edc05c2cd271aa5ff39 -SIZE (KDE/kde-i18n/kde-i18n-mk-3.5.5.tar.bz2) = 1734951 +MD5 (KDE/kde-i18n/kde-i18n-mk-3.5.6.tar.bz2) = 2e374c32eb02a6421b2076ac305926a2 +SHA256 (KDE/kde-i18n/kde-i18n-mk-3.5.6.tar.bz2) = 809cbf1a36d67419061133ade41d81cbfbe4c7754ed3665208ac05ab32ac6513 +SIZE (KDE/kde-i18n/kde-i18n-mk-3.5.6.tar.bz2) = 1794476 diff --git a/misc/kde4-l10n-mk/pkg-plist b/misc/kde4-l10n-mk/pkg-plist index 9178ea3526e6..0bb98408a288 100644 --- a/misc/kde4-l10n-mk/pkg-plist +++ b/misc/kde4-l10n-mk/pkg-plist @@ -52,6 +52,7 @@ share/locale/mk/LC_MESSAGES/kaddressbook.mo share/locale/mk/LC_MESSAGES/kalarm.mo share/locale/mk/LC_MESSAGES/kalzium.mo share/locale/mk/LC_MESSAGES/kanagram.mo +share/locale/mk/LC_MESSAGES/kandy.mo share/locale/mk/LC_MESSAGES/kappfinder.mo share/locale/mk/LC_MESSAGES/karm.mo share/locale/mk/LC_MESSAGES/kasbarextension.mo @@ -113,6 +114,7 @@ share/locale/mk/LC_MESSAGES/kcmicons.mo share/locale/mk/LC_MESSAGES/kcminfo.mo share/locale/mk/LC_MESSAGES/kcminput.mo share/locale/mk/LC_MESSAGES/kcmioslaveinfo.mo +share/locale/mk/LC_MESSAGES/kcmkabconfig.mo share/locale/mk/LC_MESSAGES/kcmkamera.mo share/locale/mk/LC_MESSAGES/kcmkclock.mo share/locale/mk/LC_MESSAGES/kcmkded.mo @@ -123,6 +125,7 @@ share/locale/mk/LC_MESSAGES/kcmkio.mo share/locale/mk/LC_MESSAGES/kcmkonq.mo share/locale/mk/LC_MESSAGES/kcmkonqhtml.mo share/locale/mk/LC_MESSAGES/kcmkonsole.mo +share/locale/mk/LC_MESSAGES/kcmkontactnt.mo share/locale/mk/LC_MESSAGES/kcmktalkd.mo share/locale/mk/LC_MESSAGES/kcmkuick.mo share/locale/mk/LC_MESSAGES/kcmkurifilt.mo @@ -166,6 +169,8 @@ share/locale/mk/LC_MESSAGES/kdelibs.mo share/locale/mk/LC_MESSAGES/kdelibs_colors.mo share/locale/mk/LC_MESSAGES/kdelirc.mo share/locale/mk/LC_MESSAGES/kdepasswd.mo +share/locale/mk/LC_MESSAGES/kdepimresources.mo +share/locale/mk/LC_MESSAGES/kdepimwizards.mo share/locale/mk/LC_MESSAGES/kdeprint.mo share/locale/mk/LC_MESSAGES/kdeprint_part.mo share/locale/mk/LC_MESSAGES/kdeprintfax.mo @@ -174,6 +179,7 @@ share/locale/mk/LC_MESSAGES/kdessh.mo share/locale/mk/LC_MESSAGES/kdesu.mo share/locale/mk/LC_MESSAGES/kdesud.mo share/locale/mk/LC_MESSAGES/kdf.mo +share/locale/mk/LC_MESSAGES/kdgantt.mo share/locale/mk/LC_MESSAGES/kdialog.mo share/locale/mk/LC_MESSAGES/kdict.mo share/locale/mk/LC_MESSAGES/kdictapplet.mo @@ -196,6 +202,7 @@ share/locale/mk/LC_MESSAGES/kfile_dds.mo share/locale/mk/LC_MESSAGES/kfile_deb.mo share/locale/mk/LC_MESSAGES/kfile_desktop.mo share/locale/mk/LC_MESSAGES/kfile_diff.mo +share/locale/mk/LC_MESSAGES/kfile_drgeo.mo share/locale/mk/LC_MESSAGES/kfile_dvi.mo share/locale/mk/LC_MESSAGES/kfile_exr.mo share/locale/mk/LC_MESSAGES/kfile_flac.mo @@ -205,6 +212,7 @@ share/locale/mk/LC_MESSAGES/kfile_html.mo share/locale/mk/LC_MESSAGES/kfile_ico.mo share/locale/mk/LC_MESSAGES/kfile_ics.mo share/locale/mk/LC_MESSAGES/kfile_jpeg.mo +share/locale/mk/LC_MESSAGES/kfile_kig.mo share/locale/mk/LC_MESSAGES/kfile_lnk.mo share/locale/mk/LC_MESSAGES/kfile_m3u.mo share/locale/mk/LC_MESSAGES/kfile_mhtml.mo @@ -241,6 +249,7 @@ share/locale/mk/LC_MESSAGES/kfmclient.mo share/locale/mk/LC_MESSAGES/kfontinst.mo share/locale/mk/LC_MESSAGES/kfouleggs.mo share/locale/mk/LC_MESSAGES/kgamma.mo +share/locale/mk/LC_MESSAGES/kgantt.mo share/locale/mk/LC_MESSAGES/kgeography.mo share/locale/mk/LC_MESSAGES/kget.mo share/locale/mk/LC_MESSAGES/kghostview.mo @@ -264,6 +273,7 @@ share/locale/mk/LC_MESSAGES/kio_audiocd.mo share/locale/mk/LC_MESSAGES/kio_finger.mo share/locale/mk/LC_MESSAGES/kio_fish.mo share/locale/mk/LC_MESSAGES/kio_floppy.mo +share/locale/mk/LC_MESSAGES/kio_groupwise.mo share/locale/mk/LC_MESSAGES/kio_help.mo share/locale/mk/LC_MESSAGES/kio_home.mo share/locale/mk/LC_MESSAGES/kio_imap4.mo @@ -281,6 +291,7 @@ share/locale/mk/LC_MESSAGES/kio_print.mo share/locale/mk/LC_MESSAGES/kio_remote.mo share/locale/mk/LC_MESSAGES/kio_settings.mo share/locale/mk/LC_MESSAGES/kio_sftp.mo +share/locale/mk/LC_MESSAGES/kio_sieve.mo share/locale/mk/LC_MESSAGES/kio_smb.mo share/locale/mk/LC_MESSAGES/kio_smtp.mo share/locale/mk/LC_MESSAGES/kio_system.mo @@ -295,6 +306,7 @@ share/locale/mk/LC_MESSAGES/kjots.mo share/locale/mk/LC_MESSAGES/kjumpingcube.mo share/locale/mk/LC_MESSAGES/klaptopdaemon.mo share/locale/mk/LC_MESSAGES/klatin.mo +share/locale/mk/LC_MESSAGES/kleopatra.mo share/locale/mk/LC_MESSAGES/klettres.mo share/locale/mk/LC_MESSAGES/klickety.mo share/locale/mk/LC_MESSAGES/klines.mo @@ -320,6 +332,7 @@ share/locale/mk/LC_MESSAGES/kmilod.mo share/locale/mk/LC_MESSAGES/kmines.mo share/locale/mk/LC_MESSAGES/kminipagerapplet.mo share/locale/mk/LC_MESSAGES/kmix.mo +share/locale/mk/LC_MESSAGES/kmobile.mo share/locale/mk/LC_MESSAGES/kmoon.mo share/locale/mk/LC_MESSAGES/kmousetool.mo share/locale/mk/LC_MESSAGES/kmouth.mo @@ -355,6 +368,7 @@ share/locale/mk/LC_MESSAGES/kontact.mo share/locale/mk/LC_MESSAGES/kooka.mo share/locale/mk/LC_MESSAGES/kopete.mo share/locale/mk/LC_MESSAGES/korganizer.mo +share/locale/mk/LC_MESSAGES/korn.mo share/locale/mk/LC_MESSAGES/kpackage.mo share/locale/mk/LC_MESSAGES/kpager.mo share/locale/mk/LC_MESSAGES/kpartsaver.mo @@ -415,6 +429,7 @@ share/locale/mk/LC_MESSAGES/kstyle_keramik_config.mo share/locale/mk/LC_MESSAGES/kstyle_phase_config.mo share/locale/mk/LC_MESSAGES/kstyle_plastik_config.mo share/locale/mk/LC_MESSAGES/ksvgplugin.mo +share/locale/mk/LC_MESSAGES/ksync.mo share/locale/mk/LC_MESSAGES/ksysguard.mo share/locale/mk/LC_MESSAGES/ksystemtrayapplet.mo share/locale/mk/LC_MESSAGES/ksystraycmd.mo @@ -429,6 +444,7 @@ share/locale/mk/LC_MESSAGES/kthememanager.mo share/locale/mk/LC_MESSAGES/ktimemon.mo share/locale/mk/LC_MESSAGES/ktimer.mo share/locale/mk/LC_MESSAGES/ktip.mo +share/locale/mk/LC_MESSAGES/ktnef.mo share/locale/mk/LC_MESSAGES/ktouch.mo share/locale/mk/LC_MESSAGES/ktron.mo share/locale/mk/LC_MESSAGES/kttsd.mo @@ -451,6 +467,7 @@ share/locale/mk/LC_MESSAGES/kviewshell.mo share/locale/mk/LC_MESSAGES/kviewviewer.mo share/locale/mk/LC_MESSAGES/kvoctrain.mo share/locale/mk/LC_MESSAGES/kwalletmanager.mo +share/locale/mk/LC_MESSAGES/kwatchgnupg.mo share/locale/mk/LC_MESSAGES/kweather.mo share/locale/mk/LC_MESSAGES/kwifimanager.mo share/locale/mk/LC_MESSAGES/kwin.mo @@ -459,6 +476,7 @@ share/locale/mk/LC_MESSAGES/kwin_art_clients.mo share/locale/mk/LC_MESSAGES/kwin_clients.mo share/locale/mk/LC_MESSAGES/kwin_lib.mo share/locale/mk/LC_MESSAGES/kwireless.mo +share/locale/mk/LC_MESSAGES/kwordquiz.mo share/locale/mk/LC_MESSAGES/kworldclock.mo share/locale/mk/LC_MESSAGES/kwriteconfig.mo share/locale/mk/LC_MESSAGES/kxkb.mo @@ -473,6 +491,7 @@ share/locale/mk/LC_MESSAGES/libkdeedu.mo share/locale/mk/LC_MESSAGES/libkdegames.mo share/locale/mk/LC_MESSAGES/libkdepim.mo share/locale/mk/LC_MESSAGES/libkfaximgage.mo +share/locale/mk/LC_MESSAGES/libkholidays.mo share/locale/mk/LC_MESSAGES/libkicker.mo share/locale/mk/LC_MESSAGES/libkickermenu_kdeprint.mo share/locale/mk/LC_MESSAGES/libkickermenu_konsole.mo @@ -481,10 +500,14 @@ share/locale/mk/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/mk/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/mk/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/mk/LC_MESSAGES/libkickermenu_tom.mo +share/locale/mk/LC_MESSAGES/libkleopatra.mo +share/locale/mk/LC_MESSAGES/libkmime.mo share/locale/mk/LC_MESSAGES/libkonq.mo +share/locale/mk/LC_MESSAGES/libkpgp.mo share/locale/mk/LC_MESSAGES/libkpimexchange.mo share/locale/mk/LC_MESSAGES/libkscan.mo share/locale/mk/LC_MESSAGES/libkscreensaver.mo +share/locale/mk/LC_MESSAGES/libksieve.mo share/locale/mk/LC_MESSAGES/libksirtet.mo share/locale/mk/LC_MESSAGES/libksync.mo share/locale/mk/LC_MESSAGES/libtaskbar.mo @@ -496,6 +519,7 @@ share/locale/mk/LC_MESSAGES/mediaapplet.mo share/locale/mk/LC_MESSAGES/mediacontrol.mo share/locale/mk/LC_MESSAGES/mf_konqplugin.mo share/locale/mk/LC_MESSAGES/minitoolsplugin.mo +share/locale/mk/LC_MESSAGES/multisynk.mo share/locale/mk/LC_MESSAGES/naughtyapplet.mo share/locale/mk/LC_MESSAGES/nexscope.mo share/locale/mk/LC_MESSAGES/noatun.mo diff --git a/misc/kde4-l10n-nb/distinfo b/misc/kde4-l10n-nb/distinfo index fdbc558d11af..197df926be01 100644 --- a/misc/kde4-l10n-nb/distinfo +++ b/misc/kde4-l10n-nb/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-nb-3.5.5.tar.bz2) = 1b3edcfa11bb648e98bab07f93e898a9 -SHA256 (KDE/kde-i18n/kde-i18n-nb-3.5.5.tar.bz2) = cdcb4dd7a73daa6cda4eff2c44e36c749b1dfefe69cd2ee05b5b066cd75b2fd3 -SIZE (KDE/kde-i18n/kde-i18n-nb-3.5.5.tar.bz2) = 2153235 +MD5 (KDE/kde-i18n/kde-i18n-nb-3.5.6.tar.bz2) = bf087b3c116770dcffa008da74e767e2 +SHA256 (KDE/kde-i18n/kde-i18n-nb-3.5.6.tar.bz2) = a449720dbd52756f950655563cbcc19376a0019bd83a35da26a70928ced76d63 +SIZE (KDE/kde-i18n/kde-i18n-nb-3.5.6.tar.bz2) = 2153589 diff --git a/misc/kde4-l10n-nds/distinfo b/misc/kde4-l10n-nds/distinfo index 49e954321a7d..60433faf15b5 100644 --- a/misc/kde4-l10n-nds/distinfo +++ b/misc/kde4-l10n-nds/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-nds-3.5.5.tar.bz2) = f159dd39c2385403a0f95c0b102ef67b -SHA256 (KDE/kde-i18n/kde-i18n-nds-3.5.5.tar.bz2) = 2f88b016ca70522a934244a076ecaae3a1886974f62b9f1adf217057cc6c4374 -SIZE (KDE/kde-i18n/kde-i18n-nds-3.5.5.tar.bz2) = 2044198 +MD5 (KDE/kde-i18n/kde-i18n-nds-3.5.6.tar.bz2) = a12623e0d68f3737447b663e070e3f61 +SHA256 (KDE/kde-i18n/kde-i18n-nds-3.5.6.tar.bz2) = de1316354b09e2a37686d0ce5c4004a025d9d92ff4b1224b07a03879132c8f2b +SIZE (KDE/kde-i18n/kde-i18n-nds-3.5.6.tar.bz2) = 2263416 diff --git a/misc/kde4-l10n-nds/pkg-plist b/misc/kde4-l10n-nds/pkg-plist index 796972738f54..3f7f0a6ffabf 100644 --- a/misc/kde4-l10n-nds/pkg-plist +++ b/misc/kde4-l10n-nds/pkg-plist @@ -42,6 +42,7 @@ share/locale/nds/LC_MESSAGES/audiocd_encoder_vorbis.mo share/locale/nds/LC_MESSAGES/audiorename_plugin.mo share/locale/nds/LC_MESSAGES/autorefresh.mo share/locale/nds/LC_MESSAGES/babelfish.mo +share/locale/nds/LC_MESSAGES/blinken.mo share/locale/nds/LC_MESSAGES/cervisia.mo share/locale/nds/LC_MESSAGES/charlatanui.mo share/locale/nds/LC_MESSAGES/clockapplet.mo @@ -77,6 +78,8 @@ share/locale/nds/LC_MESSAGES/kaboodle.mo share/locale/nds/LC_MESSAGES/kaccess.mo share/locale/nds/LC_MESSAGES/kaddressbook.mo share/locale/nds/LC_MESSAGES/kalarm.mo +share/locale/nds/LC_MESSAGES/kalzium.mo +share/locale/nds/LC_MESSAGES/kanagram.mo share/locale/nds/LC_MESSAGES/kandy.mo share/locale/nds/LC_MESSAGES/kappfinder.mo share/locale/nds/LC_MESSAGES/karm.mo @@ -110,6 +113,7 @@ share/locale/nds/LC_MESSAGES/kbattleship.mo share/locale/nds/LC_MESSAGES/kbinaryclock.mo share/locale/nds/LC_MESSAGES/kblackbox.mo share/locale/nds/LC_MESSAGES/kbounce.mo +share/locale/nds/LC_MESSAGES/kbruch.mo share/locale/nds/LC_MESSAGES/kbstateapplet.mo share/locale/nds/LC_MESSAGES/kbugbuster.mo share/locale/nds/LC_MESSAGES/kcachegrind.mo @@ -215,23 +219,33 @@ share/locale/nds/LC_MESSAGES/kdictapplet.mo share/locale/nds/LC_MESSAGES/kdjview.mo share/locale/nds/LC_MESSAGES/kdmconfig.mo share/locale/nds/LC_MESSAGES/kdmgreet.mo +share/locale/nds/LC_MESSAGES/kdvi.mo share/locale/nds/LC_MESSAGES/kedit.mo +share/locale/nds/LC_MESSAGES/keduca.mo share/locale/nds/LC_MESSAGES/kenolaba.mo +share/locale/nds/LC_MESSAGES/kfax.mo +share/locale/nds/LC_MESSAGES/kfaxview.mo share/locale/nds/LC_MESSAGES/kfifteenapplet.mo share/locale/nds/LC_MESSAGES/kfile_au.mo share/locale/nds/LC_MESSAGES/kfile_avi.mo +share/locale/nds/LC_MESSAGES/kfile_bmp.mo share/locale/nds/LC_MESSAGES/kfile_cert.mo share/locale/nds/LC_MESSAGES/kfile_cpp.mo +share/locale/nds/LC_MESSAGES/kfile_dds.mo share/locale/nds/LC_MESSAGES/kfile_deb.mo share/locale/nds/LC_MESSAGES/kfile_desktop.mo share/locale/nds/LC_MESSAGES/kfile_diff.mo +share/locale/nds/LC_MESSAGES/kfile_drgeo.mo share/locale/nds/LC_MESSAGES/kfile_dvi.mo +share/locale/nds/LC_MESSAGES/kfile_exr.mo share/locale/nds/LC_MESSAGES/kfile_flac.mo share/locale/nds/LC_MESSAGES/kfile_folder.mo share/locale/nds/LC_MESSAGES/kfile_gif.mo share/locale/nds/LC_MESSAGES/kfile_html.mo share/locale/nds/LC_MESSAGES/kfile_ico.mo share/locale/nds/LC_MESSAGES/kfile_ics.mo +share/locale/nds/LC_MESSAGES/kfile_jpeg.mo +share/locale/nds/LC_MESSAGES/kfile_kig.mo share/locale/nds/LC_MESSAGES/kfile_lnk.mo share/locale/nds/LC_MESSAGES/kfile_m3u.mo share/locale/nds/LC_MESSAGES/kfile_mhtml.mo @@ -242,14 +256,17 @@ share/locale/nds/LC_MESSAGES/kfile_ogg.mo share/locale/nds/LC_MESSAGES/kfile_palm.mo share/locale/nds/LC_MESSAGES/kfile_pcx.mo share/locale/nds/LC_MESSAGES/kfile_pdf.mo +share/locale/nds/LC_MESSAGES/kfile_png.mo share/locale/nds/LC_MESSAGES/kfile_pnm.mo share/locale/nds/LC_MESSAGES/kfile_po.mo share/locale/nds/LC_MESSAGES/kfile_ps.mo share/locale/nds/LC_MESSAGES/kfile_rfc822.mo +share/locale/nds/LC_MESSAGES/kfile_rgb.mo share/locale/nds/LC_MESSAGES/kfile_rpm.mo share/locale/nds/LC_MESSAGES/kfile_sid.mo share/locale/nds/LC_MESSAGES/kfile_tga.mo share/locale/nds/LC_MESSAGES/kfile_theora.mo +share/locale/nds/LC_MESSAGES/kfile_tiff.mo share/locale/nds/LC_MESSAGES/kfile_torrent.mo share/locale/nds/LC_MESSAGES/kfile_ts.mo share/locale/nds/LC_MESSAGES/kfile_txt.mo @@ -264,13 +281,16 @@ share/locale/nds/LC_MESSAGES/kfloppy.mo share/locale/nds/LC_MESSAGES/kfmclient.mo share/locale/nds/LC_MESSAGES/kfontinst.mo share/locale/nds/LC_MESSAGES/kfouleggs.mo +share/locale/nds/LC_MESSAGES/kgamma.mo share/locale/nds/LC_MESSAGES/kgantt.mo share/locale/nds/LC_MESSAGES/kgeography.mo share/locale/nds/LC_MESSAGES/kget.mo +share/locale/nds/LC_MESSAGES/kghostview.mo share/locale/nds/LC_MESSAGES/kgoldrunner.mo share/locale/nds/LC_MESSAGES/kgpg.mo share/locale/nds/LC_MESSAGES/kgreet_classic.mo share/locale/nds/LC_MESSAGES/kgreet_winbind.mo +share/locale/nds/LC_MESSAGES/khangman.mo share/locale/nds/LC_MESSAGES/khelpcenter.mo share/locale/nds/LC_MESSAGES/khexedit.mo share/locale/nds/LC_MESSAGES/khexedit2part.mo @@ -278,6 +298,9 @@ share/locale/nds/LC_MESSAGES/khotkeys.mo share/locale/nds/LC_MESSAGES/khtmlkttsd.mo share/locale/nds/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/nds/LC_MESSAGES/kicker.mo +share/locale/nds/LC_MESSAGES/kickermenu_kate.mo +share/locale/nds/LC_MESSAGES/kiconedit.mo +share/locale/nds/LC_MESSAGES/kig.mo share/locale/nds/LC_MESSAGES/kinetd.mo share/locale/nds/LC_MESSAGES/kio.mo share/locale/nds/LC_MESSAGES/kio_audiocd.mo @@ -312,11 +335,15 @@ share/locale/nds/LC_MESSAGES/kio_thumbnail.mo share/locale/nds/LC_MESSAGES/kio_trash.mo share/locale/nds/LC_MESSAGES/kio_zeroconf.mo share/locale/nds/LC_MESSAGES/kioexec.mo +share/locale/nds/LC_MESSAGES/kitchensync.mo +share/locale/nds/LC_MESSAGES/kiten.mo share/locale/nds/LC_MESSAGES/kjobviewer.mo share/locale/nds/LC_MESSAGES/kjots.mo share/locale/nds/LC_MESSAGES/kjumpingcube.mo share/locale/nds/LC_MESSAGES/klaptopdaemon.mo +share/locale/nds/LC_MESSAGES/klatin.mo share/locale/nds/LC_MESSAGES/kleopatra.mo +share/locale/nds/LC_MESSAGES/klettres.mo share/locale/nds/LC_MESSAGES/klickety.mo share/locale/nds/LC_MESSAGES/klines.mo share/locale/nds/LC_MESSAGES/klipper.mo @@ -345,6 +372,7 @@ share/locale/nds/LC_MESSAGES/kmobile.mo share/locale/nds/LC_MESSAGES/kmoon.mo share/locale/nds/LC_MESSAGES/kmousetool.mo share/locale/nds/LC_MESSAGES/kmouth.mo +share/locale/nds/LC_MESSAGES/kmrml.mo share/locale/nds/LC_MESSAGES/knetattach.mo share/locale/nds/LC_MESSAGES/knetwalk.mo share/locale/nds/LC_MESSAGES/knetworkconf.mo @@ -354,6 +382,7 @@ share/locale/nds/LC_MESSAGES/knotes.mo share/locale/nds/LC_MESSAGES/knotify.mo share/locale/nds/LC_MESSAGES/kodo.mo share/locale/nds/LC_MESSAGES/kolf.mo +share/locale/nds/LC_MESSAGES/kolourpaint.mo share/locale/nds/LC_MESSAGES/kolourpicker.mo share/locale/nds/LC_MESSAGES/kompare.mo share/locale/nds/LC_MESSAGES/konnector_dummy.mo @@ -371,6 +400,7 @@ share/locale/nds/LC_MESSAGES/konquest.mo share/locale/nds/LC_MESSAGES/konsole.mo share/locale/nds/LC_MESSAGES/konsolekalendar.mo share/locale/nds/LC_MESSAGES/kontact.mo +share/locale/nds/LC_MESSAGES/kooka.mo share/locale/nds/LC_MESSAGES/kopete.mo share/locale/nds/LC_MESSAGES/korganizer.mo share/locale/nds/LC_MESSAGES/korn.mo @@ -378,10 +408,12 @@ share/locale/nds/LC_MESSAGES/kpackage.mo share/locale/nds/LC_MESSAGES/kpager.mo share/locale/nds/LC_MESSAGES/kpartsaver.mo share/locale/nds/LC_MESSAGES/kpat.mo +share/locale/nds/LC_MESSAGES/kpdf.mo share/locale/nds/LC_MESSAGES/kpersonalizer.mo share/locale/nds/LC_MESSAGES/kpf.mo share/locale/nds/LC_MESSAGES/kpilot.mo share/locale/nds/LC_MESSAGES/kpoker.mo +share/locale/nds/LC_MESSAGES/kpovmodeler.mo share/locale/nds/LC_MESSAGES/kppp.mo share/locale/nds/LC_MESSAGES/kppplogview.mo share/locale/nds/LC_MESSAGES/kprinter.mo @@ -418,6 +450,7 @@ share/locale/nds/LC_MESSAGES/ksirtet.mo share/locale/nds/LC_MESSAGES/ksmiletris.mo share/locale/nds/LC_MESSAGES/ksmserver.mo share/locale/nds/LC_MESSAGES/ksnake.mo +share/locale/nds/LC_MESSAGES/ksnapshot.mo share/locale/nds/LC_MESSAGES/ksokoban.mo share/locale/nds/LC_MESSAGES/kspaceduel.mo share/locale/nds/LC_MESSAGES/ksplash.mo @@ -429,6 +462,7 @@ share/locale/nds/LC_MESSAGES/kstyle_highcontrast_config.mo share/locale/nds/LC_MESSAGES/kstyle_keramik_config.mo share/locale/nds/LC_MESSAGES/kstyle_phase_config.mo share/locale/nds/LC_MESSAGES/kstyle_plastik_config.mo +share/locale/nds/LC_MESSAGES/ksvgplugin.mo share/locale/nds/LC_MESSAGES/ksync.mo share/locale/nds/LC_MESSAGES/ksysguard.mo share/locale/nds/LC_MESSAGES/ksystemtrayapplet.mo @@ -446,15 +480,23 @@ share/locale/nds/LC_MESSAGES/ktimer.mo share/locale/nds/LC_MESSAGES/ktip.mo share/locale/nds/LC_MESSAGES/ktnef.mo share/locale/nds/LC_MESSAGES/ktron.mo +share/locale/nds/LC_MESSAGES/kttsd.mo share/locale/nds/LC_MESSAGES/ktuberling.mo share/locale/nds/LC_MESSAGES/ktux.mo share/locale/nds/LC_MESSAGES/kuick_plugin.mo +share/locale/nds/LC_MESSAGES/kuickshow.mo share/locale/nds/LC_MESSAGES/kuiviewer.mo share/locale/nds/LC_MESSAGES/kuser.mo share/locale/nds/LC_MESSAGES/kview.mo +share/locale/nds/LC_MESSAGES/kview_scale.mo share/locale/nds/LC_MESSAGES/kviewbrowserplugin.mo share/locale/nds/LC_MESSAGES/kviewcanvas.mo +share/locale/nds/LC_MESSAGES/kvieweffectsplugin.mo +share/locale/nds/LC_MESSAGES/kviewpresenterplugin.mo share/locale/nds/LC_MESSAGES/kviewscannerplugin.mo +share/locale/nds/LC_MESSAGES/kviewshell.mo +share/locale/nds/LC_MESSAGES/kviewviewer.mo +share/locale/nds/LC_MESSAGES/kvoctrain.mo share/locale/nds/LC_MESSAGES/kwalletmanager.mo share/locale/nds/LC_MESSAGES/kwatchgnupg.mo share/locale/nds/LC_MESSAGES/kweather.mo @@ -465,6 +507,7 @@ share/locale/nds/LC_MESSAGES/kwin_art_clients.mo share/locale/nds/LC_MESSAGES/kwin_clients.mo share/locale/nds/LC_MESSAGES/kwin_lib.mo share/locale/nds/LC_MESSAGES/kwireless.mo +share/locale/nds/LC_MESSAGES/kwordquiz.mo share/locale/nds/LC_MESSAGES/kworldclock.mo share/locale/nds/LC_MESSAGES/kwriteconfig.mo share/locale/nds/LC_MESSAGES/kxkb.mo @@ -475,8 +518,10 @@ share/locale/nds/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/nds/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/nds/LC_MESSAGES/libkcal.mo share/locale/nds/LC_MESSAGES/libkcddb.mo +share/locale/nds/LC_MESSAGES/libkdeedu.mo share/locale/nds/LC_MESSAGES/libkdegames.mo share/locale/nds/LC_MESSAGES/libkdepim.mo +share/locale/nds/LC_MESSAGES/libkfaximgage.mo share/locale/nds/LC_MESSAGES/libkholidays.mo share/locale/nds/LC_MESSAGES/libkicker.mo share/locale/nds/LC_MESSAGES/libkickermenu_kdeprint.mo @@ -486,11 +531,13 @@ share/locale/nds/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/nds/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/nds/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/nds/LC_MESSAGES/libkickermenu_tom.mo +share/locale/nds/LC_MESSAGES/libkitchensync.mo share/locale/nds/LC_MESSAGES/libkleopatra.mo share/locale/nds/LC_MESSAGES/libkmime.mo share/locale/nds/LC_MESSAGES/libkonq.mo share/locale/nds/LC_MESSAGES/libkpgp.mo share/locale/nds/LC_MESSAGES/libkpimexchange.mo +share/locale/nds/LC_MESSAGES/libkscan.mo share/locale/nds/LC_MESSAGES/libkscreensaver.mo share/locale/nds/LC_MESSAGES/libksieve.mo share/locale/nds/LC_MESSAGES/libksirtet.mo diff --git a/misc/kde4-l10n-nl/distinfo b/misc/kde4-l10n-nl/distinfo index 76ff1c5fc412..dcf4f102b975 100644 --- a/misc/kde4-l10n-nl/distinfo +++ b/misc/kde4-l10n-nl/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-nl-3.5.5.tar.bz2) = 44b404fc4d0b9d12714fdf2357fa3f56 -SHA256 (KDE/kde-i18n/kde-i18n-nl-3.5.5.tar.bz2) = dfd23221fd9498438d8aa53e9d3899bac53a990ab549caaff506100c29bae17c -SIZE (KDE/kde-i18n/kde-i18n-nl-3.5.5.tar.bz2) = 10207419 +MD5 (KDE/kde-i18n/kde-i18n-nl-3.5.6.tar.bz2) = 6f4eea25839984463e70d1c635813a11 +SHA256 (KDE/kde-i18n/kde-i18n-nl-3.5.6.tar.bz2) = 91879ae585aef96e8f01cf10c06a53957b099913e0f431fbeb0a9d45039048ee +SIZE (KDE/kde-i18n/kde-i18n-nl-3.5.6.tar.bz2) = 10661847 diff --git a/misc/kde4-l10n-nl/pkg-plist b/misc/kde4-l10n-nl/pkg-plist index 6b939ed9933a..e9c4122c4a28 100644 --- a/misc/kde4-l10n-nl/pkg-plist +++ b/misc/kde4-l10n-nl/pkg-plist @@ -104,6 +104,9 @@ share/doc/HTML/nl/docs/common/gpl-translated.html share/doc/HTML/nl/docs/common/kde-localised.css share/doc/HTML/nl/docs/common/lgpl-translated.html share/doc/HTML/nl/docs/common/logotp3.png +share/doc/HTML/nl/irkick/common +share/doc/HTML/nl/irkick/index.cache.bz2 +share/doc/HTML/nl/irkick/index.docbook share/doc/HTML/nl/juk/common share/doc/HTML/nl/juk/index.cache.bz2 share/doc/HTML/nl/juk/index.docbook @@ -194,6 +197,9 @@ share/doc/HTML/nl/kcalc/index.docbook share/doc/HTML/nl/kcharselect/common share/doc/HTML/nl/kcharselect/index.cache.bz2 share/doc/HTML/nl/kcharselect/index.docbook +share/doc/HTML/nl/kcmlirc/common +share/doc/HTML/nl/kcmlirc/index.cache.bz2 +share/doc/HTML/nl/kcmlirc/index.docbook share/doc/HTML/nl/kcoloredit/common share/doc/HTML/nl/kcoloredit/index.cache.bz2 share/doc/HTML/nl/kcoloredit/index.docbook @@ -383,12 +389,6 @@ share/doc/HTML/nl/kdcop/index.docbook share/doc/HTML/nl/kdebugdialog/common share/doc/HTML/nl/kdebugdialog/index.cache.bz2 share/doc/HTML/nl/kdebugdialog/index.docbook -share/doc/HTML/nl/kdelirc/irkick/common -share/doc/HTML/nl/kdelirc/irkick/index.cache.bz2 -share/doc/HTML/nl/kdelirc/irkick/index.docbook -share/doc/HTML/nl/kdelirc/kcmlirc/common -share/doc/HTML/nl/kdelirc/kcmlirc/index.cache.bz2 -share/doc/HTML/nl/kdelirc/kcmlirc/index.docbook share/doc/HTML/nl/kdeprint/add-printer-wiz.docbook share/doc/HTML/nl/kdeprint/common share/doc/HTML/nl/kdeprint/cups-config.docbook @@ -414,6 +414,10 @@ share/doc/HTML/nl/kdf/index.cache.bz2 share/doc/HTML/nl/kdf/index.docbook share/doc/HTML/nl/kdf/kdf.png share/doc/HTML/nl/kdf/kdf_config.png +share/doc/HTML/nl/kdm/common +share/doc/HTML/nl/kdm/index.cache.bz2 +share/doc/HTML/nl/kdm/index.docbook +share/doc/HTML/nl/kdm/kdmrc-ref.docbook share/doc/HTML/nl/kdvi/common share/doc/HTML/nl/kdvi/index.cache.bz2 share/doc/HTML/nl/kdvi/index.docbook @@ -423,9 +427,35 @@ share/doc/HTML/nl/keduca/index.docbook share/doc/HTML/nl/kenolaba/common share/doc/HTML/nl/kenolaba/index.cache.bz2 share/doc/HTML/nl/kenolaba/index.docbook +share/doc/HTML/nl/kfilereplace/addstringsdialog_window.png +share/doc/HTML/nl/kfilereplace/backup_option.png +share/doc/HTML/nl/kfilereplace/casesensitive_option.png +share/doc/HTML/nl/kfilereplace/command_option.png share/doc/HTML/nl/kfilereplace/common +share/doc/HTML/nl/kfilereplace/edit.png +share/doc/HTML/nl/kfilereplace/edit_add.png +share/doc/HTML/nl/kfilereplace/edit_remove.png +share/doc/HTML/nl/kfilereplace/eraser.png +share/doc/HTML/nl/kfilereplace/filereplace.png +share/doc/HTML/nl/kfilereplace/filesearch.png +share/doc/HTML/nl/kfilereplace/filesimulate.png share/doc/HTML/nl/kfilereplace/index.cache.bz2 share/doc/HTML/nl/kfilereplace/index.docbook +share/doc/HTML/nl/kfilereplace/invert.png +share/doc/HTML/nl/kfilereplace/kfr_standalone_main_window_1.png +share/doc/HTML/nl/kfilereplace/optionsdialog_main_window_1.png +share/doc/HTML/nl/kfilereplace/optionsdialog_main_window_2.png +share/doc/HTML/nl/kfilereplace/project.png +share/doc/HTML/nl/kfilereplace/projectdialog_main_window_1.png +share/doc/HTML/nl/kfilereplace/projectdialog_main_window_2.png +share/doc/HTML/nl/kfilereplace/recursive_option.png +share/doc/HTML/nl/kfilereplace/regularexpression_option.png +share/doc/HTML/nl/kfilereplace/report_example.png +share/doc/HTML/nl/kfilereplace/results_view.png +share/doc/HTML/nl/kfilereplace/stop.png +share/doc/HTML/nl/kfilereplace/strings_view.png +share/doc/HTML/nl/kfilereplace/toolbar.png +share/doc/HTML/nl/kfilereplace/unsortedList.png share/doc/HTML/nl/kfind/common share/doc/HTML/nl/kfind/index.cache.bz2 share/doc/HTML/nl/kfind/index.docbook @@ -501,7 +531,6 @@ share/doc/HTML/nl/khelpcenter/userguide/accessibility.docbook share/doc/HTML/nl/khelpcenter/userguide/base-kde-applications.docbook share/doc/HTML/nl/khelpcenter/userguide/browser-fine-tuning.docbook share/doc/HTML/nl/khelpcenter/userguide/burning-cds.docbook -share/doc/HTML/nl/khelpcenter/userguide/common share/doc/HTML/nl/khelpcenter/userguide/control-center.docbook share/doc/HTML/nl/khelpcenter/userguide/creating-graphics.docbook share/doc/HTML/nl/khelpcenter/userguide/credits-and-license.docbook @@ -515,8 +544,6 @@ share/doc/HTML/nl/khelpcenter/userguide/getting-started.docbook share/doc/HTML/nl/khelpcenter/userguide/glossary.docbook share/doc/HTML/nl/khelpcenter/userguide/groupware-kontact.docbook share/doc/HTML/nl/khelpcenter/userguide/history.docbook -share/doc/HTML/nl/khelpcenter/userguide/index.cache.bz2 -share/doc/HTML/nl/khelpcenter/userguide/index.docbook share/doc/HTML/nl/khelpcenter/userguide/installation.docbook share/doc/HTML/nl/khelpcenter/userguide/internet-shortcuts.docbook share/doc/HTML/nl/khelpcenter/userguide/intro.docbook @@ -787,6 +814,9 @@ share/doc/HTML/nl/kmplot/man-kmplot.1.docbook share/doc/HTML/nl/kmplot/menu.docbook share/doc/HTML/nl/kmplot/reference.docbook share/doc/HTML/nl/kmplot/using.docbook +share/doc/HTML/nl/knetattach/common +share/doc/HTML/nl/knetattach/index.cache.bz2 +share/doc/HTML/nl/knetattach/index.docbook share/doc/HTML/nl/knode/commands.docbook share/doc/HTML/nl/knode/common share/doc/HTML/nl/knode/credits.docbook @@ -829,6 +859,9 @@ share/doc/HTML/nl/kommander/widgets.docbook share/doc/HTML/nl/kompare/common share/doc/HTML/nl/kompare/index.cache.bz2 share/doc/HTML/nl/kompare/index.docbook +share/doc/HTML/nl/kompmgr/common +share/doc/HTML/nl/kompmgr/index.cache.bz2 +share/doc/HTML/nl/kompmgr/index.docbook share/doc/HTML/nl/konq-plugins/babel/common share/doc/HTML/nl/konq-plugins/babel/index.cache.bz2 share/doc/HTML/nl/konq-plugins/babel/index.docbook @@ -1547,6 +1580,7 @@ share/locale/nl/LC_MESSAGES/khotkeys.mo share/locale/nl/LC_MESSAGES/khtmlkttsd.mo share/locale/nl/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/nl/LC_MESSAGES/kicker.mo +share/locale/nl/LC_MESSAGES/kickermenu_kate.mo share/locale/nl/LC_MESSAGES/kiconedit.mo share/locale/nl/LC_MESSAGES/kig.mo share/locale/nl/LC_MESSAGES/kimagemapeditor.mo @@ -1584,6 +1618,7 @@ share/locale/nl/LC_MESSAGES/kio_thumbnail.mo share/locale/nl/LC_MESSAGES/kio_trash.mo share/locale/nl/LC_MESSAGES/kio_zeroconf.mo share/locale/nl/LC_MESSAGES/kioexec.mo +share/locale/nl/LC_MESSAGES/kitchensync.mo share/locale/nl/LC_MESSAGES/kiten.mo share/locale/nl/LC_MESSAGES/kjobviewer.mo share/locale/nl/LC_MESSAGES/kjots.mo @@ -1787,6 +1822,7 @@ share/locale/nl/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/nl/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/nl/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/nl/LC_MESSAGES/libkickermenu_tom.mo +share/locale/nl/LC_MESSAGES/libkitchensync.mo share/locale/nl/LC_MESSAGES/libkleopatra.mo share/locale/nl/LC_MESSAGES/libkmime.mo share/locale/nl/LC_MESSAGES/libkonq.mo @@ -1907,12 +1943,14 @@ share/locale/nl/flag.png @dirrm share/doc/HTML/nl/konq-plugins/crashes @dirrm share/doc/HTML/nl/konq-plugins/babel @dirrm share/doc/HTML/nl/konq-plugins +@dirrm share/doc/HTML/nl/kompmgr @dirrm share/doc/HTML/nl/kompare @dirrm share/doc/HTML/nl/kommander @dirrm share/doc/HTML/nl/kolf @dirrm share/doc/HTML/nl/kodo @dirrm share/doc/HTML/nl/knotes @dirrm share/doc/HTML/nl/knode +@dirrm share/doc/HTML/nl/knetattach @dirrm share/doc/HTML/nl/kmplot @dirrm share/doc/HTML/nl/kmouth @dirrm share/doc/HTML/nl/kmousetool @@ -1976,12 +2014,10 @@ share/locale/nl/flag.png @dirrm share/doc/HTML/nl/kenolaba @dirrm share/doc/HTML/nl/keduca @dirrm share/doc/HTML/nl/kdvi +@dirrm share/doc/HTML/nl/kdm @dirrm share/doc/HTML/nl/kdf @dirrm share/doc/HTML/nl/kdesu @dirrm share/doc/HTML/nl/kdeprint -@dirrm share/doc/HTML/nl/kdelirc/kcmlirc -@dirrm share/doc/HTML/nl/kdelirc/irkick -@dirrm share/doc/HTML/nl/kdelirc @dirrm share/doc/HTML/nl/kdebugdialog @dirrm share/doc/HTML/nl/kdcop @dirrm share/doc/HTML/nl/kdat @@ -2042,6 +2078,7 @@ share/locale/nl/flag.png @dirrm share/doc/HTML/nl/kcontrol/arts @dirrm share/doc/HTML/nl/kcontrol @dirrm share/doc/HTML/nl/kcoloredit +@dirrm share/doc/HTML/nl/kcmlirc @dirrm share/doc/HTML/nl/kcharselect @dirrm share/doc/HTML/nl/kcalc @dirrm share/doc/HTML/nl/kbugbuster @@ -2062,6 +2099,7 @@ share/locale/nl/flag.png @dirrm share/doc/HTML/nl/kaddressbook @dirrm share/doc/HTML/nl/kaboodle @dirrm share/doc/HTML/nl/juk +@dirrm share/doc/HTML/nl/irkick @dirrm share/doc/HTML/nl/docs/common @dirrm share/doc/HTML/nl/docs @dirrm share/doc/HTML/nl/atlantik diff --git a/misc/kde4-l10n-nn/distinfo b/misc/kde4-l10n-nn/distinfo index 4afe999dd24e..0f89e1ad790c 100644 --- a/misc/kde4-l10n-nn/distinfo +++ b/misc/kde4-l10n-nn/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-nn-3.5.5.tar.bz2) = 964c91710f2b28cdde7b8cdfef961791 -SHA256 (KDE/kde-i18n/kde-i18n-nn-3.5.5.tar.bz2) = d5e9ca40cb03bcbeb49f9441bfa79458db373fb55117c135cf27651a82fd3057 -SIZE (KDE/kde-i18n/kde-i18n-nn-3.5.5.tar.bz2) = 1877259 +MD5 (KDE/kde-i18n/kde-i18n-nn-3.5.6.tar.bz2) = 9dc810b75c2cb7c864ec5bf82a2bed2f +SHA256 (KDE/kde-i18n/kde-i18n-nn-3.5.6.tar.bz2) = 01a4a1c830d87637cff9f118c4c660d4d124dabb6bd3d578d10d3deced9194f9 +SIZE (KDE/kde-i18n/kde-i18n-nn-3.5.6.tar.bz2) = 1873894 diff --git a/misc/kde4-l10n-pa/distinfo b/misc/kde4-l10n-pa/distinfo index 3372b8304ffb..e67c349ba67a 100644 --- a/misc/kde4-l10n-pa/distinfo +++ b/misc/kde4-l10n-pa/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-pa-3.5.5.tar.bz2) = 1881a7e5b1fc6b75ca74dc4c504ad16d -SHA256 (KDE/kde-i18n/kde-i18n-pa-3.5.5.tar.bz2) = c6819eb7d6dfeef7b8c06f96a77db9af08a68680f915b50fc22ffee5bb4c10e6 -SIZE (KDE/kde-i18n/kde-i18n-pa-3.5.5.tar.bz2) = 1282232 +MD5 (KDE/kde-i18n/kde-i18n-pa-3.5.6.tar.bz2) = 6a9be2176930ceb07600913cbee525e3 +SHA256 (KDE/kde-i18n/kde-i18n-pa-3.5.6.tar.bz2) = 50e07a49009dfbe80573c57d255b5673b63255af7c2524b5742362ed513b4b96 +SIZE (KDE/kde-i18n/kde-i18n-pa-3.5.6.tar.bz2) = 1278462 diff --git a/misc/kde4-l10n-pa/pkg-plist b/misc/kde4-l10n-pa/pkg-plist index 8dab0cae9924..e64ba6ad902e 100644 --- a/misc/kde4-l10n-pa/pkg-plist +++ b/misc/kde4-l10n-pa/pkg-plist @@ -175,7 +175,6 @@ share/locale/pa/LC_MESSAGES/kdialog.mo share/locale/pa/LC_MESSAGES/kdict.mo share/locale/pa/LC_MESSAGES/kdictapplet.mo share/locale/pa/LC_MESSAGES/kdjview.mo -share/locale/pa/LC_MESSAGES/kdmchooser.mo share/locale/pa/LC_MESSAGES/kdmconfig.mo share/locale/pa/LC_MESSAGES/kdmgreet.mo share/locale/pa/LC_MESSAGES/kedit.mo diff --git a/misc/kde4-l10n-ro/distinfo b/misc/kde4-l10n-ro/distinfo index 1e6e3aa806c3..9038579bb41a 100644 --- a/misc/kde4-l10n-ro/distinfo +++ b/misc/kde4-l10n-ro/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ro-3.5.5.tar.bz2) = b31d031cbf2deae408c94a665677dfd2 -SHA256 (KDE/kde-i18n/kde-i18n-ro-3.5.5.tar.bz2) = 457b694d0f33904d17ed09245af0787bcc7b110f6966ef04accdb360dce35986 -SIZE (KDE/kde-i18n/kde-i18n-ro-3.5.5.tar.bz2) = 3154718 +MD5 (KDE/kde-i18n/kde-i18n-ro-3.5.6.tar.bz2) = af2fc2dbc745614c7286a430a7874a54 +SHA256 (KDE/kde-i18n/kde-i18n-ro-3.5.6.tar.bz2) = ca19c0245dfd604694a4a2308c7da1fa3f58401e9b7ef0d17a750eeff0215df5 +SIZE (KDE/kde-i18n/kde-i18n-ro-3.5.6.tar.bz2) = 3169518 diff --git a/misc/kde4-l10n-sk/distinfo b/misc/kde4-l10n-sk/distinfo index 0e40edf024b4..fa5d6764c349 100644 --- a/misc/kde4-l10n-sk/distinfo +++ b/misc/kde4-l10n-sk/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-sk-3.5.5.tar.bz2) = 0a1bccde30cf25cf37974362585b118a -SHA256 (KDE/kde-i18n/kde-i18n-sk-3.5.5.tar.bz2) = 5597e59e2b8e4895e473b097048edaab6603ed1fe614f12cb9b373d48de2b533 -SIZE (KDE/kde-i18n/kde-i18n-sk-3.5.5.tar.bz2) = 5729936 +MD5 (KDE/kde-i18n/kde-i18n-sk-3.5.6.tar.bz2) = 3a7b1b8bd44c92713d5e4db52655915b +SHA256 (KDE/kde-i18n/kde-i18n-sk-3.5.6.tar.bz2) = 72307acdb9ad9b5e98be0c8bc898b6f1eda87669badedd6b6450671d9b60e070 +SIZE (KDE/kde-i18n/kde-i18n-sk-3.5.6.tar.bz2) = 5763980 diff --git a/misc/kde4-l10n-sk/pkg-plist b/misc/kde4-l10n-sk/pkg-plist index 3aa924aa4cb6..798ec9077aff 100644 --- a/misc/kde4-l10n-sk/pkg-plist +++ b/misc/kde4-l10n-sk/pkg-plist @@ -1,3 +1,4 @@ +share/apps/katepart/syntax/logohighlightstyle.sk.xml share/apps/klettres/sk/alpha/a-0.ogg share/apps/klettres/sk/alpha/a-1.ogg share/apps/klettres/sk/alpha/a-10.ogg @@ -132,6 +133,20 @@ share/apps/ktuberling/sounds/sk/okuliare.wav share/apps/ktuberling/sounds/sk/slnecneokuliare.wav share/apps/ktuberling/sounds/sk/ucho.wav share/apps/ktuberling/sounds/sk/usta.wav +share/apps/kturtle/data/logokeywords.sk.xml +share/apps/kturtle/examples/sk/farbenieplatna.logo +share/apps/kturtle/examples/sk/kde.logo +share/apps/kturtle/examples/sk/kvet.logo +share/apps/kturtle/examples/sk/nahodnemeno.logo +share/apps/kturtle/examples/sk/nasobilka.logo +share/apps/kturtle/examples/sk/reklama.logo +share/apps/kturtle/examples/sk/sipka.logo +share/apps/kturtle/examples/sk/spirala.logo +share/apps/kturtle/examples/sk/spiraly.logo +share/apps/kturtle/examples/sk/stvorce.logo +share/apps/kturtle/examples/sk/stvorec.logo +share/apps/kturtle/examples/sk/trojuholnik.logo +share/apps/kturtle/examples/sk/trojuholniky.logo share/doc/HTML/sk/amor/common share/doc/HTML/sk/amor/index.cache.bz2 share/doc/HTML/sk/amor/index.docbook @@ -1055,6 +1070,7 @@ share/locale/sk/LC_MESSAGES/khotkeys.mo share/locale/sk/LC_MESSAGES/khtmlkttsd.mo share/locale/sk/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/sk/LC_MESSAGES/kicker.mo +share/locale/sk/LC_MESSAGES/kickermenu_kate.mo share/locale/sk/LC_MESSAGES/kiconedit.mo share/locale/sk/LC_MESSAGES/kig.mo share/locale/sk/LC_MESSAGES/kimagemapeditor.mo @@ -1092,6 +1108,7 @@ share/locale/sk/LC_MESSAGES/kio_thumbnail.mo share/locale/sk/LC_MESSAGES/kio_trash.mo share/locale/sk/LC_MESSAGES/kio_zeroconf.mo share/locale/sk/LC_MESSAGES/kioexec.mo +share/locale/sk/LC_MESSAGES/kitchensync.mo share/locale/sk/LC_MESSAGES/kiten.mo share/locale/sk/LC_MESSAGES/kjobviewer.mo share/locale/sk/LC_MESSAGES/kjots.mo @@ -1295,6 +1312,7 @@ share/locale/sk/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/sk/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/sk/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/sk/LC_MESSAGES/libkickermenu_tom.mo +share/locale/sk/LC_MESSAGES/libkitchensync.mo share/locale/sk/LC_MESSAGES/libkleopatra.mo share/locale/sk/LC_MESSAGES/libkmime.mo share/locale/sk/LC_MESSAGES/libkonq.mo @@ -1499,6 +1517,10 @@ share/locale/sk/flag.png @dirrm share/doc/HTML/sk/docs @dirrm share/doc/HTML/sk/atlantik @dirrm share/doc/HTML/sk/amor +@dirrm share/apps/kturtle/examples/sk +@dirrm share/apps/kturtle/examples +@dirrm share/apps/kturtle/data +@dirrm share/apps/kturtle @dirrm share/apps/ktuberling/sounds/sk @dirrm share/apps/ktuberling/sounds @dirrm share/apps/ktuberling diff --git a/misc/kde4-l10n-sl/distinfo b/misc/kde4-l10n-sl/distinfo index 451f996a8bb8..4484ed3345e3 100644 --- a/misc/kde4-l10n-sl/distinfo +++ b/misc/kde4-l10n-sl/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-sl-3.5.5.tar.bz2) = 3574861dc47aa09ada8cc6c7bca2307e -SHA256 (KDE/kde-i18n/kde-i18n-sl-3.5.5.tar.bz2) = 9bc04643fea3cd750a05898c882e36c9e9e49892a7e0a11e8531238f47a58c0e -SIZE (KDE/kde-i18n/kde-i18n-sl-3.5.5.tar.bz2) = 4483401 +MD5 (KDE/kde-i18n/kde-i18n-sl-3.5.6.tar.bz2) = 2064f33c3f76ee60ddf1aef010d92399 +SHA256 (KDE/kde-i18n/kde-i18n-sl-3.5.6.tar.bz2) = 09291f9fc22838263ce5fa79654ddef4ed105a2779eca31ed970ecf5210a770e +SIZE (KDE/kde-i18n/kde-i18n-sl-3.5.6.tar.bz2) = 4487494 diff --git a/misc/kde4-l10n-sl/pkg-plist b/misc/kde4-l10n-sl/pkg-plist index d59a8173525c..420b07e7891d 100644 --- a/misc/kde4-l10n-sl/pkg-plist +++ b/misc/kde4-l10n-sl/pkg-plist @@ -350,6 +350,7 @@ share/locale/sl/LC_MESSAGES/kaccess.mo share/locale/sl/LC_MESSAGES/kaddressbook.mo share/locale/sl/LC_MESSAGES/kalarm.mo share/locale/sl/LC_MESSAGES/kalzium.mo +share/locale/sl/LC_MESSAGES/kanagram.mo share/locale/sl/LC_MESSAGES/kandy.mo share/locale/sl/LC_MESSAGES/kappfinder.mo share/locale/sl/LC_MESSAGES/karm.mo @@ -569,6 +570,7 @@ share/locale/sl/LC_MESSAGES/khotkeys.mo share/locale/sl/LC_MESSAGES/khtmlkttsd.mo share/locale/sl/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/sl/LC_MESSAGES/kicker.mo +share/locale/sl/LC_MESSAGES/kickermenu_kate.mo share/locale/sl/LC_MESSAGES/kiconedit.mo share/locale/sl/LC_MESSAGES/kig.mo share/locale/sl/LC_MESSAGES/kimagemapeditor.mo @@ -606,6 +608,7 @@ share/locale/sl/LC_MESSAGES/kio_thumbnail.mo share/locale/sl/LC_MESSAGES/kio_trash.mo share/locale/sl/LC_MESSAGES/kio_zeroconf.mo share/locale/sl/LC_MESSAGES/kioexec.mo +share/locale/sl/LC_MESSAGES/kitchensync.mo share/locale/sl/LC_MESSAGES/kiten.mo share/locale/sl/LC_MESSAGES/kjobviewer.mo share/locale/sl/LC_MESSAGES/kjots.mo @@ -647,6 +650,7 @@ share/locale/sl/LC_MESSAGES/kmplot.mo share/locale/sl/LC_MESSAGES/kmrml.mo share/locale/sl/LC_MESSAGES/knetattach.mo share/locale/sl/LC_MESSAGES/knetwalk.mo +share/locale/sl/LC_MESSAGES/knetworkconf.mo share/locale/sl/LC_MESSAGES/knewsticker.mo share/locale/sl/LC_MESSAGES/knode.mo share/locale/sl/LC_MESSAGES/knotes.mo @@ -808,6 +812,7 @@ share/locale/sl/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/sl/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/sl/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/sl/LC_MESSAGES/libkickermenu_tom.mo +share/locale/sl/LC_MESSAGES/libkitchensync.mo share/locale/sl/LC_MESSAGES/libkleopatra.mo share/locale/sl/LC_MESSAGES/libkmime.mo share/locale/sl/LC_MESSAGES/libkonq.mo diff --git a/misc/kde4-l10n-sr/distinfo b/misc/kde4-l10n-sr/distinfo index d18ee9691cb2..4a94a70ce93c 100644 --- a/misc/kde4-l10n-sr/distinfo +++ b/misc/kde4-l10n-sr/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-sr-3.5.5.tar.bz2) = e308f4f37c5509bd5583f7fcd90bcb32 -SHA256 (KDE/kde-i18n/kde-i18n-sr-3.5.5.tar.bz2) = 9d7cac3b05f17385941bbbc3d05ca792717bf50a92b9d32e318d1f2f11ed78c9 -SIZE (KDE/kde-i18n/kde-i18n-sr-3.5.5.tar.bz2) = 2641104 +MD5 (KDE/kde-i18n/kde-i18n-sr-3.5.6.tar.bz2) = e38ff9abe6f68bc69e0df5891e7bce69 +SHA256 (KDE/kde-i18n/kde-i18n-sr-3.5.6.tar.bz2) = eb4ba6f0e98f62b4a1e6bf6e712f54918974a8bb0f8951f319fd03d8cca4bab5 +SIZE (KDE/kde-i18n/kde-i18n-sr-3.5.6.tar.bz2) = 2645423 diff --git a/misc/kde4-l10n-sr/pkg-plist b/misc/kde4-l10n-sr/pkg-plist index f8130eeaf076..2dcb9b4d7d37 100644 --- a/misc/kde4-l10n-sr/pkg-plist +++ b/misc/kde4-l10n-sr/pkg-plist @@ -304,6 +304,7 @@ share/locale/sr/LC_MESSAGES/khotkeys.mo share/locale/sr/LC_MESSAGES/khtmlkttsd.mo share/locale/sr/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/sr/LC_MESSAGES/kicker.mo +share/locale/sr/LC_MESSAGES/kickermenu_kate.mo share/locale/sr/LC_MESSAGES/kiconedit.mo share/locale/sr/LC_MESSAGES/kig.mo share/locale/sr/LC_MESSAGES/kimagemapeditor.mo @@ -341,6 +342,7 @@ share/locale/sr/LC_MESSAGES/kio_thumbnail.mo share/locale/sr/LC_MESSAGES/kio_trash.mo share/locale/sr/LC_MESSAGES/kio_zeroconf.mo share/locale/sr/LC_MESSAGES/kioexec.mo +share/locale/sr/LC_MESSAGES/kitchensync.mo share/locale/sr/LC_MESSAGES/kiten.mo share/locale/sr/LC_MESSAGES/kjobviewer.mo share/locale/sr/LC_MESSAGES/kjots.mo @@ -544,6 +546,7 @@ share/locale/sr/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/sr/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/sr/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/sr/LC_MESSAGES/libkickermenu_tom.mo +share/locale/sr/LC_MESSAGES/libkitchensync.mo share/locale/sr/LC_MESSAGES/libkleopatra.mo share/locale/sr/LC_MESSAGES/libkmime.mo share/locale/sr/LC_MESSAGES/libkonq.mo diff --git a/misc/kde4-l10n-sv/distinfo b/misc/kde4-l10n-sv/distinfo index dd6be29006bd..63252549e2df 100644 --- a/misc/kde4-l10n-sv/distinfo +++ b/misc/kde4-l10n-sv/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-sv-3.5.5.tar.bz2) = 0a614fc596f082a1a11d7ee91b1bae2a -SHA256 (KDE/kde-i18n/kde-i18n-sv-3.5.5.tar.bz2) = 0ce57064f077ce362e7b956904a662a0b303c8c7cc2c0131082e1fccc65c0d1e -SIZE (KDE/kde-i18n/kde-i18n-sv-3.5.5.tar.bz2) = 28420728 +MD5 (KDE/kde-i18n/kde-i18n-sv-3.5.6.tar.bz2) = a826fb26b9378b12dae31b15ac22d995 +SHA256 (KDE/kde-i18n/kde-i18n-sv-3.5.6.tar.bz2) = 9171affc9691742605ba789799c1b6655b06751c76222f0e3c5943355cac4166 +SIZE (KDE/kde-i18n/kde-i18n-sv-3.5.6.tar.bz2) = 28655839 diff --git a/misc/kde4-l10n-sv/pkg-plist b/misc/kde4-l10n-sv/pkg-plist index 0ef52760315c..a31146e10807 100644 --- a/misc/kde4-l10n-sv/pkg-plist +++ b/misc/kde4-l10n-sv/pkg-plist @@ -48,9 +48,25 @@ share/doc/HTML/sv/KRegExpEditor/lookaheadtools.png share/doc/HTML/sv/KRegExpEditor/repeattool.png share/doc/HTML/sv/KRegExpEditor/texttool.png share/doc/HTML/sv/KRegExpEditor/theEditor.png +share/doc/HTML/sv/akregator/add-feed.png +share/doc/HTML/sv/akregator/add-feed2.png +share/doc/HTML/sv/akregator/add-folder.png +share/doc/HTML/sv/akregator/add-folder2.png +share/doc/HTML/sv/akregator/advanced-tab.png +share/doc/HTML/sv/akregator/appearance-tab.png +share/doc/HTML/sv/akregator/archive-tab.png +share/doc/HTML/sv/akregator/browser-tab.png share/doc/HTML/sv/akregator/common +share/doc/HTML/sv/akregator/general-tab.png share/doc/HTML/sv/akregator/index.cache.bz2 share/doc/HTML/sv/akregator/index.docbook +share/doc/HTML/sv/akregator/konq.png +share/doc/HTML/sv/akregator/konq2.png +share/doc/HTML/sv/akregator/main-window.png +share/doc/HTML/sv/akregator/main-window2.png +share/doc/HTML/sv/akregator/main-window3.png +share/doc/HTML/sv/akregator/main-window4.png +share/doc/HTML/sv/akregator/quick-filter.png share/doc/HTML/sv/amor/common share/doc/HTML/sv/amor/index.cache.bz2 share/doc/HTML/sv/amor/index.docbook @@ -127,6 +143,9 @@ share/doc/HTML/sv/docs/common/gpl-translated.html share/doc/HTML/sv/docs/common/kde-localised.css share/doc/HTML/sv/docs/common/lgpl-translated.html share/doc/HTML/sv/docs/common/logotp3.png +share/doc/HTML/sv/irkick/common +share/doc/HTML/sv/irkick/index.cache.bz2 +share/doc/HTML/sv/irkick/index.docbook share/doc/HTML/sv/juk/common share/doc/HTML/sv/juk/history-playlist.png share/doc/HTML/sv/juk/index.cache.bz2 @@ -337,6 +356,9 @@ share/doc/HTML/sv/kcalc/index.docbook share/doc/HTML/sv/kcharselect/common share/doc/HTML/sv/kcharselect/index.cache.bz2 share/doc/HTML/sv/kcharselect/index.docbook +share/doc/HTML/sv/kcmlirc/common +share/doc/HTML/sv/kcmlirc/index.cache.bz2 +share/doc/HTML/sv/kcmlirc/index.docbook share/doc/HTML/sv/kcoloredit/common share/doc/HTML/sv/kcoloredit/index.cache.bz2 share/doc/HTML/sv/kcoloredit/index.docbook @@ -543,12 +565,6 @@ share/doc/HTML/sv/kdelibs/man-dcop.1.docbook share/doc/HTML/sv/kdelibs/man-kbuildsycoca.8.docbook share/doc/HTML/sv/kdelibs/man-kdeoptions.7.docbook share/doc/HTML/sv/kdelibs/man-qtoptions.7.docbook -share/doc/HTML/sv/kdelirc/irkick/common -share/doc/HTML/sv/kdelirc/irkick/index.cache.bz2 -share/doc/HTML/sv/kdelirc/irkick/index.docbook -share/doc/HTML/sv/kdelirc/kcmlirc/common -share/doc/HTML/sv/kdelirc/kcmlirc/index.cache.bz2 -share/doc/HTML/sv/kdelirc/kcmlirc/index.docbook share/doc/HTML/sv/kdeprint/add-printer-wiz.docbook share/doc/HTML/sv/kdeprint/common share/doc/HTML/sv/kdeprint/cups-config.docbook @@ -830,6 +846,7 @@ share/doc/HTML/sv/khelpcenter/userguide/common share/doc/HTML/sv/khelpcenter/userguide/control-center.docbook share/doc/HTML/sv/khelpcenter/userguide/creating-graphics.docbook share/doc/HTML/sv/khelpcenter/userguide/credits-and-license.docbook +share/doc/HTML/sv/khelpcenter/userguide/customizing-desktop.docbook share/doc/HTML/sv/khelpcenter/userguide/desktop.png share/doc/HTML/sv/khelpcenter/userguide/email.docbook share/doc/HTML/sv/khelpcenter/userguide/extragear-applications.docbook @@ -894,6 +911,7 @@ share/doc/HTML/sv/khelpcenter/userguide/screen-captures.docbook share/doc/HTML/sv/khelpcenter/userguide/services.png share/doc/HTML/sv/khelpcenter/userguide/shared-sessions.docbook share/doc/HTML/sv/khelpcenter/userguide/shortcuts.docbook +share/doc/HTML/sv/khelpcenter/userguide/splash-screen.png share/doc/HTML/sv/khelpcenter/userguide/staff.docbook share/doc/HTML/sv/khelpcenter/userguide/standard-menu-entries.docbook share/doc/HTML/sv/khelpcenter/userguide/switching-sessions.docbook @@ -908,7 +926,6 @@ share/doc/HTML/sv/khelpcenter/userguide/where-next.docbook share/doc/HTML/sv/khelpcenter/userguide/windows-how-to.docbook share/doc/HTML/sv/khelpcenter/userguide/your-kde-account.docbook share/doc/HTML/sv/khelpcenter/visualdict/common -share/doc/HTML/sv/khelpcenter/visualdict/contextmenu.png share/doc/HTML/sv/khelpcenter/visualdict/index.cache.bz2 share/doc/HTML/sv/khelpcenter/visualdict/index.docbook share/doc/HTML/sv/khelpcenter/visualdict/pict1.png @@ -924,11 +941,15 @@ share/doc/HTML/sv/khelpcenter/visualdict/pict18.png share/doc/HTML/sv/khelpcenter/visualdict/pict19.png share/doc/HTML/sv/khelpcenter/visualdict/pict2.png share/doc/HTML/sv/khelpcenter/visualdict/pict20.png +share/doc/HTML/sv/khelpcenter/visualdict/pict21.png +share/doc/HTML/sv/khelpcenter/visualdict/pict22.png +share/doc/HTML/sv/khelpcenter/visualdict/pict23.png share/doc/HTML/sv/khelpcenter/visualdict/pict3.png share/doc/HTML/sv/khelpcenter/visualdict/pict4.png share/doc/HTML/sv/khelpcenter/visualdict/pict5.png share/doc/HTML/sv/khelpcenter/visualdict/pict6.png share/doc/HTML/sv/khelpcenter/visualdict/pict7.png +share/doc/HTML/sv/khelpcenter/visualdict/pict8.png share/doc/HTML/sv/khelpcenter/welcome.docbook share/doc/HTML/sv/khelpcenter/whatiskde.docbook share/doc/HTML/sv/khexedit/common @@ -2462,6 +2483,7 @@ share/locale/sv/LC_MESSAGES/khotkeys.mo share/locale/sv/LC_MESSAGES/khtmlkttsd.mo share/locale/sv/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/sv/LC_MESSAGES/kicker.mo +share/locale/sv/LC_MESSAGES/kickermenu_kate.mo share/locale/sv/LC_MESSAGES/kiconedit.mo share/locale/sv/LC_MESSAGES/kig.mo share/locale/sv/LC_MESSAGES/kimagemapeditor.mo @@ -2499,6 +2521,7 @@ share/locale/sv/LC_MESSAGES/kio_thumbnail.mo share/locale/sv/LC_MESSAGES/kio_trash.mo share/locale/sv/LC_MESSAGES/kio_zeroconf.mo share/locale/sv/LC_MESSAGES/kioexec.mo +share/locale/sv/LC_MESSAGES/kitchensync.mo share/locale/sv/LC_MESSAGES/kiten.mo share/locale/sv/LC_MESSAGES/kjobviewer.mo share/locale/sv/LC_MESSAGES/kjots.mo @@ -2702,6 +2725,7 @@ share/locale/sv/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/sv/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/sv/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/sv/LC_MESSAGES/libkickermenu_tom.mo +share/locale/sv/LC_MESSAGES/libkitchensync.mo share/locale/sv/LC_MESSAGES/libkleopatra.mo share/locale/sv/LC_MESSAGES/libkmime.mo share/locale/sv/LC_MESSAGES/libkonq.mo @@ -2930,9 +2954,6 @@ share/locale/sv/flag.png @dirrm share/doc/HTML/sv/kdesvn-build @dirrm share/doc/HTML/sv/kdesu @dirrm share/doc/HTML/sv/kdeprint -@dirrm share/doc/HTML/sv/kdelirc/kcmlirc -@dirrm share/doc/HTML/sv/kdelirc/irkick -@dirrm share/doc/HTML/sv/kdelirc @dirrm share/doc/HTML/sv/kdelibs @dirrm share/doc/HTML/sv/kdebugdialog @dirrm share/doc/HTML/sv/kdearch @@ -2996,6 +3017,7 @@ share/locale/sv/flag.png @dirrm share/doc/HTML/sv/kcontrol/arts @dirrm share/doc/HTML/sv/kcontrol @dirrm share/doc/HTML/sv/kcoloredit +@dirrm share/doc/HTML/sv/kcmlirc @dirrm share/doc/HTML/sv/kcharselect @dirrm share/doc/HTML/sv/kcalc @dirrm share/doc/HTML/sv/kcachegrind @@ -3021,6 +3043,7 @@ share/locale/sv/flag.png @dirrm share/doc/HTML/sv/kaddressbook @dirrm share/doc/HTML/sv/kaboodle @dirrm share/doc/HTML/sv/juk +@dirrm share/doc/HTML/sv/irkick @dirrm share/doc/HTML/sv/docs/common @dirrm share/doc/HTML/sv/docs @dirrm share/doc/HTML/sv/cervisia diff --git a/misc/kde4-l10n-ta/distinfo b/misc/kde4-l10n-ta/distinfo index af7159301293..334b9b6742b1 100644 --- a/misc/kde4-l10n-ta/distinfo +++ b/misc/kde4-l10n-ta/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ta-3.5.5.tar.bz2) = 4ab3c05628fc635609218d17cce6d138 -SHA256 (KDE/kde-i18n/kde-i18n-ta-3.5.5.tar.bz2) = 3a60470355f948bf258327a1369962cf1a950fd45dcce17e3cd365546b689cfb -SIZE (KDE/kde-i18n/kde-i18n-ta-3.5.5.tar.bz2) = 2120321 +MD5 (KDE/kde-i18n/kde-i18n-ta-3.5.6.tar.bz2) = 11da7704ec348481c392cfd47af85caa +SHA256 (KDE/kde-i18n/kde-i18n-ta-3.5.6.tar.bz2) = 0ef3123bd8cb3c10dc762f23693edc444c1bba0e3972b7e1c8d9e5c226d1955a +SIZE (KDE/kde-i18n/kde-i18n-ta-3.5.6.tar.bz2) = 2122369 diff --git a/misc/kde4-l10n-tg/distinfo b/misc/kde4-l10n-tg/distinfo index 825e82222f2d..8b916339a817 100644 --- a/misc/kde4-l10n-tg/distinfo +++ b/misc/kde4-l10n-tg/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-tg-3.5.5.tar.bz2) = 135a419bb0d3429dde4bc698d095bf86 -SHA256 (KDE/kde-i18n/kde-i18n-tg-3.5.5.tar.bz2) = 36210149528026f8cf4c0414a0006ff4d7c81f983a78242d1aa682246fb86f56 -SIZE (KDE/kde-i18n/kde-i18n-tg-3.5.5.tar.bz2) = 2137881 +MD5 (KDE/kde-i18n/kde-i18n-tg-3.5.6.tar.bz2) = 33f3b735e9cbd8a736146dae8a764d06 +SHA256 (KDE/kde-i18n/kde-i18n-tg-3.5.6.tar.bz2) = 116f2c0fff6e06e021b6c3fe71b27a9e51f74181bb528d32ad9e6202f2808df0 +SIZE (KDE/kde-i18n/kde-i18n-tg-3.5.6.tar.bz2) = 2135406 diff --git a/misc/kde4-l10n-tr/distinfo b/misc/kde4-l10n-tr/distinfo index 9eb05293d2be..702d38bfefce 100644 --- a/misc/kde4-l10n-tr/distinfo +++ b/misc/kde4-l10n-tr/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-tr-3.5.5.tar.bz2) = 001d5909b3fd8121b1f4f7970d88215b -SHA256 (KDE/kde-i18n/kde-i18n-tr-3.5.5.tar.bz2) = 901fd81fbfd81db73f7f14b07d2db34d54e2bbb04850a4f5bc3b0ca6eb9920d8 -SIZE (KDE/kde-i18n/kde-i18n-tr-3.5.5.tar.bz2) = 2133194 +MD5 (KDE/kde-i18n/kde-i18n-tr-3.5.6.tar.bz2) = b56062b9908ecb6909bc4a7e4c4bb62a +SHA256 (KDE/kde-i18n/kde-i18n-tr-3.5.6.tar.bz2) = e3f1e3d3c70ec635e3ef743787328eb6dde72140c3cdbc91a9e3b190bd44d8b2 +SIZE (KDE/kde-i18n/kde-i18n-tr-3.5.6.tar.bz2) = 2136085 diff --git a/misc/kdeedu3/Makefile b/misc/kdeedu3/Makefile index a748d11c3956..3f23b4d8eb0c 100644 --- a/misc/kdeedu3/Makefile +++ b/misc/kdeedu3/Makefile @@ -29,7 +29,7 @@ USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS+=--enable-libusb=${LOCALBASE} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/misc/kdeedu3/distinfo b/misc/kdeedu3/distinfo index f8e4a14869ed..de2371c1bf6d 100644 --- a/misc/kdeedu3/distinfo +++ b/misc/kdeedu3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeedu-3.5.5.tar.bz2) = 1659863d74a510bee412d0cb404b4542 -SHA256 (KDE/kdeedu-3.5.5.tar.bz2) = f02dba5ed31d58e34c21c33989c70ce6cb185a8bebd407237175a144b3d89891 -SIZE (KDE/kdeedu-3.5.5.tar.bz2) = 30016358 +MD5 (KDE/kdeedu-3.5.6.tar.bz2) = 6017317b133d973e7fc8a279a81f37a1 +SHA256 (KDE/kdeedu-3.5.6.tar.bz2) = d3b8471f26c83c05cadfb0ff48b5d8170034c5e6e436d514529e640037350a61 +SIZE (KDE/kdeedu-3.5.6.tar.bz2) = 30049452 diff --git a/misc/kdeedu3/pkg-plist b/misc/kdeedu3/pkg-plist index 37897c4be01a..218956fcdb78 100644 --- a/misc/kdeedu3/pkg-plist +++ b/misc/kdeedu3/pkg-plist @@ -1693,14 +1693,20 @@ share/apps/ktouch/de.neo.keyboard share/apps/ktouch/de.swiss.keyboard share/apps/ktouch/dk.keyboard share/apps/ktouch/down.wav +share/apps/ktouch/dvorak-fr-1.ktouch.xml +share/apps/ktouch/dvorak-fr-2.ktouch.xml share/apps/ktouch/dvorak.ktouch.xml share/apps/ktouch/dvorak_ABCD.ktouch.xml share/apps/ktouch/dvorak_es.ktouch.xml +share/apps/ktouch/dvorak_fr.keyboard share/apps/ktouch/en.dvorak.keyboard share/apps/ktouch/en.keyboard share/apps/ktouch/english.ktouch.xml share/apps/ktouch/finnish.ktouch.xml share/apps/ktouch/finnish_for_kids.ktouch.xml +share/apps/ktouch/fr.a.keyboard +share/apps/ktouch/fr.keyboard +share/apps/ktouch/fr.swiss.keyboard share/apps/ktouch/french.ktouch.xml share/apps/ktouch/french2.ktouch.xml share/apps/ktouch/german.ktouch.xml @@ -1708,6 +1714,7 @@ share/apps/ktouch/german.neo.ktouch.xml share/apps/ktouch/german.number.ktouch.xml share/apps/ktouch/german2.ktouch.xml share/apps/ktouch/german3.ktouch.xml +share/apps/ktouch/he.keyboard share/apps/ktouch/hu.keyboard share/apps/ktouch/hungarian.ktouch.xml share/apps/ktouch/hungarian_expert.ktouch.xml @@ -1721,6 +1728,7 @@ share/apps/ktouch/polish.ktouch.xml share/apps/ktouch/russian.ktouch.xml share/apps/ktouch/russian2ktouch.xml share/apps/ktouch/russian_long.ktouch.xml +share/apps/ktouch/sl.keyboard share/apps/ktouch/slovenian.ktouch.xml share/apps/ktouch/spanish.ktouch.xml share/apps/ktouch/splash.png diff --git a/misc/kdeedu4/Makefile b/misc/kdeedu4/Makefile index a748d11c3956..3f23b4d8eb0c 100644 --- a/misc/kdeedu4/Makefile +++ b/misc/kdeedu4/Makefile @@ -29,7 +29,7 @@ USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS+=--enable-libusb=${LOCALBASE} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/misc/kdeedu4/distinfo b/misc/kdeedu4/distinfo index f8e4a14869ed..de2371c1bf6d 100644 --- a/misc/kdeedu4/distinfo +++ b/misc/kdeedu4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeedu-3.5.5.tar.bz2) = 1659863d74a510bee412d0cb404b4542 -SHA256 (KDE/kdeedu-3.5.5.tar.bz2) = f02dba5ed31d58e34c21c33989c70ce6cb185a8bebd407237175a144b3d89891 -SIZE (KDE/kdeedu-3.5.5.tar.bz2) = 30016358 +MD5 (KDE/kdeedu-3.5.6.tar.bz2) = 6017317b133d973e7fc8a279a81f37a1 +SHA256 (KDE/kdeedu-3.5.6.tar.bz2) = d3b8471f26c83c05cadfb0ff48b5d8170034c5e6e436d514529e640037350a61 +SIZE (KDE/kdeedu-3.5.6.tar.bz2) = 30049452 diff --git a/misc/kdeedu4/pkg-plist b/misc/kdeedu4/pkg-plist index 37897c4be01a..218956fcdb78 100644 --- a/misc/kdeedu4/pkg-plist +++ b/misc/kdeedu4/pkg-plist @@ -1693,14 +1693,20 @@ share/apps/ktouch/de.neo.keyboard share/apps/ktouch/de.swiss.keyboard share/apps/ktouch/dk.keyboard share/apps/ktouch/down.wav +share/apps/ktouch/dvorak-fr-1.ktouch.xml +share/apps/ktouch/dvorak-fr-2.ktouch.xml share/apps/ktouch/dvorak.ktouch.xml share/apps/ktouch/dvorak_ABCD.ktouch.xml share/apps/ktouch/dvorak_es.ktouch.xml +share/apps/ktouch/dvorak_fr.keyboard share/apps/ktouch/en.dvorak.keyboard share/apps/ktouch/en.keyboard share/apps/ktouch/english.ktouch.xml share/apps/ktouch/finnish.ktouch.xml share/apps/ktouch/finnish_for_kids.ktouch.xml +share/apps/ktouch/fr.a.keyboard +share/apps/ktouch/fr.keyboard +share/apps/ktouch/fr.swiss.keyboard share/apps/ktouch/french.ktouch.xml share/apps/ktouch/french2.ktouch.xml share/apps/ktouch/german.ktouch.xml @@ -1708,6 +1714,7 @@ share/apps/ktouch/german.neo.ktouch.xml share/apps/ktouch/german.number.ktouch.xml share/apps/ktouch/german2.ktouch.xml share/apps/ktouch/german3.ktouch.xml +share/apps/ktouch/he.keyboard share/apps/ktouch/hu.keyboard share/apps/ktouch/hungarian.ktouch.xml share/apps/ktouch/hungarian_expert.ktouch.xml @@ -1721,6 +1728,7 @@ share/apps/ktouch/polish.ktouch.xml share/apps/ktouch/russian.ktouch.xml share/apps/ktouch/russian2ktouch.xml share/apps/ktouch/russian_long.ktouch.xml +share/apps/ktouch/sl.keyboard share/apps/ktouch/slovenian.ktouch.xml share/apps/ktouch/spanish.ktouch.xml share/apps/ktouch/splash.png diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile index b686c7c02ca1..d2a8b1c1613f 100644 --- a/misc/kdeutils3/Makefile +++ b/misc/kdeutils3/Makefile @@ -7,7 +7,6 @@ PORTNAME= kdeutils PORTVERSION= ${KDE_VERSION} -PORTREVISION= 3 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -18,7 +17,7 @@ COMMENT= Utilities for the KDE integrated X11 desktop LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4 \ netsnmp:${PORTSDIR}/net-mgmt/net-snmp -RUN_DEPENDS= gpgv:${PORTSDIR}/security/gnupg1 +RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg CONFLICTS= kgpg-[0-9]* superkaramba-[0-9]* @@ -35,7 +34,7 @@ DO_NOT_COMPILE+=klaptopdaemon kmilo CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}" CONFIGURE_ARGS+=--with-pythondir=${LOCALBASE} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo index cdaf81b48169..eecf40517f6e 100644 --- a/misc/kdeutils3/distinfo +++ b/misc/kdeutils3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.5.tar.bz2) = a20a732284a3dcb735665e45f5be532e -SHA256 (KDE/kdeutils-3.5.5.tar.bz2) = 38914c84c8829ba7beb8a0e0c0ef8b4c7eee29b588c6529ff39c0bc0370f0457 -SIZE (KDE/kdeutils-3.5.5.tar.bz2) = 2988542 +MD5 (KDE/kdeutils-3.5.6.tar.bz2) = e0ea2c15ccf2bd3d8be5f2bf57cfe14a +SHA256 (KDE/kdeutils-3.5.6.tar.bz2) = 7efc558fca536a0b86abd51d7b0b9ca168e8364c222115e29424662acb0e473b +SIZE (KDE/kdeutils-3.5.6.tar.bz2) = 2989659 diff --git a/misc/kdeutils3/pkg-plist b/misc/kdeutils3/pkg-plist index bcd5d9ba088a..782d19b830c1 100644 --- a/misc/kdeutils3/pkg-plist +++ b/misc/kdeutils3/pkg-plist @@ -123,7 +123,6 @@ share/applications/kde/kdf.desktop share/applications/kde/kgpg.desktop share/applications/kde/khexedit.desktop share/applications/kde/kregexpeditor.desktop -share/applications/kde/ksim.desktop share/applications/kde/ktimer.desktop share/applications/kde/kwalletconfig.desktop share/applications/kde/kwalletmanager-kwalletd.desktop diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile index b686c7c02ca1..d2a8b1c1613f 100644 --- a/misc/kdeutils4/Makefile +++ b/misc/kdeutils4/Makefile @@ -7,7 +7,6 @@ PORTNAME= kdeutils PORTVERSION= ${KDE_VERSION} -PORTREVISION= 3 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -18,7 +17,7 @@ COMMENT= Utilities for the KDE integrated X11 desktop LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4 \ netsnmp:${PORTSDIR}/net-mgmt/net-snmp -RUN_DEPENDS= gpgv:${PORTSDIR}/security/gnupg1 +RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg CONFLICTS= kgpg-[0-9]* superkaramba-[0-9]* @@ -35,7 +34,7 @@ DO_NOT_COMPILE+=klaptopdaemon kmilo CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}" CONFIGURE_ARGS+=--with-pythondir=${LOCALBASE} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/misc/kdeutils4/distinfo b/misc/kdeutils4/distinfo index cdaf81b48169..eecf40517f6e 100644 --- a/misc/kdeutils4/distinfo +++ b/misc/kdeutils4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.5.tar.bz2) = a20a732284a3dcb735665e45f5be532e -SHA256 (KDE/kdeutils-3.5.5.tar.bz2) = 38914c84c8829ba7beb8a0e0c0ef8b4c7eee29b588c6529ff39c0bc0370f0457 -SIZE (KDE/kdeutils-3.5.5.tar.bz2) = 2988542 +MD5 (KDE/kdeutils-3.5.6.tar.bz2) = e0ea2c15ccf2bd3d8be5f2bf57cfe14a +SHA256 (KDE/kdeutils-3.5.6.tar.bz2) = 7efc558fca536a0b86abd51d7b0b9ca168e8364c222115e29424662acb0e473b +SIZE (KDE/kdeutils-3.5.6.tar.bz2) = 2989659 diff --git a/misc/kdeutils4/pkg-plist b/misc/kdeutils4/pkg-plist index bcd5d9ba088a..782d19b830c1 100644 --- a/misc/kdeutils4/pkg-plist +++ b/misc/kdeutils4/pkg-plist @@ -123,7 +123,6 @@ share/applications/kde/kdf.desktop share/applications/kde/kgpg.desktop share/applications/kde/khexedit.desktop share/applications/kde/kregexpeditor.desktop -share/applications/kde/ksim.desktop share/applications/kde/ktimer.desktop share/applications/kde/kwalletconfig.desktop share/applications/kde/kwalletmanager-kwalletd.desktop diff --git a/misc/kfile-plugins/Makefile b/misc/kfile-plugins/Makefile index e1201059cdf1..d3e16c0e22b9 100644 --- a/misc/kfile-plugins/Makefile +++ b/misc/kfile-plugins/Makefile @@ -26,7 +26,7 @@ PREFIX= ${KDE_PREFIX} USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/misc/kfile-plugins/distinfo b/misc/kfile-plugins/distinfo index b86dc7b77b7f..5a84efd83781 100644 --- a/misc/kfile-plugins/distinfo +++ b/misc/kfile-plugins/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.5.tar.bz2) = 71c0a690abf8ad0f43135fa887d0b40c -SHA256 (KDE/kdeaddons-3.5.5.tar.bz2) = 1db58293a8b967d254a39c9bdb0c5dfb3759a7d067280dd3d637e2423beb632c -SIZE (KDE/kdeaddons-3.5.5.tar.bz2) = 1663195 +MD5 (KDE/kdeaddons-3.5.6.tar.bz2) = 96d6d2a76da2a5232b3b46318456a5bc +SHA256 (KDE/kdeaddons-3.5.6.tar.bz2) = dec71f341631beb1f3e112083af11e3ef1618ed80394cf4939c662f8c5a3d807 +SIZE (KDE/kdeaddons-3.5.6.tar.bz2) = 1667731 diff --git a/misc/kfile-plugins/pkg-plist b/misc/kfile-plugins/pkg-plist index 5f03e4a1fe24..a97a8c10210b 100644 --- a/misc/kfile-plugins/pkg-plist +++ b/misc/kfile-plugins/pkg-plist @@ -20,7 +20,7 @@ lib/kde3/kfile_mhtml.so lib/kde3/kfile_txt.a lib/kde3/kfile_txt.la lib/kde3/kfile_txt.so -share/applications/kdeaddons-kfile-plugins-3.5.5 +share/applications/kdeaddons-kfile-plugins-3.5.6 share/applnk/.hidden/lnkforward.desktop share/mimelnk/application/x-win-lnk.desktop share/services/kfile_cert.desktop diff --git a/misc/kicker-applets/Makefile b/misc/kicker-applets/Makefile index 6ca956d30137..86d2b5530aaa 100644 --- a/misc/kicker-applets/Makefile +++ b/misc/kicker-applets/Makefile @@ -25,7 +25,7 @@ PREFIX= ${KDE_PREFIX} USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/misc/kicker-applets/distinfo b/misc/kicker-applets/distinfo index b86dc7b77b7f..5a84efd83781 100644 --- a/misc/kicker-applets/distinfo +++ b/misc/kicker-applets/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.5.tar.bz2) = 71c0a690abf8ad0f43135fa887d0b40c -SHA256 (KDE/kdeaddons-3.5.5.tar.bz2) = 1db58293a8b967d254a39c9bdb0c5dfb3759a7d067280dd3d637e2423beb632c -SIZE (KDE/kdeaddons-3.5.5.tar.bz2) = 1663195 +MD5 (KDE/kdeaddons-3.5.6.tar.bz2) = 96d6d2a76da2a5232b3b46318456a5bc +SHA256 (KDE/kdeaddons-3.5.6.tar.bz2) = dec71f341631beb1f3e112083af11e3ef1618ed80394cf4939c662f8c5a3d807 +SIZE (KDE/kdeaddons-3.5.6.tar.bz2) = 1667731 diff --git a/misc/kicker-applets/pkg-plist b/misc/kicker-applets/pkg-plist index 870f03252e90..cb86a257abcb 100644 --- a/misc/kicker-applets/pkg-plist +++ b/misc/kicker-applets/pkg-plist @@ -13,7 +13,7 @@ lib/kde3/math_panelapplet.so lib/kde3/mediacontrol_panelapplet.a lib/kde3/mediacontrol_panelapplet.la lib/kde3/mediacontrol_panelapplet.so -share/applications/kdeaddons-kicker-applets-3.5.5 +share/applications/kdeaddons-kicker-applets-3.5.6 share/apps/kicker/applets/kbinaryclock.desktop share/apps/kicker/applets/kolourpicker.desktop share/apps/kicker/applets/ktimemon.desktop diff --git a/misc/knewsticker-scripts/Makefile b/misc/knewsticker-scripts/Makefile index c9b20ef84d7b..80ad9288cfa3 100644 --- a/misc/knewsticker-scripts/Makefile +++ b/misc/knewsticker-scripts/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org -COMMENT= Utilityscripts for KNewsTicker +COMMENT= Additional scripts for KNewsTicker KDE_SPLIT= ${KNEWSTICKERAPP_PORTNAME:S/${KDE_SPLIT_DIST}-//} KDE_DOC_SPLIT= # none @@ -25,7 +25,7 @@ PREFIX= ${KDE_PREFIX} USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/misc/knewsticker-scripts/distinfo b/misc/knewsticker-scripts/distinfo index b86dc7b77b7f..5a84efd83781 100644 --- a/misc/knewsticker-scripts/distinfo +++ b/misc/knewsticker-scripts/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.5.tar.bz2) = 71c0a690abf8ad0f43135fa887d0b40c -SHA256 (KDE/kdeaddons-3.5.5.tar.bz2) = 1db58293a8b967d254a39c9bdb0c5dfb3759a7d067280dd3d637e2423beb632c -SIZE (KDE/kdeaddons-3.5.5.tar.bz2) = 1663195 +MD5 (KDE/kdeaddons-3.5.6.tar.bz2) = 96d6d2a76da2a5232b3b46318456a5bc +SHA256 (KDE/kdeaddons-3.5.6.tar.bz2) = dec71f341631beb1f3e112083af11e3ef1618ed80394cf4939c662f8c5a3d807 +SIZE (KDE/kdeaddons-3.5.6.tar.bz2) = 1667731 diff --git a/misc/knewsticker-scripts/pkg-plist b/misc/knewsticker-scripts/pkg-plist index 8f293e04dcc7..48c4c3fa56a2 100644 --- a/misc/knewsticker-scripts/pkg-plist +++ b/misc/knewsticker-scripts/pkg-plist @@ -1,4 +1,4 @@ -share/applications/kdeaddons-knewsticker-scripts-3.5.5 +share/applications/kdeaddons-knewsticker-scripts-3.5.6 share/apps/knewsticker/scripts/Generic.Newsticker.Error share/apps/knewsticker/scripts/Readme.ErrorHandling share/apps/knewsticker/scripts/Readme.newsrss diff --git a/misc/koffice-i18n-ca/Makefile b/misc/koffice-i18n-ca/Makefile index 5b2c53c82e80..b4bd5f13bd25 100644 --- a/misc/koffice-i18n-ca/Makefile +++ b/misc/koffice-i18n-ca/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-ca/distinfo b/misc/koffice-i18n-ca/distinfo index 64dc722ff740..e1f9aef8d9eb 100644 --- a/misc/koffice-i18n-ca/distinfo +++ b/misc/koffice-i18n-ca/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ca-1.6.1.tar.bz2) = 2af9ee48900b76f13c7b205f9f44e454 -SHA256 (KDE/kde-i18n/koffice-l10n-ca-1.6.1.tar.bz2) = bfcd51cae7df0a9985e007a0f7a275b2d0e95a2c0d8f202888c90a8b49ed6346 -SIZE (KDE/kde-i18n/koffice-l10n-ca-1.6.1.tar.bz2) = 1410868 +MD5 (KDE/kde-i18n/koffice-l10n-ca-1.6.2.tar.bz2) = 8809746f5856aa7c2b37583425501ea7 +SHA256 (KDE/kde-i18n/koffice-l10n-ca-1.6.2.tar.bz2) = 8d4104551f098df26fb80b2864fa6b8b5817b4085ff3c33676edbf329fc7eb0a +SIZE (KDE/kde-i18n/koffice-l10n-ca-1.6.2.tar.bz2) = 1675217 diff --git a/misc/koffice-i18n-ca/pkg-plist b/misc/koffice-i18n-ca/pkg-plist index f9699d3b9475..3d339bf1bdf1 100644 --- a/misc/koffice-i18n-ca/pkg-plist +++ b/misc/koffice-i18n-ca/pkg-plist @@ -8,13 +8,18 @@ share/doc/HTML/ca/kchart/index.docbook share/doc/HTML/ca/kexi/basics.docbook share/doc/HTML/ca/kexi/building.docbook share/doc/HTML/ca/kexi/common +share/doc/HTML/ca/kexi/comparing.docbook share/doc/HTML/ca/kexi/configuration.docbook share/doc/HTML/ca/kexi/credits.docbook share/doc/HTML/ca/kexi/database.docbook +share/doc/HTML/ca/kexi/designingforms.docbook +share/doc/HTML/ca/kexi/enteringdataintotables.docbook +share/doc/HTML/ca/kexi/enteringdatausingforms.docbook share/doc/HTML/ca/kexi/index.cache.bz2 share/doc/HTML/ca/kexi/index.docbook share/doc/HTML/ca/kexi/intro.docbook share/doc/HTML/ca/kexi/menus.docbook +share/doc/HTML/ca/kexi/querydesigning.docbook share/doc/HTML/ca/kformula/common share/doc/HTML/ca/kformula/index.cache.bz2 share/doc/HTML/ca/kformula/index.docbook @@ -39,13 +44,44 @@ share/doc/HTML/ca/kplato/index.docbook share/doc/HTML/ca/kplato/mainwindow.docbook share/doc/HTML/ca/kplato/options.docbook share/doc/HTML/ca/kplato/wbs.docbook +share/doc/HTML/ca/kpresenter/a11y.docbook +share/doc/HTML/ca/kpresenter/common share/doc/HTML/ca/kpresenter/faq.docbook share/doc/HTML/ca/kpresenter/great-presentations.docbook share/doc/HTML/ca/kpresenter/guides.docbook +share/doc/HTML/ca/kpresenter/index.cache.bz2 +share/doc/HTML/ca/kpresenter/index.docbook share/doc/HTML/ca/kpresenter/menus.docbook share/doc/HTML/ca/kpresenter/options.docbook share/doc/HTML/ca/kpresenter/screen.docbook share/doc/HTML/ca/kpresenter/tutorial.docbook +share/doc/HTML/ca/krita/commands-dialogs.docbook +share/doc/HTML/ca/krita/commands-menus.docbook +share/doc/HTML/ca/krita/commands-palettes.docbook +share/doc/HTML/ca/krita/commands-toolbars.docbook +share/doc/HTML/ca/krita/commands.docbook +share/doc/HTML/ca/krita/common +share/doc/HTML/ca/krita/credits.docbook +share/doc/HTML/ca/krita/developers-plugins.docbook +share/doc/HTML/ca/krita/developers-scripting.docbook +share/doc/HTML/ca/krita/developers.docbook +share/doc/HTML/ca/krita/faq.docbook +share/doc/HTML/ca/krita/index.cache.bz2 +share/doc/HTML/ca/krita/index.docbook +share/doc/HTML/ca/krita/installation.docbook +share/doc/HTML/ca/krita/introduction.docbook +share/doc/HTML/ca/krita/settings.docbook +share/doc/HTML/ca/krita/tutorial-quick-starts.docbook +share/doc/HTML/ca/krita/tutorial-select-layer.docbook +share/doc/HTML/ca/krita/tutorial-starting.docbook +share/doc/HTML/ca/krita/tutorial-tablet.docbook +share/doc/HTML/ca/krita/tutorial.docbook +share/doc/HTML/ca/krita/using-colorspaces.docbook +share/doc/HTML/ca/krita/using-filters.docbook +share/doc/HTML/ca/krita/using-images.docbook +share/doc/HTML/ca/krita/using-layers.docbook +share/doc/HTML/ca/krita/using-selections.docbook +share/doc/HTML/ca/krita/using-views.docbook share/doc/HTML/ca/kspread/a11y.docbook share/doc/HTML/ca/kspread/advanced.docbook share/doc/HTML/ca/kspread/basics.docbook @@ -81,6 +117,18 @@ share/doc/HTML/ca/kspread/shortcut1.png share/doc/HTML/ca/kspread/shortcut2.png share/doc/HTML/ca/kspread/shortcut3.png share/doc/HTML/ca/kspread/tts.png +share/doc/HTML/ca/kugar/common +share/doc/HTML/ca/kugar/datadtd.docbook +share/doc/HTML/ca/kugar/dataref.docbook +share/doc/HTML/ca/kugar/designer.docbook +share/doc/HTML/ca/kugar/index.cache.bz2 +share/doc/HTML/ca/kugar/index.docbook +share/doc/HTML/ca/kugar/progguide.docbook +share/doc/HTML/ca/kugar/starting.docbook +share/doc/HTML/ca/kugar/template-elements.docbook +share/doc/HTML/ca/kugar/template.docbook +share/doc/HTML/ca/kugar/templatedtd.docbook +share/doc/HTML/ca/kugar/tutorial.docbook share/doc/HTML/ca/kword/a11y.docbook share/doc/HTML/ca/kword/basics.docbook share/doc/HTML/ca/kword/bookmarks.docbook @@ -127,7 +175,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_abiword.mo share/locale/ca/LC_MESSAGES/kfile_gnumeric.mo @@ -156,7 +203,9 @@ share/locale/ca/LC_MESSAGES/kword.mo share/locale/ca/LC_MESSAGES/thesaurus_tool.mo @dirrm share/doc/HTML/ca/thesaurus @dirrm share/doc/HTML/ca/kword +@dirrm share/doc/HTML/ca/kugar @dirrm share/doc/HTML/ca/kspread +@dirrm share/doc/HTML/ca/krita @dirrm share/doc/HTML/ca/kpresenter @dirrm share/doc/HTML/ca/kplato @dirrm share/doc/HTML/ca/koshell diff --git a/misc/koffice-i18n-cs/Makefile b/misc/koffice-i18n-cs/Makefile index 2ab74b0b019d..49126017d9aa 100644 --- a/misc/koffice-i18n-cs/Makefile +++ b/misc/koffice-i18n-cs/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-cs/distinfo b/misc/koffice-i18n-cs/distinfo index c8b2753d9841..ba852026af3c 100644 --- a/misc/koffice-i18n-cs/distinfo +++ b/misc/koffice-i18n-cs/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-cs-1.6.1.tar.bz2) = a90d191f1d84bd5c8090ca6e004253c4 -SHA256 (KDE/kde-i18n/koffice-l10n-cs-1.6.1.tar.bz2) = 063a1db2ad60fadda8f1ab64da96e2440ae34c3b9d406ea9a45a78d27bb257c3 -SIZE (KDE/kde-i18n/koffice-l10n-cs-1.6.1.tar.bz2) = 356835 +MD5 (KDE/kde-i18n/koffice-l10n-cs-1.6.2.tar.bz2) = 2b7eb0aa4a3e21048d073b414cbca26e +SHA256 (KDE/kde-i18n/koffice-l10n-cs-1.6.2.tar.bz2) = d79ecf2a2f50b34fd8cfcc15a5f42b3b67ff4a8cd1494ab4c11e01a1fc9b6cf5 +SIZE (KDE/kde-i18n/koffice-l10n-cs-1.6.2.tar.bz2) = 356625 diff --git a/misc/koffice-i18n-cs/pkg-plist b/misc/koffice-i18n-cs/pkg-plist index 64faa279489d..f1283cce6bb0 100644 --- a/misc/koffice-i18n-cs/pkg-plist +++ b/misc/koffice-i18n-cs/pkg-plist @@ -3,7 +3,6 @@ share/locale/cs/LC_MESSAGES/desktop_koffice.mo share/locale/cs/LC_MESSAGES/example.mo share/locale/cs/LC_MESSAGES/karbon.mo share/locale/cs/LC_MESSAGES/kchart.mo -share/locale/cs/LC_MESSAGES/kdgantt.mo share/locale/cs/LC_MESSAGES/kexi.mo share/locale/cs/LC_MESSAGES/kfile_koffice.mo share/locale/cs/LC_MESSAGES/kfile_ooo.mo diff --git a/misc/koffice-i18n-cy/Makefile b/misc/koffice-i18n-cy/Makefile index e2b1ba01c39b..ea51b9d6672c 100644 --- a/misc/koffice-i18n-cy/Makefile +++ b/misc/koffice-i18n-cy/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-cy/distinfo b/misc/koffice-i18n-cy/distinfo index 21d80be97f5b..2d1eabf5a68d 100644 --- a/misc/koffice-i18n-cy/distinfo +++ b/misc/koffice-i18n-cy/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-cy-1.5.2.tar.bz2) = 64782ef55dbdfbbc3672b613dc7f5faf -SHA256 (KDE/kde-i18n/koffice-l10n-cy-1.5.2.tar.bz2) = fe88628577f77f791b445682ab42dbd5448cd2b321135c207308e0399ee6f920 -SIZE (KDE/kde-i18n/koffice-l10n-cy-1.5.2.tar.bz2) = 370382 +MD5 (KDE/kde-i18n/koffice-l10n-cy-1.6.2.tar.bz2) = 8d731dd80ebeb2d89263a3884c0fef44 +SHA256 (KDE/kde-i18n/koffice-l10n-cy-1.6.2.tar.bz2) = 21bda474b12e642a4d073ba8342274a614efa3253b98390e3dad255a47ebe0ca +SIZE (KDE/kde-i18n/koffice-l10n-cy-1.6.2.tar.bz2) = 377246 diff --git a/misc/koffice-i18n-da/Makefile b/misc/koffice-i18n-da/Makefile index 248790d56afc..d30b137918ee 100644 --- a/misc/koffice-i18n-da/Makefile +++ b/misc/koffice-i18n-da/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-da/distinfo b/misc/koffice-i18n-da/distinfo index fb79a71beb1c..583e24f07c56 100644 --- a/misc/koffice-i18n-da/distinfo +++ b/misc/koffice-i18n-da/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-da-1.6.1.tar.bz2) = 34ac13ce5bf8452f5f8b44686d03781a -SHA256 (KDE/kde-i18n/koffice-l10n-da-1.6.1.tar.bz2) = 456b9fa8dd88e20d22ccecf0fb6390738642aea1cbdacd5ae395e40981dfdfb8 -SIZE (KDE/kde-i18n/koffice-l10n-da-1.6.1.tar.bz2) = 1112047 +MD5 (KDE/kde-i18n/koffice-l10n-da-1.6.2.tar.bz2) = ed57736b883215dce9d8cf6985d70fe2 +SHA256 (KDE/kde-i18n/koffice-l10n-da-1.6.2.tar.bz2) = d8fd689d961ef66a1643b6f5e5ec82c996325c7af790a0abc9c1bb87fe2aaf81 +SIZE (KDE/kde-i18n/koffice-l10n-da-1.6.2.tar.bz2) = 1114169 diff --git a/misc/koffice-i18n-da/pkg-plist b/misc/koffice-i18n-da/pkg-plist index 834334517175..a432b4948e04 100644 --- a/misc/koffice-i18n-da/pkg-plist +++ b/misc/koffice-i18n-da/pkg-plist @@ -69,7 +69,6 @@ share/doc/HTML/da/krita/index.cache.bz2 share/doc/HTML/da/krita/index.docbook share/doc/HTML/da/krita/installation.docbook share/doc/HTML/da/krita/introduction.docbook -share/doc/HTML/da/krita/scripting.docbook share/doc/HTML/da/krita/settings.docbook share/doc/HTML/da/krita/tutorial-quick-starts.docbook share/doc/HTML/da/krita/tutorial-select-layer.docbook @@ -152,7 +151,6 @@ share/locale/da/LC_MESSAGES/desktop_koffice.mo share/locale/da/LC_MESSAGES/example.mo share/locale/da/LC_MESSAGES/karbon.mo share/locale/da/LC_MESSAGES/kchart.mo -share/locale/da/LC_MESSAGES/kdgantt.mo share/locale/da/LC_MESSAGES/kexi.mo share/locale/da/LC_MESSAGES/kfile_abiword.mo share/locale/da/LC_MESSAGES/kfile_gnumeric.mo diff --git a/misc/koffice-i18n-el/Makefile b/misc/koffice-i18n-el/Makefile index 19bbb0d828b6..c88ced91fae5 100644 --- a/misc/koffice-i18n-el/Makefile +++ b/misc/koffice-i18n-el/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-el/distinfo b/misc/koffice-i18n-el/distinfo index 0a977fd50dd0..3e43861ac5aa 100644 --- a/misc/koffice-i18n-el/distinfo +++ b/misc/koffice-i18n-el/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-el-1.6.1.tar.bz2) = c2028907c0675534694b5bad4c85ac0f -SHA256 (KDE/kde-i18n/koffice-l10n-el-1.6.1.tar.bz2) = 0fbd0569d485b233a7366d3013bd4b57ab6295e012c4bc2fd73ed961920a7a9d -SIZE (KDE/kde-i18n/koffice-l10n-el-1.6.1.tar.bz2) = 385670 +MD5 (KDE/kde-i18n/koffice-l10n-el-1.6.2.tar.bz2) = 239ea87f98dc701cc8b4b6b1ef1372b9 +SHA256 (KDE/kde-i18n/koffice-l10n-el-1.6.2.tar.bz2) = d15b71d81491ba335ee7077ac1d93272ea81ecf346294906f36e895cfd9912ea +SIZE (KDE/kde-i18n/koffice-l10n-el-1.6.2.tar.bz2) = 386210 diff --git a/misc/koffice-i18n-el/pkg-plist b/misc/koffice-i18n-el/pkg-plist index 46c436194e10..423a32aa7c81 100644 --- a/misc/koffice-i18n-el/pkg-plist +++ b/misc/koffice-i18n-el/pkg-plist @@ -2,7 +2,6 @@ share/locale/el/LC_MESSAGES/desktop_koffice.mo share/locale/el/LC_MESSAGES/example.mo share/locale/el/LC_MESSAGES/karbon.mo share/locale/el/LC_MESSAGES/kchart.mo -share/locale/el/LC_MESSAGES/kdgantt.mo share/locale/el/LC_MESSAGES/kexi.mo share/locale/el/LC_MESSAGES/kfile_abiword.mo share/locale/el/LC_MESSAGES/kfile_gnumeric.mo diff --git a/misc/koffice-i18n-en_GB/Makefile b/misc/koffice-i18n-en_GB/Makefile index cb490bb940b4..2ceee8de12a2 100644 --- a/misc/koffice-i18n-en_GB/Makefile +++ b/misc/koffice-i18n-en_GB/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-en_GB/distinfo b/misc/koffice-i18n-en_GB/distinfo index 97a08e6f157e..6ff200407f58 100644 --- a/misc/koffice-i18n-en_GB/distinfo +++ b/misc/koffice-i18n-en_GB/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-en_GB-1.6.1.tar.bz2) = 0c8edcc2fb6570ff7629e610580cac2f -SHA256 (KDE/kde-i18n/koffice-l10n-en_GB-1.6.1.tar.bz2) = bd003552c53b0b7d949cdb967b9053993e6810061c4922034e520c7e5afbb111 -SIZE (KDE/kde-i18n/koffice-l10n-en_GB-1.6.1.tar.bz2) = 357746 +MD5 (KDE/kde-i18n/koffice-l10n-en_GB-1.6.2.tar.bz2) = 445f7990c5ecb9118cbe3c7d68c74654 +SHA256 (KDE/kde-i18n/koffice-l10n-en_GB-1.6.2.tar.bz2) = 37c177e133701dd1a4c51285f96bcf8afd8c39d3ee47a08d08b706fc4fb262be +SIZE (KDE/kde-i18n/koffice-l10n-en_GB-1.6.2.tar.bz2) = 358135 diff --git a/misc/koffice-i18n-en_GB/pkg-plist b/misc/koffice-i18n-en_GB/pkg-plist index 0e783dd7b5e1..adbbd5d4d225 100644 --- a/misc/koffice-i18n-en_GB/pkg-plist +++ b/misc/koffice-i18n-en_GB/pkg-plist @@ -15,7 +15,6 @@ share/locale/en_GB/LC_MESSAGES/desktop_koffice.mo share/locale/en_GB/LC_MESSAGES/example.mo share/locale/en_GB/LC_MESSAGES/karbon.mo share/locale/en_GB/LC_MESSAGES/kchart.mo -share/locale/en_GB/LC_MESSAGES/kdgantt.mo share/locale/en_GB/LC_MESSAGES/kexi.mo share/locale/en_GB/LC_MESSAGES/kfile_koffice.mo share/locale/en_GB/LC_MESSAGES/kfile_ooo.mo diff --git a/misc/koffice-i18n-es/Makefile b/misc/koffice-i18n-es/Makefile index 3bdebfe0f4b2..22bf89236885 100644 --- a/misc/koffice-i18n-es/Makefile +++ b/misc/koffice-i18n-es/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde spanish MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-es/distinfo b/misc/koffice-i18n-es/distinfo index 96a86103ba37..d583f2a2dde6 100644 --- a/misc/koffice-i18n-es/distinfo +++ b/misc/koffice-i18n-es/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-es-1.6.1.tar.bz2) = e3095320b087fdbaf9dea4ca7384c4e7 -SHA256 (KDE/kde-i18n/koffice-l10n-es-1.6.1.tar.bz2) = 94dc8b87aea0f8e1d34ecc2b0762db9fbf0a6914c561c27d8eb6903337521c0d -SIZE (KDE/kde-i18n/koffice-l10n-es-1.6.1.tar.bz2) = 17259132 +MD5 (KDE/kde-i18n/koffice-l10n-es-1.6.2.tar.bz2) = d10222e3c617f73327db7eee522ce753 +SHA256 (KDE/kde-i18n/koffice-l10n-es-1.6.2.tar.bz2) = 09ecb9825cc27030cb5b744ce11fa89869adc8b07cbbc0c7664a8350ad63562f +SIZE (KDE/kde-i18n/koffice-l10n-es-1.6.2.tar.bz2) = 15248673 diff --git a/misc/koffice-i18n-es/pkg-plist b/misc/koffice-i18n-es/pkg-plist index de46c53cba38..b0a5fdca47aa 100644 --- a/misc/koffice-i18n-es/pkg-plist +++ b/misc/koffice-i18n-es/pkg-plist @@ -240,7 +240,6 @@ share/doc/HTML/es/krita/commands-menus.docbook share/doc/HTML/es/krita/commands-palettes.docbook share/doc/HTML/es/krita/commands-toolbars.docbook share/doc/HTML/es/krita/commands.docbook -share/doc/HTML/es/krita/common share/doc/HTML/es/krita/createdocument.png share/doc/HTML/es/krita/credits.docbook share/doc/HTML/es/krita/crocusses-bumpmap.png @@ -289,8 +288,6 @@ share/doc/HTML/es/krita/dialogs-shearimage.png share/doc/HTML/es/krita/dialogs-shearlayer.png share/doc/HTML/es/krita/faq.docbook share/doc/HTML/es/krita/filters-customconvolution.png -share/doc/HTML/es/krita/index.cache.bz2 -share/doc/HTML/es/krita/index.docbook share/doc/HTML/es/krita/installation.docbook share/doc/HTML/es/krita/introduction.docbook share/doc/HTML/es/krita/mainscreen.png @@ -568,6 +565,7 @@ share/doc/HTML/es/kword/formframe2.png share/doc/HTML/es/kword/formframe3.png share/doc/HTML/es/kword/formframe4.png share/doc/HTML/es/kword/formframe5.png +share/doc/HTML/es/kword/formframe6.png share/doc/HTML/es/kword/forminteg.png share/doc/HTML/es/kword/formllind.png share/doc/HTML/es/kword/formlrind.png @@ -727,7 +725,6 @@ share/locale/es/LC_MESSAGES/desktop_koffice.mo share/locale/es/LC_MESSAGES/example.mo share/locale/es/LC_MESSAGES/karbon.mo share/locale/es/LC_MESSAGES/kchart.mo -share/locale/es/LC_MESSAGES/kdgantt.mo share/locale/es/LC_MESSAGES/kexi.mo share/locale/es/LC_MESSAGES/kfile_abiword.mo share/locale/es/LC_MESSAGES/kfile_gnumeric.mo diff --git a/misc/koffice-i18n-et/Makefile b/misc/koffice-i18n-et/Makefile index 371637a8a638..7f2db742519a 100644 --- a/misc/koffice-i18n-et/Makefile +++ b/misc/koffice-i18n-et/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-et/distinfo b/misc/koffice-i18n-et/distinfo index cab102edda59..fc62b9b4b820 100644 --- a/misc/koffice-i18n-et/distinfo +++ b/misc/koffice-i18n-et/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-et-1.6.1.tar.bz2) = d7e32d741c284880ff01530d956cd524 -SHA256 (KDE/kde-i18n/koffice-l10n-et-1.6.1.tar.bz2) = 3af8d5733581df95d5280abfe927f922e364764c64ba5c6ca04be78c310ca395 -SIZE (KDE/kde-i18n/koffice-l10n-et-1.6.1.tar.bz2) = 1218454 +MD5 (KDE/kde-i18n/koffice-l10n-et-1.6.2.tar.bz2) = e7a4017b8db71204650c44bc72cd9500 +SHA256 (KDE/kde-i18n/koffice-l10n-et-1.6.2.tar.bz2) = 3ae6cd7182836ba235af98b679786727bb9a7581a83b3350431e2ea95de4ffdf +SIZE (KDE/kde-i18n/koffice-l10n-et-1.6.2.tar.bz2) = 1217100 diff --git a/misc/koffice-i18n-et/pkg-plist b/misc/koffice-i18n-et/pkg-plist index 42a8b9044ec5..94ca9632ea6b 100644 --- a/misc/koffice-i18n-et/pkg-plist +++ b/misc/koffice-i18n-et/pkg-plist @@ -158,7 +158,6 @@ share/locale/et/LC_MESSAGES/desktop_koffice.mo share/locale/et/LC_MESSAGES/example.mo share/locale/et/LC_MESSAGES/karbon.mo share/locale/et/LC_MESSAGES/kchart.mo -share/locale/et/LC_MESSAGES/kdgantt.mo share/locale/et/LC_MESSAGES/kexi.mo share/locale/et/LC_MESSAGES/kfile_abiword.mo share/locale/et/LC_MESSAGES/kfile_gnumeric.mo diff --git a/misc/koffice-i18n-eu/Makefile b/misc/koffice-i18n-eu/Makefile index 1b3be23fc95f..f1a3591b8054 100644 --- a/misc/koffice-i18n-eu/Makefile +++ b/misc/koffice-i18n-eu/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-eu/distinfo b/misc/koffice-i18n-eu/distinfo index 61676af5ecb9..cdedb5d75a00 100644 --- a/misc/koffice-i18n-eu/distinfo +++ b/misc/koffice-i18n-eu/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-eu-1.6.1.tar.bz2) = 33bb005893d82eeebbc1dc62495e018a -SHA256 (KDE/kde-i18n/koffice-l10n-eu-1.6.1.tar.bz2) = ba9575d582365dfb530c7e656474fb0f775b0648582c9a3d128782130ba0b624 -SIZE (KDE/kde-i18n/koffice-l10n-eu-1.6.1.tar.bz2) = 364401 +MD5 (KDE/kde-i18n/koffice-l10n-eu-1.6.2.tar.bz2) = 78244fb0777c69433dbc406bd2d5d0cc +SHA256 (KDE/kde-i18n/koffice-l10n-eu-1.6.2.tar.bz2) = 1a4d0fff8d9cce0d3b211b4bd9c4b310fb4b0055da73869535606c76b2175bed +SIZE (KDE/kde-i18n/koffice-l10n-eu-1.6.2.tar.bz2) = 365169 diff --git a/misc/koffice-i18n-eu/pkg-plist b/misc/koffice-i18n-eu/pkg-plist index 0540a7282c7e..cd343ce7a6d9 100644 --- a/misc/koffice-i18n-eu/pkg-plist +++ b/misc/koffice-i18n-eu/pkg-plist @@ -2,7 +2,6 @@ share/locale/eu/LC_MESSAGES/desktop_koffice.mo share/locale/eu/LC_MESSAGES/example.mo share/locale/eu/LC_MESSAGES/karbon.mo share/locale/eu/LC_MESSAGES/kchart.mo -share/locale/eu/LC_MESSAGES/kdgantt.mo share/locale/eu/LC_MESSAGES/kexi.mo share/locale/eu/LC_MESSAGES/kfile_koffice.mo share/locale/eu/LC_MESSAGES/kfile_ooo.mo diff --git a/misc/koffice-i18n-fa/Makefile b/misc/koffice-i18n-fa/Makefile index d21f899d3560..3973b3ccdea8 100644 --- a/misc/koffice-i18n-fa/Makefile +++ b/misc/koffice-i18n-fa/Makefile @@ -6,10 +6,10 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.5 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src/ +MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n PKGNAMEPREFIX= fa- DIST_SUBDIR= KDE diff --git a/misc/koffice-i18n-fa/distinfo b/misc/koffice-i18n-fa/distinfo index 9e825f5e9c4f..acd8c3fd6551 100644 --- a/misc/koffice-i18n-fa/distinfo +++ b/misc/koffice-i18n-fa/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-i18n-fa-1.3.5.tar.bz2) = 385bfe77bee40f92e963d1dc6b687d6c -SHA256 (KDE/kde-i18n/koffice-i18n-fa-1.3.5.tar.bz2) = 93f04eee556565a4d2f56ff9d53d106991a6f0bd47485719d1db12acdfb32eb8 -SIZE (KDE/kde-i18n/koffice-i18n-fa-1.3.5.tar.bz2) = 566310 +MD5 (KDE/kde-i18n/koffice-l10n-fa-1.6.2.tar.bz2) = c210ae6ee1dac06f0858a73183db22b6 +SHA256 (KDE/kde-i18n/koffice-l10n-fa-1.6.2.tar.bz2) = 6f010b65024bb6de408f25ea1f796a11dadb9347495a37726365ddaf10caa7c6 +SIZE (KDE/kde-i18n/koffice-l10n-fa-1.6.2.tar.bz2) = 369115 diff --git a/misc/koffice-i18n-fa/pkg-plist b/misc/koffice-i18n-fa/pkg-plist index 1659f20151bd..4e2c1a0d3dcf 100644 --- a/misc/koffice-i18n-fa/pkg-plist +++ b/misc/koffice-i18n-fa/pkg-plist @@ -1,43 +1,30 @@ -share/locale/fa/LC_MESSAGES/csvfilter.mo share/locale/fa/LC_MESSAGES/desktop_koffice.mo share/locale/fa/LC_MESSAGES/example.mo -share/locale/fa/LC_MESSAGES/karbonepsfilter.mo +share/locale/fa/LC_MESSAGES/karbon.mo share/locale/fa/LC_MESSAGES/kchart.mo +share/locale/fa/LC_MESSAGES/kexi.mo +share/locale/fa/LC_MESSAGES/kfile_abiword.mo +share/locale/fa/LC_MESSAGES/kfile_gnumeric.mo share/locale/fa/LC_MESSAGES/kfile_koffice.mo +share/locale/fa/LC_MESSAGES/kfile_ooo.mo +share/locale/fa/LC_MESSAGES/kformdesigner.mo share/locale/fa/LC_MESSAGES/kformula.mo -share/locale/fa/LC_MESSAGES/kformulalatexfilter.mo -share/locale/fa/LC_MESSAGES/kformulamathmlfilter.mo -share/locale/fa/LC_MESSAGES/kformulapngfilter.mo +share/locale/fa/LC_MESSAGES/kivio.mo share/locale/fa/LC_MESSAGES/koconverter.mo -share/locale/fa/LC_MESSAGES/kocryptfilter.mo share/locale/fa/LC_MESSAGES/koffice.mo +share/locale/fa/LC_MESSAGES/kofficefilters.mo +share/locale/fa/LC_MESSAGES/koproperty.mo share/locale/fa/LC_MESSAGES/koshell.mo share/locale/fa/LC_MESSAGES/kounavail.mo +share/locale/fa/LC_MESSAGES/kplato.mo share/locale/fa/LC_MESSAGES/kpresenter.mo -share/locale/fa/LC_MESSAGES/kpresenterkwordfilter.mo +share/locale/fa/LC_MESSAGES/krita.mo share/locale/fa/LC_MESSAGES/kscan_plugin.mo +share/locale/fa/LC_MESSAGES/kscreenshot_plugin.mo share/locale/fa/LC_MESSAGES/kspread.mo share/locale/fa/LC_MESSAGES/kspreadcalc_calc.mo -share/locale/fa/LC_MESSAGES/kspreaddbasefilter.mo -share/locale/fa/LC_MESSAGES/kspreadexcelimportfilter.mo -share/locale/fa/LC_MESSAGES/kspreadlatexexportfilter.mo -share/locale/fa/LC_MESSAGES/kspreadopencalcfilter.mo -share/locale/fa/LC_MESSAGES/kspreadqprofilter.mo +share/locale/fa/LC_MESSAGES/kspreadinsertcalendar.mo share/locale/fa/LC_MESSAGES/kthesaurus.mo share/locale/fa/LC_MESSAGES/kugar.mo share/locale/fa/LC_MESSAGES/kword.mo -share/locale/fa/LC_MESSAGES/kwordabiwordfilter.mo -share/locale/fa/LC_MESSAGES/kwordasciifilter.mo -share/locale/fa/LC_MESSAGES/kwordhtmlexportfilter.mo -share/locale/fa/LC_MESSAGES/kwordhtmlimportfilter.mo -share/locale/fa/LC_MESSAGES/kwordlatexexportfilter.mo -share/locale/fa/LC_MESSAGES/kwordlatexfilter.mo -share/locale/fa/LC_MESSAGES/kwordlateximportfilter.mo -share/locale/fa/LC_MESSAGES/kwordmswordfilter.mo -share/locale/fa/LC_MESSAGES/kwordmswritefilter.mo -share/locale/fa/LC_MESSAGES/kwordoowriterfilter.mo -share/locale/fa/LC_MESSAGES/kwordpdfimport.mo -share/locale/fa/LC_MESSAGES/olefilterswinword97filter.mo share/locale/fa/LC_MESSAGES/thesaurus_tool.mo -share/locale/fa/LC_MESSAGES/xsltexportfilter.mo -share/locale/fa/LC_MESSAGES/xsltimportfilter.mo diff --git a/misc/koffice-i18n-fi/Makefile b/misc/koffice-i18n-fi/Makefile index 8a405b0616db..cf720071bf73 100644 --- a/misc/koffice-i18n-fi/Makefile +++ b/misc/koffice-i18n-fi/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-fi/distinfo b/misc/koffice-i18n-fi/distinfo index 6e1c1ac19e88..6cc2c0e33294 100644 --- a/misc/koffice-i18n-fi/distinfo +++ b/misc/koffice-i18n-fi/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-fi-1.6.1.tar.bz2) = dc0b99fe0b1c2f0bdc5823804cf5f7f7 -SHA256 (KDE/kde-i18n/koffice-l10n-fi-1.6.1.tar.bz2) = 08a5385cc0351072849ee7b4974b22b1448200bfe98231639f243d162e90ef8a -SIZE (KDE/kde-i18n/koffice-l10n-fi-1.6.1.tar.bz2) = 359845 +MD5 (KDE/kde-i18n/koffice-l10n-fi-1.6.2.tar.bz2) = 1d3904967d3a8be1616dc0c215f4e196 +SHA256 (KDE/kde-i18n/koffice-l10n-fi-1.6.2.tar.bz2) = 6068182b07f26df45ad1bb8d5d3c9f70aeeed8708b650266143b5d8ee6fefd03 +SIZE (KDE/kde-i18n/koffice-l10n-fi-1.6.2.tar.bz2) = 365172 diff --git a/misc/koffice-i18n-fi/pkg-plist b/misc/koffice-i18n-fi/pkg-plist index f1b34356427a..a303ef4d83f7 100644 --- a/misc/koffice-i18n-fi/pkg-plist +++ b/misc/koffice-i18n-fi/pkg-plist @@ -2,7 +2,6 @@ share/locale/fi/LC_MESSAGES/desktop_koffice.mo share/locale/fi/LC_MESSAGES/example.mo share/locale/fi/LC_MESSAGES/karbon.mo share/locale/fi/LC_MESSAGES/kchart.mo -share/locale/fi/LC_MESSAGES/kdgantt.mo share/locale/fi/LC_MESSAGES/kexi.mo share/locale/fi/LC_MESSAGES/kfile_abiword.mo share/locale/fi/LC_MESSAGES/kfile_gnumeric.mo @@ -16,6 +15,7 @@ share/locale/fi/LC_MESSAGES/koffice.mo share/locale/fi/LC_MESSAGES/kofficefilters.mo share/locale/fi/LC_MESSAGES/koshell.mo share/locale/fi/LC_MESSAGES/kounavail.mo +share/locale/fi/LC_MESSAGES/kplato.mo share/locale/fi/LC_MESSAGES/kpresenter.mo share/locale/fi/LC_MESSAGES/krita.mo share/locale/fi/LC_MESSAGES/kscan_plugin.mo diff --git a/misc/koffice-i18n-ga/Makefile b/misc/koffice-i18n-ga/Makefile index 19e61ac4b29e..672d43e4ecb6 100644 --- a/misc/koffice-i18n-ga/Makefile +++ b/misc/koffice-i18n-ga/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-ga/distinfo b/misc/koffice-i18n-ga/distinfo index ac64a92304b3..5bff3e1df9f1 100644 --- a/misc/koffice-i18n-ga/distinfo +++ b/misc/koffice-i18n-ga/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ga-1.5.2.tar.bz2) = b8b4d4cbb0ff29bc0da4954eb9ba4e13 -SHA256 (KDE/kde-i18n/koffice-l10n-ga-1.5.2.tar.bz2) = 84c257d3c6672af336a3bf117a9eed2b54376dea172483bc1cb5a3ec021928a5 -SIZE (KDE/kde-i18n/koffice-l10n-ga-1.5.2.tar.bz2) = 315618 +MD5 (KDE/kde-i18n/koffice-l10n-ga-1.6.2.tar.bz2) = 721f0ae5b438ffba3e2b48b442bb4329 +SHA256 (KDE/kde-i18n/koffice-l10n-ga-1.6.2.tar.bz2) = bbfd1daf408790df032bc9eb39755cd0318d281b42cbe5ce6ecc41305c553287 +SIZE (KDE/kde-i18n/koffice-l10n-ga-1.6.2.tar.bz2) = 337275 diff --git a/misc/koffice-i18n-ga/pkg-plist b/misc/koffice-i18n-ga/pkg-plist index 8e1c92da1d07..b22327bd8a2a 100644 --- a/misc/koffice-i18n-ga/pkg-plist +++ b/misc/koffice-i18n-ga/pkg-plist @@ -3,6 +3,8 @@ share/locale/ga/LC_MESSAGES/example.mo share/locale/ga/LC_MESSAGES/karbon.mo share/locale/ga/LC_MESSAGES/kchart.mo share/locale/ga/LC_MESSAGES/kexi.mo +share/locale/ga/LC_MESSAGES/kfile_abiword.mo +share/locale/ga/LC_MESSAGES/kfile_gnumeric.mo share/locale/ga/LC_MESSAGES/kfile_koffice.mo share/locale/ga/LC_MESSAGES/kfile_ooo.mo share/locale/ga/LC_MESSAGES/kformdesigner.mo @@ -11,8 +13,10 @@ share/locale/ga/LC_MESSAGES/kivio.mo share/locale/ga/LC_MESSAGES/koconverter.mo share/locale/ga/LC_MESSAGES/koffice.mo share/locale/ga/LC_MESSAGES/kofficefilters.mo +share/locale/ga/LC_MESSAGES/koproperty.mo share/locale/ga/LC_MESSAGES/koshell.mo share/locale/ga/LC_MESSAGES/kounavail.mo +share/locale/ga/LC_MESSAGES/kplato.mo share/locale/ga/LC_MESSAGES/kpresenter.mo share/locale/ga/LC_MESSAGES/krita.mo share/locale/ga/LC_MESSAGES/kscan_plugin.mo diff --git a/misc/koffice-i18n-gl/Makefile b/misc/koffice-i18n-gl/Makefile new file mode 100644 index 000000000000..d91721e5ce05 --- /dev/null +++ b/misc/koffice-i18n-gl/Makefile @@ -0,0 +1,29 @@ +# New ports collection makefile for: koffice-i18n-gl +# Date created: 03 March 2007 +# Whom: Michael Nottebrock <lofi@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= koffice-i18n +PORTVERSION= 1.6.2 +CATEGORIES?= misc kde +MASTER_SITES= ${MASTER_SITE_KDE} +MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n +PKGNAMEPREFIX= gl- +DIST_SUBDIR= KDE + +MAINTAINER= kde@FreeBSD.org +COMMENT= Gallegan messages and documentation for koffice + +BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext + +USE_KDELIBS_VER=3 +USE_BZIP2= yes +USE_GMAKE= yes +GNU_CONFIGURE= yes +KDE_I18N= yes + +.include "${.CURDIR}/../../x11/kde3/Makefile.kde" + +.include <bsd.port.mk> diff --git a/misc/koffice-i18n-gl/distinfo b/misc/koffice-i18n-gl/distinfo new file mode 100644 index 000000000000..608bed2bb001 --- /dev/null +++ b/misc/koffice-i18n-gl/distinfo @@ -0,0 +1,3 @@ +MD5 (KDE/kde-i18n/koffice-l10n-gl-1.6.2.tar.bz2) = ab7b69562abe5d66618aa1d03296ebaa +SHA256 (KDE/kde-i18n/koffice-l10n-gl-1.6.2.tar.bz2) = be8200211cfde89e4be619efc0c460f757339190cbc5e3361c154c30b29f021c +SIZE (KDE/kde-i18n/koffice-l10n-gl-1.6.2.tar.bz2) = 460998 diff --git a/misc/koffice-i18n-gl/pkg-descr b/misc/koffice-i18n-gl/pkg-descr new file mode 100644 index 000000000000..9cb0386755e8 --- /dev/null +++ b/misc/koffice-i18n-gl/pkg-descr @@ -0,0 +1,3 @@ +Localized messages and documentation for koffice. + +WWW: http://koffice.kde.org/ diff --git a/misc/koffice-i18n-gl/pkg-plist b/misc/koffice-i18n-gl/pkg-plist new file mode 100644 index 000000000000..79e330c28a1a --- /dev/null +++ b/misc/koffice-i18n-gl/pkg-plist @@ -0,0 +1,51 @@ +share/doc/HTML/gl/karbon/common +share/doc/HTML/gl/karbon/index.cache.bz2 +share/doc/HTML/gl/karbon/index.docbook +share/doc/HTML/gl/kchart/common +share/doc/HTML/gl/kchart/index.cache.bz2 +share/doc/HTML/gl/kchart/index.docbook +share/doc/HTML/gl/koffice/common +share/doc/HTML/gl/koffice/index.cache.bz2 +share/doc/HTML/gl/koffice/index.docbook +share/doc/HTML/gl/koshell/common +share/doc/HTML/gl/koshell/index.cache.bz2 +share/doc/HTML/gl/koshell/index.docbook +share/doc/HTML/gl/thesaurus/common +share/doc/HTML/gl/thesaurus/index.cache.bz2 +share/doc/HTML/gl/thesaurus/index.docbook +share/locale/gl/LC_MESSAGES/desktop_koffice.mo +share/locale/gl/LC_MESSAGES/example.mo +share/locale/gl/LC_MESSAGES/karbon.mo +share/locale/gl/LC_MESSAGES/kchart.mo +share/locale/gl/LC_MESSAGES/kexi.mo +share/locale/gl/LC_MESSAGES/kfile_abiword.mo +share/locale/gl/LC_MESSAGES/kfile_gnumeric.mo +share/locale/gl/LC_MESSAGES/kfile_koffice.mo +share/locale/gl/LC_MESSAGES/kfile_ooo.mo +share/locale/gl/LC_MESSAGES/kformdesigner.mo +share/locale/gl/LC_MESSAGES/kformula.mo +share/locale/gl/LC_MESSAGES/kivio.mo +share/locale/gl/LC_MESSAGES/koconverter.mo +share/locale/gl/LC_MESSAGES/koffice.mo +share/locale/gl/LC_MESSAGES/kofficefilters.mo +share/locale/gl/LC_MESSAGES/koproperty.mo +share/locale/gl/LC_MESSAGES/koshell.mo +share/locale/gl/LC_MESSAGES/kounavail.mo +share/locale/gl/LC_MESSAGES/kplato.mo +share/locale/gl/LC_MESSAGES/kpresenter.mo +share/locale/gl/LC_MESSAGES/krita.mo +share/locale/gl/LC_MESSAGES/kscan_plugin.mo +share/locale/gl/LC_MESSAGES/kscreenshot_plugin.mo +share/locale/gl/LC_MESSAGES/kspread.mo +share/locale/gl/LC_MESSAGES/kspreadcalc_calc.mo +share/locale/gl/LC_MESSAGES/kspreadinsertcalendar.mo +share/locale/gl/LC_MESSAGES/kthesaurus.mo +share/locale/gl/LC_MESSAGES/kugar.mo +share/locale/gl/LC_MESSAGES/kword.mo +share/locale/gl/LC_MESSAGES/thesaurus_tool.mo +@dirrm share/doc/HTML/gl/thesaurus +@dirrm share/doc/HTML/gl/koshell +@dirrm share/doc/HTML/gl/koffice +@dirrm share/doc/HTML/gl/kchart +@dirrm share/doc/HTML/gl/karbon +@dirrm share/doc/HTML/gl diff --git a/misc/koffice-i18n-it/Makefile b/misc/koffice-i18n-it/Makefile index 7f8a39972722..a5913ca8a679 100644 --- a/misc/koffice-i18n-it/Makefile +++ b/misc/koffice-i18n-it/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-it/distinfo b/misc/koffice-i18n-it/distinfo index 9f417dfc625c..ab587c357e0d 100644 --- a/misc/koffice-i18n-it/distinfo +++ b/misc/koffice-i18n-it/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-it-1.6.1.tar.bz2) = 5fc389a6885af2acce7e5b9b48a9ce12 -SHA256 (KDE/kde-i18n/koffice-l10n-it-1.6.1.tar.bz2) = 6679bf2decdf63313bf001a51f8b89cdee2efc8c9d32d51319a84a910ff02b2b -SIZE (KDE/kde-i18n/koffice-l10n-it-1.6.1.tar.bz2) = 1638276 +MD5 (KDE/kde-i18n/koffice-l10n-it-1.6.2.tar.bz2) = 91b2df95b845fa9aabbe33a9af8e37f9 +SHA256 (KDE/kde-i18n/koffice-l10n-it-1.6.2.tar.bz2) = e4f07f020ed3466a433340b2980e215305e92e9175042863573557f98a9ab8ed +SIZE (KDE/kde-i18n/koffice-l10n-it-1.6.2.tar.bz2) = 1639570 diff --git a/misc/koffice-i18n-it/pkg-plist b/misc/koffice-i18n-it/pkg-plist index ac3627f19ced..e2258ffdc5e3 100644 --- a/misc/koffice-i18n-it/pkg-plist +++ b/misc/koffice-i18n-it/pkg-plist @@ -179,7 +179,6 @@ share/locale/it/LC_MESSAGES/desktop_koffice.mo share/locale/it/LC_MESSAGES/example.mo share/locale/it/LC_MESSAGES/karbon.mo share/locale/it/LC_MESSAGES/kchart.mo -share/locale/it/LC_MESSAGES/kdgantt.mo share/locale/it/LC_MESSAGES/kexi.mo share/locale/it/LC_MESSAGES/kfile_abiword.mo share/locale/it/LC_MESSAGES/kfile_gnumeric.mo diff --git a/misc/koffice-i18n-km/Makefile b/misc/koffice-i18n-km/Makefile new file mode 100644 index 000000000000..0931776a6a16 --- /dev/null +++ b/misc/koffice-i18n-km/Makefile @@ -0,0 +1,29 @@ +# New ports collection makefile for: koffice-i18n-km +# Date created: 03 March 2007 +# Whom: Michael Nottebrock <lofi@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= koffice-i18n +PORTVERSION= 1.6.2 +CATEGORIES?= misc kde +MASTER_SITES= ${MASTER_SITE_KDE} +MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n +PKGNAMEPREFIX= km- +DIST_SUBDIR= KDE + +MAINTAINER= kde@FreeBSD.org +COMMENT= Khmer messages and documentation for koffice + +BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext + +USE_KDELIBS_VER=3 +USE_BZIP2= yes +USE_GMAKE= yes +GNU_CONFIGURE= yes +KDE_I18N= yes + +.include "${.CURDIR}/../../x11/kde3/Makefile.kde" + +.include <bsd.port.mk> diff --git a/misc/koffice-i18n-km/distinfo b/misc/koffice-i18n-km/distinfo new file mode 100644 index 000000000000..6ef849c219fc --- /dev/null +++ b/misc/koffice-i18n-km/distinfo @@ -0,0 +1,3 @@ +MD5 (KDE/kde-i18n/koffice-l10n-km-1.6.2.tar.bz2) = a199933f40e29a3fe05c4cfd52525479 +SHA256 (KDE/kde-i18n/koffice-l10n-km-1.6.2.tar.bz2) = f2046ac1b64c246568df9ff7843eb4e6ff8e7f9a40629e3d28e61f6a61cdfd80 +SIZE (KDE/kde-i18n/koffice-l10n-km-1.6.2.tar.bz2) = 162505 diff --git a/misc/koffice-i18n-km/pkg-descr b/misc/koffice-i18n-km/pkg-descr new file mode 100644 index 000000000000..9cb0386755e8 --- /dev/null +++ b/misc/koffice-i18n-km/pkg-descr @@ -0,0 +1,3 @@ +Localized messages and documentation for koffice. + +WWW: http://koffice.kde.org/ diff --git a/misc/koffice-i18n-km/pkg-plist b/misc/koffice-i18n-km/pkg-plist new file mode 100644 index 000000000000..880db7abb1c0 --- /dev/null +++ b/misc/koffice-i18n-km/pkg-plist @@ -0,0 +1,13 @@ +share/locale/km/LC_MESSAGES/desktop_koffice.mo +share/locale/km/LC_MESSAGES/example.mo +share/locale/km/LC_MESSAGES/kfile_abiword.mo +share/locale/km/LC_MESSAGES/kfile_gnumeric.mo +share/locale/km/LC_MESSAGES/kfile_koffice.mo +share/locale/km/LC_MESSAGES/kfile_ooo.mo +share/locale/km/LC_MESSAGES/kformula.mo +share/locale/km/LC_MESSAGES/kivio.mo +share/locale/km/LC_MESSAGES/koconverter.mo +share/locale/km/LC_MESSAGES/kplato.mo +share/locale/km/LC_MESSAGES/krita.mo +@dirrm share/locale/km/LC_MESSAGES +@dirrm share/locale/km diff --git a/misc/koffice-i18n-lv/Makefile b/misc/koffice-i18n-lv/Makefile index 3ec6ff5b12bf..106daf74b643 100644 --- a/misc/koffice-i18n-lv/Makefile +++ b/misc/koffice-i18n-lv/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-lv/distinfo b/misc/koffice-i18n-lv/distinfo index cfcbabb1821d..9bf05e42995b 100644 --- a/misc/koffice-i18n-lv/distinfo +++ b/misc/koffice-i18n-lv/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-lv-1.6.1.tar.bz2) = 512650fbc0638ac0f0bae2864f295cca -SHA256 (KDE/kde-i18n/koffice-l10n-lv-1.6.1.tar.bz2) = 1c28ae196d901ddaf7ad30802510b1668014c4d4ae0299b8dde267a9faf726e2 -SIZE (KDE/kde-i18n/koffice-l10n-lv-1.6.1.tar.bz2) = 321620 +MD5 (KDE/kde-i18n/koffice-l10n-lv-1.6.2.tar.bz2) = 7e1938aa7dfef401759122bdbd54c98d +SHA256 (KDE/kde-i18n/koffice-l10n-lv-1.6.2.tar.bz2) = 0c594251d76ece8eeadcce65a1c4a511323e0f94b65e6b9d0d34735ef20ce8e4 +SIZE (KDE/kde-i18n/koffice-l10n-lv-1.6.2.tar.bz2) = 322261 diff --git a/misc/koffice-i18n-ms/Makefile b/misc/koffice-i18n-ms/Makefile index a53ad3ba941b..143d7c5f7fdb 100644 --- a/misc/koffice-i18n-ms/Makefile +++ b/misc/koffice-i18n-ms/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-ms/distinfo b/misc/koffice-i18n-ms/distinfo index 4df1b70947bc..dc987341a398 100644 --- a/misc/koffice-i18n-ms/distinfo +++ b/misc/koffice-i18n-ms/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ms-1.6.1.tar.bz2) = ff1d6abe79bf4b4239ebaccc2509c35e -SHA256 (KDE/kde-i18n/koffice-l10n-ms-1.6.1.tar.bz2) = 3f777241e8d22201f97b4be242624ec6c690ca3ee74fd9357e4e454598502d2a -SIZE (KDE/kde-i18n/koffice-l10n-ms-1.6.1.tar.bz2) = 353895 +MD5 (KDE/kde-i18n/koffice-l10n-ms-1.6.2.tar.bz2) = dbe0339a7d7bf8626e4ea7ccc8ef5c1b +SHA256 (KDE/kde-i18n/koffice-l10n-ms-1.6.2.tar.bz2) = 223ce3a2e2d2fe8cd823457c1da8ddd3ec59959facb458dd7eb9911f3e7e2b9c +SIZE (KDE/kde-i18n/koffice-l10n-ms-1.6.2.tar.bz2) = 354403 diff --git a/misc/koffice-i18n-ms/pkg-plist b/misc/koffice-i18n-ms/pkg-plist index e38de83005ca..99390aad8df2 100644 --- a/misc/koffice-i18n-ms/pkg-plist +++ b/misc/koffice-i18n-ms/pkg-plist @@ -2,7 +2,6 @@ share/locale/ms/LC_MESSAGES/desktop_koffice.mo share/locale/ms/LC_MESSAGES/example.mo share/locale/ms/LC_MESSAGES/karbon.mo share/locale/ms/LC_MESSAGES/kchart.mo -share/locale/ms/LC_MESSAGES/kdgantt.mo share/locale/ms/LC_MESSAGES/kexi.mo share/locale/ms/LC_MESSAGES/kfile_koffice.mo share/locale/ms/LC_MESSAGES/kfile_ooo.mo diff --git a/misc/koffice-i18n-nb/Makefile b/misc/koffice-i18n-nb/Makefile index 88009ebd778a..d0b367291515 100644 --- a/misc/koffice-i18n-nb/Makefile +++ b/misc/koffice-i18n-nb/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-nb/distinfo b/misc/koffice-i18n-nb/distinfo index a75ee96d5fcf..324f5c64fd63 100644 --- a/misc/koffice-i18n-nb/distinfo +++ b/misc/koffice-i18n-nb/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-nb-1.6.1.tar.bz2) = 65d3a4d15e8911faf43d1aa9c6f7b6a7 -SHA256 (KDE/kde-i18n/koffice-l10n-nb-1.6.1.tar.bz2) = 50ed91fec8debd0be62ec356107f3d7c661bd04df480719921f7c45a11e69a1d -SIZE (KDE/kde-i18n/koffice-l10n-nb-1.6.1.tar.bz2) = 380380 +MD5 (KDE/kde-i18n/koffice-l10n-nb-1.6.2.tar.bz2) = 72578347facd96247c52d48ccbbf1f0b +SHA256 (KDE/kde-i18n/koffice-l10n-nb-1.6.2.tar.bz2) = 49ea27fac5df7bc862876d640d95eaed21e37f10ea0441ca62ea0d1523e3a3b7 +SIZE (KDE/kde-i18n/koffice-l10n-nb-1.6.2.tar.bz2) = 382286 diff --git a/misc/koffice-i18n-nb/pkg-plist b/misc/koffice-i18n-nb/pkg-plist index febc3638272c..56cd255ecfe9 100644 --- a/misc/koffice-i18n-nb/pkg-plist +++ b/misc/koffice-i18n-nb/pkg-plist @@ -2,7 +2,6 @@ share/locale/nb/LC_MESSAGES/desktop_koffice.mo share/locale/nb/LC_MESSAGES/example.mo share/locale/nb/LC_MESSAGES/karbon.mo share/locale/nb/LC_MESSAGES/kchart.mo -share/locale/nb/LC_MESSAGES/kdgantt.mo share/locale/nb/LC_MESSAGES/kexi.mo share/locale/nb/LC_MESSAGES/kfile_abiword.mo share/locale/nb/LC_MESSAGES/kfile_gnumeric.mo diff --git a/misc/koffice-i18n-nl/Makefile b/misc/koffice-i18n-nl/Makefile index 0973f3e6e064..07f2907f9abf 100644 --- a/misc/koffice-i18n-nl/Makefile +++ b/misc/koffice-i18n-nl/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-nl/distinfo b/misc/koffice-i18n-nl/distinfo index 65ecfeb4b961..cdbd66afd99c 100644 --- a/misc/koffice-i18n-nl/distinfo +++ b/misc/koffice-i18n-nl/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-nl-1.6.1.tar.bz2) = 006bc0ff8b292fc8836c989d244a45bc -SHA256 (KDE/kde-i18n/koffice-l10n-nl-1.6.1.tar.bz2) = 5a5ea924223b95c56ac32e98e1f63c702574629c6d51786f2697b02f61613fb3 -SIZE (KDE/kde-i18n/koffice-l10n-nl-1.6.1.tar.bz2) = 3374788 +MD5 (KDE/kde-i18n/koffice-l10n-nl-1.6.2.tar.bz2) = 201de20b5285ac1ffccb16e75f1472e7 +SHA256 (KDE/kde-i18n/koffice-l10n-nl-1.6.2.tar.bz2) = 87a1669b6f4e42c237aed461505c291b81d373313b404652c8871d02748a70b7 +SIZE (KDE/kde-i18n/koffice-l10n-nl-1.6.2.tar.bz2) = 3377009 diff --git a/misc/koffice-i18n-nl/pkg-plist b/misc/koffice-i18n-nl/pkg-plist index 40a6e68057bd..94fd5502349f 100644 --- a/misc/koffice-i18n-nl/pkg-plist +++ b/misc/koffice-i18n-nl/pkg-plist @@ -472,7 +472,6 @@ share/locale/nl/LC_MESSAGES/desktop_koffice.mo share/locale/nl/LC_MESSAGES/example.mo share/locale/nl/LC_MESSAGES/karbon.mo share/locale/nl/LC_MESSAGES/kchart.mo -share/locale/nl/LC_MESSAGES/kdgantt.mo share/locale/nl/LC_MESSAGES/kexi.mo share/locale/nl/LC_MESSAGES/kfile_abiword.mo share/locale/nl/LC_MESSAGES/kfile_gnumeric.mo diff --git a/misc/koffice-i18n-sk/Makefile b/misc/koffice-i18n-sk/Makefile index 5a250b48c116..fb5d0adf4a3b 100644 --- a/misc/koffice-i18n-sk/Makefile +++ b/misc/koffice-i18n-sk/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-sk/distinfo b/misc/koffice-i18n-sk/distinfo index 7c87ec248a99..17c10c29e366 100644 --- a/misc/koffice-i18n-sk/distinfo +++ b/misc/koffice-i18n-sk/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-sk-1.6.1.tar.bz2) = 63b2d698040b2f5ece72e7ca67407669 -SHA256 (KDE/kde-i18n/koffice-l10n-sk-1.6.1.tar.bz2) = 45c7fb18a7046466513526c30c3d2fde70f2ecb822e9eda4f9f12a7133c9499c -SIZE (KDE/kde-i18n/koffice-l10n-sk-1.6.1.tar.bz2) = 987194 +MD5 (KDE/kde-i18n/koffice-l10n-sk-1.6.2.tar.bz2) = 8f151c52c09db40849cd67bcc11cb447 +SHA256 (KDE/kde-i18n/koffice-l10n-sk-1.6.2.tar.bz2) = cc4840c272457500e5fdb912cae69472efd709768ae950e92cc7410e696057ed +SIZE (KDE/kde-i18n/koffice-l10n-sk-1.6.2.tar.bz2) = 988301 diff --git a/misc/koffice-i18n-sk/pkg-plist b/misc/koffice-i18n-sk/pkg-plist index 9fa58c01e183..ffb01b7a3064 100644 --- a/misc/koffice-i18n-sk/pkg-plist +++ b/misc/koffice-i18n-sk/pkg-plist @@ -34,7 +34,6 @@ share/locale/sk/LC_MESSAGES/desktop_koffice.mo share/locale/sk/LC_MESSAGES/example.mo share/locale/sk/LC_MESSAGES/karbon.mo share/locale/sk/LC_MESSAGES/kchart.mo -share/locale/sk/LC_MESSAGES/kdgantt.mo share/locale/sk/LC_MESSAGES/kexi.mo share/locale/sk/LC_MESSAGES/kfile_abiword.mo share/locale/sk/LC_MESSAGES/kfile_gnumeric.mo diff --git a/misc/koffice-i18n-sl/Makefile b/misc/koffice-i18n-sl/Makefile index dc9e320c05f1..a4ae3da03d9e 100644 --- a/misc/koffice-i18n-sl/Makefile +++ b/misc/koffice-i18n-sl/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-sl/distinfo b/misc/koffice-i18n-sl/distinfo index 169aad72f8b6..d029c72b3fd7 100644 --- a/misc/koffice-i18n-sl/distinfo +++ b/misc/koffice-i18n-sl/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-sl-1.5.2.tar.bz2) = e5fe2c8a350ba2636f4bd8dd2168b017 -SHA256 (KDE/kde-i18n/koffice-l10n-sl-1.5.2.tar.bz2) = 9a81919a223b2f8b243a68ea2802518843b861f721165c3be3f2405ecd28fa24 -SIZE (KDE/kde-i18n/koffice-l10n-sl-1.5.2.tar.bz2) = 361997 +MD5 (KDE/kde-i18n/koffice-l10n-sl-1.6.2.tar.bz2) = 0e12b6670b31a089c054b9b7370ba4d3 +SHA256 (KDE/kde-i18n/koffice-l10n-sl-1.6.2.tar.bz2) = d28f6a895c412d8ea1f1db4b99954890c879aacc237d323c46351c29c81ab4c6 +SIZE (KDE/kde-i18n/koffice-l10n-sl-1.6.2.tar.bz2) = 374020 diff --git a/misc/koffice-i18n-sr/Makefile b/misc/koffice-i18n-sr/Makefile index bb7e9a3fae66..12976dc3fbdd 100644 --- a/misc/koffice-i18n-sr/Makefile +++ b/misc/koffice-i18n-sr/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-sr/distinfo b/misc/koffice-i18n-sr/distinfo index 00cc0748b09d..87a5fa0fe6ec 100644 --- a/misc/koffice-i18n-sr/distinfo +++ b/misc/koffice-i18n-sr/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-sr-1.6.1.tar.bz2) = ff1137b214460cfc6c647643da08e098 -SHA256 (KDE/kde-i18n/koffice-l10n-sr-1.6.1.tar.bz2) = 5a790a5ede02129e82f500dface6b1bc11592b14e60ed2c16865cafb883660a8 -SIZE (KDE/kde-i18n/koffice-l10n-sr-1.6.1.tar.bz2) = 382309 +MD5 (KDE/kde-i18n/koffice-l10n-sr-1.6.2.tar.bz2) = 94fb0ca00bd2f089db2854413316fe87 +SHA256 (KDE/kde-i18n/koffice-l10n-sr-1.6.2.tar.bz2) = 7a069436518a231fbbf849c8663287ba8ea1766b980fdc0b56a3845a9f58f13b +SIZE (KDE/kde-i18n/koffice-l10n-sr-1.6.2.tar.bz2) = 382991 diff --git a/misc/koffice-i18n-sr/pkg-plist b/misc/koffice-i18n-sr/pkg-plist index 2cbaa6d90f6b..44c0504be1af 100644 --- a/misc/koffice-i18n-sr/pkg-plist +++ b/misc/koffice-i18n-sr/pkg-plist @@ -2,7 +2,6 @@ share/locale/sr/LC_MESSAGES/desktop_koffice.mo share/locale/sr/LC_MESSAGES/example.mo share/locale/sr/LC_MESSAGES/karbon.mo share/locale/sr/LC_MESSAGES/kchart.mo -share/locale/sr/LC_MESSAGES/kdgantt.mo share/locale/sr/LC_MESSAGES/kexi.mo share/locale/sr/LC_MESSAGES/kfile_abiword.mo share/locale/sr/LC_MESSAGES/kfile_gnumeric.mo diff --git a/misc/koffice-i18n-sr@Latn/Makefile b/misc/koffice-i18n-sr@Latn/Makefile index 1d65f9705213..ef6cb3f78c8f 100644 --- a/misc/koffice-i18n-sr@Latn/Makefile +++ b/misc/koffice-i18n-sr@Latn/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-sr@Latn/distinfo b/misc/koffice-i18n-sr@Latn/distinfo index 366e86446314..4a65db2a9a5b 100644 --- a/misc/koffice-i18n-sr@Latn/distinfo +++ b/misc/koffice-i18n-sr@Latn/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.6.1.tar.bz2) = ed4eab803a7c0443ff3c4839e32757d1 -SHA256 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.6.1.tar.bz2) = e3305d41f6fb1b812f091c56ab390f9094d191916ee23bde883c13b93d36b85f -SIZE (KDE/kde-i18n/koffice-l10n-sr@Latn-1.6.1.tar.bz2) = 385044 +MD5 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.6.2.tar.bz2) = 93f0ba1b6b54d677a354806f0e204fe5 +SHA256 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.6.2.tar.bz2) = d1b54736996e9a55d768d7d07cab365c64d9b30267946bc4e4374fbbc0640898 +SIZE (KDE/kde-i18n/koffice-l10n-sr@Latn-1.6.2.tar.bz2) = 384555 diff --git a/misc/koffice-i18n-sr@Latn/pkg-plist b/misc/koffice-i18n-sr@Latn/pkg-plist index 48ef6abe70ee..98143cd5c517 100644 --- a/misc/koffice-i18n-sr@Latn/pkg-plist +++ b/misc/koffice-i18n-sr@Latn/pkg-plist @@ -2,7 +2,6 @@ share/locale/sr@Latn/LC_MESSAGES/desktop_koffice.mo share/locale/sr@Latn/LC_MESSAGES/example.mo share/locale/sr@Latn/LC_MESSAGES/karbon.mo share/locale/sr@Latn/LC_MESSAGES/kchart.mo -share/locale/sr@Latn/LC_MESSAGES/kdgantt.mo share/locale/sr@Latn/LC_MESSAGES/kexi.mo share/locale/sr@Latn/LC_MESSAGES/kfile_abiword.mo share/locale/sr@Latn/LC_MESSAGES/kfile_gnumeric.mo diff --git a/misc/koffice-i18n-sv/Makefile b/misc/koffice-i18n-sv/Makefile index a41463e11c3c..d3a487787ce0 100644 --- a/misc/koffice-i18n-sv/Makefile +++ b/misc/koffice-i18n-sv/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-sv/distinfo b/misc/koffice-i18n-sv/distinfo index 57649992cc47..305fdf94540e 100644 --- a/misc/koffice-i18n-sv/distinfo +++ b/misc/koffice-i18n-sv/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-sv-1.6.1.tar.bz2) = fd5ebf8d8480797f84121f9efcb00823 -SHA256 (KDE/kde-i18n/koffice-l10n-sv-1.6.1.tar.bz2) = 721174f990db6d5ea8254100048463e5d8a721335f7ec318ed52d393fd410bbb -SIZE (KDE/kde-i18n/koffice-l10n-sv-1.6.1.tar.bz2) = 6445810 +MD5 (KDE/kde-i18n/koffice-l10n-sv-1.6.2.tar.bz2) = f63e6deda90f6bc1f10985c5e7971add +SHA256 (KDE/kde-i18n/koffice-l10n-sv-1.6.2.tar.bz2) = a4c053479521cc1e3283071c0690694d3e308729ff8e8ff17e9266698eac14cc +SIZE (KDE/kde-i18n/koffice-l10n-sv-1.6.2.tar.bz2) = 6445892 diff --git a/misc/koffice-i18n-sv/pkg-plist b/misc/koffice-i18n-sv/pkg-plist index 0f24d03f2f32..984eccad701c 100644 --- a/misc/koffice-i18n-sv/pkg-plist +++ b/misc/koffice-i18n-sv/pkg-plist @@ -632,7 +632,6 @@ share/locale/sv/LC_MESSAGES/desktop_koffice.mo share/locale/sv/LC_MESSAGES/example.mo share/locale/sv/LC_MESSAGES/karbon.mo share/locale/sv/LC_MESSAGES/kchart.mo -share/locale/sv/LC_MESSAGES/kdgantt.mo share/locale/sv/LC_MESSAGES/kexi.mo share/locale/sv/LC_MESSAGES/kfile_abiword.mo share/locale/sv/LC_MESSAGES/kfile_gnumeric.mo diff --git a/misc/koffice-i18n-tr/Makefile b/misc/koffice-i18n-tr/Makefile index 7fbbde696c26..d8370e503c5d 100644 --- a/misc/koffice-i18n-tr/Makefile +++ b/misc/koffice-i18n-tr/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-tr/distinfo b/misc/koffice-i18n-tr/distinfo index 8391191c7b6d..c135f7660690 100644 --- a/misc/koffice-i18n-tr/distinfo +++ b/misc/koffice-i18n-tr/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-tr-1.6.1.tar.bz2) = 909ed845836e7219a4cf6710ee128846 -SHA256 (KDE/kde-i18n/koffice-l10n-tr-1.6.1.tar.bz2) = 70433437988733b889eaa4b62d7f3f7f34df9f13517dfd190dbdb8bde0975058 -SIZE (KDE/kde-i18n/koffice-l10n-tr-1.6.1.tar.bz2) = 369415 +MD5 (KDE/kde-i18n/koffice-l10n-tr-1.6.2.tar.bz2) = a17e9f38819b242b9019b92412b2d22f +SHA256 (KDE/kde-i18n/koffice-l10n-tr-1.6.2.tar.bz2) = c33d57249c97fe689cb6b1a05612b69987d3a12064527b1c523c5fd95edd48b5 +SIZE (KDE/kde-i18n/koffice-l10n-tr-1.6.2.tar.bz2) = 368002 diff --git a/misc/koffice-i18n-tr/pkg-plist b/misc/koffice-i18n-tr/pkg-plist index 265074fd8d3e..a45d88477dc7 100644 --- a/misc/koffice-i18n-tr/pkg-plist +++ b/misc/koffice-i18n-tr/pkg-plist @@ -2,7 +2,6 @@ share/locale/tr/LC_MESSAGES/desktop_koffice.mo share/locale/tr/LC_MESSAGES/example.mo share/locale/tr/LC_MESSAGES/karbon.mo share/locale/tr/LC_MESSAGES/kchart.mo -share/locale/tr/LC_MESSAGES/kdgantt.mo share/locale/tr/LC_MESSAGES/kexi.mo share/locale/tr/LC_MESSAGES/kfile_abiword.mo share/locale/tr/LC_MESSAGES/kfile_gnumeric.mo diff --git a/misc/koffice-i18n/Makefile b/misc/koffice-i18n/Makefile index bd8bae7d81c3..8cdef1089255 100644 --- a/misc/koffice-i18n/Makefile +++ b/misc/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES= misc kde MASTER_SITES= # none DISTFILES= # none @@ -16,6 +16,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Localized messages and documentation for KDE RUN_DEPENDS+=\ + ${LOCALBASE}/share/locale/km/LC_MESSAGES/example.mo:${PORTSDIR}/misc/koffice-i18n-km\ ${LOCALBASE}/share/locale/ar/LC_MESSAGES/kword.mo:${PORTSDIR}/arabic/koffice-i18n\ ${LOCALBASE}/share/locale/de/LC_MESSAGES/kword.mo:${PORTSDIR}/german/koffice-i18n\ ${LOCALBASE}/share/locale/fr/LC_MESSAGES/kword.mo:${PORTSDIR}/french/koffice-i18n\ @@ -30,7 +31,7 @@ RUN_DEPENDS+=\ ${LOCALBASE}/share/locale/zh_CN/LC_MESSAGES/kword.mo:${PORTSDIR}/chinese/koffice-i18n-zh_CN \ ${LOCALBASE}/share/locale/zh_TW/LC_MESSAGES/kword.mo:${PORTSDIR}/chinese/koffice-i18n-zh_TW -.for LANG in af bg br bs ca cs cy da el en_GB eo es et eu fa fi ga hi hsb is it \ +.for LANG in af bg br bs ca cs cy da el en_GB eo es et eu fa fi ga gl hi hsb is it \ lo lt lv mk ms mt nb nl nn ro se sk sl sr sr@Latn sv ta tg th tr uz ven xh zu RUN_DEPENDS+=\ ${LOCALBASE}/share/locale/${LANG}/LC_MESSAGES/kword.mo:${PORTSDIR}/misc/koffice-i18n-${LANG} diff --git a/misc/konq-plugins-kde4/Makefile b/misc/konq-plugins-kde4/Makefile index 9dd0f2c5345e..33dfe53301c3 100644 --- a/misc/konq-plugins-kde4/Makefile +++ b/misc/konq-plugins-kde4/Makefile @@ -25,7 +25,7 @@ PREFIX= ${KDE_PREFIX} USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/misc/konq-plugins-kde4/distinfo b/misc/konq-plugins-kde4/distinfo index b86dc7b77b7f..5a84efd83781 100644 --- a/misc/konq-plugins-kde4/distinfo +++ b/misc/konq-plugins-kde4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.5.tar.bz2) = 71c0a690abf8ad0f43135fa887d0b40c -SHA256 (KDE/kdeaddons-3.5.5.tar.bz2) = 1db58293a8b967d254a39c9bdb0c5dfb3759a7d067280dd3d637e2423beb632c -SIZE (KDE/kdeaddons-3.5.5.tar.bz2) = 1663195 +MD5 (KDE/kdeaddons-3.5.6.tar.bz2) = 96d6d2a76da2a5232b3b46318456a5bc +SHA256 (KDE/kdeaddons-3.5.6.tar.bz2) = dec71f341631beb1f3e112083af11e3ef1618ed80394cf4939c662f8c5a3d807 +SIZE (KDE/kdeaddons-3.5.6.tar.bz2) = 1667731 diff --git a/misc/konq-plugins-kde4/pkg-plist b/misc/konq-plugins-kde4/pkg-plist index 6c09f11eb267..b077b8c79a9a 100644 --- a/misc/konq-plugins-kde4/pkg-plist +++ b/misc/konq-plugins-kde4/pkg-plist @@ -76,7 +76,7 @@ lib/kde3/libwebarchiverplugin.so lib/kde3/webarchivethumbnail.a lib/kde3/webarchivethumbnail.la lib/kde3/webarchivethumbnail.so -share/applications/kdeaddons-konq-plugins-3.5.5 +share/applications/kdeaddons-konq-plugins-3.5.6 share/applnk/.hidden/arkplugin.desktop share/applnk/.hidden/kcmkuick.desktop share/applnk/.hidden/kuickplugin.desktop diff --git a/misc/konq-plugins/Makefile b/misc/konq-plugins/Makefile index 9dd0f2c5345e..33dfe53301c3 100644 --- a/misc/konq-plugins/Makefile +++ b/misc/konq-plugins/Makefile @@ -25,7 +25,7 @@ PREFIX= ${KDE_PREFIX} USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/misc/konq-plugins/distinfo b/misc/konq-plugins/distinfo index b86dc7b77b7f..5a84efd83781 100644 --- a/misc/konq-plugins/distinfo +++ b/misc/konq-plugins/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.5.tar.bz2) = 71c0a690abf8ad0f43135fa887d0b40c -SHA256 (KDE/kdeaddons-3.5.5.tar.bz2) = 1db58293a8b967d254a39c9bdb0c5dfb3759a7d067280dd3d637e2423beb632c -SIZE (KDE/kdeaddons-3.5.5.tar.bz2) = 1663195 +MD5 (KDE/kdeaddons-3.5.6.tar.bz2) = 96d6d2a76da2a5232b3b46318456a5bc +SHA256 (KDE/kdeaddons-3.5.6.tar.bz2) = dec71f341631beb1f3e112083af11e3ef1618ed80394cf4939c662f8c5a3d807 +SIZE (KDE/kdeaddons-3.5.6.tar.bz2) = 1667731 diff --git a/misc/konq-plugins/pkg-plist b/misc/konq-plugins/pkg-plist index 6c09f11eb267..b077b8c79a9a 100644 --- a/misc/konq-plugins/pkg-plist +++ b/misc/konq-plugins/pkg-plist @@ -76,7 +76,7 @@ lib/kde3/libwebarchiverplugin.so lib/kde3/webarchivethumbnail.a lib/kde3/webarchivethumbnail.la lib/kde3/webarchivethumbnail.so -share/applications/kdeaddons-konq-plugins-3.5.5 +share/applications/kdeaddons-konq-plugins-3.5.6 share/applnk/.hidden/arkplugin.desktop share/applnk/.hidden/kcmkuick.desktop share/applnk/.hidden/kuickplugin.desktop diff --git a/misc/ksig/Makefile b/misc/ksig/Makefile index aab63c8880fb..00cbfd255f33 100644 --- a/misc/ksig/Makefile +++ b/misc/ksig/Makefile @@ -25,7 +25,7 @@ PREFIX= ${KDE_PREFIX} USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/misc/ksig/distinfo b/misc/ksig/distinfo index b86dc7b77b7f..5a84efd83781 100644 --- a/misc/ksig/distinfo +++ b/misc/ksig/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.5.tar.bz2) = 71c0a690abf8ad0f43135fa887d0b40c -SHA256 (KDE/kdeaddons-3.5.5.tar.bz2) = 1db58293a8b967d254a39c9bdb0c5dfb3759a7d067280dd3d637e2423beb632c -SIZE (KDE/kdeaddons-3.5.5.tar.bz2) = 1663195 +MD5 (KDE/kdeaddons-3.5.6.tar.bz2) = 96d6d2a76da2a5232b3b46318456a5bc +SHA256 (KDE/kdeaddons-3.5.6.tar.bz2) = dec71f341631beb1f3e112083af11e3ef1618ed80394cf4939c662f8c5a3d807 +SIZE (KDE/kdeaddons-3.5.6.tar.bz2) = 1667731 diff --git a/misc/ksig/pkg-plist b/misc/ksig/pkg-plist index 81dc74ea25af..09dc154bff5e 100644 --- a/misc/ksig/pkg-plist +++ b/misc/ksig/pkg-plist @@ -1,6 +1,6 @@ bin/ksig share/applications/kde/ksig.desktop -share/applications/kdeaddons-ksig-3.5.5 +share/applications/kdeaddons-ksig-3.5.6 share/apps/ksig/ksigui.rc share/icons/hicolor/16x16/apps/ksig.png share/icons/hicolor/32x32/apps/ksig.png diff --git a/misc/renamedlgplugins/Makefile b/misc/renamedlgplugins/Makefile index 946b4ccf5ba6..9f6da38fa017 100644 --- a/misc/renamedlgplugins/Makefile +++ b/misc/renamedlgplugins/Makefile @@ -25,7 +25,7 @@ PREFIX= ${KDE_PREFIX} USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/misc/renamedlgplugins/distinfo b/misc/renamedlgplugins/distinfo index b86dc7b77b7f..5a84efd83781 100644 --- a/misc/renamedlgplugins/distinfo +++ b/misc/renamedlgplugins/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.5.tar.bz2) = 71c0a690abf8ad0f43135fa887d0b40c -SHA256 (KDE/kdeaddons-3.5.5.tar.bz2) = 1db58293a8b967d254a39c9bdb0c5dfb3759a7d067280dd3d637e2423beb632c -SIZE (KDE/kdeaddons-3.5.5.tar.bz2) = 1663195 +MD5 (KDE/kdeaddons-3.5.6.tar.bz2) = 96d6d2a76da2a5232b3b46318456a5bc +SHA256 (KDE/kdeaddons-3.5.6.tar.bz2) = dec71f341631beb1f3e112083af11e3ef1618ed80394cf4939c662f8c5a3d807 +SIZE (KDE/kdeaddons-3.5.6.tar.bz2) = 1667731 diff --git a/misc/renamedlgplugins/pkg-plist b/misc/renamedlgplugins/pkg-plist index 366419940a45..8b7d02aea798 100644 --- a/misc/renamedlgplugins/pkg-plist +++ b/misc/renamedlgplugins/pkg-plist @@ -4,6 +4,6 @@ lib/kde3/librenaudioplugin.so lib/kde3/librenimageplugin.a lib/kde3/librenimageplugin.la lib/kde3/librenimageplugin.so -share/applications/kdeaddons-renamedlg-plugins-3.5.5 +share/applications/kdeaddons-renamedlg-plugins-3.5.6 share/services/renaudiodlg.desktop share/services/renimagedlg.desktop diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile index 742409c47c7c..08f08468273c 100644 --- a/multimedia/kdemultimedia3/Makefile +++ b/multimedia/kdemultimedia3/Makefile @@ -23,6 +23,7 @@ LIB_DEPENDS+= audiofile:${PORTSDIR}/audio/libaudiofile \ cdda_paranoia:${PORTSDIR}/audio/cdparanoia \ ogg:${PORTSDIR}/audio/libogg \ tag:${PORTSDIR}/audio/taglib \ + theora:${PORTSDIR}/multimedia/libtheora \ vorbis:${PORTSDIR}/audio/libvorbis USE_KDELIBS_VER=3 @@ -36,7 +37,7 @@ MAKE_ENV= ${CONFIGURE_ENV} CONFIGURE_ARGS+= --with-vorbis="${LOCALBASE}" --disable-xinetest CONFIGURE_ENV+= AKODE_CONFIG=${LOCALBASE}/bin/akode-config -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 DO_NOT_COMPILE+=akode juk mpeglib mpeglib_artsplug xine_artsplugin @@ -47,13 +48,6 @@ OPTIONS= AKODE "Use akode for audio playback" on \ .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> -#.if ${OSVERSION} > 500035 -LIB_DEPENDS+= theora:${PORTSDIR}/multimedia/libtheora -PLIST_SUB+= THEORA="" -#.else -#PLIST_SUB+= THEORA="@comment " -#.endif - .if !defined(WITHOUT_AKODE) LIB_DEPENDS+= akode:${PORTSDIR}/audio/akode RUN_DEPENDS+= ${LOCALBASE}/lib/libakode.so:${PORTSDIR}/audio/akode diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo index 9b50fd30006c..a745fd185171 100644 --- a/multimedia/kdemultimedia3/distinfo +++ b/multimedia/kdemultimedia3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdemultimedia-3.5.5.tar.bz2) = fc8f0911050c42aec0636cf3873e22ba -SHA256 (KDE/kdemultimedia-3.5.5.tar.bz2) = 1c15f9572bec29fbfac5224b7f7c88bd57375c827622a9017d3861475881fb4c -SIZE (KDE/kdemultimedia-3.5.5.tar.bz2) = 6287234 +MD5 (KDE/kdemultimedia-3.5.6.tar.bz2) = 57c50bfcb0147324a1af02ebcc103376 +SHA256 (KDE/kdemultimedia-3.5.6.tar.bz2) = 1a08f71c73cacb1da1d2269d0376193c23de727235a255866f869caeea300719 +SIZE (KDE/kdemultimedia-3.5.6.tar.bz2) = 6291692 diff --git a/multimedia/kdemultimedia3/pkg-plist b/multimedia/kdemultimedia3/pkg-plist index d12f057c3a87..b18ea9fc7e07 100644 --- a/multimedia/kdemultimedia3/pkg-plist +++ b/multimedia/kdemultimedia3/pkg-plist @@ -105,9 +105,9 @@ lib/kde3/kfile_ogg.so lib/kde3/kfile_sid.a lib/kde3/kfile_sid.la lib/kde3/kfile_sid.so -%%THEORA%%lib/kde3/kfile_theora.a -%%THEORA%%lib/kde3/kfile_theora.la -%%THEORA%%lib/kde3/kfile_theora.so +lib/kde3/kfile_theora.a +lib/kde3/kfile_theora.la +lib/kde3/kfile_theora.so lib/kde3/kfile_wav.a lib/kde3/kfile_wav.la lib/kde3/kfile_wav.so @@ -1128,7 +1128,7 @@ share/services/kfile_mpc.desktop share/services/kfile_mpeg.desktop share/services/kfile_ogg.desktop share/services/kfile_sid.desktop -%%THEORA%%share/services/kfile_theora.desktop +share/services/kfile_theora.desktop share/services/kfile_wav.desktop share/services/kmixctrl_restore.desktop share/services/krec_exportogg.desktop diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile index 742409c47c7c..08f08468273c 100644 --- a/multimedia/kdemultimedia4/Makefile +++ b/multimedia/kdemultimedia4/Makefile @@ -23,6 +23,7 @@ LIB_DEPENDS+= audiofile:${PORTSDIR}/audio/libaudiofile \ cdda_paranoia:${PORTSDIR}/audio/cdparanoia \ ogg:${PORTSDIR}/audio/libogg \ tag:${PORTSDIR}/audio/taglib \ + theora:${PORTSDIR}/multimedia/libtheora \ vorbis:${PORTSDIR}/audio/libvorbis USE_KDELIBS_VER=3 @@ -36,7 +37,7 @@ MAKE_ENV= ${CONFIGURE_ENV} CONFIGURE_ARGS+= --with-vorbis="${LOCALBASE}" --disable-xinetest CONFIGURE_ENV+= AKODE_CONFIG=${LOCALBASE}/bin/akode-config -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 DO_NOT_COMPILE+=akode juk mpeglib mpeglib_artsplug xine_artsplugin @@ -47,13 +48,6 @@ OPTIONS= AKODE "Use akode for audio playback" on \ .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> -#.if ${OSVERSION} > 500035 -LIB_DEPENDS+= theora:${PORTSDIR}/multimedia/libtheora -PLIST_SUB+= THEORA="" -#.else -#PLIST_SUB+= THEORA="@comment " -#.endif - .if !defined(WITHOUT_AKODE) LIB_DEPENDS+= akode:${PORTSDIR}/audio/akode RUN_DEPENDS+= ${LOCALBASE}/lib/libakode.so:${PORTSDIR}/audio/akode diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo index 9b50fd30006c..a745fd185171 100644 --- a/multimedia/kdemultimedia4/distinfo +++ b/multimedia/kdemultimedia4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdemultimedia-3.5.5.tar.bz2) = fc8f0911050c42aec0636cf3873e22ba -SHA256 (KDE/kdemultimedia-3.5.5.tar.bz2) = 1c15f9572bec29fbfac5224b7f7c88bd57375c827622a9017d3861475881fb4c -SIZE (KDE/kdemultimedia-3.5.5.tar.bz2) = 6287234 +MD5 (KDE/kdemultimedia-3.5.6.tar.bz2) = 57c50bfcb0147324a1af02ebcc103376 +SHA256 (KDE/kdemultimedia-3.5.6.tar.bz2) = 1a08f71c73cacb1da1d2269d0376193c23de727235a255866f869caeea300719 +SIZE (KDE/kdemultimedia-3.5.6.tar.bz2) = 6291692 diff --git a/multimedia/kdemultimedia4/pkg-plist b/multimedia/kdemultimedia4/pkg-plist index d12f057c3a87..b18ea9fc7e07 100644 --- a/multimedia/kdemultimedia4/pkg-plist +++ b/multimedia/kdemultimedia4/pkg-plist @@ -105,9 +105,9 @@ lib/kde3/kfile_ogg.so lib/kde3/kfile_sid.a lib/kde3/kfile_sid.la lib/kde3/kfile_sid.so -%%THEORA%%lib/kde3/kfile_theora.a -%%THEORA%%lib/kde3/kfile_theora.la -%%THEORA%%lib/kde3/kfile_theora.so +lib/kde3/kfile_theora.a +lib/kde3/kfile_theora.la +lib/kde3/kfile_theora.so lib/kde3/kfile_wav.a lib/kde3/kfile_wav.la lib/kde3/kfile_wav.so @@ -1128,7 +1128,7 @@ share/services/kfile_mpc.desktop share/services/kfile_mpeg.desktop share/services/kfile_ogg.desktop share/services/kfile_sid.desktop -%%THEORA%%share/services/kfile_theora.desktop +share/services/kfile_theora.desktop share/services/kfile_wav.desktop share/services/kmixctrl_restore.desktop share/services/krec_exportogg.desktop diff --git a/multimedia/noatun-plugins/Makefile b/multimedia/noatun-plugins/Makefile index e3ba820f3495..4c5cfdbc2021 100644 --- a/multimedia/noatun-plugins/Makefile +++ b/multimedia/noatun-plugins/Makefile @@ -28,7 +28,7 @@ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_SDL= sdl -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/multimedia/noatun-plugins/distinfo b/multimedia/noatun-plugins/distinfo index b86dc7b77b7f..5a84efd83781 100644 --- a/multimedia/noatun-plugins/distinfo +++ b/multimedia/noatun-plugins/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.5.tar.bz2) = 71c0a690abf8ad0f43135fa887d0b40c -SHA256 (KDE/kdeaddons-3.5.5.tar.bz2) = 1db58293a8b967d254a39c9bdb0c5dfb3759a7d067280dd3d637e2423beb632c -SIZE (KDE/kdeaddons-3.5.5.tar.bz2) = 1663195 +MD5 (KDE/kdeaddons-3.5.6.tar.bz2) = 96d6d2a76da2a5232b3b46318456a5bc +SHA256 (KDE/kdeaddons-3.5.6.tar.bz2) = dec71f341631beb1f3e112083af11e3ef1618ed80394cf4939c662f8c5a3d807 +SIZE (KDE/kdeaddons-3.5.6.tar.bz2) = 1667731 diff --git a/multimedia/noatun-plugins/pkg-plist b/multimedia/noatun-plugins/pkg-plist index 58afe67885f9..201bac376550 100644 --- a/multimedia/noatun-plugins/pkg-plist +++ b/multimedia/noatun-plugins/pkg-plist @@ -43,7 +43,7 @@ lib/kde3/noatunwakeup.so lib/kde3/noatunwavecapture.a lib/kde3/noatunwavecapture.la lib/kde3/noatunwavecapture.so -share/applications/kdeaddons-noatun-plugins-3.5.5 +share/applications/kdeaddons-noatun-plugins-3.5.6 share/apps/noatun/alsaplayerui.plugin share/apps/noatun/blurscope.plugin share/apps/noatun/charlatanui.plugin diff --git a/multimedia/xine_artsplugin/Makefile b/multimedia/xine_artsplugin/Makefile index c07864da2882..ddbfe72d7159 100644 --- a/multimedia/xine_artsplugin/Makefile +++ b/multimedia/xine_artsplugin/Makefile @@ -29,7 +29,7 @@ USE_BZIP2= yes USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes WRKSRC= ${WRKDIR}/kdemultimedia-${PORTVERSION} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes pre-configure: ${REINPLACE_CMD} -e 's/-lc_r/${PTHREAD_LIBS}/g' \ diff --git a/multimedia/xine_artsplugin/distinfo b/multimedia/xine_artsplugin/distinfo index 9b50fd30006c..a745fd185171 100644 --- a/multimedia/xine_artsplugin/distinfo +++ b/multimedia/xine_artsplugin/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdemultimedia-3.5.5.tar.bz2) = fc8f0911050c42aec0636cf3873e22ba -SHA256 (KDE/kdemultimedia-3.5.5.tar.bz2) = 1c15f9572bec29fbfac5224b7f7c88bd57375c827622a9017d3861475881fb4c -SIZE (KDE/kdemultimedia-3.5.5.tar.bz2) = 6287234 +MD5 (KDE/kdemultimedia-3.5.6.tar.bz2) = 57c50bfcb0147324a1af02ebcc103376 +SHA256 (KDE/kdemultimedia-3.5.6.tar.bz2) = 1a08f71c73cacb1da1d2269d0376193c23de727235a255866f869caeea300719 +SIZE (KDE/kdemultimedia-3.5.6.tar.bz2) = 6291692 diff --git a/net-im/kopete/Makefile b/net-im/kopete/Makefile index e3d223bf2775..b6ee98ca1731 100644 --- a/net-im/kopete/Makefile +++ b/net-im/kopete/Makefile @@ -6,12 +6,12 @@ # PORTNAME= kopete -PORTVERSION= 0.12.3 +PORTVERSION= 0.12.4 CATEGORIES?= net-im kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/3.5.5/src +MASTER_SITE_SUBDIR= stable/3.5.6/src PKGNAMEPREFIX= kdenetwork- -DISTNAME= kdenetwork-3.5.5 +DISTNAME= kdenetwork-3.5.6 DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org diff --git a/net-im/kopete/distinfo b/net-im/kopete/distinfo index 7615aba07796..6a8b1a2651e3 100644 --- a/net-im/kopete/distinfo +++ b/net-im/kopete/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdenetwork-3.5.5.tar.bz2) = a6e642c070cbd50d4a817f6588bf8e46 -SHA256 (KDE/kdenetwork-3.5.5.tar.bz2) = c3f36e69bbd23902f2bdd9a1a8cda93b0436338ada422bb8ac6bc3d2bcd8e38f -SIZE (KDE/kdenetwork-3.5.5.tar.bz2) = 9235564 +MD5 (KDE/kdenetwork-3.5.6.tar.bz2) = 0f428cccc4ea16aa53c427530874c591 +SHA256 (KDE/kdenetwork-3.5.6.tar.bz2) = 786e6c25d5cba4ed1eeac947c5554d7fe57de593abf6551c58c178043b82475e +SIZE (KDE/kdenetwork-3.5.6.tar.bz2) = 9245468 diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile index 90188bce6974..55cc4bfe08dc 100644 --- a/net/kdenetwork3/Makefile +++ b/net/kdenetwork3/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdenetwork PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 CATEGORIES?= net kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -30,7 +29,7 @@ USE_GMAKE= yes USE_OPENSSL= yes USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 DO_NOT_COMPILE+=kopete lanbrowsing filesharing diff --git a/net/kdenetwork3/distinfo b/net/kdenetwork3/distinfo index 7615aba07796..6a8b1a2651e3 100644 --- a/net/kdenetwork3/distinfo +++ b/net/kdenetwork3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdenetwork-3.5.5.tar.bz2) = a6e642c070cbd50d4a817f6588bf8e46 -SHA256 (KDE/kdenetwork-3.5.5.tar.bz2) = c3f36e69bbd23902f2bdd9a1a8cda93b0436338ada422bb8ac6bc3d2bcd8e38f -SIZE (KDE/kdenetwork-3.5.5.tar.bz2) = 9235564 +MD5 (KDE/kdenetwork-3.5.6.tar.bz2) = 0f428cccc4ea16aa53c427530874c591 +SHA256 (KDE/kdenetwork-3.5.6.tar.bz2) = 786e6c25d5cba4ed1eeac947c5554d7fe57de593abf6551c58c178043b82475e +SIZE (KDE/kdenetwork-3.5.6.tar.bz2) = 9245468 diff --git a/net/kdenetwork3/files/patch-post-3.5.5-kdenetwork-ksirc.diff b/net/kdenetwork3/files/patch-post-3.5.5-kdenetwork-ksirc.diff deleted file mode 100644 index db3f82833b43..000000000000 --- a/net/kdenetwork3/files/patch-post-3.5.5-kdenetwork-ksirc.diff +++ /dev/null @@ -1,26 +0,0 @@ ------------------------------------------------------------------------- -r621124 | mueller | 2007-01-08 11:33:10 +0100 (Mon, 08 Jan 2007) | 2 lines - -add fix for CVE-2006-6811 - ------------------------------------------------------------------------- -Index: ksirc/iocontroller.cpp -=================================================================== ---- ksirc/iocontroller.cpp (revision 621123) -+++ ksirc/iocontroller.cpp (revision 621124) -@@ -266,13 +266,13 @@ void KSircIOController::stdout_read(KPro - if(ksopts->autoCreateWin == TRUE && line[0] != '`' && line[1] != '#' && line[1] != '&' && noticeCreate) { - //kdDebug(5008) << "Creating window for: " << qsname << " because of: " << line.data() << endl; - ksircproc->new_toplevel(KSircChannel(ksircproc->serverName(), qsname)); -- assert(ksircproc->TopList[qsname] != 0x0); - } -- else{ -+ if (!ksircproc->TopList[qsname]) { - qsname = "!default"; - if(line[0] == '`') - qsname = "!discard"; - } -+ assert(ksircproc->TopList[qsname]); - } - - ksircproc->TopList[qsname]->sirc_receive(line); diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile index 90188bce6974..55cc4bfe08dc 100644 --- a/net/kdenetwork4/Makefile +++ b/net/kdenetwork4/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdenetwork PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 CATEGORIES?= net kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -30,7 +29,7 @@ USE_GMAKE= yes USE_OPENSSL= yes USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 DO_NOT_COMPILE+=kopete lanbrowsing filesharing diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo index 7615aba07796..6a8b1a2651e3 100644 --- a/net/kdenetwork4/distinfo +++ b/net/kdenetwork4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdenetwork-3.5.5.tar.bz2) = a6e642c070cbd50d4a817f6588bf8e46 -SHA256 (KDE/kdenetwork-3.5.5.tar.bz2) = c3f36e69bbd23902f2bdd9a1a8cda93b0436338ada422bb8ac6bc3d2bcd8e38f -SIZE (KDE/kdenetwork-3.5.5.tar.bz2) = 9235564 +MD5 (KDE/kdenetwork-3.5.6.tar.bz2) = 0f428cccc4ea16aa53c427530874c591 +SHA256 (KDE/kdenetwork-3.5.6.tar.bz2) = 786e6c25d5cba4ed1eeac947c5554d7fe57de593abf6551c58c178043b82475e +SIZE (KDE/kdenetwork-3.5.6.tar.bz2) = 9245468 diff --git a/net/kdenetwork4/files/patch-post-3.5.5-kdenetwork-ksirc.diff b/net/kdenetwork4/files/patch-post-3.5.5-kdenetwork-ksirc.diff deleted file mode 100644 index db3f82833b43..000000000000 --- a/net/kdenetwork4/files/patch-post-3.5.5-kdenetwork-ksirc.diff +++ /dev/null @@ -1,26 +0,0 @@ ------------------------------------------------------------------------- -r621124 | mueller | 2007-01-08 11:33:10 +0100 (Mon, 08 Jan 2007) | 2 lines - -add fix for CVE-2006-6811 - ------------------------------------------------------------------------- -Index: ksirc/iocontroller.cpp -=================================================================== ---- ksirc/iocontroller.cpp (revision 621123) -+++ ksirc/iocontroller.cpp (revision 621124) -@@ -266,13 +266,13 @@ void KSircIOController::stdout_read(KPro - if(ksopts->autoCreateWin == TRUE && line[0] != '`' && line[1] != '#' && line[1] != '&' && noticeCreate) { - //kdDebug(5008) << "Creating window for: " << qsname << " because of: " << line.data() << endl; - ksircproc->new_toplevel(KSircChannel(ksircproc->serverName(), qsname)); -- assert(ksircproc->TopList[qsname] != 0x0); - } -- else{ -+ if (!ksircproc->TopList[qsname]) { - qsname = "!default"; - if(line[0] == '`') - qsname = "!discard"; - } -+ assert(ksircproc->TopList[qsname]); - } - - ksircproc->TopList[qsname]->sirc_receive(line); diff --git a/net/lanbrowsing/Makefile b/net/lanbrowsing/Makefile index 6470ec31155a..30274bf2b332 100644 --- a/net/lanbrowsing/Makefile +++ b/net/lanbrowsing/Makefile @@ -7,7 +7,6 @@ PORTNAME= lanbrowsing PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 CATEGORIES= net kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -30,7 +29,7 @@ USE_BZIP2= yes USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes WRKSRC= ${WRKDIR}/kdenetwork-${PORTVERSION} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes RC_SCRIPTS_SUB= PREFIX=${PREFIX} \ RC_SUBR=${RC_SUBR} diff --git a/net/lanbrowsing/distinfo b/net/lanbrowsing/distinfo index 7615aba07796..6a8b1a2651e3 100644 --- a/net/lanbrowsing/distinfo +++ b/net/lanbrowsing/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdenetwork-3.5.5.tar.bz2) = a6e642c070cbd50d4a817f6588bf8e46 -SHA256 (KDE/kdenetwork-3.5.5.tar.bz2) = c3f36e69bbd23902f2bdd9a1a8cda93b0436338ada422bb8ac6bc3d2bcd8e38f -SIZE (KDE/kdenetwork-3.5.5.tar.bz2) = 9235564 +MD5 (KDE/kdenetwork-3.5.6.tar.bz2) = 0f428cccc4ea16aa53c427530874c591 +SHA256 (KDE/kdenetwork-3.5.6.tar.bz2) = 786e6c25d5cba4ed1eeac947c5554d7fe57de593abf6551c58c178043b82475e +SIZE (KDE/kdenetwork-3.5.6.tar.bz2) = 9245468 diff --git a/polish/calligra-l10n/Makefile b/polish/calligra-l10n/Makefile index 40e0deeb333d..439aaee50bb2 100644 --- a/polish/calligra-l10n/Makefile +++ b/polish/calligra-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= polish kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/polish/calligra-l10n/distinfo b/polish/calligra-l10n/distinfo index a7b92caa358d..64050385010a 100644 --- a/polish/calligra-l10n/distinfo +++ b/polish/calligra-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-pl-1.6.1.tar.bz2) = ca6e0bd7de872e51f342cd153598981b -SHA256 (KDE/kde-i18n/koffice-l10n-pl-1.6.1.tar.bz2) = 64d43efeb10eadaac320a412948a8e397f838aff73d5ee8c5eb88650dcae6412 -SIZE (KDE/kde-i18n/koffice-l10n-pl-1.6.1.tar.bz2) = 386344 +MD5 (KDE/kde-i18n/koffice-l10n-pl-1.6.2.tar.bz2) = ce121b8c225a6ffd4530b095f1b590e9 +SHA256 (KDE/kde-i18n/koffice-l10n-pl-1.6.2.tar.bz2) = 21471db973a2af8f72eec5659946978083ce40b773b34c87cb15d8e4b5edf9f7 +SIZE (KDE/kde-i18n/koffice-l10n-pl-1.6.2.tar.bz2) = 386450 diff --git a/polish/calligra-l10n/pkg-plist b/polish/calligra-l10n/pkg-plist index 4b4534d94bbe..a9161205f0d6 100644 --- a/polish/calligra-l10n/pkg-plist +++ b/polish/calligra-l10n/pkg-plist @@ -2,7 +2,6 @@ share/locale/pl/LC_MESSAGES/desktop_koffice.mo share/locale/pl/LC_MESSAGES/example.mo share/locale/pl/LC_MESSAGES/karbon.mo share/locale/pl/LC_MESSAGES/kchart.mo -share/locale/pl/LC_MESSAGES/kdgantt.mo share/locale/pl/LC_MESSAGES/kexi.mo share/locale/pl/LC_MESSAGES/kfile_abiword.mo share/locale/pl/LC_MESSAGES/kfile_gnumeric.mo diff --git a/polish/kde3-i18n/distinfo b/polish/kde3-i18n/distinfo index b423346e5332..54558320f2fe 100644 --- a/polish/kde3-i18n/distinfo +++ b/polish/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-pl-3.5.5.tar.bz2) = 7444560d7d6cb3221e8f0907218157de -SHA256 (KDE/kde-i18n/kde-i18n-pl-3.5.5.tar.bz2) = 41f798c489a72f1c47237ff3e5be9dc6bc7bdc092fa8995ec89ae9f17de68e4d -SIZE (KDE/kde-i18n/kde-i18n-pl-3.5.5.tar.bz2) = 9671038 +MD5 (KDE/kde-i18n/kde-i18n-pl-3.5.6.tar.bz2) = 71852ce8f2549cfc19ffe71468a82349 +SHA256 (KDE/kde-i18n/kde-i18n-pl-3.5.6.tar.bz2) = 3fd2cc2e5698e70b1a9e7686ca0b2097b215eb5fac503d23da53fbf68d243633 +SIZE (KDE/kde-i18n/kde-i18n-pl-3.5.6.tar.bz2) = 11946705 diff --git a/polish/kde3-i18n/pkg-plist b/polish/kde3-i18n/pkg-plist index 55d7102fc2f6..58618b7f12a5 100644 --- a/polish/kde3-i18n/pkg-plist +++ b/polish/kde3-i18n/pkg-plist @@ -17,6 +17,9 @@ share/apps/kturtle/examples/pl/tabliczkamnozenia.pl.logo share/apps/kturtle/examples/pl/trojkat.pl.logo share/apps/kturtle/examples/pl/trojkaty.pl.logo share/apps/kturtle/examples/pl/zawijasy.pl.logo +share/doc/HTML/pl/KRegExpEditor/common +share/doc/HTML/pl/KRegExpEditor/index.cache.bz2 +share/doc/HTML/pl/KRegExpEditor/index.docbook share/doc/HTML/pl/ark/common share/doc/HTML/pl/ark/index.cache.bz2 share/doc/HTML/pl/ark/index.docbook @@ -49,6 +52,17 @@ share/doc/HTML/pl/kalzium/screenshot1.png share/doc/HTML/pl/kanagram/common share/doc/HTML/pl/kanagram/index.cache.bz2 share/doc/HTML/pl/kanagram/index.docbook +share/doc/HTML/pl/kappfinder/man-kappfinder.1.docbook +share/doc/HTML/pl/kate-plugins/common +share/doc/HTML/pl/kate-plugins/filetemplates.docbook +share/doc/HTML/pl/kate-plugins/htmltools.docbook +share/doc/HTML/pl/kate-plugins/index.cache.bz2 +share/doc/HTML/pl/kate-plugins/index.docbook +share/doc/HTML/pl/kate-plugins/insertcommand.docbook +share/doc/HTML/pl/kate-plugins/openheader.docbook +share/doc/HTML/pl/kate-plugins/textfilter.docbook +share/doc/HTML/pl/kate-plugins/xmlcheck.docbook +share/doc/HTML/pl/kate-plugins/xmltools.docbook share/doc/HTML/pl/kate/advanced.docbook share/doc/HTML/pl/kate/common share/doc/HTML/pl/kate/configdialog01.png @@ -225,6 +239,15 @@ share/doc/HTML/pl/kcontrol/useragent/index.docbook share/doc/HTML/pl/kcontrol/windowmanagement/common share/doc/HTML/pl/kcontrol/windowmanagement/index.cache.bz2 share/doc/HTML/pl/kcontrol/windowmanagement/index.docbook +share/doc/HTML/pl/kdcop/common +share/doc/HTML/pl/kdcop/index.cache.bz2 +share/doc/HTML/pl/kdcop/index.docbook +share/doc/HTML/pl/kdelibs/man-artsmessage.1.docbook +share/doc/HTML/pl/kdelibs/man-checkXML.1.docbook +share/doc/HTML/pl/kdelibs/man-dcop.1.docbook +share/doc/HTML/pl/kdelibs/man-kbuildsycoca.8.docbook +share/doc/HTML/pl/kdelibs/man-kdeoptions.7.docbook +share/doc/HTML/pl/kdelibs/man-qtoptions.7.docbook share/doc/HTML/pl/kdeprint/add-printer-wiz.docbook share/doc/HTML/pl/kdeprint/common share/doc/HTML/pl/kdeprint/cups-config.docbook @@ -245,6 +268,7 @@ share/doc/HTML/pl/kdeprint/theory.docbook share/doc/HTML/pl/kdesu/common share/doc/HTML/pl/kdesu/index.cache.bz2 share/doc/HTML/pl/kdesu/index.docbook +share/doc/HTML/pl/kdesu/man-kdesu.1.docbook share/doc/HTML/pl/kdevelop/tip.database share/doc/HTML/pl/kdf/common share/doc/HTML/pl/kdf/index.cache.bz2 @@ -260,6 +284,10 @@ share/doc/HTML/pl/keduca/screenshot.png share/doc/HTML/pl/kfind/common share/doc/HTML/pl/kfind/index.cache.bz2 share/doc/HTML/pl/kfind/index.docbook +share/doc/HTML/pl/kfind/man-kfind.1.docbook +share/doc/HTML/pl/kfloppy/common +share/doc/HTML/pl/kfloppy/index.cache.bz2 +share/doc/HTML/pl/kfloppy/index.docbook share/doc/HTML/pl/kgeography/common share/doc/HTML/pl/kgeography/first-start1.png share/doc/HTML/pl/kgeography/first-start10.png @@ -315,6 +343,10 @@ share/doc/HTML/pl/khelpcenter/faq/sound.docbook share/doc/HTML/pl/khelpcenter/faq/tips.docbook share/doc/HTML/pl/khelpcenter/faq/webbrowse.docbook share/doc/HTML/pl/khelpcenter/faq/winmng.docbook +share/doc/HTML/pl/khelpcenter/glossary/common +share/doc/HTML/pl/khelpcenter/glossary/index.cache.bz2 +share/doc/HTML/pl/khelpcenter/glossary/index.docbook +share/doc/HTML/pl/khelpcenter/glossary/kdeprintingglossary.docbook share/doc/HTML/pl/khelpcenter/help.docbook share/doc/HTML/pl/khelpcenter/index.cache.bz2 share/doc/HTML/pl/khelpcenter/index.docbook @@ -332,6 +364,7 @@ share/doc/HTML/pl/khelpcenter/userguide/common share/doc/HTML/pl/khelpcenter/userguide/control-center.docbook share/doc/HTML/pl/khelpcenter/userguide/creating-graphics.docbook share/doc/HTML/pl/khelpcenter/userguide/credits-and-license.docbook +share/doc/HTML/pl/khelpcenter/userguide/customizing-desktop.docbook share/doc/HTML/pl/khelpcenter/userguide/desktop.png share/doc/HTML/pl/khelpcenter/userguide/email.docbook share/doc/HTML/pl/khelpcenter/userguide/extragear-applications.docbook @@ -401,9 +434,14 @@ share/doc/HTML/pl/khelpcenter/userguide/windows-how-to.docbook share/doc/HTML/pl/khelpcenter/userguide/your-kde-account.docbook share/doc/HTML/pl/khelpcenter/welcome.docbook share/doc/HTML/pl/khelpcenter/whatiskde.docbook +share/doc/HTML/pl/khexedit/common +share/doc/HTML/pl/khexedit/index.cache.bz2 +share/doc/HTML/pl/khexedit/index.docbook share/doc/HTML/pl/kicker/common share/doc/HTML/pl/kicker/index.cache.bz2 share/doc/HTML/pl/kicker/index.docbook +share/doc/HTML/pl/kicker/man-appletproxy.1.docbook +share/doc/HTML/pl/kicker/man-kicker.1.docbook share/doc/HTML/pl/kig/common share/doc/HTML/pl/kig/index.cache.bz2 share/doc/HTML/pl/kig/index.docbook @@ -467,6 +505,48 @@ share/doc/HTML/pl/kinfocenter/usb/index.docbook share/doc/HTML/pl/kinfocenter/xserver/common share/doc/HTML/pl/kinfocenter/xserver/index.cache.bz2 share/doc/HTML/pl/kinfocenter/xserver/index.docbook +share/doc/HTML/pl/kioslave/bzip.docbook +share/doc/HTML/pl/kioslave/bzip2.docbook +share/doc/HTML/pl/kioslave/cgi.docbook +share/doc/HTML/pl/kioslave/common +share/doc/HTML/pl/kioslave/data.docbook +share/doc/HTML/pl/kioslave/file.docbook +share/doc/HTML/pl/kioslave/finger.docbook +share/doc/HTML/pl/kioslave/fish.docbook +share/doc/HTML/pl/kioslave/floppy.docbook +share/doc/HTML/pl/kioslave/ftp.docbook +share/doc/HTML/pl/kioslave/gopher.docbook +share/doc/HTML/pl/kioslave/gzip.docbook +share/doc/HTML/pl/kioslave/help.docbook +share/doc/HTML/pl/kioslave/http.docbook +share/doc/HTML/pl/kioslave/https.docbook +share/doc/HTML/pl/kioslave/imap.docbook +share/doc/HTML/pl/kioslave/imaps.docbook +share/doc/HTML/pl/kioslave/index.cache.bz2 +share/doc/HTML/pl/kioslave/index.docbook +share/doc/HTML/pl/kioslave/info.docbook +share/doc/HTML/pl/kioslave/lan.docbook +share/doc/HTML/pl/kioslave/ldap.docbook +share/doc/HTML/pl/kioslave/mac.docbook +share/doc/HTML/pl/kioslave/mailto.docbook +share/doc/HTML/pl/kioslave/man.docbook +share/doc/HTML/pl/kioslave/mrml.docbook +share/doc/HTML/pl/kioslave/news.docbook +share/doc/HTML/pl/kioslave/nfs.docbook +share/doc/HTML/pl/kioslave/nntp.docbook +share/doc/HTML/pl/kioslave/pop3.docbook +share/doc/HTML/pl/kioslave/pop3s.docbook +share/doc/HTML/pl/kioslave/print.docbook +share/doc/HTML/pl/kioslave/rlan.docbook +share/doc/HTML/pl/kioslave/rlogin.docbook +share/doc/HTML/pl/kioslave/sftp.docbook +share/doc/HTML/pl/kioslave/smb.docbook +share/doc/HTML/pl/kioslave/smtp.docbook +share/doc/HTML/pl/kioslave/tar.docbook +share/doc/HTML/pl/kioslave/telnet.docbook +share/doc/HTML/pl/kioslave/thumbnail.docbook +share/doc/HTML/pl/kioslave/webdav.docbook +share/doc/HTML/pl/kioslave/webdavs.docbook share/doc/HTML/pl/kiten/common share/doc/HTML/pl/kiten/index.cache.bz2 share/doc/HTML/pl/kiten/index.docbook @@ -475,6 +555,14 @@ share/doc/HTML/pl/kiten/kiten2.png share/doc/HTML/pl/kjots/common share/doc/HTML/pl/kjots/index.cache.bz2 share/doc/HTML/pl/kjots/index.docbook +share/doc/HTML/pl/klatin/adjectives.docbook +share/doc/HTML/pl/klatin/common +share/doc/HTML/pl/klatin/index.cache.bz2 +share/doc/HTML/pl/klatin/index.docbook +share/doc/HTML/pl/klatin/nouns.docbook +share/doc/HTML/pl/klatin/numbers.docbook +share/doc/HTML/pl/klatin/pronouns.docbook +share/doc/HTML/pl/klatin/verbs.docbook share/doc/HTML/pl/klettres/common share/doc/HTML/pl/klettres/index.cache.bz2 share/doc/HTML/pl/klettres/index.docbook @@ -484,6 +572,9 @@ share/doc/HTML/pl/klettres/klettres3.png share/doc/HTML/pl/klettres/klettres4.png share/doc/HTML/pl/klettres/klettres5.png share/doc/HTML/pl/klettres/klettres6.png +share/doc/HTML/pl/klipper/common +share/doc/HTML/pl/klipper/index.cache.bz2 +share/doc/HTML/pl/klipper/index.docbook share/doc/HTML/pl/kmail/common share/doc/HTML/pl/kmail/configure.docbook share/doc/HTML/pl/kmail/credits-and-licenses.docbook @@ -501,6 +592,9 @@ share/doc/HTML/pl/kmenuedit/index.docbook share/doc/HTML/pl/kmines/common share/doc/HTML/pl/kmines/index.cache.bz2 share/doc/HTML/pl/kmines/index.docbook +share/doc/HTML/pl/kmix/common +share/doc/HTML/pl/kmix/index.cache.bz2 +share/doc/HTML/pl/kmix/index.docbook share/doc/HTML/pl/kmplot/commands.docbook share/doc/HTML/pl/kmplot/common share/doc/HTML/pl/kmplot/configuration.docbook @@ -515,12 +609,74 @@ share/doc/HTML/pl/kmplot/introduction.docbook share/doc/HTML/pl/kmplot/menu.docbook share/doc/HTML/pl/kmplot/reference.docbook share/doc/HTML/pl/kmplot/using.docbook +share/doc/HTML/pl/knetattach/common +share/doc/HTML/pl/knetattach/index.cache.bz2 +share/doc/HTML/pl/knetattach/index.docbook +share/doc/HTML/pl/knetattach/screenshot.png +share/doc/HTML/pl/knetattach/screenshot2.png +share/doc/HTML/pl/knetattach/screenshot3.png +share/doc/HTML/pl/knetattach/screenshot4.png share/doc/HTML/pl/knetworkconf/common share/doc/HTML/pl/knetworkconf/index.cache.bz2 share/doc/HTML/pl/knetworkconf/index.docbook share/doc/HTML/pl/knotes/common share/doc/HTML/pl/knotes/index.cache.bz2 share/doc/HTML/pl/knotes/index.docbook +share/doc/HTML/pl/kolourpaint/common +share/doc/HTML/pl/kolourpaint/image_balance.png +share/doc/HTML/pl/kolourpaint/image_emboss.png +share/doc/HTML/pl/kolourpaint/image_flatten.png +share/doc/HTML/pl/kolourpaint/image_flip.png +share/doc/HTML/pl/kolourpaint/image_invert.png +share/doc/HTML/pl/kolourpaint/image_reduce_colors.png +share/doc/HTML/pl/kolourpaint/image_resize_scale.png +share/doc/HTML/pl/kolourpaint/image_rotate.png +share/doc/HTML/pl/kolourpaint/image_skew.png +share/doc/HTML/pl/kolourpaint/image_soften_sharpen.png +share/doc/HTML/pl/kolourpaint/index.cache.bz2 +share/doc/HTML/pl/kolourpaint/index.docbook +share/doc/HTML/pl/konq-plugins/babel/common +share/doc/HTML/pl/konq-plugins/babel/index.cache.bz2 +share/doc/HTML/pl/konq-plugins/babel/index.docbook +share/doc/HTML/pl/konq-plugins/common +share/doc/HTML/pl/konq-plugins/crashes/common +share/doc/HTML/pl/konq-plugins/crashes/index.cache.bz2 +share/doc/HTML/pl/konq-plugins/crashes/index.docbook +share/doc/HTML/pl/konq-plugins/dirfilter/common +share/doc/HTML/pl/konq-plugins/dirfilter/index.cache.bz2 +share/doc/HTML/pl/konq-plugins/dirfilter/index.docbook +share/doc/HTML/pl/konq-plugins/domtreeviewer/common +share/doc/HTML/pl/konq-plugins/domtreeviewer/index.cache.bz2 +share/doc/HTML/pl/konq-plugins/domtreeviewer/index.docbook +share/doc/HTML/pl/konq-plugins/fsview/common +share/doc/HTML/pl/konq-plugins/fsview/index.cache.bz2 +share/doc/HTML/pl/konq-plugins/fsview/index.docbook +share/doc/HTML/pl/konq-plugins/imgallery/common +share/doc/HTML/pl/konq-plugins/imgallery/folders.png +share/doc/HTML/pl/konq-plugins/imgallery/index.cache.bz2 +share/doc/HTML/pl/konq-plugins/imgallery/index.docbook +share/doc/HTML/pl/konq-plugins/imgallery/look.png +share/doc/HTML/pl/konq-plugins/imgallery/thumbnails.png +share/doc/HTML/pl/konq-plugins/index.cache.bz2 +share/doc/HTML/pl/konq-plugins/index.docbook +share/doc/HTML/pl/konq-plugins/khtmlsettings/common +share/doc/HTML/pl/konq-plugins/khtmlsettings/index.cache.bz2 +share/doc/HTML/pl/konq-plugins/khtmlsettings/index.docbook +share/doc/HTML/pl/konq-plugins/kuick/common +share/doc/HTML/pl/konq-plugins/kuick/index.cache.bz2 +share/doc/HTML/pl/konq-plugins/kuick/index.docbook +share/doc/HTML/pl/konq-plugins/mediaplayer/common +share/doc/HTML/pl/konq-plugins/mediaplayer/index.cache.bz2 +share/doc/HTML/pl/konq-plugins/mediaplayer/index.docbook +share/doc/HTML/pl/konq-plugins/uachanger/common +share/doc/HTML/pl/konq-plugins/uachanger/index.cache.bz2 +share/doc/HTML/pl/konq-plugins/uachanger/index.docbook +share/doc/HTML/pl/konq-plugins/validators/common +share/doc/HTML/pl/konq-plugins/validators/index.cache.bz2 +share/doc/HTML/pl/konq-plugins/validators/index.docbook +share/doc/HTML/pl/konq-plugins/webarchiver/common +share/doc/HTML/pl/konq-plugins/webarchiver/index.cache.bz2 +share/doc/HTML/pl/konq-plugins/webarchiver/index.docbook share/doc/HTML/pl/konqueror/basics.docbook share/doc/HTML/pl/konqueror/bookmarks.docbook share/doc/HTML/pl/konqueror/browser.docbook @@ -652,6 +808,9 @@ share/doc/HTML/pl/ksnake/index.docbook share/doc/HTML/pl/kspell/common share/doc/HTML/pl/kspell/index.cache.bz2 share/doc/HTML/pl/kspell/index.docbook +share/doc/HTML/pl/ksplashml/common +share/doc/HTML/pl/ksplashml/index.cache.bz2 +share/doc/HTML/pl/ksplashml/index.docbook share/doc/HTML/pl/kstars/ai-contents.docbook share/doc/HTML/pl/kstars/altvstime.docbook share/doc/HTML/pl/kstars/astroinfo.docbook @@ -738,11 +897,64 @@ share/doc/HTML/pl/ktuberling/common share/doc/HTML/pl/ktuberling/index.cache.bz2 share/doc/HTML/pl/ktuberling/index.docbook share/doc/HTML/pl/ktuberling/technical-reference.docbook +share/doc/HTML/pl/kturtle/common +share/doc/HTML/pl/kturtle/getting-started.docbook +share/doc/HTML/pl/kturtle/glossary.docbook +share/doc/HTML/pl/kturtle/index.cache.bz2 +share/doc/HTML/pl/kturtle/index.docbook +share/doc/HTML/pl/kturtle/programming-reference.docbook +share/doc/HTML/pl/kturtle/translator-guide.docbook +share/doc/HTML/pl/kturtle/using-kturtle.docbook +share/doc/HTML/pl/kview/common +share/doc/HTML/pl/kview/index.cache.bz2 +share/doc/HTML/pl/kview/index.docbook +share/doc/HTML/pl/kvoctrain/art-query-dlg.png +share/doc/HTML/pl/kvoctrain/common +share/doc/HTML/pl/kvoctrain/comp-query-dlg.png +share/doc/HTML/pl/kvoctrain/docprop1-dlg.png +share/doc/HTML/pl/kvoctrain/docprop2-dlg.png +share/doc/HTML/pl/kvoctrain/docprop6-dlg.png +share/doc/HTML/pl/kvoctrain/entry1-dlg.png +share/doc/HTML/pl/kvoctrain/entry2-dlg.png +share/doc/HTML/pl/kvoctrain/entry3-dlg.png +share/doc/HTML/pl/kvoctrain/entry4-dlg.png +share/doc/HTML/pl/kvoctrain/entry5-dlg.png +share/doc/HTML/pl/kvoctrain/entry6-dlg.png +share/doc/HTML/pl/kvoctrain/entry7-dlg.png +share/doc/HTML/pl/kvoctrain/get-new-stuff.png +share/doc/HTML/pl/kvoctrain/index.cache.bz2 +share/doc/HTML/pl/kvoctrain/index.docbook +share/doc/HTML/pl/kvoctrain/lang1-dlg.png +share/doc/HTML/pl/kvoctrain/mainview.png +share/doc/HTML/pl/kvoctrain/man-spotlight2kvtml.1.docbook +share/doc/HTML/pl/kvoctrain/mu-query-dlg.png +share/doc/HTML/pl/kvoctrain/options1-dlg.png +share/doc/HTML/pl/kvoctrain/options2-dlg.png +share/doc/HTML/pl/kvoctrain/options3-dlg.png +share/doc/HTML/pl/kvoctrain/options4-dlg.png +share/doc/HTML/pl/kvoctrain/options5-dlg.png +share/doc/HTML/pl/kvoctrain/options6-dlg.png +share/doc/HTML/pl/kvoctrain/options7-dlg.png +share/doc/HTML/pl/kvoctrain/profiles.png +share/doc/HTML/pl/kvoctrain/pron-dlg.png +share/doc/HTML/pl/kvoctrain/query-dlg.png +share/doc/HTML/pl/kvoctrain/quick-1.png +share/doc/HTML/pl/kvoctrain/quick-2.png +share/doc/HTML/pl/kvoctrain/quick-3.png +share/doc/HTML/pl/kvoctrain/quick-4.png +share/doc/HTML/pl/kvoctrain/quick-5.png +share/doc/HTML/pl/kvoctrain/stat1-dlg.png +share/doc/HTML/pl/kvoctrain/stat2-dlg.png +share/doc/HTML/pl/kvoctrain/syn-query-dlg.png +share/doc/HTML/pl/kvoctrain/verb-query-dlg.png share/doc/HTML/pl/kwallet/common share/doc/HTML/pl/kwallet/edit1.png share/doc/HTML/pl/kwallet/index.cache.bz2 share/doc/HTML/pl/kwallet/index.docbook share/doc/HTML/pl/kwallet/kwalletmanager.png +share/doc/HTML/pl/kwin4/common +share/doc/HTML/pl/kwin4/index.cache.bz2 +share/doc/HTML/pl/kwin4/index.docbook share/doc/HTML/pl/kwordquiz/common share/doc/HTML/pl/kwordquiz/index.cache.bz2 share/doc/HTML/pl/kwordquiz/index.docbook @@ -1029,6 +1241,7 @@ share/locale/pl/LC_MESSAGES/khotkeys.mo share/locale/pl/LC_MESSAGES/khtmlkttsd.mo share/locale/pl/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/pl/LC_MESSAGES/kicker.mo +share/locale/pl/LC_MESSAGES/kickermenu_kate.mo share/locale/pl/LC_MESSAGES/kiconedit.mo share/locale/pl/LC_MESSAGES/kig.mo share/locale/pl/LC_MESSAGES/kimagemapeditor.mo @@ -1066,6 +1279,7 @@ share/locale/pl/LC_MESSAGES/kio_thumbnail.mo share/locale/pl/LC_MESSAGES/kio_trash.mo share/locale/pl/LC_MESSAGES/kio_zeroconf.mo share/locale/pl/LC_MESSAGES/kioexec.mo +share/locale/pl/LC_MESSAGES/kitchensync.mo share/locale/pl/LC_MESSAGES/kiten.mo share/locale/pl/LC_MESSAGES/kjobviewer.mo share/locale/pl/LC_MESSAGES/kjots.mo @@ -1269,6 +1483,7 @@ share/locale/pl/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/pl/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/pl/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/pl/LC_MESSAGES/libkickermenu_tom.mo +share/locale/pl/LC_MESSAGES/libkitchensync.mo share/locale/pl/LC_MESSAGES/libkleopatra.mo share/locale/pl/LC_MESSAGES/libkmime.mo share/locale/pl/LC_MESSAGES/libkonq.mo @@ -1323,11 +1538,16 @@ share/locale/pl/flag.png @dirrm share/doc/HTML/pl/kxkb @dirrm share/doc/HTML/pl/kwrite @dirrm share/doc/HTML/pl/kwordquiz +@dirrm share/doc/HTML/pl/kwin4 @dirrm share/doc/HTML/pl/kwallet +@dirrm share/doc/HTML/pl/kvoctrain +@dirrm share/doc/HTML/pl/kview +@dirrm share/doc/HTML/pl/kturtle @dirrm share/doc/HTML/pl/ktuberling @dirrm share/doc/HTML/pl/ktouch @dirrm share/doc/HTML/pl/ksysguard @dirrm share/doc/HTML/pl/kstars +@dirrm share/doc/HTML/pl/ksplashml @dirrm share/doc/HTML/pl/kspell @dirrm share/doc/HTML/pl/ksnake @dirrm share/doc/HTML/pl/ksirc @@ -1346,15 +1566,34 @@ share/locale/pl/flag.png @dirrm share/doc/HTML/pl/konsole @dirrm share/doc/HTML/pl/konquest @dirrm share/doc/HTML/pl/konqueror +@dirrm share/doc/HTML/pl/konq-plugins/webarchiver +@dirrm share/doc/HTML/pl/konq-plugins/validators +@dirrm share/doc/HTML/pl/konq-plugins/uachanger +@dirrm share/doc/HTML/pl/konq-plugins/mediaplayer +@dirrm share/doc/HTML/pl/konq-plugins/kuick +@dirrm share/doc/HTML/pl/konq-plugins/khtmlsettings +@dirrm share/doc/HTML/pl/konq-plugins/imgallery +@dirrm share/doc/HTML/pl/konq-plugins/fsview +@dirrm share/doc/HTML/pl/konq-plugins/domtreeviewer +@dirrm share/doc/HTML/pl/konq-plugins/dirfilter +@dirrm share/doc/HTML/pl/konq-plugins/crashes +@dirrm share/doc/HTML/pl/konq-plugins/babel +@dirrm share/doc/HTML/pl/konq-plugins +@dirrm share/doc/HTML/pl/kolourpaint @dirrm share/doc/HTML/pl/knotes @dirrm share/doc/HTML/pl/knetworkconf +@dirrm share/doc/HTML/pl/knetattach @dirrm share/doc/HTML/pl/kmplot +@dirrm share/doc/HTML/pl/kmix @dirrm share/doc/HTML/pl/kmines @dirrm share/doc/HTML/pl/kmenuedit @dirrm share/doc/HTML/pl/kmail +@dirrm share/doc/HTML/pl/klipper @dirrm share/doc/HTML/pl/klettres +@dirrm share/doc/HTML/pl/klatin @dirrm share/doc/HTML/pl/kjots @dirrm share/doc/HTML/pl/kiten +@dirrm share/doc/HTML/pl/kioslave @dirrm share/doc/HTML/pl/kinfocenter/xserver @dirrm share/doc/HTML/pl/kinfocenter/usb @dirrm share/doc/HTML/pl/kinfocenter/sound @@ -1377,13 +1616,16 @@ share/locale/pl/flag.png @dirrm share/doc/HTML/pl/kinfocenter @dirrm share/doc/HTML/pl/kig @dirrm share/doc/HTML/pl/kicker +@dirrm share/doc/HTML/pl/khexedit @dirrm share/doc/HTML/pl/khelpcenter/userguide @dirrm share/doc/HTML/pl/khelpcenter/quickstart +@dirrm share/doc/HTML/pl/khelpcenter/glossary @dirrm share/doc/HTML/pl/khelpcenter/faq @dirrm share/doc/HTML/pl/khelpcenter @dirrm share/doc/HTML/pl/khangman @dirrm share/doc/HTML/pl/kget @dirrm share/doc/HTML/pl/kgeography +@dirrm share/doc/HTML/pl/kfloppy @dirrm share/doc/HTML/pl/kfind @dirrm share/doc/HTML/pl/keduca @dirrm share/doc/HTML/pl/kdm @@ -1391,6 +1633,8 @@ share/locale/pl/flag.png @dirrm share/doc/HTML/pl/kdevelop @dirrm share/doc/HTML/pl/kdesu @dirrm share/doc/HTML/pl/kdeprint +@dirrm share/doc/HTML/pl/kdelibs +@dirrm share/doc/HTML/pl/kdcop @dirrm share/doc/HTML/pl/kcontrol/windowmanagement @dirrm share/doc/HTML/pl/kcontrol/useragent @dirrm share/doc/HTML/pl/kcontrol/spellchecking @@ -1439,7 +1683,9 @@ share/locale/pl/flag.png @dirrm share/doc/HTML/pl/kcalc @dirrm share/doc/HTML/pl/kbruch @dirrm share/doc/HTML/pl/kbattleship +@dirrm share/doc/HTML/pl/kate-plugins @dirrm share/doc/HTML/pl/kate +@dirrm share/doc/HTML/pl/kappfinder @dirrm share/doc/HTML/pl/kanagram @dirrm share/doc/HTML/pl/kalzium @dirrm share/doc/HTML/pl/kaddressbook @@ -1447,6 +1693,7 @@ share/locale/pl/flag.png @dirrm share/doc/HTML/pl/docs @dirrm share/doc/HTML/pl/blinken @dirrm share/doc/HTML/pl/ark +@dirrm share/doc/HTML/pl/KRegExpEditor @dirrm share/apps/kturtle/examples/pl @dirrm share/apps/kturtle/examples @dirrm share/apps/kturtle/data diff --git a/polish/kde4-l10n/distinfo b/polish/kde4-l10n/distinfo index b423346e5332..54558320f2fe 100644 --- a/polish/kde4-l10n/distinfo +++ b/polish/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-pl-3.5.5.tar.bz2) = 7444560d7d6cb3221e8f0907218157de -SHA256 (KDE/kde-i18n/kde-i18n-pl-3.5.5.tar.bz2) = 41f798c489a72f1c47237ff3e5be9dc6bc7bdc092fa8995ec89ae9f17de68e4d -SIZE (KDE/kde-i18n/kde-i18n-pl-3.5.5.tar.bz2) = 9671038 +MD5 (KDE/kde-i18n/kde-i18n-pl-3.5.6.tar.bz2) = 71852ce8f2549cfc19ffe71468a82349 +SHA256 (KDE/kde-i18n/kde-i18n-pl-3.5.6.tar.bz2) = 3fd2cc2e5698e70b1a9e7686ca0b2097b215eb5fac503d23da53fbf68d243633 +SIZE (KDE/kde-i18n/kde-i18n-pl-3.5.6.tar.bz2) = 11946705 diff --git a/polish/kde4-l10n/pkg-plist b/polish/kde4-l10n/pkg-plist index 55d7102fc2f6..58618b7f12a5 100644 --- a/polish/kde4-l10n/pkg-plist +++ b/polish/kde4-l10n/pkg-plist @@ -17,6 +17,9 @@ share/apps/kturtle/examples/pl/tabliczkamnozenia.pl.logo share/apps/kturtle/examples/pl/trojkat.pl.logo share/apps/kturtle/examples/pl/trojkaty.pl.logo share/apps/kturtle/examples/pl/zawijasy.pl.logo +share/doc/HTML/pl/KRegExpEditor/common +share/doc/HTML/pl/KRegExpEditor/index.cache.bz2 +share/doc/HTML/pl/KRegExpEditor/index.docbook share/doc/HTML/pl/ark/common share/doc/HTML/pl/ark/index.cache.bz2 share/doc/HTML/pl/ark/index.docbook @@ -49,6 +52,17 @@ share/doc/HTML/pl/kalzium/screenshot1.png share/doc/HTML/pl/kanagram/common share/doc/HTML/pl/kanagram/index.cache.bz2 share/doc/HTML/pl/kanagram/index.docbook +share/doc/HTML/pl/kappfinder/man-kappfinder.1.docbook +share/doc/HTML/pl/kate-plugins/common +share/doc/HTML/pl/kate-plugins/filetemplates.docbook +share/doc/HTML/pl/kate-plugins/htmltools.docbook +share/doc/HTML/pl/kate-plugins/index.cache.bz2 +share/doc/HTML/pl/kate-plugins/index.docbook +share/doc/HTML/pl/kate-plugins/insertcommand.docbook +share/doc/HTML/pl/kate-plugins/openheader.docbook +share/doc/HTML/pl/kate-plugins/textfilter.docbook +share/doc/HTML/pl/kate-plugins/xmlcheck.docbook +share/doc/HTML/pl/kate-plugins/xmltools.docbook share/doc/HTML/pl/kate/advanced.docbook share/doc/HTML/pl/kate/common share/doc/HTML/pl/kate/configdialog01.png @@ -225,6 +239,15 @@ share/doc/HTML/pl/kcontrol/useragent/index.docbook share/doc/HTML/pl/kcontrol/windowmanagement/common share/doc/HTML/pl/kcontrol/windowmanagement/index.cache.bz2 share/doc/HTML/pl/kcontrol/windowmanagement/index.docbook +share/doc/HTML/pl/kdcop/common +share/doc/HTML/pl/kdcop/index.cache.bz2 +share/doc/HTML/pl/kdcop/index.docbook +share/doc/HTML/pl/kdelibs/man-artsmessage.1.docbook +share/doc/HTML/pl/kdelibs/man-checkXML.1.docbook +share/doc/HTML/pl/kdelibs/man-dcop.1.docbook +share/doc/HTML/pl/kdelibs/man-kbuildsycoca.8.docbook +share/doc/HTML/pl/kdelibs/man-kdeoptions.7.docbook +share/doc/HTML/pl/kdelibs/man-qtoptions.7.docbook share/doc/HTML/pl/kdeprint/add-printer-wiz.docbook share/doc/HTML/pl/kdeprint/common share/doc/HTML/pl/kdeprint/cups-config.docbook @@ -245,6 +268,7 @@ share/doc/HTML/pl/kdeprint/theory.docbook share/doc/HTML/pl/kdesu/common share/doc/HTML/pl/kdesu/index.cache.bz2 share/doc/HTML/pl/kdesu/index.docbook +share/doc/HTML/pl/kdesu/man-kdesu.1.docbook share/doc/HTML/pl/kdevelop/tip.database share/doc/HTML/pl/kdf/common share/doc/HTML/pl/kdf/index.cache.bz2 @@ -260,6 +284,10 @@ share/doc/HTML/pl/keduca/screenshot.png share/doc/HTML/pl/kfind/common share/doc/HTML/pl/kfind/index.cache.bz2 share/doc/HTML/pl/kfind/index.docbook +share/doc/HTML/pl/kfind/man-kfind.1.docbook +share/doc/HTML/pl/kfloppy/common +share/doc/HTML/pl/kfloppy/index.cache.bz2 +share/doc/HTML/pl/kfloppy/index.docbook share/doc/HTML/pl/kgeography/common share/doc/HTML/pl/kgeography/first-start1.png share/doc/HTML/pl/kgeography/first-start10.png @@ -315,6 +343,10 @@ share/doc/HTML/pl/khelpcenter/faq/sound.docbook share/doc/HTML/pl/khelpcenter/faq/tips.docbook share/doc/HTML/pl/khelpcenter/faq/webbrowse.docbook share/doc/HTML/pl/khelpcenter/faq/winmng.docbook +share/doc/HTML/pl/khelpcenter/glossary/common +share/doc/HTML/pl/khelpcenter/glossary/index.cache.bz2 +share/doc/HTML/pl/khelpcenter/glossary/index.docbook +share/doc/HTML/pl/khelpcenter/glossary/kdeprintingglossary.docbook share/doc/HTML/pl/khelpcenter/help.docbook share/doc/HTML/pl/khelpcenter/index.cache.bz2 share/doc/HTML/pl/khelpcenter/index.docbook @@ -332,6 +364,7 @@ share/doc/HTML/pl/khelpcenter/userguide/common share/doc/HTML/pl/khelpcenter/userguide/control-center.docbook share/doc/HTML/pl/khelpcenter/userguide/creating-graphics.docbook share/doc/HTML/pl/khelpcenter/userguide/credits-and-license.docbook +share/doc/HTML/pl/khelpcenter/userguide/customizing-desktop.docbook share/doc/HTML/pl/khelpcenter/userguide/desktop.png share/doc/HTML/pl/khelpcenter/userguide/email.docbook share/doc/HTML/pl/khelpcenter/userguide/extragear-applications.docbook @@ -401,9 +434,14 @@ share/doc/HTML/pl/khelpcenter/userguide/windows-how-to.docbook share/doc/HTML/pl/khelpcenter/userguide/your-kde-account.docbook share/doc/HTML/pl/khelpcenter/welcome.docbook share/doc/HTML/pl/khelpcenter/whatiskde.docbook +share/doc/HTML/pl/khexedit/common +share/doc/HTML/pl/khexedit/index.cache.bz2 +share/doc/HTML/pl/khexedit/index.docbook share/doc/HTML/pl/kicker/common share/doc/HTML/pl/kicker/index.cache.bz2 share/doc/HTML/pl/kicker/index.docbook +share/doc/HTML/pl/kicker/man-appletproxy.1.docbook +share/doc/HTML/pl/kicker/man-kicker.1.docbook share/doc/HTML/pl/kig/common share/doc/HTML/pl/kig/index.cache.bz2 share/doc/HTML/pl/kig/index.docbook @@ -467,6 +505,48 @@ share/doc/HTML/pl/kinfocenter/usb/index.docbook share/doc/HTML/pl/kinfocenter/xserver/common share/doc/HTML/pl/kinfocenter/xserver/index.cache.bz2 share/doc/HTML/pl/kinfocenter/xserver/index.docbook +share/doc/HTML/pl/kioslave/bzip.docbook +share/doc/HTML/pl/kioslave/bzip2.docbook +share/doc/HTML/pl/kioslave/cgi.docbook +share/doc/HTML/pl/kioslave/common +share/doc/HTML/pl/kioslave/data.docbook +share/doc/HTML/pl/kioslave/file.docbook +share/doc/HTML/pl/kioslave/finger.docbook +share/doc/HTML/pl/kioslave/fish.docbook +share/doc/HTML/pl/kioslave/floppy.docbook +share/doc/HTML/pl/kioslave/ftp.docbook +share/doc/HTML/pl/kioslave/gopher.docbook +share/doc/HTML/pl/kioslave/gzip.docbook +share/doc/HTML/pl/kioslave/help.docbook +share/doc/HTML/pl/kioslave/http.docbook +share/doc/HTML/pl/kioslave/https.docbook +share/doc/HTML/pl/kioslave/imap.docbook +share/doc/HTML/pl/kioslave/imaps.docbook +share/doc/HTML/pl/kioslave/index.cache.bz2 +share/doc/HTML/pl/kioslave/index.docbook +share/doc/HTML/pl/kioslave/info.docbook +share/doc/HTML/pl/kioslave/lan.docbook +share/doc/HTML/pl/kioslave/ldap.docbook +share/doc/HTML/pl/kioslave/mac.docbook +share/doc/HTML/pl/kioslave/mailto.docbook +share/doc/HTML/pl/kioslave/man.docbook +share/doc/HTML/pl/kioslave/mrml.docbook +share/doc/HTML/pl/kioslave/news.docbook +share/doc/HTML/pl/kioslave/nfs.docbook +share/doc/HTML/pl/kioslave/nntp.docbook +share/doc/HTML/pl/kioslave/pop3.docbook +share/doc/HTML/pl/kioslave/pop3s.docbook +share/doc/HTML/pl/kioslave/print.docbook +share/doc/HTML/pl/kioslave/rlan.docbook +share/doc/HTML/pl/kioslave/rlogin.docbook +share/doc/HTML/pl/kioslave/sftp.docbook +share/doc/HTML/pl/kioslave/smb.docbook +share/doc/HTML/pl/kioslave/smtp.docbook +share/doc/HTML/pl/kioslave/tar.docbook +share/doc/HTML/pl/kioslave/telnet.docbook +share/doc/HTML/pl/kioslave/thumbnail.docbook +share/doc/HTML/pl/kioslave/webdav.docbook +share/doc/HTML/pl/kioslave/webdavs.docbook share/doc/HTML/pl/kiten/common share/doc/HTML/pl/kiten/index.cache.bz2 share/doc/HTML/pl/kiten/index.docbook @@ -475,6 +555,14 @@ share/doc/HTML/pl/kiten/kiten2.png share/doc/HTML/pl/kjots/common share/doc/HTML/pl/kjots/index.cache.bz2 share/doc/HTML/pl/kjots/index.docbook +share/doc/HTML/pl/klatin/adjectives.docbook +share/doc/HTML/pl/klatin/common +share/doc/HTML/pl/klatin/index.cache.bz2 +share/doc/HTML/pl/klatin/index.docbook +share/doc/HTML/pl/klatin/nouns.docbook +share/doc/HTML/pl/klatin/numbers.docbook +share/doc/HTML/pl/klatin/pronouns.docbook +share/doc/HTML/pl/klatin/verbs.docbook share/doc/HTML/pl/klettres/common share/doc/HTML/pl/klettres/index.cache.bz2 share/doc/HTML/pl/klettres/index.docbook @@ -484,6 +572,9 @@ share/doc/HTML/pl/klettres/klettres3.png share/doc/HTML/pl/klettres/klettres4.png share/doc/HTML/pl/klettres/klettres5.png share/doc/HTML/pl/klettres/klettres6.png +share/doc/HTML/pl/klipper/common +share/doc/HTML/pl/klipper/index.cache.bz2 +share/doc/HTML/pl/klipper/index.docbook share/doc/HTML/pl/kmail/common share/doc/HTML/pl/kmail/configure.docbook share/doc/HTML/pl/kmail/credits-and-licenses.docbook @@ -501,6 +592,9 @@ share/doc/HTML/pl/kmenuedit/index.docbook share/doc/HTML/pl/kmines/common share/doc/HTML/pl/kmines/index.cache.bz2 share/doc/HTML/pl/kmines/index.docbook +share/doc/HTML/pl/kmix/common +share/doc/HTML/pl/kmix/index.cache.bz2 +share/doc/HTML/pl/kmix/index.docbook share/doc/HTML/pl/kmplot/commands.docbook share/doc/HTML/pl/kmplot/common share/doc/HTML/pl/kmplot/configuration.docbook @@ -515,12 +609,74 @@ share/doc/HTML/pl/kmplot/introduction.docbook share/doc/HTML/pl/kmplot/menu.docbook share/doc/HTML/pl/kmplot/reference.docbook share/doc/HTML/pl/kmplot/using.docbook +share/doc/HTML/pl/knetattach/common +share/doc/HTML/pl/knetattach/index.cache.bz2 +share/doc/HTML/pl/knetattach/index.docbook +share/doc/HTML/pl/knetattach/screenshot.png +share/doc/HTML/pl/knetattach/screenshot2.png +share/doc/HTML/pl/knetattach/screenshot3.png +share/doc/HTML/pl/knetattach/screenshot4.png share/doc/HTML/pl/knetworkconf/common share/doc/HTML/pl/knetworkconf/index.cache.bz2 share/doc/HTML/pl/knetworkconf/index.docbook share/doc/HTML/pl/knotes/common share/doc/HTML/pl/knotes/index.cache.bz2 share/doc/HTML/pl/knotes/index.docbook +share/doc/HTML/pl/kolourpaint/common +share/doc/HTML/pl/kolourpaint/image_balance.png +share/doc/HTML/pl/kolourpaint/image_emboss.png +share/doc/HTML/pl/kolourpaint/image_flatten.png +share/doc/HTML/pl/kolourpaint/image_flip.png +share/doc/HTML/pl/kolourpaint/image_invert.png +share/doc/HTML/pl/kolourpaint/image_reduce_colors.png +share/doc/HTML/pl/kolourpaint/image_resize_scale.png +share/doc/HTML/pl/kolourpaint/image_rotate.png +share/doc/HTML/pl/kolourpaint/image_skew.png +share/doc/HTML/pl/kolourpaint/image_soften_sharpen.png +share/doc/HTML/pl/kolourpaint/index.cache.bz2 +share/doc/HTML/pl/kolourpaint/index.docbook +share/doc/HTML/pl/konq-plugins/babel/common +share/doc/HTML/pl/konq-plugins/babel/index.cache.bz2 +share/doc/HTML/pl/konq-plugins/babel/index.docbook +share/doc/HTML/pl/konq-plugins/common +share/doc/HTML/pl/konq-plugins/crashes/common +share/doc/HTML/pl/konq-plugins/crashes/index.cache.bz2 +share/doc/HTML/pl/konq-plugins/crashes/index.docbook +share/doc/HTML/pl/konq-plugins/dirfilter/common +share/doc/HTML/pl/konq-plugins/dirfilter/index.cache.bz2 +share/doc/HTML/pl/konq-plugins/dirfilter/index.docbook +share/doc/HTML/pl/konq-plugins/domtreeviewer/common +share/doc/HTML/pl/konq-plugins/domtreeviewer/index.cache.bz2 +share/doc/HTML/pl/konq-plugins/domtreeviewer/index.docbook +share/doc/HTML/pl/konq-plugins/fsview/common +share/doc/HTML/pl/konq-plugins/fsview/index.cache.bz2 +share/doc/HTML/pl/konq-plugins/fsview/index.docbook +share/doc/HTML/pl/konq-plugins/imgallery/common +share/doc/HTML/pl/konq-plugins/imgallery/folders.png +share/doc/HTML/pl/konq-plugins/imgallery/index.cache.bz2 +share/doc/HTML/pl/konq-plugins/imgallery/index.docbook +share/doc/HTML/pl/konq-plugins/imgallery/look.png +share/doc/HTML/pl/konq-plugins/imgallery/thumbnails.png +share/doc/HTML/pl/konq-plugins/index.cache.bz2 +share/doc/HTML/pl/konq-plugins/index.docbook +share/doc/HTML/pl/konq-plugins/khtmlsettings/common +share/doc/HTML/pl/konq-plugins/khtmlsettings/index.cache.bz2 +share/doc/HTML/pl/konq-plugins/khtmlsettings/index.docbook +share/doc/HTML/pl/konq-plugins/kuick/common +share/doc/HTML/pl/konq-plugins/kuick/index.cache.bz2 +share/doc/HTML/pl/konq-plugins/kuick/index.docbook +share/doc/HTML/pl/konq-plugins/mediaplayer/common +share/doc/HTML/pl/konq-plugins/mediaplayer/index.cache.bz2 +share/doc/HTML/pl/konq-plugins/mediaplayer/index.docbook +share/doc/HTML/pl/konq-plugins/uachanger/common +share/doc/HTML/pl/konq-plugins/uachanger/index.cache.bz2 +share/doc/HTML/pl/konq-plugins/uachanger/index.docbook +share/doc/HTML/pl/konq-plugins/validators/common +share/doc/HTML/pl/konq-plugins/validators/index.cache.bz2 +share/doc/HTML/pl/konq-plugins/validators/index.docbook +share/doc/HTML/pl/konq-plugins/webarchiver/common +share/doc/HTML/pl/konq-plugins/webarchiver/index.cache.bz2 +share/doc/HTML/pl/konq-plugins/webarchiver/index.docbook share/doc/HTML/pl/konqueror/basics.docbook share/doc/HTML/pl/konqueror/bookmarks.docbook share/doc/HTML/pl/konqueror/browser.docbook @@ -652,6 +808,9 @@ share/doc/HTML/pl/ksnake/index.docbook share/doc/HTML/pl/kspell/common share/doc/HTML/pl/kspell/index.cache.bz2 share/doc/HTML/pl/kspell/index.docbook +share/doc/HTML/pl/ksplashml/common +share/doc/HTML/pl/ksplashml/index.cache.bz2 +share/doc/HTML/pl/ksplashml/index.docbook share/doc/HTML/pl/kstars/ai-contents.docbook share/doc/HTML/pl/kstars/altvstime.docbook share/doc/HTML/pl/kstars/astroinfo.docbook @@ -738,11 +897,64 @@ share/doc/HTML/pl/ktuberling/common share/doc/HTML/pl/ktuberling/index.cache.bz2 share/doc/HTML/pl/ktuberling/index.docbook share/doc/HTML/pl/ktuberling/technical-reference.docbook +share/doc/HTML/pl/kturtle/common +share/doc/HTML/pl/kturtle/getting-started.docbook +share/doc/HTML/pl/kturtle/glossary.docbook +share/doc/HTML/pl/kturtle/index.cache.bz2 +share/doc/HTML/pl/kturtle/index.docbook +share/doc/HTML/pl/kturtle/programming-reference.docbook +share/doc/HTML/pl/kturtle/translator-guide.docbook +share/doc/HTML/pl/kturtle/using-kturtle.docbook +share/doc/HTML/pl/kview/common +share/doc/HTML/pl/kview/index.cache.bz2 +share/doc/HTML/pl/kview/index.docbook +share/doc/HTML/pl/kvoctrain/art-query-dlg.png +share/doc/HTML/pl/kvoctrain/common +share/doc/HTML/pl/kvoctrain/comp-query-dlg.png +share/doc/HTML/pl/kvoctrain/docprop1-dlg.png +share/doc/HTML/pl/kvoctrain/docprop2-dlg.png +share/doc/HTML/pl/kvoctrain/docprop6-dlg.png +share/doc/HTML/pl/kvoctrain/entry1-dlg.png +share/doc/HTML/pl/kvoctrain/entry2-dlg.png +share/doc/HTML/pl/kvoctrain/entry3-dlg.png +share/doc/HTML/pl/kvoctrain/entry4-dlg.png +share/doc/HTML/pl/kvoctrain/entry5-dlg.png +share/doc/HTML/pl/kvoctrain/entry6-dlg.png +share/doc/HTML/pl/kvoctrain/entry7-dlg.png +share/doc/HTML/pl/kvoctrain/get-new-stuff.png +share/doc/HTML/pl/kvoctrain/index.cache.bz2 +share/doc/HTML/pl/kvoctrain/index.docbook +share/doc/HTML/pl/kvoctrain/lang1-dlg.png +share/doc/HTML/pl/kvoctrain/mainview.png +share/doc/HTML/pl/kvoctrain/man-spotlight2kvtml.1.docbook +share/doc/HTML/pl/kvoctrain/mu-query-dlg.png +share/doc/HTML/pl/kvoctrain/options1-dlg.png +share/doc/HTML/pl/kvoctrain/options2-dlg.png +share/doc/HTML/pl/kvoctrain/options3-dlg.png +share/doc/HTML/pl/kvoctrain/options4-dlg.png +share/doc/HTML/pl/kvoctrain/options5-dlg.png +share/doc/HTML/pl/kvoctrain/options6-dlg.png +share/doc/HTML/pl/kvoctrain/options7-dlg.png +share/doc/HTML/pl/kvoctrain/profiles.png +share/doc/HTML/pl/kvoctrain/pron-dlg.png +share/doc/HTML/pl/kvoctrain/query-dlg.png +share/doc/HTML/pl/kvoctrain/quick-1.png +share/doc/HTML/pl/kvoctrain/quick-2.png +share/doc/HTML/pl/kvoctrain/quick-3.png +share/doc/HTML/pl/kvoctrain/quick-4.png +share/doc/HTML/pl/kvoctrain/quick-5.png +share/doc/HTML/pl/kvoctrain/stat1-dlg.png +share/doc/HTML/pl/kvoctrain/stat2-dlg.png +share/doc/HTML/pl/kvoctrain/syn-query-dlg.png +share/doc/HTML/pl/kvoctrain/verb-query-dlg.png share/doc/HTML/pl/kwallet/common share/doc/HTML/pl/kwallet/edit1.png share/doc/HTML/pl/kwallet/index.cache.bz2 share/doc/HTML/pl/kwallet/index.docbook share/doc/HTML/pl/kwallet/kwalletmanager.png +share/doc/HTML/pl/kwin4/common +share/doc/HTML/pl/kwin4/index.cache.bz2 +share/doc/HTML/pl/kwin4/index.docbook share/doc/HTML/pl/kwordquiz/common share/doc/HTML/pl/kwordquiz/index.cache.bz2 share/doc/HTML/pl/kwordquiz/index.docbook @@ -1029,6 +1241,7 @@ share/locale/pl/LC_MESSAGES/khotkeys.mo share/locale/pl/LC_MESSAGES/khtmlkttsd.mo share/locale/pl/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/pl/LC_MESSAGES/kicker.mo +share/locale/pl/LC_MESSAGES/kickermenu_kate.mo share/locale/pl/LC_MESSAGES/kiconedit.mo share/locale/pl/LC_MESSAGES/kig.mo share/locale/pl/LC_MESSAGES/kimagemapeditor.mo @@ -1066,6 +1279,7 @@ share/locale/pl/LC_MESSAGES/kio_thumbnail.mo share/locale/pl/LC_MESSAGES/kio_trash.mo share/locale/pl/LC_MESSAGES/kio_zeroconf.mo share/locale/pl/LC_MESSAGES/kioexec.mo +share/locale/pl/LC_MESSAGES/kitchensync.mo share/locale/pl/LC_MESSAGES/kiten.mo share/locale/pl/LC_MESSAGES/kjobviewer.mo share/locale/pl/LC_MESSAGES/kjots.mo @@ -1269,6 +1483,7 @@ share/locale/pl/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/pl/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/pl/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/pl/LC_MESSAGES/libkickermenu_tom.mo +share/locale/pl/LC_MESSAGES/libkitchensync.mo share/locale/pl/LC_MESSAGES/libkleopatra.mo share/locale/pl/LC_MESSAGES/libkmime.mo share/locale/pl/LC_MESSAGES/libkonq.mo @@ -1323,11 +1538,16 @@ share/locale/pl/flag.png @dirrm share/doc/HTML/pl/kxkb @dirrm share/doc/HTML/pl/kwrite @dirrm share/doc/HTML/pl/kwordquiz +@dirrm share/doc/HTML/pl/kwin4 @dirrm share/doc/HTML/pl/kwallet +@dirrm share/doc/HTML/pl/kvoctrain +@dirrm share/doc/HTML/pl/kview +@dirrm share/doc/HTML/pl/kturtle @dirrm share/doc/HTML/pl/ktuberling @dirrm share/doc/HTML/pl/ktouch @dirrm share/doc/HTML/pl/ksysguard @dirrm share/doc/HTML/pl/kstars +@dirrm share/doc/HTML/pl/ksplashml @dirrm share/doc/HTML/pl/kspell @dirrm share/doc/HTML/pl/ksnake @dirrm share/doc/HTML/pl/ksirc @@ -1346,15 +1566,34 @@ share/locale/pl/flag.png @dirrm share/doc/HTML/pl/konsole @dirrm share/doc/HTML/pl/konquest @dirrm share/doc/HTML/pl/konqueror +@dirrm share/doc/HTML/pl/konq-plugins/webarchiver +@dirrm share/doc/HTML/pl/konq-plugins/validators +@dirrm share/doc/HTML/pl/konq-plugins/uachanger +@dirrm share/doc/HTML/pl/konq-plugins/mediaplayer +@dirrm share/doc/HTML/pl/konq-plugins/kuick +@dirrm share/doc/HTML/pl/konq-plugins/khtmlsettings +@dirrm share/doc/HTML/pl/konq-plugins/imgallery +@dirrm share/doc/HTML/pl/konq-plugins/fsview +@dirrm share/doc/HTML/pl/konq-plugins/domtreeviewer +@dirrm share/doc/HTML/pl/konq-plugins/dirfilter +@dirrm share/doc/HTML/pl/konq-plugins/crashes +@dirrm share/doc/HTML/pl/konq-plugins/babel +@dirrm share/doc/HTML/pl/konq-plugins +@dirrm share/doc/HTML/pl/kolourpaint @dirrm share/doc/HTML/pl/knotes @dirrm share/doc/HTML/pl/knetworkconf +@dirrm share/doc/HTML/pl/knetattach @dirrm share/doc/HTML/pl/kmplot +@dirrm share/doc/HTML/pl/kmix @dirrm share/doc/HTML/pl/kmines @dirrm share/doc/HTML/pl/kmenuedit @dirrm share/doc/HTML/pl/kmail +@dirrm share/doc/HTML/pl/klipper @dirrm share/doc/HTML/pl/klettres +@dirrm share/doc/HTML/pl/klatin @dirrm share/doc/HTML/pl/kjots @dirrm share/doc/HTML/pl/kiten +@dirrm share/doc/HTML/pl/kioslave @dirrm share/doc/HTML/pl/kinfocenter/xserver @dirrm share/doc/HTML/pl/kinfocenter/usb @dirrm share/doc/HTML/pl/kinfocenter/sound @@ -1377,13 +1616,16 @@ share/locale/pl/flag.png @dirrm share/doc/HTML/pl/kinfocenter @dirrm share/doc/HTML/pl/kig @dirrm share/doc/HTML/pl/kicker +@dirrm share/doc/HTML/pl/khexedit @dirrm share/doc/HTML/pl/khelpcenter/userguide @dirrm share/doc/HTML/pl/khelpcenter/quickstart +@dirrm share/doc/HTML/pl/khelpcenter/glossary @dirrm share/doc/HTML/pl/khelpcenter/faq @dirrm share/doc/HTML/pl/khelpcenter @dirrm share/doc/HTML/pl/khangman @dirrm share/doc/HTML/pl/kget @dirrm share/doc/HTML/pl/kgeography +@dirrm share/doc/HTML/pl/kfloppy @dirrm share/doc/HTML/pl/kfind @dirrm share/doc/HTML/pl/keduca @dirrm share/doc/HTML/pl/kdm @@ -1391,6 +1633,8 @@ share/locale/pl/flag.png @dirrm share/doc/HTML/pl/kdevelop @dirrm share/doc/HTML/pl/kdesu @dirrm share/doc/HTML/pl/kdeprint +@dirrm share/doc/HTML/pl/kdelibs +@dirrm share/doc/HTML/pl/kdcop @dirrm share/doc/HTML/pl/kcontrol/windowmanagement @dirrm share/doc/HTML/pl/kcontrol/useragent @dirrm share/doc/HTML/pl/kcontrol/spellchecking @@ -1439,7 +1683,9 @@ share/locale/pl/flag.png @dirrm share/doc/HTML/pl/kcalc @dirrm share/doc/HTML/pl/kbruch @dirrm share/doc/HTML/pl/kbattleship +@dirrm share/doc/HTML/pl/kate-plugins @dirrm share/doc/HTML/pl/kate +@dirrm share/doc/HTML/pl/kappfinder @dirrm share/doc/HTML/pl/kanagram @dirrm share/doc/HTML/pl/kalzium @dirrm share/doc/HTML/pl/kaddressbook @@ -1447,6 +1693,7 @@ share/locale/pl/flag.png @dirrm share/doc/HTML/pl/docs @dirrm share/doc/HTML/pl/blinken @dirrm share/doc/HTML/pl/ark +@dirrm share/doc/HTML/pl/KRegExpEditor @dirrm share/apps/kturtle/examples/pl @dirrm share/apps/kturtle/examples @dirrm share/apps/kturtle/data diff --git a/polish/koffice-i18n/Makefile b/polish/koffice-i18n/Makefile index 40e0deeb333d..439aaee50bb2 100644 --- a/polish/koffice-i18n/Makefile +++ b/polish/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= polish kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/polish/koffice-i18n/distinfo b/polish/koffice-i18n/distinfo index a7b92caa358d..64050385010a 100644 --- a/polish/koffice-i18n/distinfo +++ b/polish/koffice-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-pl-1.6.1.tar.bz2) = ca6e0bd7de872e51f342cd153598981b -SHA256 (KDE/kde-i18n/koffice-l10n-pl-1.6.1.tar.bz2) = 64d43efeb10eadaac320a412948a8e397f838aff73d5ee8c5eb88650dcae6412 -SIZE (KDE/kde-i18n/koffice-l10n-pl-1.6.1.tar.bz2) = 386344 +MD5 (KDE/kde-i18n/koffice-l10n-pl-1.6.2.tar.bz2) = ce121b8c225a6ffd4530b095f1b590e9 +SHA256 (KDE/kde-i18n/koffice-l10n-pl-1.6.2.tar.bz2) = 21471db973a2af8f72eec5659946978083ce40b773b34c87cb15d8e4b5edf9f7 +SIZE (KDE/kde-i18n/koffice-l10n-pl-1.6.2.tar.bz2) = 386450 diff --git a/polish/koffice-i18n/pkg-plist b/polish/koffice-i18n/pkg-plist index 4b4534d94bbe..a9161205f0d6 100644 --- a/polish/koffice-i18n/pkg-plist +++ b/polish/koffice-i18n/pkg-plist @@ -2,7 +2,6 @@ share/locale/pl/LC_MESSAGES/desktop_koffice.mo share/locale/pl/LC_MESSAGES/example.mo share/locale/pl/LC_MESSAGES/karbon.mo share/locale/pl/LC_MESSAGES/kchart.mo -share/locale/pl/LC_MESSAGES/kdgantt.mo share/locale/pl/LC_MESSAGES/kexi.mo share/locale/pl/LC_MESSAGES/kfile_abiword.mo share/locale/pl/LC_MESSAGES/kfile_gnumeric.mo diff --git a/polish/koffice-kde4-l10n/Makefile b/polish/koffice-kde4-l10n/Makefile index 40e0deeb333d..439aaee50bb2 100644 --- a/polish/koffice-kde4-l10n/Makefile +++ b/polish/koffice-kde4-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= polish kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/polish/koffice-kde4-l10n/distinfo b/polish/koffice-kde4-l10n/distinfo index a7b92caa358d..64050385010a 100644 --- a/polish/koffice-kde4-l10n/distinfo +++ b/polish/koffice-kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-pl-1.6.1.tar.bz2) = ca6e0bd7de872e51f342cd153598981b -SHA256 (KDE/kde-i18n/koffice-l10n-pl-1.6.1.tar.bz2) = 64d43efeb10eadaac320a412948a8e397f838aff73d5ee8c5eb88650dcae6412 -SIZE (KDE/kde-i18n/koffice-l10n-pl-1.6.1.tar.bz2) = 386344 +MD5 (KDE/kde-i18n/koffice-l10n-pl-1.6.2.tar.bz2) = ce121b8c225a6ffd4530b095f1b590e9 +SHA256 (KDE/kde-i18n/koffice-l10n-pl-1.6.2.tar.bz2) = 21471db973a2af8f72eec5659946978083ce40b773b34c87cb15d8e4b5edf9f7 +SIZE (KDE/kde-i18n/koffice-l10n-pl-1.6.2.tar.bz2) = 386450 diff --git a/polish/koffice-kde4-l10n/pkg-plist b/polish/koffice-kde4-l10n/pkg-plist index 4b4534d94bbe..a9161205f0d6 100644 --- a/polish/koffice-kde4-l10n/pkg-plist +++ b/polish/koffice-kde4-l10n/pkg-plist @@ -2,7 +2,6 @@ share/locale/pl/LC_MESSAGES/desktop_koffice.mo share/locale/pl/LC_MESSAGES/example.mo share/locale/pl/LC_MESSAGES/karbon.mo share/locale/pl/LC_MESSAGES/kchart.mo -share/locale/pl/LC_MESSAGES/kdgantt.mo share/locale/pl/LC_MESSAGES/kexi.mo share/locale/pl/LC_MESSAGES/kfile_abiword.mo share/locale/pl/LC_MESSAGES/kfile_gnumeric.mo diff --git a/portuguese/calligra-l10n-pt_BR/Makefile b/portuguese/calligra-l10n-pt_BR/Makefile index 3f06ce477d89..e1f5a3e8f430 100644 --- a/portuguese/calligra-l10n-pt_BR/Makefile +++ b/portuguese/calligra-l10n-pt_BR/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= portuguese kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/portuguese/calligra-l10n-pt_BR/distinfo b/portuguese/calligra-l10n-pt_BR/distinfo index a04a8005a1a2..e0b62dc0e357 100644 --- a/portuguese/calligra-l10n-pt_BR/distinfo +++ b/portuguese/calligra-l10n-pt_BR/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-pt_BR-1.6.1.tar.bz2) = 71efdf80a256b20baece5e58f2d4527a -SHA256 (KDE/kde-i18n/koffice-l10n-pt_BR-1.6.1.tar.bz2) = 2699b82bd9322e73060a1daf99d6898a10fc675ea55a0f26df5b8e8bb75692c3 -SIZE (KDE/kde-i18n/koffice-l10n-pt_BR-1.6.1.tar.bz2) = 5924672 +MD5 (KDE/kde-i18n/koffice-l10n-pt_BR-1.6.2.tar.bz2) = 2502c7ad3f66da2d51b643531acde224 +SHA256 (KDE/kde-i18n/koffice-l10n-pt_BR-1.6.2.tar.bz2) = 24e4c291661fd957b39a39f477f5674751035f964bcb298fd8d61954a5b57f5e +SIZE (KDE/kde-i18n/koffice-l10n-pt_BR-1.6.2.tar.bz2) = 5924854 diff --git a/portuguese/calligra-l10n-pt_BR/pkg-plist b/portuguese/calligra-l10n-pt_BR/pkg-plist index 0a9b3432a18e..6d0928bab6e8 100644 --- a/portuguese/calligra-l10n-pt_BR/pkg-plist +++ b/portuguese/calligra-l10n-pt_BR/pkg-plist @@ -489,7 +489,6 @@ share/locale/pt_BR/LC_MESSAGES/desktop_koffice.mo share/locale/pt_BR/LC_MESSAGES/example.mo share/locale/pt_BR/LC_MESSAGES/karbon.mo share/locale/pt_BR/LC_MESSAGES/kchart.mo -share/locale/pt_BR/LC_MESSAGES/kdgantt.mo share/locale/pt_BR/LC_MESSAGES/kexi.mo share/locale/pt_BR/LC_MESSAGES/kfile_abiword.mo share/locale/pt_BR/LC_MESSAGES/kfile_gnumeric.mo diff --git a/portuguese/calligra-l10n/Makefile b/portuguese/calligra-l10n/Makefile index d280a0b87342..b587c0ac109a 100644 --- a/portuguese/calligra-l10n/Makefile +++ b/portuguese/calligra-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= portuguese kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/portuguese/calligra-l10n/distinfo b/portuguese/calligra-l10n/distinfo index 5137782d8475..3c6ba9fcbc18 100644 --- a/portuguese/calligra-l10n/distinfo +++ b/portuguese/calligra-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-pt-1.6.1.tar.bz2) = c4e59783b4b93a50c7e5e9b53c864caa -SHA256 (KDE/kde-i18n/koffice-l10n-pt-1.6.1.tar.bz2) = 4a7d1108074d9ff678c1eff8a8a28faa91b9362efb6af725a7e91d8ef940ec31 -SIZE (KDE/kde-i18n/koffice-l10n-pt-1.6.1.tar.bz2) = 1130883 +MD5 (KDE/kde-i18n/koffice-l10n-pt-1.6.2.tar.bz2) = f8f90316c3aacc6a6c9150d1241a808d +SHA256 (KDE/kde-i18n/koffice-l10n-pt-1.6.2.tar.bz2) = 89c0210d8b1ce37a9a77f02925d555e942d2911714697066270d82dfa9951d19 +SIZE (KDE/kde-i18n/koffice-l10n-pt-1.6.2.tar.bz2) = 1132098 diff --git a/portuguese/calligra-l10n/pkg-plist b/portuguese/calligra-l10n/pkg-plist index b474302403e1..3a997fadbaf6 100644 --- a/portuguese/calligra-l10n/pkg-plist +++ b/portuguese/calligra-l10n/pkg-plist @@ -152,7 +152,6 @@ share/locale/pt/LC_MESSAGES/desktop_koffice.mo share/locale/pt/LC_MESSAGES/example.mo share/locale/pt/LC_MESSAGES/karbon.mo share/locale/pt/LC_MESSAGES/kchart.mo -share/locale/pt/LC_MESSAGES/kdgantt.mo share/locale/pt/LC_MESSAGES/kexi.mo share/locale/pt/LC_MESSAGES/kfile_abiword.mo share/locale/pt/LC_MESSAGES/kfile_gnumeric.mo diff --git a/portuguese/kde3-i18n-pt_BR/distinfo b/portuguese/kde3-i18n-pt_BR/distinfo index 72ed6ca79a7c..2f69c0b80419 100644 --- a/portuguese/kde3-i18n-pt_BR/distinfo +++ b/portuguese/kde3-i18n-pt_BR/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-pt_BR-3.5.5.tar.bz2) = d9359ccc0040a5c6ac88d5cad12d4fcf -SHA256 (KDE/kde-i18n/kde-i18n-pt_BR-3.5.5.tar.bz2) = a63454be61be1fd2ce845f2fa6e219c4eb1a10b254fed684703c39dd4746ffd5 -SIZE (KDE/kde-i18n/kde-i18n-pt_BR-3.5.5.tar.bz2) = 11880457 +MD5 (KDE/kde-i18n/kde-i18n-pt_BR-3.5.6.tar.bz2) = 29836d3d914f41a2cab1567d1df6feff +SHA256 (KDE/kde-i18n/kde-i18n-pt_BR-3.5.6.tar.bz2) = 7bcade31c0cd90559717820b46c756e2287cd028cc1e3b552070c72b650f61b5 +SIZE (KDE/kde-i18n/kde-i18n-pt_BR-3.5.6.tar.bz2) = 11903550 diff --git a/portuguese/kde3-i18n-pt_BR/pkg-plist b/portuguese/kde3-i18n-pt_BR/pkg-plist index db0cf0501eb1..fbe3941c39ee 100644 --- a/portuguese/kde3-i18n-pt_BR/pkg-plist +++ b/portuguese/kde3-i18n-pt_BR/pkg-plist @@ -61,6 +61,9 @@ share/doc/HTML/pt_BR/docs/common/gpl-translated.html share/doc/HTML/pt_BR/docs/common/kde-localised.css share/doc/HTML/pt_BR/docs/common/lgpl-translated.html share/doc/HTML/pt_BR/docs/common/logotp3.png +share/doc/HTML/pt_BR/irkick/common +share/doc/HTML/pt_BR/irkick/index.cache.bz2 +share/doc/HTML/pt_BR/irkick/index.docbook share/doc/HTML/pt_BR/juk/common share/doc/HTML/pt_BR/juk/index.cache.bz2 share/doc/HTML/pt_BR/juk/index.docbook @@ -157,6 +160,9 @@ share/doc/HTML/pt_BR/kcalc/index.docbook share/doc/HTML/pt_BR/kcharselect/common share/doc/HTML/pt_BR/kcharselect/index.cache.bz2 share/doc/HTML/pt_BR/kcharselect/index.docbook +share/doc/HTML/pt_BR/kcmlirc/common +share/doc/HTML/pt_BR/kcmlirc/index.cache.bz2 +share/doc/HTML/pt_BR/kcmlirc/index.docbook share/doc/HTML/pt_BR/kcoloredit/common share/doc/HTML/pt_BR/kcoloredit/index.cache.bz2 share/doc/HTML/pt_BR/kcoloredit/index.docbook @@ -340,12 +346,6 @@ share/doc/HTML/pt_BR/kdelibs/man-checkXML.1.docbook share/doc/HTML/pt_BR/kdelibs/man-dcop.1.docbook share/doc/HTML/pt_BR/kdelibs/man-kdeoptions.7.docbook share/doc/HTML/pt_BR/kdelibs/man-qtoptions.7.docbook -share/doc/HTML/pt_BR/kdelirc/irkick/common -share/doc/HTML/pt_BR/kdelirc/irkick/index.cache.bz2 -share/doc/HTML/pt_BR/kdelirc/irkick/index.docbook -share/doc/HTML/pt_BR/kdelirc/kcmlirc/common -share/doc/HTML/pt_BR/kdelirc/kcmlirc/index.cache.bz2 -share/doc/HTML/pt_BR/kdelirc/kcmlirc/index.docbook share/doc/HTML/pt_BR/kdeprint/add-printer-wiz.docbook share/doc/HTML/pt_BR/kdeprint/common share/doc/HTML/pt_BR/kdeprint/cups-config.docbook @@ -1369,6 +1369,7 @@ share/locale/pt_BR/LC_MESSAGES/audiocd_encoder_vorbis.mo share/locale/pt_BR/LC_MESSAGES/audiorename_plugin.mo share/locale/pt_BR/LC_MESSAGES/autorefresh.mo share/locale/pt_BR/LC_MESSAGES/babelfish.mo +share/locale/pt_BR/LC_MESSAGES/blinken.mo share/locale/pt_BR/LC_MESSAGES/cervisia.mo share/locale/pt_BR/LC_MESSAGES/charlatanui.mo share/locale/pt_BR/LC_MESSAGES/clockapplet.mo @@ -1405,6 +1406,7 @@ share/locale/pt_BR/LC_MESSAGES/kaccess.mo share/locale/pt_BR/LC_MESSAGES/kaddressbook.mo share/locale/pt_BR/LC_MESSAGES/kalarm.mo share/locale/pt_BR/LC_MESSAGES/kalzium.mo +share/locale/pt_BR/LC_MESSAGES/kanagram.mo share/locale/pt_BR/LC_MESSAGES/kandy.mo share/locale/pt_BR/LC_MESSAGES/kappfinder.mo share/locale/pt_BR/LC_MESSAGES/karm.mo @@ -1680,7 +1682,6 @@ share/locale/pt_BR/LC_MESSAGES/kmathapplet.mo share/locale/pt_BR/LC_MESSAGES/kmcop.mo share/locale/pt_BR/LC_MESSAGES/kmenuapplet.mo share/locale/pt_BR/LC_MESSAGES/kmenuedit.mo -share/locale/pt_BR/LC_MESSAGES/kmessedwords.mo share/locale/pt_BR/LC_MESSAGES/kmid.mo share/locale/pt_BR/LC_MESSAGES/kmilo_delli8k.mo share/locale/pt_BR/LC_MESSAGES/kmilo_generic.mo @@ -1846,6 +1847,7 @@ share/locale/pt_BR/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/pt_BR/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/pt_BR/LC_MESSAGES/libkcal.mo share/locale/pt_BR/LC_MESSAGES/libkcddb.mo +share/locale/pt_BR/LC_MESSAGES/libkdeedu.mo share/locale/pt_BR/LC_MESSAGES/libkdegames.mo share/locale/pt_BR/LC_MESSAGES/libkdepim.mo share/locale/pt_BR/LC_MESSAGES/libkholidays.mo @@ -2079,9 +2081,6 @@ share/locale/pt_BR/flag.png @dirrm share/doc/HTML/pt_BR/kdesvn-build @dirrm share/doc/HTML/pt_BR/kdesu @dirrm share/doc/HTML/pt_BR/kdeprint -@dirrm share/doc/HTML/pt_BR/kdelirc/kcmlirc -@dirrm share/doc/HTML/pt_BR/kdelirc/irkick -@dirrm share/doc/HTML/pt_BR/kdelirc @dirrm share/doc/HTML/pt_BR/kdelibs @dirrm share/doc/HTML/pt_BR/kdebugdialog @dirrm share/doc/HTML/pt_BR/kdcop @@ -2141,6 +2140,7 @@ share/locale/pt_BR/flag.png @dirrm share/doc/HTML/pt_BR/kcontrol/arts @dirrm share/doc/HTML/pt_BR/kcontrol @dirrm share/doc/HTML/pt_BR/kcoloredit +@dirrm share/doc/HTML/pt_BR/kcmlirc @dirrm share/doc/HTML/pt_BR/kcharselect @dirrm share/doc/HTML/pt_BR/kcalc @dirrm share/doc/HTML/pt_BR/kcachegrind @@ -2165,6 +2165,7 @@ share/locale/pt_BR/flag.png @dirrm share/doc/HTML/pt_BR/kaddressbook @dirrm share/doc/HTML/pt_BR/kaboodle @dirrm share/doc/HTML/pt_BR/juk +@dirrm share/doc/HTML/pt_BR/irkick @dirrm share/doc/HTML/pt_BR/docs/common @dirrm share/doc/HTML/pt_BR/docs @dirrm share/doc/HTML/pt_BR/cervisia diff --git a/portuguese/kde3-i18n/distinfo b/portuguese/kde3-i18n/distinfo index 1d1d2bae854a..281310558104 100644 --- a/portuguese/kde3-i18n/distinfo +++ b/portuguese/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-pt-3.5.5.tar.bz2) = af8b477236f98e0fa7fcae21db3df5cc -SHA256 (KDE/kde-i18n/kde-i18n-pt-3.5.5.tar.bz2) = 76b69d67cabbcb75de0f63a181602b8b6d083d63b47052bbcdd3bf79e1802b2d -SIZE (KDE/kde-i18n/kde-i18n-pt-3.5.5.tar.bz2) = 12417602 +MD5 (KDE/kde-i18n/kde-i18n-pt-3.5.6.tar.bz2) = ee8322ab521d796fbfafef471d845d6d +SHA256 (KDE/kde-i18n/kde-i18n-pt-3.5.6.tar.bz2) = 1d77cbc4f488b7f523051307c1550a3fb480cb240a35b8a24a8118b2e4932650 +SIZE (KDE/kde-i18n/kde-i18n-pt-3.5.6.tar.bz2) = 12456750 diff --git a/portuguese/kde3-i18n/pkg-plist b/portuguese/kde3-i18n/pkg-plist index b53ccde9a249..5c158f93ee09 100644 --- a/portuguese/kde3-i18n/pkg-plist +++ b/portuguese/kde3-i18n/pkg-plist @@ -72,6 +72,9 @@ share/doc/HTML/pt/docs/common/gpl-translated.html share/doc/HTML/pt/docs/common/kde-localised.css share/doc/HTML/pt/docs/common/lgpl-translated.html share/doc/HTML/pt/docs/common/logotp3.png +share/doc/HTML/pt/irkick/common +share/doc/HTML/pt/irkick/index.cache.bz2 +share/doc/HTML/pt/irkick/index.docbook share/doc/HTML/pt/juk/common share/doc/HTML/pt/juk/index.cache.bz2 share/doc/HTML/pt/juk/index.docbook @@ -198,6 +201,9 @@ share/doc/HTML/pt/kcalc/index.docbook share/doc/HTML/pt/kcharselect/common share/doc/HTML/pt/kcharselect/index.cache.bz2 share/doc/HTML/pt/kcharselect/index.docbook +share/doc/HTML/pt/kcmlirc/common +share/doc/HTML/pt/kcmlirc/index.cache.bz2 +share/doc/HTML/pt/kcmlirc/index.docbook share/doc/HTML/pt/kcoloredit/common share/doc/HTML/pt/kcoloredit/index.cache.bz2 share/doc/HTML/pt/kcoloredit/index.docbook @@ -401,12 +407,6 @@ share/doc/HTML/pt/kdelibs/man-dcop.1.docbook share/doc/HTML/pt/kdelibs/man-kbuildsycoca.8.docbook share/doc/HTML/pt/kdelibs/man-kdeoptions.7.docbook share/doc/HTML/pt/kdelibs/man-qtoptions.7.docbook -share/doc/HTML/pt/kdelirc/irkick/common -share/doc/HTML/pt/kdelirc/irkick/index.cache.bz2 -share/doc/HTML/pt/kdelirc/irkick/index.docbook -share/doc/HTML/pt/kdelirc/kcmlirc/common -share/doc/HTML/pt/kdelirc/kcmlirc/index.cache.bz2 -share/doc/HTML/pt/kdelirc/kcmlirc/index.docbook share/doc/HTML/pt/kdeprint/add-printer-wiz.docbook share/doc/HTML/pt/kdeprint/common share/doc/HTML/pt/kdeprint/cups-config.docbook @@ -585,6 +585,7 @@ share/doc/HTML/pt/khelpcenter/userguide/common share/doc/HTML/pt/khelpcenter/userguide/control-center.docbook share/doc/HTML/pt/khelpcenter/userguide/creating-graphics.docbook share/doc/HTML/pt/khelpcenter/userguide/credits-and-license.docbook +share/doc/HTML/pt/khelpcenter/userguide/customizing-desktop.docbook share/doc/HTML/pt/khelpcenter/userguide/email.docbook share/doc/HTML/pt/khelpcenter/userguide/extragear-applications.docbook share/doc/HTML/pt/khelpcenter/userguide/file-sharing.docbook @@ -1763,6 +1764,7 @@ share/locale/pt/LC_MESSAGES/khotkeys.mo share/locale/pt/LC_MESSAGES/khtmlkttsd.mo share/locale/pt/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/pt/LC_MESSAGES/kicker.mo +share/locale/pt/LC_MESSAGES/kickermenu_kate.mo share/locale/pt/LC_MESSAGES/kiconedit.mo share/locale/pt/LC_MESSAGES/kig.mo share/locale/pt/LC_MESSAGES/kimagemapeditor.mo @@ -1800,6 +1802,7 @@ share/locale/pt/LC_MESSAGES/kio_thumbnail.mo share/locale/pt/LC_MESSAGES/kio_trash.mo share/locale/pt/LC_MESSAGES/kio_zeroconf.mo share/locale/pt/LC_MESSAGES/kioexec.mo +share/locale/pt/LC_MESSAGES/kitchensync.mo share/locale/pt/LC_MESSAGES/kiten.mo share/locale/pt/LC_MESSAGES/kjobviewer.mo share/locale/pt/LC_MESSAGES/kjots.mo @@ -2003,6 +2006,7 @@ share/locale/pt/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/pt/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/pt/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/pt/LC_MESSAGES/libkickermenu_tom.mo +share/locale/pt/LC_MESSAGES/libkitchensync.mo share/locale/pt/LC_MESSAGES/libkleopatra.mo share/locale/pt/LC_MESSAGES/libkmime.mo share/locale/pt/LC_MESSAGES/libkonq.mo @@ -2232,9 +2236,6 @@ share/locale/pt/flag.png @dirrm share/doc/HTML/pt/kdesvn-build @dirrm share/doc/HTML/pt/kdesu @dirrm share/doc/HTML/pt/kdeprint -@dirrm share/doc/HTML/pt/kdelirc/kcmlirc -@dirrm share/doc/HTML/pt/kdelirc/irkick -@dirrm share/doc/HTML/pt/kdelirc @dirrm share/doc/HTML/pt/kdelibs @dirrm share/doc/HTML/pt/kdebugdialog @dirrm share/doc/HTML/pt/kdearch @@ -2299,6 +2300,7 @@ share/locale/pt/flag.png @dirrm share/doc/HTML/pt/kcontrol/arts @dirrm share/doc/HTML/pt/kcontrol @dirrm share/doc/HTML/pt/kcoloredit +@dirrm share/doc/HTML/pt/kcmlirc @dirrm share/doc/HTML/pt/kcharselect @dirrm share/doc/HTML/pt/kcalc @dirrm share/doc/HTML/pt/kcachegrind @@ -2325,6 +2327,7 @@ share/locale/pt/flag.png @dirrm share/doc/HTML/pt/kaddressbook @dirrm share/doc/HTML/pt/kaboodle @dirrm share/doc/HTML/pt/juk +@dirrm share/doc/HTML/pt/irkick @dirrm share/doc/HTML/pt/docs/common @dirrm share/doc/HTML/pt/docs @dirrm share/doc/HTML/pt/cervisia diff --git a/portuguese/kde4-l10n-pt_BR/distinfo b/portuguese/kde4-l10n-pt_BR/distinfo index 72ed6ca79a7c..2f69c0b80419 100644 --- a/portuguese/kde4-l10n-pt_BR/distinfo +++ b/portuguese/kde4-l10n-pt_BR/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-pt_BR-3.5.5.tar.bz2) = d9359ccc0040a5c6ac88d5cad12d4fcf -SHA256 (KDE/kde-i18n/kde-i18n-pt_BR-3.5.5.tar.bz2) = a63454be61be1fd2ce845f2fa6e219c4eb1a10b254fed684703c39dd4746ffd5 -SIZE (KDE/kde-i18n/kde-i18n-pt_BR-3.5.5.tar.bz2) = 11880457 +MD5 (KDE/kde-i18n/kde-i18n-pt_BR-3.5.6.tar.bz2) = 29836d3d914f41a2cab1567d1df6feff +SHA256 (KDE/kde-i18n/kde-i18n-pt_BR-3.5.6.tar.bz2) = 7bcade31c0cd90559717820b46c756e2287cd028cc1e3b552070c72b650f61b5 +SIZE (KDE/kde-i18n/kde-i18n-pt_BR-3.5.6.tar.bz2) = 11903550 diff --git a/portuguese/kde4-l10n-pt_BR/pkg-plist b/portuguese/kde4-l10n-pt_BR/pkg-plist index db0cf0501eb1..fbe3941c39ee 100644 --- a/portuguese/kde4-l10n-pt_BR/pkg-plist +++ b/portuguese/kde4-l10n-pt_BR/pkg-plist @@ -61,6 +61,9 @@ share/doc/HTML/pt_BR/docs/common/gpl-translated.html share/doc/HTML/pt_BR/docs/common/kde-localised.css share/doc/HTML/pt_BR/docs/common/lgpl-translated.html share/doc/HTML/pt_BR/docs/common/logotp3.png +share/doc/HTML/pt_BR/irkick/common +share/doc/HTML/pt_BR/irkick/index.cache.bz2 +share/doc/HTML/pt_BR/irkick/index.docbook share/doc/HTML/pt_BR/juk/common share/doc/HTML/pt_BR/juk/index.cache.bz2 share/doc/HTML/pt_BR/juk/index.docbook @@ -157,6 +160,9 @@ share/doc/HTML/pt_BR/kcalc/index.docbook share/doc/HTML/pt_BR/kcharselect/common share/doc/HTML/pt_BR/kcharselect/index.cache.bz2 share/doc/HTML/pt_BR/kcharselect/index.docbook +share/doc/HTML/pt_BR/kcmlirc/common +share/doc/HTML/pt_BR/kcmlirc/index.cache.bz2 +share/doc/HTML/pt_BR/kcmlirc/index.docbook share/doc/HTML/pt_BR/kcoloredit/common share/doc/HTML/pt_BR/kcoloredit/index.cache.bz2 share/doc/HTML/pt_BR/kcoloredit/index.docbook @@ -340,12 +346,6 @@ share/doc/HTML/pt_BR/kdelibs/man-checkXML.1.docbook share/doc/HTML/pt_BR/kdelibs/man-dcop.1.docbook share/doc/HTML/pt_BR/kdelibs/man-kdeoptions.7.docbook share/doc/HTML/pt_BR/kdelibs/man-qtoptions.7.docbook -share/doc/HTML/pt_BR/kdelirc/irkick/common -share/doc/HTML/pt_BR/kdelirc/irkick/index.cache.bz2 -share/doc/HTML/pt_BR/kdelirc/irkick/index.docbook -share/doc/HTML/pt_BR/kdelirc/kcmlirc/common -share/doc/HTML/pt_BR/kdelirc/kcmlirc/index.cache.bz2 -share/doc/HTML/pt_BR/kdelirc/kcmlirc/index.docbook share/doc/HTML/pt_BR/kdeprint/add-printer-wiz.docbook share/doc/HTML/pt_BR/kdeprint/common share/doc/HTML/pt_BR/kdeprint/cups-config.docbook @@ -1369,6 +1369,7 @@ share/locale/pt_BR/LC_MESSAGES/audiocd_encoder_vorbis.mo share/locale/pt_BR/LC_MESSAGES/audiorename_plugin.mo share/locale/pt_BR/LC_MESSAGES/autorefresh.mo share/locale/pt_BR/LC_MESSAGES/babelfish.mo +share/locale/pt_BR/LC_MESSAGES/blinken.mo share/locale/pt_BR/LC_MESSAGES/cervisia.mo share/locale/pt_BR/LC_MESSAGES/charlatanui.mo share/locale/pt_BR/LC_MESSAGES/clockapplet.mo @@ -1405,6 +1406,7 @@ share/locale/pt_BR/LC_MESSAGES/kaccess.mo share/locale/pt_BR/LC_MESSAGES/kaddressbook.mo share/locale/pt_BR/LC_MESSAGES/kalarm.mo share/locale/pt_BR/LC_MESSAGES/kalzium.mo +share/locale/pt_BR/LC_MESSAGES/kanagram.mo share/locale/pt_BR/LC_MESSAGES/kandy.mo share/locale/pt_BR/LC_MESSAGES/kappfinder.mo share/locale/pt_BR/LC_MESSAGES/karm.mo @@ -1680,7 +1682,6 @@ share/locale/pt_BR/LC_MESSAGES/kmathapplet.mo share/locale/pt_BR/LC_MESSAGES/kmcop.mo share/locale/pt_BR/LC_MESSAGES/kmenuapplet.mo share/locale/pt_BR/LC_MESSAGES/kmenuedit.mo -share/locale/pt_BR/LC_MESSAGES/kmessedwords.mo share/locale/pt_BR/LC_MESSAGES/kmid.mo share/locale/pt_BR/LC_MESSAGES/kmilo_delli8k.mo share/locale/pt_BR/LC_MESSAGES/kmilo_generic.mo @@ -1846,6 +1847,7 @@ share/locale/pt_BR/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/pt_BR/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/pt_BR/LC_MESSAGES/libkcal.mo share/locale/pt_BR/LC_MESSAGES/libkcddb.mo +share/locale/pt_BR/LC_MESSAGES/libkdeedu.mo share/locale/pt_BR/LC_MESSAGES/libkdegames.mo share/locale/pt_BR/LC_MESSAGES/libkdepim.mo share/locale/pt_BR/LC_MESSAGES/libkholidays.mo @@ -2079,9 +2081,6 @@ share/locale/pt_BR/flag.png @dirrm share/doc/HTML/pt_BR/kdesvn-build @dirrm share/doc/HTML/pt_BR/kdesu @dirrm share/doc/HTML/pt_BR/kdeprint -@dirrm share/doc/HTML/pt_BR/kdelirc/kcmlirc -@dirrm share/doc/HTML/pt_BR/kdelirc/irkick -@dirrm share/doc/HTML/pt_BR/kdelirc @dirrm share/doc/HTML/pt_BR/kdelibs @dirrm share/doc/HTML/pt_BR/kdebugdialog @dirrm share/doc/HTML/pt_BR/kdcop @@ -2141,6 +2140,7 @@ share/locale/pt_BR/flag.png @dirrm share/doc/HTML/pt_BR/kcontrol/arts @dirrm share/doc/HTML/pt_BR/kcontrol @dirrm share/doc/HTML/pt_BR/kcoloredit +@dirrm share/doc/HTML/pt_BR/kcmlirc @dirrm share/doc/HTML/pt_BR/kcharselect @dirrm share/doc/HTML/pt_BR/kcalc @dirrm share/doc/HTML/pt_BR/kcachegrind @@ -2165,6 +2165,7 @@ share/locale/pt_BR/flag.png @dirrm share/doc/HTML/pt_BR/kaddressbook @dirrm share/doc/HTML/pt_BR/kaboodle @dirrm share/doc/HTML/pt_BR/juk +@dirrm share/doc/HTML/pt_BR/irkick @dirrm share/doc/HTML/pt_BR/docs/common @dirrm share/doc/HTML/pt_BR/docs @dirrm share/doc/HTML/pt_BR/cervisia diff --git a/portuguese/kde4-l10n/distinfo b/portuguese/kde4-l10n/distinfo index 1d1d2bae854a..281310558104 100644 --- a/portuguese/kde4-l10n/distinfo +++ b/portuguese/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-pt-3.5.5.tar.bz2) = af8b477236f98e0fa7fcae21db3df5cc -SHA256 (KDE/kde-i18n/kde-i18n-pt-3.5.5.tar.bz2) = 76b69d67cabbcb75de0f63a181602b8b6d083d63b47052bbcdd3bf79e1802b2d -SIZE (KDE/kde-i18n/kde-i18n-pt-3.5.5.tar.bz2) = 12417602 +MD5 (KDE/kde-i18n/kde-i18n-pt-3.5.6.tar.bz2) = ee8322ab521d796fbfafef471d845d6d +SHA256 (KDE/kde-i18n/kde-i18n-pt-3.5.6.tar.bz2) = 1d77cbc4f488b7f523051307c1550a3fb480cb240a35b8a24a8118b2e4932650 +SIZE (KDE/kde-i18n/kde-i18n-pt-3.5.6.tar.bz2) = 12456750 diff --git a/portuguese/kde4-l10n/pkg-plist b/portuguese/kde4-l10n/pkg-plist index b53ccde9a249..5c158f93ee09 100644 --- a/portuguese/kde4-l10n/pkg-plist +++ b/portuguese/kde4-l10n/pkg-plist @@ -72,6 +72,9 @@ share/doc/HTML/pt/docs/common/gpl-translated.html share/doc/HTML/pt/docs/common/kde-localised.css share/doc/HTML/pt/docs/common/lgpl-translated.html share/doc/HTML/pt/docs/common/logotp3.png +share/doc/HTML/pt/irkick/common +share/doc/HTML/pt/irkick/index.cache.bz2 +share/doc/HTML/pt/irkick/index.docbook share/doc/HTML/pt/juk/common share/doc/HTML/pt/juk/index.cache.bz2 share/doc/HTML/pt/juk/index.docbook @@ -198,6 +201,9 @@ share/doc/HTML/pt/kcalc/index.docbook share/doc/HTML/pt/kcharselect/common share/doc/HTML/pt/kcharselect/index.cache.bz2 share/doc/HTML/pt/kcharselect/index.docbook +share/doc/HTML/pt/kcmlirc/common +share/doc/HTML/pt/kcmlirc/index.cache.bz2 +share/doc/HTML/pt/kcmlirc/index.docbook share/doc/HTML/pt/kcoloredit/common share/doc/HTML/pt/kcoloredit/index.cache.bz2 share/doc/HTML/pt/kcoloredit/index.docbook @@ -401,12 +407,6 @@ share/doc/HTML/pt/kdelibs/man-dcop.1.docbook share/doc/HTML/pt/kdelibs/man-kbuildsycoca.8.docbook share/doc/HTML/pt/kdelibs/man-kdeoptions.7.docbook share/doc/HTML/pt/kdelibs/man-qtoptions.7.docbook -share/doc/HTML/pt/kdelirc/irkick/common -share/doc/HTML/pt/kdelirc/irkick/index.cache.bz2 -share/doc/HTML/pt/kdelirc/irkick/index.docbook -share/doc/HTML/pt/kdelirc/kcmlirc/common -share/doc/HTML/pt/kdelirc/kcmlirc/index.cache.bz2 -share/doc/HTML/pt/kdelirc/kcmlirc/index.docbook share/doc/HTML/pt/kdeprint/add-printer-wiz.docbook share/doc/HTML/pt/kdeprint/common share/doc/HTML/pt/kdeprint/cups-config.docbook @@ -585,6 +585,7 @@ share/doc/HTML/pt/khelpcenter/userguide/common share/doc/HTML/pt/khelpcenter/userguide/control-center.docbook share/doc/HTML/pt/khelpcenter/userguide/creating-graphics.docbook share/doc/HTML/pt/khelpcenter/userguide/credits-and-license.docbook +share/doc/HTML/pt/khelpcenter/userguide/customizing-desktop.docbook share/doc/HTML/pt/khelpcenter/userguide/email.docbook share/doc/HTML/pt/khelpcenter/userguide/extragear-applications.docbook share/doc/HTML/pt/khelpcenter/userguide/file-sharing.docbook @@ -1763,6 +1764,7 @@ share/locale/pt/LC_MESSAGES/khotkeys.mo share/locale/pt/LC_MESSAGES/khtmlkttsd.mo share/locale/pt/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/pt/LC_MESSAGES/kicker.mo +share/locale/pt/LC_MESSAGES/kickermenu_kate.mo share/locale/pt/LC_MESSAGES/kiconedit.mo share/locale/pt/LC_MESSAGES/kig.mo share/locale/pt/LC_MESSAGES/kimagemapeditor.mo @@ -1800,6 +1802,7 @@ share/locale/pt/LC_MESSAGES/kio_thumbnail.mo share/locale/pt/LC_MESSAGES/kio_trash.mo share/locale/pt/LC_MESSAGES/kio_zeroconf.mo share/locale/pt/LC_MESSAGES/kioexec.mo +share/locale/pt/LC_MESSAGES/kitchensync.mo share/locale/pt/LC_MESSAGES/kiten.mo share/locale/pt/LC_MESSAGES/kjobviewer.mo share/locale/pt/LC_MESSAGES/kjots.mo @@ -2003,6 +2006,7 @@ share/locale/pt/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/pt/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/pt/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/pt/LC_MESSAGES/libkickermenu_tom.mo +share/locale/pt/LC_MESSAGES/libkitchensync.mo share/locale/pt/LC_MESSAGES/libkleopatra.mo share/locale/pt/LC_MESSAGES/libkmime.mo share/locale/pt/LC_MESSAGES/libkonq.mo @@ -2232,9 +2236,6 @@ share/locale/pt/flag.png @dirrm share/doc/HTML/pt/kdesvn-build @dirrm share/doc/HTML/pt/kdesu @dirrm share/doc/HTML/pt/kdeprint -@dirrm share/doc/HTML/pt/kdelirc/kcmlirc -@dirrm share/doc/HTML/pt/kdelirc/irkick -@dirrm share/doc/HTML/pt/kdelirc @dirrm share/doc/HTML/pt/kdelibs @dirrm share/doc/HTML/pt/kdebugdialog @dirrm share/doc/HTML/pt/kdearch @@ -2299,6 +2300,7 @@ share/locale/pt/flag.png @dirrm share/doc/HTML/pt/kcontrol/arts @dirrm share/doc/HTML/pt/kcontrol @dirrm share/doc/HTML/pt/kcoloredit +@dirrm share/doc/HTML/pt/kcmlirc @dirrm share/doc/HTML/pt/kcharselect @dirrm share/doc/HTML/pt/kcalc @dirrm share/doc/HTML/pt/kcachegrind @@ -2325,6 +2327,7 @@ share/locale/pt/flag.png @dirrm share/doc/HTML/pt/kaddressbook @dirrm share/doc/HTML/pt/kaboodle @dirrm share/doc/HTML/pt/juk +@dirrm share/doc/HTML/pt/irkick @dirrm share/doc/HTML/pt/docs/common @dirrm share/doc/HTML/pt/docs @dirrm share/doc/HTML/pt/cervisia diff --git a/portuguese/koffice-i18n-pt_BR/Makefile b/portuguese/koffice-i18n-pt_BR/Makefile index 3f06ce477d89..e1f5a3e8f430 100644 --- a/portuguese/koffice-i18n-pt_BR/Makefile +++ b/portuguese/koffice-i18n-pt_BR/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= portuguese kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/portuguese/koffice-i18n-pt_BR/distinfo b/portuguese/koffice-i18n-pt_BR/distinfo index a04a8005a1a2..e0b62dc0e357 100644 --- a/portuguese/koffice-i18n-pt_BR/distinfo +++ b/portuguese/koffice-i18n-pt_BR/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-pt_BR-1.6.1.tar.bz2) = 71efdf80a256b20baece5e58f2d4527a -SHA256 (KDE/kde-i18n/koffice-l10n-pt_BR-1.6.1.tar.bz2) = 2699b82bd9322e73060a1daf99d6898a10fc675ea55a0f26df5b8e8bb75692c3 -SIZE (KDE/kde-i18n/koffice-l10n-pt_BR-1.6.1.tar.bz2) = 5924672 +MD5 (KDE/kde-i18n/koffice-l10n-pt_BR-1.6.2.tar.bz2) = 2502c7ad3f66da2d51b643531acde224 +SHA256 (KDE/kde-i18n/koffice-l10n-pt_BR-1.6.2.tar.bz2) = 24e4c291661fd957b39a39f477f5674751035f964bcb298fd8d61954a5b57f5e +SIZE (KDE/kde-i18n/koffice-l10n-pt_BR-1.6.2.tar.bz2) = 5924854 diff --git a/portuguese/koffice-i18n-pt_BR/pkg-plist b/portuguese/koffice-i18n-pt_BR/pkg-plist index 0a9b3432a18e..6d0928bab6e8 100644 --- a/portuguese/koffice-i18n-pt_BR/pkg-plist +++ b/portuguese/koffice-i18n-pt_BR/pkg-plist @@ -489,7 +489,6 @@ share/locale/pt_BR/LC_MESSAGES/desktop_koffice.mo share/locale/pt_BR/LC_MESSAGES/example.mo share/locale/pt_BR/LC_MESSAGES/karbon.mo share/locale/pt_BR/LC_MESSAGES/kchart.mo -share/locale/pt_BR/LC_MESSAGES/kdgantt.mo share/locale/pt_BR/LC_MESSAGES/kexi.mo share/locale/pt_BR/LC_MESSAGES/kfile_abiword.mo share/locale/pt_BR/LC_MESSAGES/kfile_gnumeric.mo diff --git a/portuguese/koffice-i18n/Makefile b/portuguese/koffice-i18n/Makefile index d280a0b87342..b587c0ac109a 100644 --- a/portuguese/koffice-i18n/Makefile +++ b/portuguese/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= portuguese kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/portuguese/koffice-i18n/distinfo b/portuguese/koffice-i18n/distinfo index 5137782d8475..3c6ba9fcbc18 100644 --- a/portuguese/koffice-i18n/distinfo +++ b/portuguese/koffice-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-pt-1.6.1.tar.bz2) = c4e59783b4b93a50c7e5e9b53c864caa -SHA256 (KDE/kde-i18n/koffice-l10n-pt-1.6.1.tar.bz2) = 4a7d1108074d9ff678c1eff8a8a28faa91b9362efb6af725a7e91d8ef940ec31 -SIZE (KDE/kde-i18n/koffice-l10n-pt-1.6.1.tar.bz2) = 1130883 +MD5 (KDE/kde-i18n/koffice-l10n-pt-1.6.2.tar.bz2) = f8f90316c3aacc6a6c9150d1241a808d +SHA256 (KDE/kde-i18n/koffice-l10n-pt-1.6.2.tar.bz2) = 89c0210d8b1ce37a9a77f02925d555e942d2911714697066270d82dfa9951d19 +SIZE (KDE/kde-i18n/koffice-l10n-pt-1.6.2.tar.bz2) = 1132098 diff --git a/portuguese/koffice-i18n/pkg-plist b/portuguese/koffice-i18n/pkg-plist index b474302403e1..3a997fadbaf6 100644 --- a/portuguese/koffice-i18n/pkg-plist +++ b/portuguese/koffice-i18n/pkg-plist @@ -152,7 +152,6 @@ share/locale/pt/LC_MESSAGES/desktop_koffice.mo share/locale/pt/LC_MESSAGES/example.mo share/locale/pt/LC_MESSAGES/karbon.mo share/locale/pt/LC_MESSAGES/kchart.mo -share/locale/pt/LC_MESSAGES/kdgantt.mo share/locale/pt/LC_MESSAGES/kexi.mo share/locale/pt/LC_MESSAGES/kfile_abiword.mo share/locale/pt/LC_MESSAGES/kfile_gnumeric.mo diff --git a/portuguese/koffice-kde4-l10n-pt_BR/Makefile b/portuguese/koffice-kde4-l10n-pt_BR/Makefile index 3f06ce477d89..e1f5a3e8f430 100644 --- a/portuguese/koffice-kde4-l10n-pt_BR/Makefile +++ b/portuguese/koffice-kde4-l10n-pt_BR/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= portuguese kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/portuguese/koffice-kde4-l10n-pt_BR/distinfo b/portuguese/koffice-kde4-l10n-pt_BR/distinfo index a04a8005a1a2..e0b62dc0e357 100644 --- a/portuguese/koffice-kde4-l10n-pt_BR/distinfo +++ b/portuguese/koffice-kde4-l10n-pt_BR/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-pt_BR-1.6.1.tar.bz2) = 71efdf80a256b20baece5e58f2d4527a -SHA256 (KDE/kde-i18n/koffice-l10n-pt_BR-1.6.1.tar.bz2) = 2699b82bd9322e73060a1daf99d6898a10fc675ea55a0f26df5b8e8bb75692c3 -SIZE (KDE/kde-i18n/koffice-l10n-pt_BR-1.6.1.tar.bz2) = 5924672 +MD5 (KDE/kde-i18n/koffice-l10n-pt_BR-1.6.2.tar.bz2) = 2502c7ad3f66da2d51b643531acde224 +SHA256 (KDE/kde-i18n/koffice-l10n-pt_BR-1.6.2.tar.bz2) = 24e4c291661fd957b39a39f477f5674751035f964bcb298fd8d61954a5b57f5e +SIZE (KDE/kde-i18n/koffice-l10n-pt_BR-1.6.2.tar.bz2) = 5924854 diff --git a/portuguese/koffice-kde4-l10n-pt_BR/pkg-plist b/portuguese/koffice-kde4-l10n-pt_BR/pkg-plist index 0a9b3432a18e..6d0928bab6e8 100644 --- a/portuguese/koffice-kde4-l10n-pt_BR/pkg-plist +++ b/portuguese/koffice-kde4-l10n-pt_BR/pkg-plist @@ -489,7 +489,6 @@ share/locale/pt_BR/LC_MESSAGES/desktop_koffice.mo share/locale/pt_BR/LC_MESSAGES/example.mo share/locale/pt_BR/LC_MESSAGES/karbon.mo share/locale/pt_BR/LC_MESSAGES/kchart.mo -share/locale/pt_BR/LC_MESSAGES/kdgantt.mo share/locale/pt_BR/LC_MESSAGES/kexi.mo share/locale/pt_BR/LC_MESSAGES/kfile_abiword.mo share/locale/pt_BR/LC_MESSAGES/kfile_gnumeric.mo diff --git a/portuguese/koffice-kde4-l10n/Makefile b/portuguese/koffice-kde4-l10n/Makefile index d280a0b87342..b587c0ac109a 100644 --- a/portuguese/koffice-kde4-l10n/Makefile +++ b/portuguese/koffice-kde4-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= portuguese kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/portuguese/koffice-kde4-l10n/distinfo b/portuguese/koffice-kde4-l10n/distinfo index 5137782d8475..3c6ba9fcbc18 100644 --- a/portuguese/koffice-kde4-l10n/distinfo +++ b/portuguese/koffice-kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-pt-1.6.1.tar.bz2) = c4e59783b4b93a50c7e5e9b53c864caa -SHA256 (KDE/kde-i18n/koffice-l10n-pt-1.6.1.tar.bz2) = 4a7d1108074d9ff678c1eff8a8a28faa91b9362efb6af725a7e91d8ef940ec31 -SIZE (KDE/kde-i18n/koffice-l10n-pt-1.6.1.tar.bz2) = 1130883 +MD5 (KDE/kde-i18n/koffice-l10n-pt-1.6.2.tar.bz2) = f8f90316c3aacc6a6c9150d1241a808d +SHA256 (KDE/kde-i18n/koffice-l10n-pt-1.6.2.tar.bz2) = 89c0210d8b1ce37a9a77f02925d555e942d2911714697066270d82dfa9951d19 +SIZE (KDE/kde-i18n/koffice-l10n-pt-1.6.2.tar.bz2) = 1132098 diff --git a/portuguese/koffice-kde4-l10n/pkg-plist b/portuguese/koffice-kde4-l10n/pkg-plist index b474302403e1..3a997fadbaf6 100644 --- a/portuguese/koffice-kde4-l10n/pkg-plist +++ b/portuguese/koffice-kde4-l10n/pkg-plist @@ -152,7 +152,6 @@ share/locale/pt/LC_MESSAGES/desktop_koffice.mo share/locale/pt/LC_MESSAGES/example.mo share/locale/pt/LC_MESSAGES/karbon.mo share/locale/pt/LC_MESSAGES/kchart.mo -share/locale/pt/LC_MESSAGES/kdgantt.mo share/locale/pt/LC_MESSAGES/kexi.mo share/locale/pt/LC_MESSAGES/kfile_abiword.mo share/locale/pt/LC_MESSAGES/kfile_gnumeric.mo diff --git a/russian/calligra-l10n/Makefile b/russian/calligra-l10n/Makefile index 05b8141341a5..8ecc4ff95f87 100644 --- a/russian/calligra-l10n/Makefile +++ b/russian/calligra-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= russian kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/russian/calligra-l10n/distinfo b/russian/calligra-l10n/distinfo index af141522176e..a7c8fbff1f4b 100644 --- a/russian/calligra-l10n/distinfo +++ b/russian/calligra-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ru-1.6.1.tar.bz2) = d72bb7ce7fe685c4c92940dca4cf4bf8 -SHA256 (KDE/kde-i18n/koffice-l10n-ru-1.6.1.tar.bz2) = 1a2ab577da6662b8df86174373623614a9c4ac2d1ad6835a783cca7d67ebac58 -SIZE (KDE/kde-i18n/koffice-l10n-ru-1.6.1.tar.bz2) = 855651 +MD5 (KDE/kde-i18n/koffice-l10n-ru-1.6.2.tar.bz2) = 0fc0f3c8942acc6c4f87ee37e76f48f8 +SHA256 (KDE/kde-i18n/koffice-l10n-ru-1.6.2.tar.bz2) = 2e0e5ba125c2a59d99470ad3f32e0a92ca22cc23df3ea893204f020b43b685f6 +SIZE (KDE/kde-i18n/koffice-l10n-ru-1.6.2.tar.bz2) = 854850 diff --git a/russian/calligra-l10n/pkg-plist b/russian/calligra-l10n/pkg-plist index 64cd1d7bb284..ed2c9226e904 100644 --- a/russian/calligra-l10n/pkg-plist +++ b/russian/calligra-l10n/pkg-plist @@ -96,8 +96,9 @@ share/locale/ru/LC_MESSAGES/desktop_koffice.mo share/locale/ru/LC_MESSAGES/example.mo share/locale/ru/LC_MESSAGES/karbon.mo share/locale/ru/LC_MESSAGES/kchart.mo -share/locale/ru/LC_MESSAGES/kdgantt.mo share/locale/ru/LC_MESSAGES/kexi.mo +share/locale/ru/LC_MESSAGES/kfile_abiword.mo +share/locale/ru/LC_MESSAGES/kfile_gnumeric.mo share/locale/ru/LC_MESSAGES/kfile_koffice.mo share/locale/ru/LC_MESSAGES/kfile_ooo.mo share/locale/ru/LC_MESSAGES/kformdesigner.mo diff --git a/russian/kde3-i18n/distinfo b/russian/kde3-i18n/distinfo index f59016da115e..2209d531017f 100644 --- a/russian/kde3-i18n/distinfo +++ b/russian/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ru-3.5.5.tar.bz2) = 4bfa140a22122446fd8ab356d32fee40 -SHA256 (KDE/kde-i18n/kde-i18n-ru-3.5.5.tar.bz2) = 833a1816092bb66faf553663c388a5e8e613652533c420482bd052861d3dc88d -SIZE (KDE/kde-i18n/kde-i18n-ru-3.5.5.tar.bz2) = 7374178 +MD5 (KDE/kde-i18n/kde-i18n-ru-3.5.6.tar.bz2) = 348d72dfa83d51cbb65f6c7e964d64b3 +SHA256 (KDE/kde-i18n/kde-i18n-ru-3.5.6.tar.bz2) = 2ccef6a71fa87f67aea23baa58060ec78da4a8a6a7fe072b2d7851ee4c7da819 +SIZE (KDE/kde-i18n/kde-i18n-ru-3.5.6.tar.bz2) = 7392092 diff --git a/russian/kde3-i18n/pkg-plist b/russian/kde3-i18n/pkg-plist index bcd97644b907..91f55ca65de4 100644 --- a/russian/kde3-i18n/pkg-plist +++ b/russian/kde3-i18n/pkg-plist @@ -49,6 +49,9 @@ share/doc/HTML/ru/docs/common/fdl-translated.html share/doc/HTML/ru/docs/common/gpl-translated.html share/doc/HTML/ru/docs/common/kde-localised.css share/doc/HTML/ru/docs/common/logotp3.png +share/doc/HTML/ru/irkick/common +share/doc/HTML/ru/irkick/index.cache.bz2 +share/doc/HTML/ru/irkick/index.docbook share/doc/HTML/ru/juk/common share/doc/HTML/ru/juk/index.cache.bz2 share/doc/HTML/ru/juk/index.docbook @@ -144,6 +147,9 @@ share/doc/HTML/ru/kcalc/index.docbook share/doc/HTML/ru/kcharselect/common share/doc/HTML/ru/kcharselect/index.cache.bz2 share/doc/HTML/ru/kcharselect/index.docbook +share/doc/HTML/ru/kcmlirc/common +share/doc/HTML/ru/kcmlirc/index.cache.bz2 +share/doc/HTML/ru/kcmlirc/index.docbook share/doc/HTML/ru/kcoloredit/common share/doc/HTML/ru/kcoloredit/index.cache.bz2 share/doc/HTML/ru/kcoloredit/index.docbook @@ -334,12 +340,6 @@ share/doc/HTML/ru/kdelibs/man-artsmessage.1.docbook share/doc/HTML/ru/kdelibs/man-checkXML.1.docbook share/doc/HTML/ru/kdelibs/man-kdeoptions.7.docbook share/doc/HTML/ru/kdelibs/man-qtoptions.7.docbook -share/doc/HTML/ru/kdelirc/irkick/common -share/doc/HTML/ru/kdelirc/irkick/index.cache.bz2 -share/doc/HTML/ru/kdelirc/irkick/index.docbook -share/doc/HTML/ru/kdelirc/kcmlirc/common -share/doc/HTML/ru/kdelirc/kcmlirc/index.cache.bz2 -share/doc/HTML/ru/kdelirc/kcmlirc/index.docbook share/doc/HTML/ru/kdeprint/add-printer-wiz.docbook share/doc/HTML/ru/kdeprint/common share/doc/HTML/ru/kdeprint/cups-config.docbook @@ -1224,6 +1224,13 @@ share/doc/HTML/ru/umbrello/introduction.docbook share/doc/HTML/ru/umbrello/other_features.docbook share/doc/HTML/ru/umbrello/uml_basics.docbook share/doc/HTML/ru/umbrello/working_with_umbrello.docbook +share/doc/HTML/ru/xsldbg/commands.docbook +share/doc/HTML/ru/xsldbg/common +share/doc/HTML/ru/xsldbg/credits.docbook +share/doc/HTML/ru/xsldbg/index.cache.bz2 +share/doc/HTML/ru/xsldbg/index.docbook +share/doc/HTML/ru/xsldbg/introduction.docbook +share/doc/HTML/ru/xsldbg/usage.docbook share/locale/ru/LC_MESSAGES/akregator.mo share/locale/ru/LC_MESSAGES/akregator_konqplugin.mo share/locale/ru/LC_MESSAGES/alsaplayerui.mo @@ -1498,6 +1505,7 @@ share/locale/ru/LC_MESSAGES/khotkeys.mo share/locale/ru/LC_MESSAGES/khtmlkttsd.mo share/locale/ru/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/ru/LC_MESSAGES/kicker.mo +share/locale/ru/LC_MESSAGES/kickermenu_kate.mo share/locale/ru/LC_MESSAGES/kiconedit.mo share/locale/ru/LC_MESSAGES/kig.mo share/locale/ru/LC_MESSAGES/kimagemapeditor.mo @@ -1535,6 +1543,7 @@ share/locale/ru/LC_MESSAGES/kio_thumbnail.mo share/locale/ru/LC_MESSAGES/kio_trash.mo share/locale/ru/LC_MESSAGES/kio_zeroconf.mo share/locale/ru/LC_MESSAGES/kioexec.mo +share/locale/ru/LC_MESSAGES/kitchensync.mo share/locale/ru/LC_MESSAGES/kiten.mo share/locale/ru/LC_MESSAGES/kjobviewer.mo share/locale/ru/LC_MESSAGES/kjots.mo @@ -1738,6 +1747,7 @@ share/locale/ru/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/ru/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/ru/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/ru/LC_MESSAGES/libkickermenu_tom.mo +share/locale/ru/LC_MESSAGES/libkitchensync.mo share/locale/ru/LC_MESSAGES/libkleopatra.mo share/locale/ru/LC_MESSAGES/libkmime.mo share/locale/ru/LC_MESSAGES/libkonq.mo @@ -1788,6 +1798,7 @@ share/locale/ru/LC_MESSAGES/webarchiver.mo share/locale/ru/charset share/locale/ru/entry.desktop share/locale/ru/flag.png +@dirrm share/doc/HTML/ru/xsldbg @dirrm share/doc/HTML/ru/umbrello @dirrm share/doc/HTML/ru/superkaramba @dirrm share/doc/HTML/ru/scripts @@ -1954,9 +1965,6 @@ share/locale/ru/flag.png @dirrm share/doc/HTML/ru/kdevelop @dirrm share/doc/HTML/ru/kdesu @dirrm share/doc/HTML/ru/kdeprint -@dirrm share/doc/HTML/ru/kdelirc/kcmlirc -@dirrm share/doc/HTML/ru/kdelirc/irkick -@dirrm share/doc/HTML/ru/kdelirc @dirrm share/doc/HTML/ru/kdelibs @dirrm share/doc/HTML/ru/kdebugdialog @dirrm share/doc/HTML/ru/kdearch @@ -2019,6 +2027,7 @@ share/locale/ru/flag.png @dirrm share/doc/HTML/ru/kcontrol/arts @dirrm share/doc/HTML/ru/kcontrol @dirrm share/doc/HTML/ru/kcoloredit +@dirrm share/doc/HTML/ru/kcmlirc @dirrm share/doc/HTML/ru/kcharselect @dirrm share/doc/HTML/ru/kcalc @dirrm share/doc/HTML/ru/kcachegrind @@ -2041,6 +2050,7 @@ share/locale/ru/flag.png @dirrm share/doc/HTML/ru/kaddressbook @dirrm share/doc/HTML/ru/kaboodle @dirrm share/doc/HTML/ru/juk +@dirrm share/doc/HTML/ru/irkick @dirrm share/doc/HTML/ru/docs/common @dirrm share/doc/HTML/ru/docs @dirrm share/doc/HTML/ru/cervisia diff --git a/russian/kde4-l10n/distinfo b/russian/kde4-l10n/distinfo index f59016da115e..2209d531017f 100644 --- a/russian/kde4-l10n/distinfo +++ b/russian/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ru-3.5.5.tar.bz2) = 4bfa140a22122446fd8ab356d32fee40 -SHA256 (KDE/kde-i18n/kde-i18n-ru-3.5.5.tar.bz2) = 833a1816092bb66faf553663c388a5e8e613652533c420482bd052861d3dc88d -SIZE (KDE/kde-i18n/kde-i18n-ru-3.5.5.tar.bz2) = 7374178 +MD5 (KDE/kde-i18n/kde-i18n-ru-3.5.6.tar.bz2) = 348d72dfa83d51cbb65f6c7e964d64b3 +SHA256 (KDE/kde-i18n/kde-i18n-ru-3.5.6.tar.bz2) = 2ccef6a71fa87f67aea23baa58060ec78da4a8a6a7fe072b2d7851ee4c7da819 +SIZE (KDE/kde-i18n/kde-i18n-ru-3.5.6.tar.bz2) = 7392092 diff --git a/russian/kde4-l10n/pkg-plist b/russian/kde4-l10n/pkg-plist index bcd97644b907..91f55ca65de4 100644 --- a/russian/kde4-l10n/pkg-plist +++ b/russian/kde4-l10n/pkg-plist @@ -49,6 +49,9 @@ share/doc/HTML/ru/docs/common/fdl-translated.html share/doc/HTML/ru/docs/common/gpl-translated.html share/doc/HTML/ru/docs/common/kde-localised.css share/doc/HTML/ru/docs/common/logotp3.png +share/doc/HTML/ru/irkick/common +share/doc/HTML/ru/irkick/index.cache.bz2 +share/doc/HTML/ru/irkick/index.docbook share/doc/HTML/ru/juk/common share/doc/HTML/ru/juk/index.cache.bz2 share/doc/HTML/ru/juk/index.docbook @@ -144,6 +147,9 @@ share/doc/HTML/ru/kcalc/index.docbook share/doc/HTML/ru/kcharselect/common share/doc/HTML/ru/kcharselect/index.cache.bz2 share/doc/HTML/ru/kcharselect/index.docbook +share/doc/HTML/ru/kcmlirc/common +share/doc/HTML/ru/kcmlirc/index.cache.bz2 +share/doc/HTML/ru/kcmlirc/index.docbook share/doc/HTML/ru/kcoloredit/common share/doc/HTML/ru/kcoloredit/index.cache.bz2 share/doc/HTML/ru/kcoloredit/index.docbook @@ -334,12 +340,6 @@ share/doc/HTML/ru/kdelibs/man-artsmessage.1.docbook share/doc/HTML/ru/kdelibs/man-checkXML.1.docbook share/doc/HTML/ru/kdelibs/man-kdeoptions.7.docbook share/doc/HTML/ru/kdelibs/man-qtoptions.7.docbook -share/doc/HTML/ru/kdelirc/irkick/common -share/doc/HTML/ru/kdelirc/irkick/index.cache.bz2 -share/doc/HTML/ru/kdelirc/irkick/index.docbook -share/doc/HTML/ru/kdelirc/kcmlirc/common -share/doc/HTML/ru/kdelirc/kcmlirc/index.cache.bz2 -share/doc/HTML/ru/kdelirc/kcmlirc/index.docbook share/doc/HTML/ru/kdeprint/add-printer-wiz.docbook share/doc/HTML/ru/kdeprint/common share/doc/HTML/ru/kdeprint/cups-config.docbook @@ -1224,6 +1224,13 @@ share/doc/HTML/ru/umbrello/introduction.docbook share/doc/HTML/ru/umbrello/other_features.docbook share/doc/HTML/ru/umbrello/uml_basics.docbook share/doc/HTML/ru/umbrello/working_with_umbrello.docbook +share/doc/HTML/ru/xsldbg/commands.docbook +share/doc/HTML/ru/xsldbg/common +share/doc/HTML/ru/xsldbg/credits.docbook +share/doc/HTML/ru/xsldbg/index.cache.bz2 +share/doc/HTML/ru/xsldbg/index.docbook +share/doc/HTML/ru/xsldbg/introduction.docbook +share/doc/HTML/ru/xsldbg/usage.docbook share/locale/ru/LC_MESSAGES/akregator.mo share/locale/ru/LC_MESSAGES/akregator_konqplugin.mo share/locale/ru/LC_MESSAGES/alsaplayerui.mo @@ -1498,6 +1505,7 @@ share/locale/ru/LC_MESSAGES/khotkeys.mo share/locale/ru/LC_MESSAGES/khtmlkttsd.mo share/locale/ru/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/ru/LC_MESSAGES/kicker.mo +share/locale/ru/LC_MESSAGES/kickermenu_kate.mo share/locale/ru/LC_MESSAGES/kiconedit.mo share/locale/ru/LC_MESSAGES/kig.mo share/locale/ru/LC_MESSAGES/kimagemapeditor.mo @@ -1535,6 +1543,7 @@ share/locale/ru/LC_MESSAGES/kio_thumbnail.mo share/locale/ru/LC_MESSAGES/kio_trash.mo share/locale/ru/LC_MESSAGES/kio_zeroconf.mo share/locale/ru/LC_MESSAGES/kioexec.mo +share/locale/ru/LC_MESSAGES/kitchensync.mo share/locale/ru/LC_MESSAGES/kiten.mo share/locale/ru/LC_MESSAGES/kjobviewer.mo share/locale/ru/LC_MESSAGES/kjots.mo @@ -1738,6 +1747,7 @@ share/locale/ru/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/ru/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/ru/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/ru/LC_MESSAGES/libkickermenu_tom.mo +share/locale/ru/LC_MESSAGES/libkitchensync.mo share/locale/ru/LC_MESSAGES/libkleopatra.mo share/locale/ru/LC_MESSAGES/libkmime.mo share/locale/ru/LC_MESSAGES/libkonq.mo @@ -1788,6 +1798,7 @@ share/locale/ru/LC_MESSAGES/webarchiver.mo share/locale/ru/charset share/locale/ru/entry.desktop share/locale/ru/flag.png +@dirrm share/doc/HTML/ru/xsldbg @dirrm share/doc/HTML/ru/umbrello @dirrm share/doc/HTML/ru/superkaramba @dirrm share/doc/HTML/ru/scripts @@ -1954,9 +1965,6 @@ share/locale/ru/flag.png @dirrm share/doc/HTML/ru/kdevelop @dirrm share/doc/HTML/ru/kdesu @dirrm share/doc/HTML/ru/kdeprint -@dirrm share/doc/HTML/ru/kdelirc/kcmlirc -@dirrm share/doc/HTML/ru/kdelirc/irkick -@dirrm share/doc/HTML/ru/kdelirc @dirrm share/doc/HTML/ru/kdelibs @dirrm share/doc/HTML/ru/kdebugdialog @dirrm share/doc/HTML/ru/kdearch @@ -2019,6 +2027,7 @@ share/locale/ru/flag.png @dirrm share/doc/HTML/ru/kcontrol/arts @dirrm share/doc/HTML/ru/kcontrol @dirrm share/doc/HTML/ru/kcoloredit +@dirrm share/doc/HTML/ru/kcmlirc @dirrm share/doc/HTML/ru/kcharselect @dirrm share/doc/HTML/ru/kcalc @dirrm share/doc/HTML/ru/kcachegrind @@ -2041,6 +2050,7 @@ share/locale/ru/flag.png @dirrm share/doc/HTML/ru/kaddressbook @dirrm share/doc/HTML/ru/kaboodle @dirrm share/doc/HTML/ru/juk +@dirrm share/doc/HTML/ru/irkick @dirrm share/doc/HTML/ru/docs/common @dirrm share/doc/HTML/ru/docs @dirrm share/doc/HTML/ru/cervisia diff --git a/russian/koffice-i18n/Makefile b/russian/koffice-i18n/Makefile index 05b8141341a5..8ecc4ff95f87 100644 --- a/russian/koffice-i18n/Makefile +++ b/russian/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= russian kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/russian/koffice-i18n/distinfo b/russian/koffice-i18n/distinfo index af141522176e..a7c8fbff1f4b 100644 --- a/russian/koffice-i18n/distinfo +++ b/russian/koffice-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ru-1.6.1.tar.bz2) = d72bb7ce7fe685c4c92940dca4cf4bf8 -SHA256 (KDE/kde-i18n/koffice-l10n-ru-1.6.1.tar.bz2) = 1a2ab577da6662b8df86174373623614a9c4ac2d1ad6835a783cca7d67ebac58 -SIZE (KDE/kde-i18n/koffice-l10n-ru-1.6.1.tar.bz2) = 855651 +MD5 (KDE/kde-i18n/koffice-l10n-ru-1.6.2.tar.bz2) = 0fc0f3c8942acc6c4f87ee37e76f48f8 +SHA256 (KDE/kde-i18n/koffice-l10n-ru-1.6.2.tar.bz2) = 2e0e5ba125c2a59d99470ad3f32e0a92ca22cc23df3ea893204f020b43b685f6 +SIZE (KDE/kde-i18n/koffice-l10n-ru-1.6.2.tar.bz2) = 854850 diff --git a/russian/koffice-i18n/pkg-plist b/russian/koffice-i18n/pkg-plist index 64cd1d7bb284..ed2c9226e904 100644 --- a/russian/koffice-i18n/pkg-plist +++ b/russian/koffice-i18n/pkg-plist @@ -96,8 +96,9 @@ share/locale/ru/LC_MESSAGES/desktop_koffice.mo share/locale/ru/LC_MESSAGES/example.mo share/locale/ru/LC_MESSAGES/karbon.mo share/locale/ru/LC_MESSAGES/kchart.mo -share/locale/ru/LC_MESSAGES/kdgantt.mo share/locale/ru/LC_MESSAGES/kexi.mo +share/locale/ru/LC_MESSAGES/kfile_abiword.mo +share/locale/ru/LC_MESSAGES/kfile_gnumeric.mo share/locale/ru/LC_MESSAGES/kfile_koffice.mo share/locale/ru/LC_MESSAGES/kfile_ooo.mo share/locale/ru/LC_MESSAGES/kformdesigner.mo diff --git a/russian/koffice-kde4-l10n/Makefile b/russian/koffice-kde4-l10n/Makefile index 05b8141341a5..8ecc4ff95f87 100644 --- a/russian/koffice-kde4-l10n/Makefile +++ b/russian/koffice-kde4-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= russian kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/russian/koffice-kde4-l10n/distinfo b/russian/koffice-kde4-l10n/distinfo index af141522176e..a7c8fbff1f4b 100644 --- a/russian/koffice-kde4-l10n/distinfo +++ b/russian/koffice-kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ru-1.6.1.tar.bz2) = d72bb7ce7fe685c4c92940dca4cf4bf8 -SHA256 (KDE/kde-i18n/koffice-l10n-ru-1.6.1.tar.bz2) = 1a2ab577da6662b8df86174373623614a9c4ac2d1ad6835a783cca7d67ebac58 -SIZE (KDE/kde-i18n/koffice-l10n-ru-1.6.1.tar.bz2) = 855651 +MD5 (KDE/kde-i18n/koffice-l10n-ru-1.6.2.tar.bz2) = 0fc0f3c8942acc6c4f87ee37e76f48f8 +SHA256 (KDE/kde-i18n/koffice-l10n-ru-1.6.2.tar.bz2) = 2e0e5ba125c2a59d99470ad3f32e0a92ca22cc23df3ea893204f020b43b685f6 +SIZE (KDE/kde-i18n/koffice-l10n-ru-1.6.2.tar.bz2) = 854850 diff --git a/russian/koffice-kde4-l10n/pkg-plist b/russian/koffice-kde4-l10n/pkg-plist index 64cd1d7bb284..ed2c9226e904 100644 --- a/russian/koffice-kde4-l10n/pkg-plist +++ b/russian/koffice-kde4-l10n/pkg-plist @@ -96,8 +96,9 @@ share/locale/ru/LC_MESSAGES/desktop_koffice.mo share/locale/ru/LC_MESSAGES/example.mo share/locale/ru/LC_MESSAGES/karbon.mo share/locale/ru/LC_MESSAGES/kchart.mo -share/locale/ru/LC_MESSAGES/kdgantt.mo share/locale/ru/LC_MESSAGES/kexi.mo +share/locale/ru/LC_MESSAGES/kfile_abiword.mo +share/locale/ru/LC_MESSAGES/kfile_gnumeric.mo share/locale/ru/LC_MESSAGES/kfile_koffice.mo share/locale/ru/LC_MESSAGES/kfile_ooo.mo share/locale/ru/LC_MESSAGES/kformdesigner.mo diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile index b686c7c02ca1..d2a8b1c1613f 100644 --- a/security/kgpg-kde4/Makefile +++ b/security/kgpg-kde4/Makefile @@ -7,7 +7,6 @@ PORTNAME= kdeutils PORTVERSION= ${KDE_VERSION} -PORTREVISION= 3 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -18,7 +17,7 @@ COMMENT= Utilities for the KDE integrated X11 desktop LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4 \ netsnmp:${PORTSDIR}/net-mgmt/net-snmp -RUN_DEPENDS= gpgv:${PORTSDIR}/security/gnupg1 +RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg CONFLICTS= kgpg-[0-9]* superkaramba-[0-9]* @@ -35,7 +34,7 @@ DO_NOT_COMPILE+=klaptopdaemon kmilo CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}" CONFIGURE_ARGS+=--with-pythondir=${LOCALBASE} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/security/kgpg-kde4/distinfo b/security/kgpg-kde4/distinfo index cdaf81b48169..eecf40517f6e 100644 --- a/security/kgpg-kde4/distinfo +++ b/security/kgpg-kde4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.5.tar.bz2) = a20a732284a3dcb735665e45f5be532e -SHA256 (KDE/kdeutils-3.5.5.tar.bz2) = 38914c84c8829ba7beb8a0e0c0ef8b4c7eee29b588c6529ff39c0bc0370f0457 -SIZE (KDE/kdeutils-3.5.5.tar.bz2) = 2988542 +MD5 (KDE/kdeutils-3.5.6.tar.bz2) = e0ea2c15ccf2bd3d8be5f2bf57cfe14a +SHA256 (KDE/kdeutils-3.5.6.tar.bz2) = 7efc558fca536a0b86abd51d7b0b9ca168e8364c222115e29424662acb0e473b +SIZE (KDE/kdeutils-3.5.6.tar.bz2) = 2989659 diff --git a/security/kgpg-kde4/pkg-plist b/security/kgpg-kde4/pkg-plist index bcd5d9ba088a..782d19b830c1 100644 --- a/security/kgpg-kde4/pkg-plist +++ b/security/kgpg-kde4/pkg-plist @@ -123,7 +123,6 @@ share/applications/kde/kdf.desktop share/applications/kde/kgpg.desktop share/applications/kde/khexedit.desktop share/applications/kde/kregexpeditor.desktop -share/applications/kde/ksim.desktop share/applications/kde/ktimer.desktop share/applications/kde/kwalletconfig.desktop share/applications/kde/kwalletmanager-kwalletd.desktop diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile index b686c7c02ca1..d2a8b1c1613f 100644 --- a/security/kwallet/Makefile +++ b/security/kwallet/Makefile @@ -7,7 +7,6 @@ PORTNAME= kdeutils PORTVERSION= ${KDE_VERSION} -PORTREVISION= 3 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -18,7 +17,7 @@ COMMENT= Utilities for the KDE integrated X11 desktop LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4 \ netsnmp:${PORTSDIR}/net-mgmt/net-snmp -RUN_DEPENDS= gpgv:${PORTSDIR}/security/gnupg1 +RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg CONFLICTS= kgpg-[0-9]* superkaramba-[0-9]* @@ -35,7 +34,7 @@ DO_NOT_COMPILE+=klaptopdaemon kmilo CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}" CONFIGURE_ARGS+=--with-pythondir=${LOCALBASE} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/security/kwallet/distinfo b/security/kwallet/distinfo index cdaf81b48169..eecf40517f6e 100644 --- a/security/kwallet/distinfo +++ b/security/kwallet/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.5.tar.bz2) = a20a732284a3dcb735665e45f5be532e -SHA256 (KDE/kdeutils-3.5.5.tar.bz2) = 38914c84c8829ba7beb8a0e0c0ef8b4c7eee29b588c6529ff39c0bc0370f0457 -SIZE (KDE/kdeutils-3.5.5.tar.bz2) = 2988542 +MD5 (KDE/kdeutils-3.5.6.tar.bz2) = e0ea2c15ccf2bd3d8be5f2bf57cfe14a +SHA256 (KDE/kdeutils-3.5.6.tar.bz2) = 7efc558fca536a0b86abd51d7b0b9ca168e8364c222115e29424662acb0e473b +SIZE (KDE/kdeutils-3.5.6.tar.bz2) = 2989659 diff --git a/security/kwallet/pkg-plist b/security/kwallet/pkg-plist index bcd5d9ba088a..782d19b830c1 100644 --- a/security/kwallet/pkg-plist +++ b/security/kwallet/pkg-plist @@ -123,7 +123,6 @@ share/applications/kde/kdf.desktop share/applications/kde/kgpg.desktop share/applications/kde/khexedit.desktop share/applications/kde/kregexpeditor.desktop -share/applications/kde/ksim.desktop share/applications/kde/ktimer.desktop share/applications/kde/kwalletconfig.desktop share/applications/kde/kwalletmanager-kwalletd.desktop diff --git a/sysutils/kdeadmin3/Makefile b/sysutils/kdeadmin3/Makefile index 9013a7efd0ca..32c981541e86 100644 --- a/sysutils/kdeadmin3/Makefile +++ b/sysutils/kdeadmin3/Makefile @@ -23,7 +23,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 post-patch: diff --git a/sysutils/kdeadmin3/distinfo b/sysutils/kdeadmin3/distinfo index 870d5335b496..b24b42772e5a 100644 --- a/sysutils/kdeadmin3/distinfo +++ b/sysutils/kdeadmin3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeadmin-3.5.5.tar.bz2) = 4af595f5d5506521e8b29a1d92ba3409 -SHA256 (KDE/kdeadmin-3.5.5.tar.bz2) = 007281182a1216064e21596f66dc99fe3436ab1a2affa3d46d6c915256a93a93 -SIZE (KDE/kdeadmin-3.5.5.tar.bz2) = 2119865 +MD5 (KDE/kdeadmin-3.5.6.tar.bz2) = 13654a93e83b7c8fd2ccce3aceb2d535 +SHA256 (KDE/kdeadmin-3.5.6.tar.bz2) = 739e918952e2de7b9c68d876fe0999bde819bb8ad5b676ec017fc41db5db2e27 +SIZE (KDE/kdeadmin-3.5.6.tar.bz2) = 2120507 diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile index 9013a7efd0ca..32c981541e86 100644 --- a/sysutils/kdeadmin4/Makefile +++ b/sysutils/kdeadmin4/Makefile @@ -23,7 +23,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 post-patch: diff --git a/sysutils/kdeadmin4/distinfo b/sysutils/kdeadmin4/distinfo index 870d5335b496..b24b42772e5a 100644 --- a/sysutils/kdeadmin4/distinfo +++ b/sysutils/kdeadmin4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeadmin-3.5.5.tar.bz2) = 4af595f5d5506521e8b29a1d92ba3409 -SHA256 (KDE/kdeadmin-3.5.5.tar.bz2) = 007281182a1216064e21596f66dc99fe3436ab1a2affa3d46d6c915256a93a93 -SIZE (KDE/kdeadmin-3.5.5.tar.bz2) = 2119865 +MD5 (KDE/kdeadmin-3.5.6.tar.bz2) = 13654a93e83b7c8fd2ccce3aceb2d535 +SHA256 (KDE/kdeadmin-3.5.6.tar.bz2) = 739e918952e2de7b9c68d876fe0999bde819bb8ad5b676ec017fc41db5db2e27 +SIZE (KDE/kdeadmin-3.5.6.tar.bz2) = 2120507 diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile index b686c7c02ca1..d2a8b1c1613f 100644 --- a/sysutils/kdf/Makefile +++ b/sysutils/kdf/Makefile @@ -7,7 +7,6 @@ PORTNAME= kdeutils PORTVERSION= ${KDE_VERSION} -PORTREVISION= 3 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -18,7 +17,7 @@ COMMENT= Utilities for the KDE integrated X11 desktop LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4 \ netsnmp:${PORTSDIR}/net-mgmt/net-snmp -RUN_DEPENDS= gpgv:${PORTSDIR}/security/gnupg1 +RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg CONFLICTS= kgpg-[0-9]* superkaramba-[0-9]* @@ -35,7 +34,7 @@ DO_NOT_COMPILE+=klaptopdaemon kmilo CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}" CONFIGURE_ARGS+=--with-pythondir=${LOCALBASE} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/sysutils/kdf/distinfo b/sysutils/kdf/distinfo index cdaf81b48169..eecf40517f6e 100644 --- a/sysutils/kdf/distinfo +++ b/sysutils/kdf/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.5.tar.bz2) = a20a732284a3dcb735665e45f5be532e -SHA256 (KDE/kdeutils-3.5.5.tar.bz2) = 38914c84c8829ba7beb8a0e0c0ef8b4c7eee29b588c6529ff39c0bc0370f0457 -SIZE (KDE/kdeutils-3.5.5.tar.bz2) = 2988542 +MD5 (KDE/kdeutils-3.5.6.tar.bz2) = e0ea2c15ccf2bd3d8be5f2bf57cfe14a +SHA256 (KDE/kdeutils-3.5.6.tar.bz2) = 7efc558fca536a0b86abd51d7b0b9ca168e8364c222115e29424662acb0e473b +SIZE (KDE/kdeutils-3.5.6.tar.bz2) = 2989659 diff --git a/sysutils/kdf/pkg-plist b/sysutils/kdf/pkg-plist index bcd5d9ba088a..782d19b830c1 100644 --- a/sysutils/kdf/pkg-plist +++ b/sysutils/kdf/pkg-plist @@ -123,7 +123,6 @@ share/applications/kde/kdf.desktop share/applications/kde/kgpg.desktop share/applications/kde/khexedit.desktop share/applications/kde/kregexpeditor.desktop -share/applications/kde/ksim.desktop share/applications/kde/ktimer.desktop share/applications/kde/kwalletconfig.desktop share/applications/kde/kwalletmanager-kwalletd.desktop diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile index b686c7c02ca1..d2a8b1c1613f 100644 --- a/sysutils/kfloppy/Makefile +++ b/sysutils/kfloppy/Makefile @@ -7,7 +7,6 @@ PORTNAME= kdeutils PORTVERSION= ${KDE_VERSION} -PORTREVISION= 3 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -18,7 +17,7 @@ COMMENT= Utilities for the KDE integrated X11 desktop LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4 \ netsnmp:${PORTSDIR}/net-mgmt/net-snmp -RUN_DEPENDS= gpgv:${PORTSDIR}/security/gnupg1 +RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg CONFLICTS= kgpg-[0-9]* superkaramba-[0-9]* @@ -35,7 +34,7 @@ DO_NOT_COMPILE+=klaptopdaemon kmilo CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}" CONFIGURE_ARGS+=--with-pythondir=${LOCALBASE} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/sysutils/kfloppy/distinfo b/sysutils/kfloppy/distinfo index cdaf81b48169..eecf40517f6e 100644 --- a/sysutils/kfloppy/distinfo +++ b/sysutils/kfloppy/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.5.tar.bz2) = a20a732284a3dcb735665e45f5be532e -SHA256 (KDE/kdeutils-3.5.5.tar.bz2) = 38914c84c8829ba7beb8a0e0c0ef8b4c7eee29b588c6529ff39c0bc0370f0457 -SIZE (KDE/kdeutils-3.5.5.tar.bz2) = 2988542 +MD5 (KDE/kdeutils-3.5.6.tar.bz2) = e0ea2c15ccf2bd3d8be5f2bf57cfe14a +SHA256 (KDE/kdeutils-3.5.6.tar.bz2) = 7efc558fca536a0b86abd51d7b0b9ca168e8364c222115e29424662acb0e473b +SIZE (KDE/kdeutils-3.5.6.tar.bz2) = 2989659 diff --git a/sysutils/kfloppy/pkg-plist b/sysutils/kfloppy/pkg-plist index bcd5d9ba088a..782d19b830c1 100644 --- a/sysutils/kfloppy/pkg-plist +++ b/sysutils/kfloppy/pkg-plist @@ -123,7 +123,6 @@ share/applications/kde/kdf.desktop share/applications/kde/kgpg.desktop share/applications/kde/khexedit.desktop share/applications/kde/kregexpeditor.desktop -share/applications/kde/ksim.desktop share/applications/kde/ktimer.desktop share/applications/kde/kwalletconfig.desktop share/applications/kde/kwalletmanager-kwalletd.desktop diff --git a/sysutils/klaptopdaemon/Makefile b/sysutils/klaptopdaemon/Makefile index 6864d4ef1597..29be5f29ab75 100644 --- a/sysutils/klaptopdaemon/Makefile +++ b/sysutils/klaptopdaemon/Makefile @@ -28,7 +28,7 @@ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes WRKSRC= ${WRKDIR}/kdeutils-${PORTVERSION} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 pre-configure: diff --git a/sysutils/klaptopdaemon/distinfo b/sysutils/klaptopdaemon/distinfo index cdaf81b48169..eecf40517f6e 100644 --- a/sysutils/klaptopdaemon/distinfo +++ b/sysutils/klaptopdaemon/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.5.tar.bz2) = a20a732284a3dcb735665e45f5be532e -SHA256 (KDE/kdeutils-3.5.5.tar.bz2) = 38914c84c8829ba7beb8a0e0c0ef8b4c7eee29b588c6529ff39c0bc0370f0457 -SIZE (KDE/kdeutils-3.5.5.tar.bz2) = 2988542 +MD5 (KDE/kdeutils-3.5.6.tar.bz2) = e0ea2c15ccf2bd3d8be5f2bf57cfe14a +SHA256 (KDE/kdeutils-3.5.6.tar.bz2) = 7efc558fca536a0b86abd51d7b0b9ca168e8364c222115e29424662acb0e473b +SIZE (KDE/kdeutils-3.5.6.tar.bz2) = 2989659 diff --git a/sysutils/kmilo/Makefile b/sysutils/kmilo/Makefile index 2a56fdd509ce..264771810d32 100644 --- a/sysutils/kmilo/Makefile +++ b/sysutils/kmilo/Makefile @@ -26,7 +26,7 @@ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes WRKSRC= ${WRKDIR}/kdeutils-${PORTVERSION} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 pre-configure: diff --git a/sysutils/kmilo/distinfo b/sysutils/kmilo/distinfo index cdaf81b48169..eecf40517f6e 100644 --- a/sysutils/kmilo/distinfo +++ b/sysutils/kmilo/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.5.tar.bz2) = a20a732284a3dcb735665e45f5be532e -SHA256 (KDE/kdeutils-3.5.5.tar.bz2) = 38914c84c8829ba7beb8a0e0c0ef8b4c7eee29b588c6529ff39c0bc0370f0457 -SIZE (KDE/kdeutils-3.5.5.tar.bz2) = 2988542 +MD5 (KDE/kdeutils-3.5.6.tar.bz2) = e0ea2c15ccf2bd3d8be5f2bf57cfe14a +SHA256 (KDE/kdeutils-3.5.6.tar.bz2) = 7efc558fca536a0b86abd51d7b0b9ca168e8364c222115e29424662acb0e473b +SIZE (KDE/kdeutils-3.5.6.tar.bz2) = 2989659 diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile index b686c7c02ca1..d2a8b1c1613f 100644 --- a/sysutils/sweeper/Makefile +++ b/sysutils/sweeper/Makefile @@ -7,7 +7,6 @@ PORTNAME= kdeutils PORTVERSION= ${KDE_VERSION} -PORTREVISION= 3 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -18,7 +17,7 @@ COMMENT= Utilities for the KDE integrated X11 desktop LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4 \ netsnmp:${PORTSDIR}/net-mgmt/net-snmp -RUN_DEPENDS= gpgv:${PORTSDIR}/security/gnupg1 +RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg CONFLICTS= kgpg-[0-9]* superkaramba-[0-9]* @@ -35,7 +34,7 @@ DO_NOT_COMPILE+=klaptopdaemon kmilo CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}" CONFIGURE_ARGS+=--with-pythondir=${LOCALBASE} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/sysutils/sweeper/distinfo b/sysutils/sweeper/distinfo index cdaf81b48169..eecf40517f6e 100644 --- a/sysutils/sweeper/distinfo +++ b/sysutils/sweeper/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.5.tar.bz2) = a20a732284a3dcb735665e45f5be532e -SHA256 (KDE/kdeutils-3.5.5.tar.bz2) = 38914c84c8829ba7beb8a0e0c0ef8b4c7eee29b588c6529ff39c0bc0370f0457 -SIZE (KDE/kdeutils-3.5.5.tar.bz2) = 2988542 +MD5 (KDE/kdeutils-3.5.6.tar.bz2) = e0ea2c15ccf2bd3d8be5f2bf57cfe14a +SHA256 (KDE/kdeutils-3.5.6.tar.bz2) = 7efc558fca536a0b86abd51d7b0b9ca168e8364c222115e29424662acb0e473b +SIZE (KDE/kdeutils-3.5.6.tar.bz2) = 2989659 diff --git a/sysutils/sweeper/pkg-plist b/sysutils/sweeper/pkg-plist index bcd5d9ba088a..782d19b830c1 100644 --- a/sysutils/sweeper/pkg-plist +++ b/sysutils/sweeper/pkg-plist @@ -123,7 +123,6 @@ share/applications/kde/kdf.desktop share/applications/kde/kgpg.desktop share/applications/kde/khexedit.desktop share/applications/kde/kregexpeditor.desktop -share/applications/kde/ksim.desktop share/applications/kde/ktimer.desktop share/applications/kde/kwalletconfig.desktop share/applications/kde/kwalletmanager-kwalletd.desktop diff --git a/ukrainian/calligra-l10n/Makefile b/ukrainian/calligra-l10n/Makefile index 7bb84ec0fb8c..3c86be82de8b 100644 --- a/ukrainian/calligra-l10n/Makefile +++ b/ukrainian/calligra-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= ukrainian kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/ukrainian/calligra-l10n/distinfo b/ukrainian/calligra-l10n/distinfo index 1f4b8ea018a8..2fd1b8d5fa19 100644 --- a/ukrainian/calligra-l10n/distinfo +++ b/ukrainian/calligra-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-uk-1.6.1.tar.bz2) = dcab018c147831f47543b082f1beb5a5 -SHA256 (KDE/kde-i18n/koffice-l10n-uk-1.6.1.tar.bz2) = 72dfc1f6e60ffb62d81f390e19850dfee6a51ab5b133be00bca823d5354f3355 -SIZE (KDE/kde-i18n/koffice-l10n-uk-1.6.1.tar.bz2) = 369593 +MD5 (KDE/kde-i18n/koffice-l10n-uk-1.6.2.tar.bz2) = 983b0509583a7aa08684310f6d4133a4 +SHA256 (KDE/kde-i18n/koffice-l10n-uk-1.6.2.tar.bz2) = 9328ca2ab864139db5b2352860f5b3ca170afa688a0fe00a3b38775982a5d035 +SIZE (KDE/kde-i18n/koffice-l10n-uk-1.6.2.tar.bz2) = 366718 diff --git a/ukrainian/calligra-l10n/pkg-plist b/ukrainian/calligra-l10n/pkg-plist index d5a4f47594c7..9e7a5cb201d0 100644 --- a/ukrainian/calligra-l10n/pkg-plist +++ b/ukrainian/calligra-l10n/pkg-plist @@ -2,7 +2,6 @@ share/locale/uk/LC_MESSAGES/desktop_koffice.mo share/locale/uk/LC_MESSAGES/example.mo share/locale/uk/LC_MESSAGES/karbon.mo share/locale/uk/LC_MESSAGES/kchart.mo -share/locale/uk/LC_MESSAGES/kdgantt.mo share/locale/uk/LC_MESSAGES/kexi.mo share/locale/uk/LC_MESSAGES/kfile_abiword.mo share/locale/uk/LC_MESSAGES/kfile_gnumeric.mo diff --git a/ukrainian/kde3-i18n/distinfo b/ukrainian/kde3-i18n/distinfo index e1127258b339..b8946c684fb6 100644 --- a/ukrainian/kde3-i18n/distinfo +++ b/ukrainian/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-uk-3.5.5.tar.bz2) = fc18b699825837e49e3062e5acc0a3f5 -SHA256 (KDE/kde-i18n/kde-i18n-uk-3.5.5.tar.bz2) = adf4ad603cd213750abebf11e406c657d549988b9207dcd45416f8a383beac40 -SIZE (KDE/kde-i18n/kde-i18n-uk-3.5.5.tar.bz2) = 1846683 +MD5 (KDE/kde-i18n/kde-i18n-uk-3.5.6.tar.bz2) = 82f0f3f3567d551307c03ebad12f3a1c +SHA256 (KDE/kde-i18n/kde-i18n-uk-3.5.6.tar.bz2) = de95bbd12263d18230765f0390aaae7875f8400a525d1d67770b4d362a83cfe5 +SIZE (KDE/kde-i18n/kde-i18n-uk-3.5.6.tar.bz2) = 1884216 diff --git a/ukrainian/kde3-i18n/pkg-plist b/ukrainian/kde3-i18n/pkg-plist index cdda549a7aed..a1c98f089845 100644 --- a/ukrainian/kde3-i18n/pkg-plist +++ b/ukrainian/kde3-i18n/pkg-plist @@ -106,6 +106,7 @@ share/locale/uk/LC_MESSAGES/katomic.mo share/locale/uk/LC_MESSAGES/kaudiocreator.mo share/locale/uk/LC_MESSAGES/kay.mo share/locale/uk/LC_MESSAGES/kbabel.mo +share/locale/uk/LC_MESSAGES/kbackgammon.mo share/locale/uk/LC_MESSAGES/kbattleship.mo share/locale/uk/LC_MESSAGES/kbinaryclock.mo share/locale/uk/LC_MESSAGES/kblackbox.mo @@ -280,6 +281,7 @@ share/locale/uk/LC_MESSAGES/kgamma.mo share/locale/uk/LC_MESSAGES/kgantt.mo share/locale/uk/LC_MESSAGES/kget.mo share/locale/uk/LC_MESSAGES/kghostview.mo +share/locale/uk/LC_MESSAGES/kgoldrunner.mo share/locale/uk/LC_MESSAGES/kgpg.mo share/locale/uk/LC_MESSAGES/kgreet_classic.mo share/locale/uk/LC_MESSAGES/kgreet_winbind.mo @@ -290,6 +292,7 @@ share/locale/uk/LC_MESSAGES/khotkeys.mo share/locale/uk/LC_MESSAGES/khtmlkttsd.mo share/locale/uk/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/uk/LC_MESSAGES/kicker.mo +share/locale/uk/LC_MESSAGES/kickermenu_kate.mo share/locale/uk/LC_MESSAGES/kiconedit.mo share/locale/uk/LC_MESSAGES/kimagemapeditor.mo share/locale/uk/LC_MESSAGES/kinetd.mo @@ -326,6 +329,7 @@ share/locale/uk/LC_MESSAGES/kio_thumbnail.mo share/locale/uk/LC_MESSAGES/kio_trash.mo share/locale/uk/LC_MESSAGES/kio_zeroconf.mo share/locale/uk/LC_MESSAGES/kioexec.mo +share/locale/uk/LC_MESSAGES/kitchensync.mo share/locale/uk/LC_MESSAGES/kjobviewer.mo share/locale/uk/LC_MESSAGES/kjots.mo share/locale/uk/LC_MESSAGES/kjumpingcube.mo @@ -339,6 +343,7 @@ share/locale/uk/LC_MESSAGES/klinkstatus.mo share/locale/uk/LC_MESSAGES/klipper.mo share/locale/uk/LC_MESSAGES/klock.mo share/locale/uk/LC_MESSAGES/kmag.mo +share/locale/uk/LC_MESSAGES/kmahjongg.mo share/locale/uk/LC_MESSAGES/kmail.mo share/locale/uk/LC_MESSAGES/kmail_text_calendar_plugin.mo share/locale/uk/LC_MESSAGES/kmail_text_vcard_plugin.mo @@ -403,6 +408,7 @@ share/locale/uk/LC_MESSAGES/kpercentage.mo share/locale/uk/LC_MESSAGES/kpersonalizer.mo share/locale/uk/LC_MESSAGES/kpf.mo share/locale/uk/LC_MESSAGES/kpilot.mo +share/locale/uk/LC_MESSAGES/kpoker.mo share/locale/uk/LC_MESSAGES/kpovmodeler.mo share/locale/uk/LC_MESSAGES/kppp.mo share/locale/uk/LC_MESSAGES/kppplogview.mo @@ -522,6 +528,7 @@ share/locale/uk/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/uk/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/uk/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/uk/LC_MESSAGES/libkickermenu_tom.mo +share/locale/uk/LC_MESSAGES/libkitchensync.mo share/locale/uk/LC_MESSAGES/libkleopatra.mo share/locale/uk/LC_MESSAGES/libkmime.mo share/locale/uk/LC_MESSAGES/libkonq.mo diff --git a/ukrainian/kde4-l10n/distinfo b/ukrainian/kde4-l10n/distinfo index e1127258b339..b8946c684fb6 100644 --- a/ukrainian/kde4-l10n/distinfo +++ b/ukrainian/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-uk-3.5.5.tar.bz2) = fc18b699825837e49e3062e5acc0a3f5 -SHA256 (KDE/kde-i18n/kde-i18n-uk-3.5.5.tar.bz2) = adf4ad603cd213750abebf11e406c657d549988b9207dcd45416f8a383beac40 -SIZE (KDE/kde-i18n/kde-i18n-uk-3.5.5.tar.bz2) = 1846683 +MD5 (KDE/kde-i18n/kde-i18n-uk-3.5.6.tar.bz2) = 82f0f3f3567d551307c03ebad12f3a1c +SHA256 (KDE/kde-i18n/kde-i18n-uk-3.5.6.tar.bz2) = de95bbd12263d18230765f0390aaae7875f8400a525d1d67770b4d362a83cfe5 +SIZE (KDE/kde-i18n/kde-i18n-uk-3.5.6.tar.bz2) = 1884216 diff --git a/ukrainian/kde4-l10n/pkg-plist b/ukrainian/kde4-l10n/pkg-plist index cdda549a7aed..a1c98f089845 100644 --- a/ukrainian/kde4-l10n/pkg-plist +++ b/ukrainian/kde4-l10n/pkg-plist @@ -106,6 +106,7 @@ share/locale/uk/LC_MESSAGES/katomic.mo share/locale/uk/LC_MESSAGES/kaudiocreator.mo share/locale/uk/LC_MESSAGES/kay.mo share/locale/uk/LC_MESSAGES/kbabel.mo +share/locale/uk/LC_MESSAGES/kbackgammon.mo share/locale/uk/LC_MESSAGES/kbattleship.mo share/locale/uk/LC_MESSAGES/kbinaryclock.mo share/locale/uk/LC_MESSAGES/kblackbox.mo @@ -280,6 +281,7 @@ share/locale/uk/LC_MESSAGES/kgamma.mo share/locale/uk/LC_MESSAGES/kgantt.mo share/locale/uk/LC_MESSAGES/kget.mo share/locale/uk/LC_MESSAGES/kghostview.mo +share/locale/uk/LC_MESSAGES/kgoldrunner.mo share/locale/uk/LC_MESSAGES/kgpg.mo share/locale/uk/LC_MESSAGES/kgreet_classic.mo share/locale/uk/LC_MESSAGES/kgreet_winbind.mo @@ -290,6 +292,7 @@ share/locale/uk/LC_MESSAGES/khotkeys.mo share/locale/uk/LC_MESSAGES/khtmlkttsd.mo share/locale/uk/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/uk/LC_MESSAGES/kicker.mo +share/locale/uk/LC_MESSAGES/kickermenu_kate.mo share/locale/uk/LC_MESSAGES/kiconedit.mo share/locale/uk/LC_MESSAGES/kimagemapeditor.mo share/locale/uk/LC_MESSAGES/kinetd.mo @@ -326,6 +329,7 @@ share/locale/uk/LC_MESSAGES/kio_thumbnail.mo share/locale/uk/LC_MESSAGES/kio_trash.mo share/locale/uk/LC_MESSAGES/kio_zeroconf.mo share/locale/uk/LC_MESSAGES/kioexec.mo +share/locale/uk/LC_MESSAGES/kitchensync.mo share/locale/uk/LC_MESSAGES/kjobviewer.mo share/locale/uk/LC_MESSAGES/kjots.mo share/locale/uk/LC_MESSAGES/kjumpingcube.mo @@ -339,6 +343,7 @@ share/locale/uk/LC_MESSAGES/klinkstatus.mo share/locale/uk/LC_MESSAGES/klipper.mo share/locale/uk/LC_MESSAGES/klock.mo share/locale/uk/LC_MESSAGES/kmag.mo +share/locale/uk/LC_MESSAGES/kmahjongg.mo share/locale/uk/LC_MESSAGES/kmail.mo share/locale/uk/LC_MESSAGES/kmail_text_calendar_plugin.mo share/locale/uk/LC_MESSAGES/kmail_text_vcard_plugin.mo @@ -403,6 +408,7 @@ share/locale/uk/LC_MESSAGES/kpercentage.mo share/locale/uk/LC_MESSAGES/kpersonalizer.mo share/locale/uk/LC_MESSAGES/kpf.mo share/locale/uk/LC_MESSAGES/kpilot.mo +share/locale/uk/LC_MESSAGES/kpoker.mo share/locale/uk/LC_MESSAGES/kpovmodeler.mo share/locale/uk/LC_MESSAGES/kppp.mo share/locale/uk/LC_MESSAGES/kppplogview.mo @@ -522,6 +528,7 @@ share/locale/uk/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/uk/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/uk/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/uk/LC_MESSAGES/libkickermenu_tom.mo +share/locale/uk/LC_MESSAGES/libkitchensync.mo share/locale/uk/LC_MESSAGES/libkleopatra.mo share/locale/uk/LC_MESSAGES/libkmime.mo share/locale/uk/LC_MESSAGES/libkonq.mo diff --git a/ukrainian/koffice-i18n/Makefile b/ukrainian/koffice-i18n/Makefile index 7bb84ec0fb8c..3c86be82de8b 100644 --- a/ukrainian/koffice-i18n/Makefile +++ b/ukrainian/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= ukrainian kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/ukrainian/koffice-i18n/distinfo b/ukrainian/koffice-i18n/distinfo index 1f4b8ea018a8..2fd1b8d5fa19 100644 --- a/ukrainian/koffice-i18n/distinfo +++ b/ukrainian/koffice-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-uk-1.6.1.tar.bz2) = dcab018c147831f47543b082f1beb5a5 -SHA256 (KDE/kde-i18n/koffice-l10n-uk-1.6.1.tar.bz2) = 72dfc1f6e60ffb62d81f390e19850dfee6a51ab5b133be00bca823d5354f3355 -SIZE (KDE/kde-i18n/koffice-l10n-uk-1.6.1.tar.bz2) = 369593 +MD5 (KDE/kde-i18n/koffice-l10n-uk-1.6.2.tar.bz2) = 983b0509583a7aa08684310f6d4133a4 +SHA256 (KDE/kde-i18n/koffice-l10n-uk-1.6.2.tar.bz2) = 9328ca2ab864139db5b2352860f5b3ca170afa688a0fe00a3b38775982a5d035 +SIZE (KDE/kde-i18n/koffice-l10n-uk-1.6.2.tar.bz2) = 366718 diff --git a/ukrainian/koffice-i18n/pkg-plist b/ukrainian/koffice-i18n/pkg-plist index d5a4f47594c7..9e7a5cb201d0 100644 --- a/ukrainian/koffice-i18n/pkg-plist +++ b/ukrainian/koffice-i18n/pkg-plist @@ -2,7 +2,6 @@ share/locale/uk/LC_MESSAGES/desktop_koffice.mo share/locale/uk/LC_MESSAGES/example.mo share/locale/uk/LC_MESSAGES/karbon.mo share/locale/uk/LC_MESSAGES/kchart.mo -share/locale/uk/LC_MESSAGES/kdgantt.mo share/locale/uk/LC_MESSAGES/kexi.mo share/locale/uk/LC_MESSAGES/kfile_abiword.mo share/locale/uk/LC_MESSAGES/kfile_gnumeric.mo diff --git a/ukrainian/koffice-kde4-l10n/Makefile b/ukrainian/koffice-kde4-l10n/Makefile index 7bb84ec0fb8c..3c86be82de8b 100644 --- a/ukrainian/koffice-kde4-l10n/Makefile +++ b/ukrainian/koffice-kde4-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.2 CATEGORIES?= ukrainian kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/ukrainian/koffice-kde4-l10n/distinfo b/ukrainian/koffice-kde4-l10n/distinfo index 1f4b8ea018a8..2fd1b8d5fa19 100644 --- a/ukrainian/koffice-kde4-l10n/distinfo +++ b/ukrainian/koffice-kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-uk-1.6.1.tar.bz2) = dcab018c147831f47543b082f1beb5a5 -SHA256 (KDE/kde-i18n/koffice-l10n-uk-1.6.1.tar.bz2) = 72dfc1f6e60ffb62d81f390e19850dfee6a51ab5b133be00bca823d5354f3355 -SIZE (KDE/kde-i18n/koffice-l10n-uk-1.6.1.tar.bz2) = 369593 +MD5 (KDE/kde-i18n/koffice-l10n-uk-1.6.2.tar.bz2) = 983b0509583a7aa08684310f6d4133a4 +SHA256 (KDE/kde-i18n/koffice-l10n-uk-1.6.2.tar.bz2) = 9328ca2ab864139db5b2352860f5b3ca170afa688a0fe00a3b38775982a5d035 +SIZE (KDE/kde-i18n/koffice-l10n-uk-1.6.2.tar.bz2) = 366718 diff --git a/ukrainian/koffice-kde4-l10n/pkg-plist b/ukrainian/koffice-kde4-l10n/pkg-plist index d5a4f47594c7..9e7a5cb201d0 100644 --- a/ukrainian/koffice-kde4-l10n/pkg-plist +++ b/ukrainian/koffice-kde4-l10n/pkg-plist @@ -2,7 +2,6 @@ share/locale/uk/LC_MESSAGES/desktop_koffice.mo share/locale/uk/LC_MESSAGES/example.mo share/locale/uk/LC_MESSAGES/karbon.mo share/locale/uk/LC_MESSAGES/kchart.mo -share/locale/uk/LC_MESSAGES/kdgantt.mo share/locale/uk/LC_MESSAGES/kexi.mo share/locale/uk/LC_MESSAGES/kfile_abiword.mo share/locale/uk/LC_MESSAGES/kfile_gnumeric.mo diff --git a/vietnamese/kde3-i18n/distinfo b/vietnamese/kde3-i18n/distinfo index 596075765206..4995a00b6455 100644 --- a/vietnamese/kde3-i18n/distinfo +++ b/vietnamese/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-vi-3.5.5.tar.bz2) = d7356301309e566eff3fb036c994ca5a -SHA256 (KDE/kde-i18n/kde-i18n-vi-3.5.5.tar.bz2) = 18b19da93c4a855acfaa7c123365bf8d2c59be54622b8b9260ddc95decd67145 -SIZE (KDE/kde-i18n/kde-i18n-vi-3.5.5.tar.bz2) = 913961 +MD5 (KDE/kde-i18n/kde-i18n-vi-3.5.6.tar.bz2) = 58602a074a5868b3c1ae299080289d9a +SHA256 (KDE/kde-i18n/kde-i18n-vi-3.5.6.tar.bz2) = 0ab6f39186ea06215c541aa74ee1cf90daf25563cf585f5e41e23827a379e51d +SIZE (KDE/kde-i18n/kde-i18n-vi-3.5.6.tar.bz2) = 929358 diff --git a/vietnamese/kde3-i18n/pkg-plist b/vietnamese/kde3-i18n/pkg-plist index 69d1beddc3f2..041bfb6f79da 100644 --- a/vietnamese/kde3-i18n/pkg-plist +++ b/vietnamese/kde3-i18n/pkg-plist @@ -1,7 +1,15 @@ +share/locale/vi/LC_MESSAGES/akregator_konqplugin.mo +share/locale/vi/LC_MESSAGES/alsaplayerui.mo share/locale/vi/LC_MESSAGES/appletproxy.mo +share/locale/vi/LC_MESSAGES/ark_plugin.mo +share/locale/vi/LC_MESSAGES/atlantikdesigner.mo +share/locale/vi/LC_MESSAGES/audiorename_plugin.mo +share/locale/vi/LC_MESSAGES/autorefresh.mo share/locale/vi/LC_MESSAGES/babelfish.mo share/locale/vi/LC_MESSAGES/blinken.mo +share/locale/vi/LC_MESSAGES/charlatanui.mo share/locale/vi/LC_MESSAGES/clockapplet.mo +share/locale/vi/LC_MESSAGES/crashesplugin.mo share/locale/vi/LC_MESSAGES/cupsdconf.mo share/locale/vi/LC_MESSAGES/dcoprss.mo share/locale/vi/LC_MESSAGES/dirfilterplugin.mo @@ -11,8 +19,11 @@ share/locale/vi/LC_MESSAGES/domtreeviewer.mo share/locale/vi/LC_MESSAGES/drkonqi.mo share/locale/vi/LC_MESSAGES/dub.mo share/locale/vi/LC_MESSAGES/extensionproxy.mo +share/locale/vi/LC_MESSAGES/ffrs.mo share/locale/vi/LC_MESSAGES/filetypes.mo +share/locale/vi/LC_MESSAGES/fsview.mo share/locale/vi/LC_MESSAGES/htmlsearch.mo +share/locale/vi/LC_MESSAGES/imagerename_plugin.mo share/locale/vi/LC_MESSAGES/imgalleryplugin.mo share/locale/vi/LC_MESSAGES/joystick.mo share/locale/vi/LC_MESSAGES/kabc_dir.mo @@ -26,17 +37,29 @@ share/locale/vi/LC_MESSAGES/kaddressbook.mo share/locale/vi/LC_MESSAGES/kappfinder.mo share/locale/vi/LC_MESSAGES/kasbarextension.mo share/locale/vi/LC_MESSAGES/kate.mo +share/locale/vi/LC_MESSAGES/katecppsymbolviewer.mo +share/locale/vi/LC_MESSAGES/katefiletemplates.mo +share/locale/vi/LC_MESSAGES/katefll_initplugin.mo +share/locale/vi/LC_MESSAGES/katefll_plugin.mo share/locale/vi/LC_MESSAGES/katehelloworld.mo share/locale/vi/LC_MESSAGES/katehtmltools.mo share/locale/vi/LC_MESSAGES/kateinsertcommand.mo +share/locale/vi/LC_MESSAGES/katekjswrapper.mo +share/locale/vi/LC_MESSAGES/katemake.mo +share/locale/vi/LC_MESSAGES/katemodeline.mo share/locale/vi/LC_MESSAGES/kateopenheader.mo share/locale/vi/LC_MESSAGES/katepart.mo +share/locale/vi/LC_MESSAGES/katepybrowse.mo +share/locale/vi/LC_MESSAGES/katesnippets.mo +share/locale/vi/LC_MESSAGES/katetabbarextension.mo share/locale/vi/LC_MESSAGES/katetextfilter.mo +share/locale/vi/LC_MESSAGES/katexmlcheck.mo share/locale/vi/LC_MESSAGES/katexmltools.mo share/locale/vi/LC_MESSAGES/katomic.mo share/locale/vi/LC_MESSAGES/kay.mo share/locale/vi/LC_MESSAGES/kbabel.mo share/locale/vi/LC_MESSAGES/kbattleship.mo +share/locale/vi/LC_MESSAGES/kbinaryclock.mo share/locale/vi/LC_MESSAGES/kblackbox.mo share/locale/vi/LC_MESSAGES/kbounce.mo share/locale/vi/LC_MESSAGES/kbstateapplet.mo @@ -122,11 +145,19 @@ share/locale/vi/LC_MESSAGES/kedit.mo share/locale/vi/LC_MESSAGES/keduca.mo share/locale/vi/LC_MESSAGES/kenolaba.mo share/locale/vi/LC_MESSAGES/kfax.mo +share/locale/vi/LC_MESSAGES/kfile_cert.mo +share/locale/vi/LC_MESSAGES/kfile_deb.mo +share/locale/vi/LC_MESSAGES/kfile_desktop.mo share/locale/vi/LC_MESSAGES/kfile_drgeo.mo +share/locale/vi/LC_MESSAGES/kfile_folder.mo +share/locale/vi/LC_MESSAGES/kfile_html.mo share/locale/vi/LC_MESSAGES/kfile_kig.mo +share/locale/vi/LC_MESSAGES/kfile_lnk.mo +share/locale/vi/LC_MESSAGES/kfile_mhtml.mo share/locale/vi/LC_MESSAGES/kfile_pdf.mo share/locale/vi/LC_MESSAGES/kfile_png.mo share/locale/vi/LC_MESSAGES/kfile_ps.mo +share/locale/vi/LC_MESSAGES/kfile_txt.mo share/locale/vi/LC_MESSAGES/kfileaudiopreview.mo share/locale/vi/LC_MESSAGES/kfindpart.mo share/locale/vi/LC_MESSAGES/kfmclient.mo @@ -175,6 +206,7 @@ share/locale/vi/LC_MESSAGES/klettres.mo share/locale/vi/LC_MESSAGES/klipper.mo share/locale/vi/LC_MESSAGES/klock.mo share/locale/vi/LC_MESSAGES/kmag.mo +share/locale/vi/LC_MESSAGES/kmathapplet.mo share/locale/vi/LC_MESSAGES/kmcop.mo share/locale/vi/LC_MESSAGES/kmenuapplet.mo share/locale/vi/LC_MESSAGES/kmenuedit.mo @@ -186,7 +218,10 @@ share/locale/vi/LC_MESSAGES/knetattach.mo share/locale/vi/LC_MESSAGES/knewsticker.mo share/locale/vi/LC_MESSAGES/knotify.mo share/locale/vi/LC_MESSAGES/kolourpicker.mo +share/locale/vi/LC_MESSAGES/konqsidebar_delicious.mo share/locale/vi/LC_MESSAGES/konqsidebar_mediaplayer.mo +share/locale/vi/LC_MESSAGES/konqsidebar_metabar.mo +share/locale/vi/LC_MESSAGES/konqsidebar_news.mo share/locale/vi/LC_MESSAGES/konqueror.mo share/locale/vi/LC_MESSAGES/konsole.mo share/locale/vi/LC_MESSAGES/kooka.mo @@ -208,6 +243,7 @@ share/locale/vi/LC_MESSAGES/krunapplet.mo share/locale/vi/LC_MESSAGES/ksame.mo share/locale/vi/LC_MESSAGES/ksayit.mo share/locale/vi/LC_MESSAGES/kscreensaver.mo +share/locale/vi/LC_MESSAGES/ksig.mo share/locale/vi/LC_MESSAGES/ksmserver.mo share/locale/vi/LC_MESSAGES/ksnapshot.mo share/locale/vi/LC_MESSAGES/ksplash.mo @@ -246,6 +282,8 @@ share/locale/vi/LC_MESSAGES/kxkb.mo share/locale/vi/LC_MESSAGES/kxsconfig.mo share/locale/vi/LC_MESSAGES/libKTTSD.mo share/locale/vi/LC_MESSAGES/libdmctl.mo +share/locale/vi/LC_MESSAGES/libkaddrbk_geo_xxport.mo +share/locale/vi/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/vi/LC_MESSAGES/libkdeedu.mo share/locale/vi/LC_MESSAGES/libkicker.mo share/locale/vi/LC_MESSAGES/libkickermenu_kdeprint.mo @@ -261,18 +299,31 @@ share/locale/vi/LC_MESSAGES/libkscreensaver.mo share/locale/vi/LC_MESSAGES/libtaskbar.mo share/locale/vi/LC_MESSAGES/libtaskmanager.mo share/locale/vi/LC_MESSAGES/lockout.mo +share/locale/vi/LC_MESSAGES/lyrics.mo share/locale/vi/LC_MESSAGES/mediaapplet.mo +share/locale/vi/LC_MESSAGES/mediacontrol.mo +share/locale/vi/LC_MESSAGES/mf_konqplugin.mo +share/locale/vi/LC_MESSAGES/minitoolsplugin.mo share/locale/vi/LC_MESSAGES/naughtyapplet.mo +share/locale/vi/LC_MESSAGES/nexscope.mo share/locale/vi/LC_MESSAGES/nsplugin.mo +share/locale/vi/LC_MESSAGES/pitchablespeed.mo share/locale/vi/LC_MESSAGES/ppdtranslations.mo share/locale/vi/LC_MESSAGES/privacy.mo share/locale/vi/LC_MESSAGES/quicklauncher.mo +share/locale/vi/LC_MESSAGES/rellinks.mo +share/locale/vi/LC_MESSAGES/searchbarplugin.mo share/locale/vi/LC_MESSAGES/secpolicy.mo +share/locale/vi/LC_MESSAGES/synaescope.mo share/locale/vi/LC_MESSAGES/timezones.mo +share/locale/vi/LC_MESSAGES/tippecanoe.mo share/locale/vi/LC_MESSAGES/trashapplet.mo +share/locale/vi/LC_MESSAGES/tyler.mo share/locale/vi/LC_MESSAGES/uachangerplugin.mo share/locale/vi/LC_MESSAGES/useraccount.mo share/locale/vi/LC_MESSAGES/validatorsplugin.mo +share/locale/vi/LC_MESSAGES/wakeup.mo +share/locale/vi/LC_MESSAGES/wavecapture.mo share/locale/vi/LC_MESSAGES/webarchiver.mo share/locale/vi/charset share/locale/vi/entry.desktop diff --git a/www/kdewebdev/Makefile b/www/kdewebdev/Makefile index 9b582cc54f51..588b101c19aa 100644 --- a/www/kdewebdev/Makefile +++ b/www/kdewebdev/Makefile @@ -18,7 +18,8 @@ COMMENT= Comprehensive html/website development environment BUILD_DEPENDS= cvsservice:${PORTSDIR}/devel/kdesdk3 \ xgettext:${PORTSDIR}/devel/gettext -RUN_DEPENDS= tidy:${PORTSDIR}/www/tidy +RUN_DEPENDS= cvsservice:${PORTSDIR}/devel/kdesdk3 \ + tidy:${PORTSDIR}/www/tidy USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} diff --git a/www/kdewebdev/distinfo b/www/kdewebdev/distinfo index 3cea54b05355..981d8aeb5cb5 100644 --- a/www/kdewebdev/distinfo +++ b/www/kdewebdev/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdewebdev-3.5.5.tar.bz2) = d0655fd0286607f4726a82db96f00da3 -SHA256 (KDE/kdewebdev-3.5.5.tar.bz2) = 3dcb8be41a1499532ef3e60fd292638e147b91882bf3d9cf48b83ed0b8bc36b3 -SIZE (KDE/kdewebdev-3.5.5.tar.bz2) = 6046994 +MD5 (KDE/kdewebdev-3.5.6.tar.bz2) = fa1fc2d7c81465c7e1762014a892ced3 +SHA256 (KDE/kdewebdev-3.5.6.tar.bz2) = fc61291ebbb26cb132a8176f45654adbbfe1531f042c124f3a3cbb46f0dbcb88 +SIZE (KDE/kdewebdev-3.5.6.tar.bz2) = 6050792 diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile index 9b582cc54f51..588b101c19aa 100644 --- a/www/kdewebdev4/Makefile +++ b/www/kdewebdev4/Makefile @@ -18,7 +18,8 @@ COMMENT= Comprehensive html/website development environment BUILD_DEPENDS= cvsservice:${PORTSDIR}/devel/kdesdk3 \ xgettext:${PORTSDIR}/devel/gettext -RUN_DEPENDS= tidy:${PORTSDIR}/www/tidy +RUN_DEPENDS= cvsservice:${PORTSDIR}/devel/kdesdk3 \ + tidy:${PORTSDIR}/www/tidy USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} diff --git a/www/kdewebdev4/distinfo b/www/kdewebdev4/distinfo index 3cea54b05355..981d8aeb5cb5 100644 --- a/www/kdewebdev4/distinfo +++ b/www/kdewebdev4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdewebdev-3.5.5.tar.bz2) = d0655fd0286607f4726a82db96f00da3 -SHA256 (KDE/kdewebdev-3.5.5.tar.bz2) = 3dcb8be41a1499532ef3e60fd292638e147b91882bf3d9cf48b83ed0b8bc36b3 -SIZE (KDE/kdewebdev-3.5.5.tar.bz2) = 6046994 +MD5 (KDE/kdewebdev-3.5.6.tar.bz2) = fa1fc2d7c81465c7e1762014a892ced3 +SHA256 (KDE/kdewebdev-3.5.6.tar.bz2) = fc61291ebbb26cb132a8176f45654adbbfe1531f042c124f3a3cbb46f0dbcb88 +SIZE (KDE/kdewebdev-3.5.6.tar.bz2) = 6050792 diff --git a/x11-clocks/kdetoys3/Makefile b/x11-clocks/kdetoys3/Makefile index 354abd8d37dd..5cd2d055edcc 100644 --- a/x11-clocks/kdetoys3/Makefile +++ b/x11-clocks/kdetoys3/Makefile @@ -23,7 +23,7 @@ USE_BZIP2= yes USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/x11-clocks/kdetoys3/distinfo b/x11-clocks/kdetoys3/distinfo index ce986c982809..5b0d330520b0 100644 --- a/x11-clocks/kdetoys3/distinfo +++ b/x11-clocks/kdetoys3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdetoys-3.5.5.tar.bz2) = 2b03fd068209cf324396b75334f39aba -SHA256 (KDE/kdetoys-3.5.5.tar.bz2) = eedd713a6478509cd0583fcbb27921de21f7af5ecab7f2141479421a9577411c -SIZE (KDE/kdetoys-3.5.5.tar.bz2) = 3178385 +MD5 (KDE/kdetoys-3.5.6.tar.bz2) = 7d4f1a33e5379f789fcbf17b9e503bfd +SHA256 (KDE/kdetoys-3.5.6.tar.bz2) = 51df68b8f002068ab5b34edb18320588a6ef80caf4b1bae950a8765924c49953 +SIZE (KDE/kdetoys-3.5.6.tar.bz2) = 3194529 diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile index 354abd8d37dd..5cd2d055edcc 100644 --- a/x11-clocks/kdetoys4/Makefile +++ b/x11-clocks/kdetoys4/Makefile @@ -23,7 +23,7 @@ USE_BZIP2= yes USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/x11-clocks/kdetoys4/distinfo b/x11-clocks/kdetoys4/distinfo index ce986c982809..5b0d330520b0 100644 --- a/x11-clocks/kdetoys4/distinfo +++ b/x11-clocks/kdetoys4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdetoys-3.5.5.tar.bz2) = 2b03fd068209cf324396b75334f39aba -SHA256 (KDE/kdetoys-3.5.5.tar.bz2) = eedd713a6478509cd0583fcbb27921de21f7af5ecab7f2141479421a9577411c -SIZE (KDE/kdetoys-3.5.5.tar.bz2) = 3178385 +MD5 (KDE/kdetoys-3.5.6.tar.bz2) = 7d4f1a33e5379f789fcbf17b9e503bfd +SHA256 (KDE/kdetoys-3.5.6.tar.bz2) = 51df68b8f002068ab5b34edb18320588a6ef80caf4b1bae950a8765924c49953 +SIZE (KDE/kdetoys-3.5.6.tar.bz2) = 3194529 diff --git a/x11-themes/kdeartwork3/Makefile b/x11-themes/kdeartwork3/Makefile index 4532be6a936e..444cf43679be 100644 --- a/x11-themes/kdeartwork3/Makefile +++ b/x11-themes/kdeartwork3/Makefile @@ -26,7 +26,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/x11-themes/kdeartwork3/distinfo b/x11-themes/kdeartwork3/distinfo index b32d6fb7c8d5..232519e2f37e 100644 --- a/x11-themes/kdeartwork3/distinfo +++ b/x11-themes/kdeartwork3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeartwork-3.5.5.tar.bz2) = 8d35156b506cf870eb9641f72a304c8c -SHA256 (KDE/kdeartwork-3.5.5.tar.bz2) = 4966c255dc4ca9781e61b55e3a77b990c77e7d527ed49781035a7177639137a1 -SIZE (KDE/kdeartwork-3.5.5.tar.bz2) = 16586027 +MD5 (KDE/kdeartwork-3.5.6.tar.bz2) = 4c817eab517fba30fce8f3b40a6f019d +SHA256 (KDE/kdeartwork-3.5.6.tar.bz2) = 4f7d5a7c3bdd53968a5f5af7f6daa2fbd57a11eeb2d670b16977087b2ff9aab2 +SIZE (KDE/kdeartwork-3.5.6.tar.bz2) = 16569318 diff --git a/x11-themes/kdeartwork4/Makefile b/x11-themes/kdeartwork4/Makefile index 4532be6a936e..444cf43679be 100644 --- a/x11-themes/kdeartwork4/Makefile +++ b/x11-themes/kdeartwork4/Makefile @@ -26,7 +26,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/x11-themes/kdeartwork4/distinfo b/x11-themes/kdeartwork4/distinfo index b32d6fb7c8d5..232519e2f37e 100644 --- a/x11-themes/kdeartwork4/distinfo +++ b/x11-themes/kdeartwork4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeartwork-3.5.5.tar.bz2) = 8d35156b506cf870eb9641f72a304c8c -SHA256 (KDE/kdeartwork-3.5.5.tar.bz2) = 4966c255dc4ca9781e61b55e3a77b990c77e7d527ed49781035a7177639137a1 -SIZE (KDE/kdeartwork-3.5.5.tar.bz2) = 16586027 +MD5 (KDE/kdeartwork-3.5.6.tar.bz2) = 4c817eab517fba30fce8f3b40a6f019d +SHA256 (KDE/kdeartwork-3.5.6.tar.bz2) = 4f7d5a7c3bdd53968a5f5af7f6daa2fbd57a11eeb2d670b16977087b2ff9aab2 +SIZE (KDE/kdeartwork-3.5.6.tar.bz2) = 16569318 diff --git a/x11-wm/kompmgr/Makefile b/x11-wm/kompmgr/Makefile index f0bdf3a4e215..d2fae3ee85c8 100644 --- a/x11-wm/kompmgr/Makefile +++ b/x11-wm/kompmgr/Makefile @@ -24,7 +24,7 @@ USE_BZIP2= yes USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes WRKSRC= ${WRKDIR}/kdebase-${PORTVERSION} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS+=--without-java diff --git a/x11-wm/kompmgr/distinfo b/x11-wm/kompmgr/distinfo index 6f53a73368ff..9051c799c5c2 100644 --- a/x11-wm/kompmgr/distinfo +++ b/x11-wm/kompmgr/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.5.tar.bz2) = 0c685af1cbca75f9c77b3ed231ba0468 -SHA256 (KDE/kdebase-3.5.5.tar.bz2) = f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0 -SIZE (KDE/kdebase-3.5.5.tar.bz2) = 23851886 +MD5 (KDE/kdebase-3.5.6.tar.bz2) = a53f589f58012e655a52220a6a151019 +SHA256 (KDE/kdebase-3.5.6.tar.bz2) = 245b35f8b2e1533f9ae92b3b07bee5339a716dfb8db363d0126d2e7409b7bd7e +SIZE (KDE/kdebase-3.5.6.tar.bz2) = 24155599 diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index 53cec9a18b5f..b4baad2d68d0 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 4 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -42,7 +41,7 @@ PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp @@ -52,7 +51,7 @@ CONFIGURE_ARGS+=--without-java \ --with-ssl-dir=${OPENSSLBASE} OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ - HAL "Use HAL backend for media:/ (FreeBSD 5+ only)" off \ + HAL "Use HAL backend for media:/ (FreeBSD 5+ only)" on \ HTDIG "Depend on htdig, used to build manual indices" off .include "${.CURDIR}/../../x11/kde3/Makefile.kde" @@ -70,7 +69,7 @@ RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper RUN_DEPENDS+= htdig:${PORTSDIR}/textproc/htdig .endif -.if defined(WITH_HAL) && ${OSVERSION} > 500035 +.if !defined(WITHOUT_HAL) && ${OSVERSION} > 500035 EXTRA_PATCHES= ${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.cpp \ ${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.h \ ${FILESDIR}/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp @@ -79,12 +78,9 @@ LIB_DEPENDS+= dbus-qt-1.1:${PORTSDIR}/devel/dbus-qt3 \ PLIST_SUB+= MEDIA="" .else CONFIGURE_ARGS+=--without-hal -EXTRA_PATCHES= ${FILESDIR}/extrapatch-kio_media \ - ${FILESDIR}/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp PLIST_SUB+= MEDIA="@comment " .endif - post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo index 6f53a73368ff..9051c799c5c2 100644 --- a/x11/kde4-baseapps/distinfo +++ b/x11/kde4-baseapps/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.5.tar.bz2) = 0c685af1cbca75f9c77b3ed231ba0468 -SHA256 (KDE/kdebase-3.5.5.tar.bz2) = f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0 -SIZE (KDE/kdebase-3.5.5.tar.bz2) = 23851886 +MD5 (KDE/kdebase-3.5.6.tar.bz2) = a53f589f58012e655a52220a6a151019 +SHA256 (KDE/kdebase-3.5.6.tar.bz2) = 245b35f8b2e1533f9ae92b3b07bee5339a716dfb8db363d0126d2e7409b7bd7e +SIZE (KDE/kdebase-3.5.6.tar.bz2) = 24155599 diff --git a/x11/kde4-baseapps/files/extrapatch-kio_media b/x11/kde4-baseapps/files/extrapatch-kio_media deleted file mode 100644 index ab1a03b094cb..000000000000 --- a/x11/kde4-baseapps/files/extrapatch-kio_media +++ /dev/null @@ -1,5814 +0,0 @@ -diff -urN kioslave/media/Makefile.in kioslave/media/Makefile.in ---- kioslave/media/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/Makefile.in Fri May 26 09:54:31 2006 -@@ -122,8 +122,7 @@ - DATA = $(kde_services_DATA) - ETAGS = etags - CTAGS = ctags --DIST_SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ -- kfile-plugin kcmodule mimetypes services propsdlgplugin -+DIST_SUBDIRS = $(SUBDIRS) - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 1 - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -276,6 +275,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -@@ -611,9 +611,8 @@ - xdg_appsdir = @xdg_appsdir@ - xdg_directorydir = @xdg_directorydir@ - xdg_menudir = @xdg_menudir@ --@include_media_halbackend_TRUE@PROPSDLGPLUGINDIR = propsdlgplugin - SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ -- kfile-plugin kcmodule mimetypes services $(PROPSDLGPLUGINDIR) -+ kfile-plugin kcmodule mimetypes services - - INCLUDES = -I$(srcdir)/libmediacommon $(all_includes) - #>- METASOURCES = AUTO -@@ -1092,8 +1091,7 @@ - ./testmedia - - messages: rc.cpp -- $(EXTRACTRC) propsdlgplugin/propertiespagegui.ui >> rc.cpp -- $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp propsdlgplugin/*.cpp -o $(podir)/kio_media.pot -+ $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp -o $(podir)/kio_media.pot - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -diff -urN kioslave/media/kcmodule/Makefile.in kioslave/media/kcmodule/Makefile.in ---- kioslave/media/kcmodule/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/kcmodule/Makefile.in Fri May 26 09:54:31 2006 -@@ -253,6 +253,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/kcmodule/managermodule.cpp kioslave/media/kcmodule/managermodule.cpp ---- kioslave/media/kcmodule/managermodule.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/managermodule.cpp Sun Nov 20 20:14:21 2005 -@@ -39,15 +39,15 @@ - QString hal_text = view->kcfg_HalBackendEnabled->text(); - hal_text += " ("+i18n("No support for HAL on this system")+")"; - view->kcfg_HalBackendEnabled->setText( hal_text ); --#endif - view->kcfg_HalBackendEnabled->setEnabled( false ); -+#endif - - #ifndef COMPILE_LINUXCDPOLLING - QString poll_text = view->kcfg_CdPollingEnabled->text(); - poll_text += " ("+i18n("No support for CD polling on this system")+")"; - view->kcfg_CdPollingEnabled->setText( poll_text ); --#endif - view->kcfg_CdPollingEnabled->setEnabled( false ); -+#endif - - load(); - } -diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.desktop ---- kioslave/media/kcmodule/media.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/kcmodule/media.desktop Mon May 22 20:12:42 2006 -@@ -24,7 +24,6 @@ - Name[es]=Dispositivos de almacenamiento - Name[et]=Andmekandjad - Name[eu]=Biltegiratze-euskarria --Name[fa]=رسانه ذخیرهگاه - Name[fi]=Tallennusmedia - Name[fr]=Support de stockage - Name[fy]=Opslachapparaten -@@ -33,7 +32,7 @@ - Name[he]=התקנים - Name[hi]=भंडार मीडिया - Name[hr]=Mediji za pohranjivanje --Name[hu]=Tárolóeszközök -+Name[hu]=Tárolóeszköz - Name[is]=Geymslumiðlar - Name[it]=Dispositivi di archiviazione - Name[ja]=記憶メディア -@@ -43,7 +42,7 @@ - Name[mk]=Медиуми за податоци - Name[ms]=Media Storan - Name[nb]=Lagringsenheter --Name[nds]=Spiekermedien -+Name[nds]=Spiekerreedschappen - Name[nl]=Opslagapparaten - Name[nn]=Lagringsmedium - Name[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ -@@ -54,7 +53,6 @@ - Name[ru]=Устройства хранения данных - Name[rw]=Uburyo bwo Kubika - Name[se]=Vurkenmedia --Name[sk]=Zálohovacie médiá - Name[sl]=Nosilci za shranjevanje - Name[sr]=Складишни медијуми - Name[sr@Latn]=Skladišni medijumi -@@ -82,13 +80,11 @@ - Comment[es]=Configuración de las medios de almacenamiento - Comment[et]=Salvestusandmekandjate seadistused - Comment[eu]=Konfiguratu biltegiratze-euskarria --Comment[fa]=پیکربندی رسانه ذخیرهگاه - Comment[fi]=Aseta tallennusmedia - Comment[fr]=Configurer le média de stockage - Comment[fy]=Opslachmedia ynstelle - Comment[ga]=Cumraigh Meáin Stórála - Comment[gl]=Configurar Medios de Armacenaxe --Comment[he]=שינוי הגדרות מדיות אחסון - Comment[hr]=Konfiguriranje medija za pohranu - Comment[hu]=A tárolóeszközök beállítása - Comment[is]=Stillingar geymslumiðla -@@ -98,16 +94,15 @@ - Comment[lt]=Konfigūruoti saugojimo įrenginius - Comment[mk]=Конфигурирајте ги медиумите за податоци - Comment[nb]=Sett opp lagringsmedier --Comment[nds]=Spiekermedien instellen -+Comment[nds]=Spiekerreedschappen instellen - Comment[nl]=Opslagmedia instellen - Comment[nn]=Set opp lagringsmedium - Comment[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ ਸੰਰਚਨਾ - Comment[pl]=Konfiguracja nośników danych --Comment[pt]=Configurar os Suportes de Armazenamento -+Comment[pt]=Configurar os Meios de Armazenamento - Comment[pt_BR]=Configura as mídias de armazenamento - Comment[ru]=Настройка подключаемых устройств хранения - Comment[se]=Heivet vurkenmediaid --Comment[sk]=Nastavenie zálohovacích médií - Comment[sl]=Nastavitve nosilcev za shranjevanje - Comment[sr]=Подешавање медијума за складиштење - Comment[sr@Latn]=Podešavanje medijuma za skladištenje -@@ -132,13 +127,11 @@ - Keywords[es]=almacenamiento,medios,usb,cdrom,dispositivo - Keywords[et]=salvestamine,andmekandja,usb,cd,seade - Keywords[eu]=biltegiratzea,euskarriak,usb,cdrom,gailua --Keywords[fa]=ذخیره گاه، رسانه، گذرگاه سریال جهانی، دیسک فشرده، دستگاه - Keywords[fi]=varasto,media,usb,cdrom,laite - Keywords[fr]=stockage,media,medium,usb,cdrom,périphérique - Keywords[fy]=storage,opslach,media,usb,cd-rom,kompakt-skiif,device,apparaat,mp3-speler,usb-stick,geheugenkaart - Keywords[ga]=stóráil,stóras,meáin,meán,usb,cdrom,dlúthdhiosca,gléas - Keywords[gl]=armacenaxe,medios,usb,cdrom,dispositivo --Keywords[he]=storage,media,usb,cdrom,device,מדיה,התקן,סידירום,תקליטור - Keywords[hr]=storage,media,usb,cdrom,device,pohrana,snimanje,mediji,uređaj - Keywords[hu]=tároló,adathordozó,USB,CD-ROM,eszköz - Keywords[is]=geymsla,miðill,usb,cdrom,tæki -@@ -153,7 +146,7 @@ - Keywords[nn]=lagring,media,usb,CD-spiller,CD-ROM,einingar,minnepinnar,harddiskar,HD,eksterne harddiskar,zip-diskar - Keywords[pa]=ਸਟੋਰੇਜ਼,ਮੀਡਿਆ,ਜੰਤਰ,usb,cdrom - Keywords[pl]=dane,przechowywanie danych,nośnik danych,nośniki danych,usb,cdrom,urządzenie --Keywords[pt]=armazenamento,meio,suporte,usb,cdrom,dispositivo -+Keywords[pt]=armazenamento,meio,usb,cdrom,dispositivo - Keywords[pt_BR]=armazenamento,mídia,usb,cd-rom,device,dispositivo - Keywords[ru]=storage,media,usb,cdrom,device,устройство хранения - Keywords[sl]=shranjevanje,nosilec,usb,cdrom,naprava -diff -urN kioslave/media/kcmodule/notifiermodule.cpp kioslave/media/kcmodule/notifiermodule.cpp ---- kioslave/media/kcmodule/notifiermodule.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/notifiermodule.cpp Mon May 22 20:12:42 2006 -@@ -174,8 +174,8 @@ - ActionListBoxItem *action_item - = static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem()); - -- NotifierServiceAction * action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); -- if ( action ) -+ NotifierServiceAction * action; -+ if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() ) ) ) - { - ServiceConfigDialog dialog(action, m_settings.supportedMimetypes(), this); - -@@ -195,8 +195,7 @@ - = static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem()); - - NotifierServiceAction *action; -- action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); -- if ( action ) -+ if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() )) ) - { - m_settings.deleteAction( action ); - updateListBox(); -diff -urN kioslave/media/kfile-plugin/Makefile.in kioslave/media/kfile-plugin/Makefile.in ---- kioslave/media/kfile-plugin/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/kfile-plugin/Makefile.in Fri May 26 09:54:31 2006 -@@ -248,6 +248,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/kfile-plugin/kfile_media.desktop kioslave/media/kfile-plugin/kfile_media.desktop ---- kioslave/media/kfile-plugin/kfile_media.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/kfile-plugin/kfile_media.desktop Mon May 22 20:12:42 2006 -@@ -16,7 +16,6 @@ - Name[es]=Información de recursos - Name[et]=Andmekandja info - Name[eu]=Media informazioa --Name[fa]=اطلاعات رسانه - Name[fi]=Tallenteiden tiedot - Name[fr]=Informations sur le média - Name[fy]=Mediumynformaasje -@@ -47,7 +46,6 @@ - Name[ru]=Сведения о носителе - Name[rw]=Amakuru y'igitangazamakuru - Name[se]=Mediumdieđut --Name[sk]=Informácie o médiu - Name[sl]=Informacije o mediju - Name[sr]=Информације о медијуму - Name[sr@Latn]=Informacije o medijumu -@@ -63,4 +61,4 @@ - Name[zh_TW]=媒體資訊 - ServiceTypes=KFilePlugin - X-KDE-Library=kfile_media --MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera;media/camera_mounted;media/camera_unmounted -+MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera -diff -urN kioslave/media/kfile-plugin/kfilemediaplugin.cpp kioslave/media/kfile-plugin/kfilemediaplugin.cpp ---- kioslave/media/kfile-plugin/kfilemediaplugin.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/kfile-plugin/kfilemediaplugin.cpp Tue Nov 8 23:36:07 2005 -@@ -64,16 +64,12 @@ - addMimeType( "media/floppy_unmounted" ); - addMimeType( "media/zip_unmounted" ); - addMimeType( "media/gphoto2camera" ); -- addMimeType( "media/camera_mounted" ); -- addMimeType( "media/camera_unmounted" ); - } - - bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/) - { -- const Medium medium = askMedium(info); -+ const Medium medium = askMedium(info); - -- kdDebug() << "KFileMediaPlugin::readInfo " << medium.id() << endl; -- - if (medium.id().isNull()) return false; - - QString mount_point = medium.mountPoint(); -@@ -165,8 +161,7 @@ - const Medium KFileMediaPlugin::askMedium(KFileMetaInfo &info) - { - DCOPRef mediamanager("kded", "mediamanager"); -- kdDebug() << "properties " << info.url() << endl; -- DCOPReply reply = mediamanager.call( "properties", info.url().url() ); -+ DCOPReply reply = mediamanager.call( "properties", info.url().fileName() ); - - if ( !reply.isValid() ) - { -diff -urN kioslave/media/libmediacommon/Makefile.in kioslave/media/libmediacommon/Makefile.in ---- kioslave/media/libmediacommon/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/libmediacommon/Makefile.in Fri May 26 09:54:31 2006 -@@ -250,6 +250,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/libmediacommon/medium.cpp kioslave/media/libmediacommon/medium.cpp ---- kioslave/media/libmediacommon/medium.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/libmediacommon/medium.cpp Mon Oct 10 17:04:00 2005 -@@ -40,8 +40,6 @@ - m_properties+= QString::null; /* ICON_NAME */ - - loadUserLabel(); -- -- m_halmounted = false; - } - - Medium::Medium() -@@ -59,8 +57,6 @@ - m_properties+= QString::null; /* BASE_URL */ - m_properties+= QString::null; /* MIME_TYPE */ - m_properties+= QString::null; /* ICON_NAME */ -- -- m_halmounted = false; - } - - const Medium Medium::create(const QStringList &properties) -@@ -163,7 +159,7 @@ - bool Medium::mountableState(bool mounted) - { - if ( m_properties[DEVICE_NODE].isEmpty() -- || ( mounted && m_properties[MOUNT_POINT].isEmpty() ) ) -+ || m_properties[MOUNT_POINT].isEmpty() ) - { - return false; - } -@@ -208,10 +204,14 @@ - - KURL Medium::prettyBaseURL() const - { -- if ( !baseURL().isEmpty() ) -- return baseURL(); -- -+ if ( isMountable() ) -+ { - return KURL( mountPoint() ); -+ } -+ else -+ { -+ return KURL( baseURL() ); -+ } - } - - QString Medium::prettyLabel() const -diff -urN kioslave/media/libmediacommon/medium.h kioslave/media/libmediacommon/medium.h ---- kioslave/media/libmediacommon/medium.h Sat Jul 22 10:15:42 2006 -+++ kioslave/media/libmediacommon/medium.h Mon Oct 10 17:04:00 2005 -@@ -22,7 +22,6 @@ - #include <qstring.h> - #include <qstringlist.h> - #include <kurl.h> --#include <qmap.h> - - class Medium - { -@@ -79,32 +78,14 @@ - - void setMimeType(const QString &mimeType); - void setIconName(const QString &iconName); -- void setHalMounted(bool flag) const { m_halmounted = flag; } -- bool halMounted() const { return m_halmounted; } - - private: - Medium(); - void loadUserLabel(); - - QStringList m_properties; -- mutable bool m_halmounted; -- -+ - friend class QValueListNode<const Medium>; - }; -- --namespace MediaManagerUtils { -- static inline QMap<QString,QString> splitOptions(const QStringList & options) -- { -- QMap<QString,QString> valids; -- -- for (QStringList::ConstIterator it = options.begin(); it != options.end(); ++it) -- { -- QString key = (*it).left((*it).find('=')); -- QString value = (*it).mid((*it).find('=') + 1); -- valids[key] = value; -- } -- return valids; -- } --} - - #endif -diff -urN kioslave/media/mediaimpl.cpp kioslave/media/mediaimpl.cpp ---- kioslave/media/mediaimpl.cpp Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediaimpl.cpp Mon Oct 10 17:04:01 2005 -@@ -226,8 +226,6 @@ - - mp_mounting = &medium; - -- -- /* - KIO::Job* job = KIO::mount(false, 0, - medium.deviceNode(), - medium.mountPoint()); -@@ -236,7 +234,6 @@ - this, SLOT( slotMountResult( KIO::Job * ) ) ); - connect( job, SIGNAL( warning( KIO::Job *, const QString & ) ), - this, SLOT( slotWarning( KIO::Job *, const QString & ) ) ); -- */ - kapp->dcopClient() - ->connectDCOPSignal("kded", "mediamanager", - "mediumChanged(QString, bool)", -@@ -244,17 +241,7 @@ - "slotMediumChanged(QString)", - false); - -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "mount", medium.id()); -- if (reply.isValid()) -- reply.get(m_lastErrorMessage); -- else -- m_lastErrorMessage = i18n("Internal Error"); -- if (!m_lastErrorMessage.isEmpty()) -- m_lastErrorCode = KIO::ERR_SLAVE_DEFINED; -- else { -- qApp->eventLoop()->enterLoop(); -- } -+ qApp->eventLoop()->enterLoop(); - - mp_mounting = 0L; - -diff -urN kioslave/media/mediamanager/Makefile.in kioslave/media/mediamanager/Makefile.in ---- kioslave/media/mediamanager/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/mediamanager/Makefile.in Fri May 26 09:54:31 2006 -@@ -284,6 +284,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/mediamanager/fstabbackend.cpp kioslave/media/mediamanager/fstabbackend.cpp ---- kioslave/media/mediamanager/fstabbackend.cpp Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/fstabbackend.cpp Mon May 22 20:12:42 2006 -@@ -37,9 +37,6 @@ - #endif - - #include <klocale.h> --#include <kio/job.h> --#include <kio/netaccess.h> --#include <kdebug.h> - #include <kdirwatch.h> - #include <kurl.h> - #include <kmountpoint.h> -@@ -97,26 +94,6 @@ - KDirWatch::self()->removeFile(MTAB); - } - --QString FstabBackend::mount( const QString &_udi ) --{ -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- return i18n("No such medium: %1").arg(_udi); -- KIO::Job* job = KIO::mount( false, 0, medium->deviceNode(), medium->mountPoint()); -- KIO::NetAccess::synchronousRun( job, 0 ); -- return QString::null; --} -- --QString FstabBackend::unmount( const QString &_udi ) --{ -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- return i18n("No such medium: %1").arg(_udi); -- KIO::Job* job = KIO::unmount( medium->mountPoint(), false); -- KIO::NetAccess::synchronousRun( job, 0 ); -- return QString::null; --} -- - void FstabBackend::slotDirty(const QString &path) - { - if (path==MTAB) -@@ -134,7 +111,6 @@ - if ( mount->mountType() == "swap" - || mount->mountType() == "tmpfs" - || mount->mountType() == "sysfs" -- || mount->mountType() == "fdescfs" - || mount->mountType() == "kernfs" - || mount->mountType() == "usbfs" - || mount->mountType().contains( "proc" ) -@@ -147,7 +123,6 @@ - || mount->mountPoint() == "/dev/swap" - || mount->mountPoint() == "/dev/pts" - || mount->mountPoint().find("/proc") == 0 -- || mount->mountPoint().find("/sys") == 0 - - // We might want to display only network shares - // since HAL doesn't handle them -@@ -169,7 +144,7 @@ - - void FstabBackend::handleMtabChange(bool allowNotification) - { -- QStringList new_mtabIds; -+ QStringList new_mtabIds, new_mtabEntries; - KMountPoint::List mtab = KMountPoint::currentMountPoints(); - - KMountPoint::List::iterator it = mtab.begin(); -@@ -187,19 +162,18 @@ - nothing has changed, do not stat the mount point. Avoids - hang if network shares are stalling */ - QString mtabEntry = dev + "*" + mp + "*" + fs; -- if(m_mtabEntries.contains(mtabEntry)) { -- new_mtabIds += m_mtabEntries[mtabEntry]; -- continue; -- } -+ bool isOldEntry = m_mtabEntries.contains(mtabEntry); -+ new_mtabEntries+=mtabEntry; -+ if (isOldEntry) continue; - - QString id = generateId(dev, mp); - new_mtabIds+=id; -- m_mtabEntries[mtabEntry] = id; - - if ( !m_mtabIds.contains(id) && m_fstabIds.contains(id) ) - { - QString mime, icon, label; - guess(dev, mp, fs, true, mime, icon, label); -+ - m_mediaList.changeMediumState(id, true, false, - mime, icon, label); - } -@@ -237,10 +211,6 @@ - QString mp = medium->mountPoint(); - QString fs = medium->fsType(); - -- -- QString mtabEntry = dev + "*" + mp + "*" + fs; -- m_mtabEntries.remove(mtabEntry); -- - QString mime, icon, label; - guess(dev, mp, fs, false, mime, icon, label); - -@@ -256,6 +226,7 @@ - } - - m_mtabIds = new_mtabIds; -+ m_mtabEntries = new_mtabEntries; - } - - void FstabBackend::handleFstabChange(bool allowNotification) -diff -urN kioslave/media/mediamanager/fstabbackend.h kioslave/media/mediamanager/fstabbackend.h ---- kioslave/media/mediamanager/fstabbackend.h Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/fstabbackend.h Mon May 22 20:12:42 2006 -@@ -23,7 +23,6 @@ - - #include <qobject.h> - #include <qstringlist.h> --#include <qmap.h> - - #ifdef Q_OS_FREEBSD - #include <qtimer.h> -@@ -41,10 +40,6 @@ - const QString &fsType, bool mounted, - QString &mimeType, QString &iconName, - QString &label); -- -- QString mount(const QString &id); -- QString unmount(const QString &id); -- - private slots: - void slotDirty(const QString &path); - void handleFstabChange(bool allowNotification = true); -@@ -58,7 +53,7 @@ - - bool m_networkSharesOnly; - QStringList m_mtabIds; -- QMap<QString, QString> m_mtabEntries; -+ QStringList m_mtabEntries; - QStringList m_fstabIds; - #ifdef Q_OS_FREEBSD - QTimer m_mtabTimer; -diff -urN kioslave/media/mediamanager/halbackend.cpp kioslave/media/mediamanager/halbackend.cpp ---- kioslave/media/mediamanager/halbackend.cpp Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/halbackend.cpp Thu Jan 19 18:00:58 2006 -@@ -21,16 +21,9 @@ - - #include <stdlib.h> - --#include <qfile.h> - #include <klocale.h> - #include <kurl.h> - #include <kdebug.h> --#include <kprocess.h> --#include <kconfig.h> --#include <qstylesheet.h> --#include <kmountpoint.h> --#include <kmessagebox.h> --#include <kio/job.h> - - #define MOUNT_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mounted") : QString("_unmounted")) - #define MOUNT_ICON_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mount") : QString("_unmount")) -@@ -39,1177 +32,615 @@ - static HALBackend* s_HALBackend; - - /* A macro function to convert HAL string properties to QString */ --QString libhal_device_get_property_QString(LibHalContext *ctx, const char* udi, const char *key) -+QString hal_device_get_property_QString(LibHalContext *ctx, const char* udi, const char *key) - { -- char* _ppt_string; -- QString _ppt_QString; -- _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL); -- _ppt_QString = QString(_ppt_string ? _ppt_string : ""); -- libhal_free_string(_ppt_string); -- return _ppt_QString; -+ char* _ppt_string; -+ QString _ppt_QString; -+ _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL); -+ _ppt_QString = QString(_ppt_string ? _ppt_string : ""); -+ libhal_free_string(_ppt_string); -+ return _ppt_QString; - } - - /* Constructor */ - HALBackend::HALBackend(MediaList &list, QObject* parent) -- : QObject() -- , BackendBase(list) -- , m_halContext(NULL) -- , m_halStoragePolicy(NULL) -- , m_parent(parent) -+ : QObject() -+ , BackendBase(list) -+ , m_halContext(NULL) -+ , m_halStoragePolicy(NULL) -+ , m_parent(parent) - { -- s_HALBackend = this; -+ s_HALBackend = this; - } - - /* Destructor */ - HALBackend::~HALBackend() - { -- /* Close HAL connection */ -- if (m_halContext) -- { -- const QPtrList<Medium> medlist = m_mediaList.list(); -- QPtrListIterator<Medium> it (medlist); -- for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) -- unmount(current_medium->id()); -- -- -- /* Remove all the registered media first */ -- int numDevices; -- char** halDeviceList = libhal_get_all_devices( m_halContext, &numDevices, NULL ); -- -- if ( halDeviceList ) -- { -- for ( int i = 0; i < numDevices; i++ ) -- { -- m_mediaList.removeMedium( halDeviceList[i], false ); -- } -- } -- -- libhal_free_string_array( halDeviceList ); -- -- DBusError error; -- dbus_error_init(&error); -- libhal_ctx_shutdown(m_halContext, &error); -- libhal_ctx_free(m_halContext); -- } -- -- if (m_halStoragePolicy) -- libhal_storage_policy_free(m_halStoragePolicy); -+ /* Close HAL connection */ -+ if (m_halContext) -+ { -+ /* Remove all the registered media first */ -+ int numDevices; -+ char** halDeviceList = libhal_get_all_devices( m_halContext, &numDevices, NULL ); -+ -+ if ( halDeviceList ) -+ { -+ for ( int i = 0; i < numDevices; i++ ) -+ { -+ m_mediaList.removeMedium( halDeviceList[i], false ); -+ } -+ } -+ -+ #ifdef HAL_0_4 -+ hal_shutdown(m_halContext); -+ #else -+ libhal_ctx_shutdown(m_halContext, NULL); -+ libhal_ctx_free(m_halContext); -+ #endif -+ } -+ -+ if (m_halStoragePolicy) -+ libhal_storage_policy_free(m_halStoragePolicy); - } - - /* Connect to the HAL */ - bool HALBackend::InitHal() - { -- kdDebug(1219) << "Context new" << endl; -- m_halContext = libhal_ctx_new(); -- if (!m_halContext) -- { -- kdDebug(1219) << "Failed to initialize HAL!" << endl; -- return false; -- } -- -- // Main loop integration -- kdDebug(1219) << "Main loop integration" << endl; -- DBusError error; -- dbus_error_init(&error); -- dbus_connection = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error); -- -- if (!dbus_connection || dbus_error_is_set(&error)) { -- dbus_error_free(&error); -- libhal_ctx_free(m_halContext); -- m_halContext = NULL; -- return false; -- } -- -- dbus_bus_register(dbus_connection, &error); -- -- if (dbus_error_is_set(&error)) { -- dbus_error_free(&error); -- libhal_ctx_free(m_halContext); -- m_halContext = NULL; -- return false; -- } -- MainLoopIntegration(dbus_connection); -- libhal_ctx_set_dbus_connection(m_halContext, dbus_connection); -- -- // HAL callback functions -- kdDebug(1219) << "Callback functions" << endl; -- libhal_ctx_set_device_added(m_halContext, HALBackend::hal_device_added); -- libhal_ctx_set_device_removed(m_halContext, HALBackend::hal_device_removed); -- libhal_ctx_set_device_new_capability (m_halContext, NULL); -- libhal_ctx_set_device_lost_capability (m_halContext, NULL); -- libhal_ctx_set_device_property_modified (m_halContext, HALBackend::hal_device_property_modified); -- libhal_ctx_set_device_condition(m_halContext, HALBackend::hal_device_condition); -- -- kdDebug(1219) << "Context Init" << endl; -- if (!libhal_ctx_init(m_halContext, &error)) -- { -- if (dbus_error_is_set(&error)) -- dbus_error_free(&error); -- libhal_ctx_free(m_halContext); -- m_halContext = NULL; -- kdDebug(1219) << "Failed to init HAL context!" << endl; -- return false; -- } -- -- /** @todo customize watch policy */ -- kdDebug(1219) << "Watch properties" << endl; -- if (!libhal_device_property_watch_all(m_halContext, &error)) -- { -- kdDebug(1219) << "Failed to watch HAL properties!" << endl; -- return false; -- } -- -- /* libhal-storage initialization */ -- kdDebug(1219) << "Storage Policy" << endl; -- m_halStoragePolicy = libhal_storage_policy_new(); -- /** @todo define libhal-storage icon policy */ -+#ifdef HAL_0_4 /* HAL API 0.4 */ -+ /* libhal initialization */ -+ m_halFunctions.main_loop_integration = HALBackend::hal_main_loop_integration; -+ m_halFunctions.device_added = HALBackend::hal_device_added; -+ m_halFunctions.device_removed = HALBackend::hal_device_removed; -+ m_halFunctions.device_new_capability = NULL; -+ m_halFunctions.device_lost_capability = NULL; -+ m_halFunctions.device_property_modified = HALBackend::hal_device_property_modified; -+ m_halFunctions.device_condition = HALBackend::hal_device_condition; -+ -+ m_halContext = hal_initialize(&m_halFunctions, false); -+ if (!m_halContext) -+ { -+ kdDebug(1219) << "Failed to initialize HAL!" << endl; -+ return false; -+ } -+ -+ /** @todo customize watch policy */ -+ kdDebug(1219) << "Watch properties" << endl; -+ if (libhal_device_property_watch_all(m_halContext, NULL)) -+ { -+ kdDebug(1219) << "Failed to watch HAL properties!" << endl; -+ return false; -+ } -+#else /* HAL API >= 0.5 */ -+ kdDebug(1219) << "Context new" << endl; -+ m_halContext = libhal_ctx_new(); -+ if (!m_halContext) -+ { -+ kdDebug(1219) << "Failed to initialize HAL!" << endl; -+ return false; -+ } -+ -+ // Main loop integration -+ kdDebug(1219) << "Main loop integration" << endl; -+ DBusError error; -+ dbus_error_init(&error); -+ DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -+ if (dbus_error_is_set(&error)) { -+ dbus_error_free(&error); -+ libhal_ctx_free(m_halContext); -+ m_halContext = NULL; -+ return false; -+ } -+ MainLoopIntegration(dbus_connection); -+ libhal_ctx_set_dbus_connection(m_halContext, dbus_connection); -+ -+ // HAL callback functions -+ kdDebug(1219) << "Callback functions" << endl; -+ libhal_ctx_set_device_added(m_halContext, HALBackend::hal_device_added); -+ libhal_ctx_set_device_removed(m_halContext, HALBackend::hal_device_removed); -+ libhal_ctx_set_device_new_capability (m_halContext, NULL); -+ libhal_ctx_set_device_lost_capability (m_halContext, NULL); -+ libhal_ctx_set_device_property_modified (m_halContext, HALBackend::hal_device_property_modified); -+ libhal_ctx_set_device_condition(m_halContext, HALBackend::hal_device_condition); - -- /* List devices at startup */ -- return ListDevices(); -+ kdDebug(1219) << "Context Init" << endl; -+ if (!libhal_ctx_init(m_halContext, &error)) -+ { -+ if (dbus_error_is_set(&error)) -+ dbus_error_free(&error); -+ libhal_ctx_free(m_halContext); -+ m_halContext = NULL; -+ kdDebug(1219) << "Failed to init HAL context!" << endl; -+ return false; -+ } -+ -+ /** @todo customize watch policy */ -+ kdDebug(1219) << "Watch properties" << endl; -+ if (!libhal_device_property_watch_all(m_halContext, &error)) -+ { -+ kdDebug(1219) << "Failed to watch HAL properties!" << endl; -+ return false; -+ } -+#endif -+ -+ /* libhal-storage initialization */ -+ kdDebug(1219) << "Storage Policy" << endl; -+ m_halStoragePolicy = libhal_storage_policy_new(); -+ /** @todo define libhal-storage icon policy */ -+ -+ /* List devices at startup */ -+ return ListDevices(); - } - - /* List devices (at startup)*/ - bool HALBackend::ListDevices() - { -- kdDebug(1219) << "ListDevices" << endl; -+ kdDebug(1219) << "ListDevices" << endl; - -- int numDevices; -- char** halDeviceList = libhal_get_all_devices(m_halContext, &numDevices, NULL); -+ int numDevices; -+ char** halDeviceList = libhal_get_all_devices(m_halContext, &numDevices, NULL); - -- if (!halDeviceList) -- return false; -+ if (!halDeviceList) -+ return false; - -- kdDebug(1219) << "HALBackend::ListDevices : " << numDevices << " devices found" << endl; -- for (int i = 0; i < numDevices; i++) -- AddDevice(halDeviceList[i], false); -+ kdDebug(1219) << "HALBackend::ListDevices : " << numDevices << " devices found" << endl; -+ for (int i = 0; i < numDevices; i++) -+ AddDevice(halDeviceList[i], false); - -- libhal_free_string_array( halDeviceList ); -- -- return true; -+ return true; - } - - /* Create a media instance for the HAL device "udi". -- This functions checks whether the device is worth listing */ -+This functions checks whether the device is worth listing */ - void HALBackend::AddDevice(const char *udi, bool allowNotification) - { -- /* We don't deal with devices that do not expose their capabilities. -- If we don't check this, we will get a lot of warning messages from libhal */ -- if (!libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -- return; -- -- /* If the device is already listed, do not process. -- This should not happen, but who knows... */ -- /** @todo : refresh properties instead ? */ -- if (m_mediaList.findById(udi)) -- return; -- -- if (libhal_device_get_property_bool(m_halContext, "/org/freedesktop/Hal/devices/computer", "storage.disable_volume_handling", NULL)) -- allowNotification=false; -- -- /* Add volume block devices */ -- if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -- { -- /* We only list volume that have a filesystem or volume that have an audio track*/ -- if ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem" && -- !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio", NULL) && -- !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL) ) -- return; -- -- if ( ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") == "filesystem" && -- !libhal_device_get_property_bool(m_halContext, udi, "volume.is_mounted", NULL ) ) && -- ( libhal_device_get_property_bool(m_halContext, udi, "volume.ignore", NULL ) ) ) -- return; -- -- /* Query drive udi */ -- QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -- /* We don't list floppy volumes because we list floppy drives */ -- if ((libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "floppy") || -- (libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "zip") || -- (libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "jaz")) -- return; -- -- // if the device is locked do not act upon it -- if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "info.locked", NULL)) -- allowNotification=false; -- -- // if the device is locked do not act upon it -- if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "storage.partition_table_changed", NULL)) -- allowNotification=false; -- -- /** @todo check exclusion list **/ -- -- /* Create medium */ -- Medium* medium = new Medium(udi, ""); -- -- QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi)); -- kdDebug() << "automount " << options["automount"] << endl; -- if (options["automount"] == "true" && allowNotification ) { -- QString error = mount(medium); -- if (!error.isEmpty()) -- kdDebug() << "error " << error << endl; -- } -- setVolumeProperties(medium); -- m_mediaList.addMedium(medium, allowNotification); -- -- return; -- } -- -- /* Floppy & zip drives */ -- if (libhal_device_query_capability(m_halContext, udi, "storage", NULL)) -- if ((libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") || -- (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") || -- (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "jaz")) -- { -- /* Create medium */ -- Medium* medium = new Medium(udi, ""); -- setFloppyProperties(medium); -- m_mediaList.addMedium(medium, allowNotification); -- return; -- } -- -- /* Camera handled by gphoto2*/ -- if (libhal_device_query_capability(m_halContext, udi, "camera", NULL) && -- ((libhal_device_get_property_QString(m_halContext, udi, "camera.access_method")=="ptp") || -- -- (libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2.support", NULL) && -- libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2.support", NULL))) -- ) -- { -- /* Create medium */ -- Medium* medium = new Medium(udi, ""); -- setCameraProperties(medium); -- m_mediaList.addMedium(medium, allowNotification); -- return; -- } -+ /* We don't deal with devices that do not expose their capabilities. -+ If we don't check this, we will get a lot of warning messages from libhal */ -+ if (!libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -+ return; -+ -+ /* If the device is already listed, do not process. -+ This should not happen, but who knows... */ -+ /** @todo : refresh properties instead ? */ -+ if (m_mediaList.findById(udi)) -+ return; -+ -+ /* Add volume block devices */ -+ if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -+ { -+ /* We only list volume that have a filesystem or volume that have an audio track*/ -+ if ( (hal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem") && -+ (!libhal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio", NULL)) && -+ (!libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL)) ) -+ return; -+ /* Query drive udi */ -+ QString driveUdi = hal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -+ /* We don't list floppy volumes because we list floppy drives */ -+ if ((hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "floppy") || -+ (hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "zip") || -+ (hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "jaz")) -+ return; -+ -+ /** @todo check exclusion list **/ -+ -+ /* Create medium */ -+ Medium* medium = new Medium(udi, ""); -+ setVolumeProperties(medium); -+ m_mediaList.addMedium(medium, allowNotification); -+ -+ return; -+ } -+ -+ /* Floppy & zip drives */ -+ if (libhal_device_query_capability(m_halContext, udi, "storage", NULL)) -+ if ((hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") || -+ (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") || -+ (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "jaz")) -+ { -+ /* Create medium */ -+ Medium* medium = new Medium(udi, ""); -+ setFloppyProperties(medium); -+ m_mediaList.addMedium(medium, allowNotification); -+ return; -+ } -+ -+ /* Camera handled by gphoto2*/ -+ if (libhal_device_query_capability(m_halContext, udi, "camera", NULL) && -+#ifdef HAL_0_4 -+ libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2_support", NULL) && -+ libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2_support", NULL) -+#else -+ ((hal_device_get_property_QString(m_halContext, udi, "camera.access_method")=="ptp") || -+ -+ (libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2.support", NULL) && -+ libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2.support", NULL))) -+#endif -+ ) -+ { -+ /* Create medium */ -+ Medium* medium = new Medium(udi, ""); -+ setCameraProperties(medium); -+ m_mediaList.addMedium(medium, allowNotification); -+ return; -+ } - } - - void HALBackend::RemoveDevice(const char *udi) - { -- m_mediaList.removeMedium(udi, true); -+ m_mediaList.removeMedium(udi, true); - } - - void HALBackend::ModifyDevice(const char *udi, const char* key) - { -- Q_UNUSED(key); -- const char* mediumUdi = findMediumUdiFromUdi(udi); -- if (!mediumUdi) -- return; -- ResetProperties(mediumUdi); -+ Q_UNUSED(key); -+ const char* mediumUdi = findMediumUdiFromUdi(udi); -+ if (!mediumUdi) -+ return; -+ ResetProperties(mediumUdi); - } - - void HALBackend::DeviceCondition(const char* udi, const char* condition) - { -- QString conditionName = QString(condition); -- kdDebug(1219) << "Processing device condition " << conditionName << " for " << udi << endl; -- -- if (conditionName == "EjectPressed") { -- const Medium* medium = m_mediaList.findById(udi); -- if (!medium) { -- /* the ejectpressed appears on the drive and we need to find the volume */ -- const QPtrList<Medium> medlist = m_mediaList.list(); -- QPtrListIterator<Medium> it (medlist); -- for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) -- { -- QString driveUdi = libhal_device_get_property_QString(m_halContext, current_medium->id().latin1(), "block.storage_device"); -- if (driveUdi == udi) -- { -- medium = current_medium; -- break; -- } -- } -- } -- if (medium) { -- KProcess p; -- p << "kio_media_mounthelper" << "-e" << medium->name(); -- p.start(KProcess::DontCare); -- } -- } -- -- const char* mediumUdi = findMediumUdiFromUdi(udi); -- kdDebug() << "findMedumUdiFromUdi " << udi << " returned " << mediumUdi << endl; -- if (!mediumUdi) -- return; -- -- /* TODO: Warn the user that (s)he should unmount devices before unplugging */ -- if (conditionName == "VolumeUnmountForced") -- ResetProperties(mediumUdi); -- -- /* Reset properties after mounting */ -- if (conditionName == "VolumeMount") -- ResetProperties(mediumUdi); -- -- /* Reset properties after unmounting */ -- if (conditionName == "VolumeUnmount") -- ResetProperties(mediumUdi); -- -+ const char* mediumUdi = findMediumUdiFromUdi(udi); -+ if (!mediumUdi) -+ return; -+ -+ QString conditionName = QString(condition); -+ kdDebug(1219) << "Processing device condition " << conditionName << " for " << udi << endl; -+ -+ /* TODO: Warn the user that (s)he should unmount devices before unplugging */ -+ if (conditionName == "VolumeUnmountForced") -+ ResetProperties(mediumUdi); -+ -+ /* Reset properties after mounting */ -+ if (conditionName == "VolumeMount") -+ ResetProperties(mediumUdi); -+ -+ /* Reset properties after unmounting */ -+ if (conditionName == "VolumeUnmount") -+ ResetProperties(mediumUdi); - } - - void HALBackend::MainLoopIntegration(DBusConnection *dbusConnection) - { -- m_dBusQtConnection = new DBusQt::Connection(m_parent); -- m_dBusQtConnection->dbus_connection_setup_with_qt_main(dbusConnection); -+ m_dBusQtConnection = new DBusQt::Connection(m_parent); -+ m_dBusQtConnection->dbus_connection_setup_with_qt_main(dbusConnection); - } - - /****************************************** -- ** Properties attribution ** -- ******************************************/ -+** Properties attribution ** -+******************************************/ - - /* Return the medium udi that should be updated when recieving a call for -- device udi */ -+device udi */ - const char* HALBackend::findMediumUdiFromUdi(const char* udi) - { -- /* Easy part : this Udi is already registered as a device */ -- const Medium* medium = m_mediaList.findById(udi); -- if (medium) -- return medium->id().ascii(); -- -- /* Hard part : this is a volume whose drive is registered */ -- if (libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -- if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -- { -- QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -- return findMediumUdiFromUdi(driveUdi.ascii()); -- } -+ /* Easy part : this Udi is already registered as a device */ -+ const Medium* medium = m_mediaList.findById(udi); -+ if (medium) -+ return medium->id().ascii(); -+ -+ /* Hard part : this is a volume whose drive is registered */ -+ if (libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -+ if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -+ { -+ QString driveUdi = hal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -+ return findMediumUdiFromUdi(driveUdi.ascii()); -+ } - -- return NULL; -+ return NULL; - } - - void HALBackend::ResetProperties(const char* mediumUdi) - { -- kdDebug(1219) << "HALBackend::setProperties" << endl; -- if ( QString::fromLatin1( mediumUdi ).startsWith( "/org/kde/" ) ) -- { -- const Medium *cmedium = m_mediaList.findById(mediumUdi); -- if ( cmedium ) -- { -- Medium m( *cmedium ); -- if ( setFstabProperties( &m ) ) { -- kdDebug() << "setFstabProperties worked" << endl; -- m_mediaList.changeMediumState(m, false); -- } -- return; -- } -- } -- -- Medium* m = new Medium(mediumUdi, ""); -- -- if (libhal_device_query_capability(m_halContext, mediumUdi, "volume", NULL)) -- setVolumeProperties(m); -- if (libhal_device_query_capability(m_halContext, mediumUdi, "storage", NULL)) -- setFloppyProperties(m); -- if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) -- setCameraProperties(m); -+ kdDebug(1219) << "HALBackend::setProperties" << endl; - -- m_mediaList.changeMediumState(*m, false); -+ Medium* m = new Medium(mediumUdi, ""); -+ -+ if (libhal_device_query_capability(m_halContext, mediumUdi, "volume", NULL)) -+ setVolumeProperties(m); -+ if (libhal_device_query_capability(m_halContext, mediumUdi, "storage", NULL)) -+ setFloppyProperties(m); -+ if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) -+ setCameraProperties(m); - -- delete m; --} -+ m_mediaList.changeMediumState(*m, false); - --void HALBackend::setVolumeProperties(Medium* medium) --{ -- kdDebug(1219) << "HALBackend::setVolumeProperties for " << medium->id() << endl; -- -- const char* udi = medium->id().ascii(); -- /* Check if the device still exists */ -- if (!libhal_device_exists(m_halContext, udi, NULL)) -- return; -- -- /* Get device information from libhal-storage */ -- LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi); -- if (!halVolume) -- return; -- QString driveUdi = libhal_volume_get_storage_device_udi(halVolume); -- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, driveUdi.ascii()); -- if (!halDrive) { -- // at times HAL sends an UnmountForced event before the device is removed -- libhal_volume_free(halVolume); -- return; -- } -- -- medium->setName( -- generateName(libhal_volume_get_device_file(halVolume)) ); -- -- medium->mountableState( -- libhal_volume_get_device_file(halVolume), /* Device node */ -- libhal_volume_get_mount_point(halVolume), /* Mount point */ -- libhal_volume_get_fstype(halVolume), /* Filesystem type */ -- libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -- -- char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -- QString volume_name = QString::fromUtf8(name); -- QString media_name = volume_name; -- medium->setLabel(media_name); -- free(name); -- -- QString mimeType; -- if (libhal_volume_is_disc(halVolume)) -- { -- mimeType = "media/cdrom" + MOUNT_SUFFIX; -- -- LibHalVolumeDiscType discType = libhal_volume_get_disc_type(halVolume); -- if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_CDR) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_CDRW)) -- if (libhal_volume_disc_is_blank(halVolume)) -- { -- mimeType = "media/blankcd"; -- medium->unmountableState(""); -- } -- else -- mimeType = "media/cdwriter" + MOUNT_SUFFIX; -- -- if ((discType == LIBHAL_VOLUME_DISC_TYPE_DVDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRAM) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_DVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRW) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW) ) -- if (libhal_volume_disc_is_blank(halVolume)) -- { -- mimeType = "media/blankdvd"; -- medium->unmountableState(""); -- } -- else -- mimeType = "media/dvd" + MOUNT_SUFFIX; -- -- if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) -- { -- mimeType = "media/audiocd"; -- medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); -- } -- -- medium->setIconName(QString::null); -- -- /* check if the disc id a vcd or a video dvd */ -- DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); -- switch (type) -- { -- case DiscType::VCD: -- mimeType = "media/vcd"; -- break; -- case DiscType::SVCD: -- mimeType = "media/svcd"; -- break; -- case DiscType::DVD: -- mimeType = "media/dvdvideo"; -- break; -- } -- } -- else -- { -- mimeType = "media/hdd" + MOUNT_SUFFIX; -- if (libhal_drive_is_hotpluggable(halDrive)) -- { -- mimeType = "media/removable" + MOUNT_SUFFIX; -- medium->needMounting(); -- switch (libhal_drive_get_type(halDrive)) { -- case LIBHAL_DRIVE_TYPE_COMPACT_FLASH: -- medium->setIconName("compact_flash" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_MEMORY_STICK: -- medium->setIconName("memory_stick" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_SMART_MEDIA: -- medium->setIconName("smart_media" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_SD_MMC: -- medium->setIconName("sd_mmc" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER: -- { -- medium->setIconName("ipod" + MOUNT_ICON_SUFFIX); -- break; -- } -- case LIBHAL_DRIVE_TYPE_CAMERA: -- { -- mimeType = "media/camera" + MOUNT_SUFFIX; -- medium->setIconName("camera" + MOUNT_ICON_SUFFIX); -- const char *physdev = libhal_drive_get_physical_device_udi(halDrive); -- // get model from camera -- if (physdev && libhal_device_query_capability(m_halContext, physdev, "camera", NULL)) -- { -- if (libhal_device_property_exists(m_halContext, physdev, "usb_device.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, "usb_device.product")); -- else if (libhal_device_property_exists(m_halContext, physdev, "usb.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, "usb.product")); -- } -- break; -- } -- case LIBHAL_DRIVE_TYPE_TAPE: -- medium->setIconName(QString::null); //FIXME need icon -- break; -- default: -- medium->setIconName(QString::null); -- } -- -- if (medium->isMounted() && QFile::exists(medium->mountPoint() + "/dcim")) -- { -- mimeType = "media/camera" + MOUNT_SUFFIX; -- medium->setIconName("camera" + MOUNT_ICON_SUFFIX); -- } -- } -- } -- medium->setMimeType(mimeType); -- -- libhal_drive_free(halDrive); -- libhal_volume_free(halVolume); -+ delete m; - } - --bool HALBackend::setFstabProperties( Medium *medium ) -+void HALBackend::setVolumeProperties(Medium* medium) - { -- QString mp = isInFstab(medium); -+ kdDebug(1219) << "HALBackend::setVolumeProperties for " << medium->id() << endl; - -- if (!mp.isNull() && !medium->id().startsWith( "/org/kde" ) ) -- { -- // now that we know it's in fstab, we have to find out if it's mounted -- KMountPoint::List mtab = KMountPoint::currentMountPoints(); -- -- KMountPoint::List::iterator it = mtab.begin(); -- KMountPoint::List::iterator end = mtab.end(); -- -- bool mounted = false; -- -- for (; it!=end; ++it) -- { -- if ((*it)->mountedFrom() == medium->deviceNode() && (*it)->mountPoint() == mp ) -- { -- mounted = true; -- break; -- } -- } -- -- kdDebug() << mp << " " << mounted << " " << medium->deviceNode() << " " << endl; -- QString fstype = medium->fsType(); -- if ( fstype.isNull() ) -- fstype = "auto"; -- -- medium->mountableState( -- medium->deviceNode(), -- mp, /* Mount point */ -- fstype, /* Filesystem type */ -- mounted ); /* Mounted ? */ -+ const char* udi = medium->id().ascii(); -+ /* Check if the device still exists */ -+ if (!libhal_device_exists(m_halContext, udi, NULL)) -+ return; -+ -+ /* Get device information from libhal-storage */ -+ LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi); -+ if (!halVolume) -+ return; -+ QString driveUdi = libhal_volume_get_storage_device_udi(halVolume); -+ LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, driveUdi.ascii()); -+ -+ medium->setName( -+ generateName(libhal_volume_get_device_file(halVolume)) ); -+ -+ medium->mountableState( -+ libhal_volume_get_device_file(halVolume), /* Device node */ -+ libhal_volume_get_mount_point(halVolume), /* Mount point */ -+ libhal_volume_get_fstype(halVolume), /* Filesystem type */ -+ libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -+ -+ char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -+ QString volume_name = QString::fromUtf8(name); -+ QString media_name = volume_name; -+ medium->setLabel(media_name); -+ free(name); - -- return true; -- } -+ QString mimeType; -+ if (libhal_volume_is_disc(halVolume)) -+ { -+ mimeType = "media/cdrom" + MOUNT_SUFFIX; - -- return false; -+ LibHalVolumeDiscType discType = libhal_volume_get_disc_type(halVolume); -+ if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_CDR) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_CDRW)) -+ if (libhal_volume_disc_is_blank(halVolume)) -+ { -+ mimeType = "media/blankcd"; -+ medium->unmountableState(""); -+ } -+ else -+ mimeType = "media/cdwriter" + MOUNT_SUFFIX; -+ -+ if ((discType == LIBHAL_VOLUME_DISC_TYPE_DVDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRAM) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_DVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRW) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW) ) -+ if (libhal_volume_disc_is_blank(halVolume)) -+ { -+ mimeType = "media/blankdvd"; -+ medium->unmountableState(""); -+ } -+ else -+ mimeType = "media/dvd" + MOUNT_SUFFIX; -+ -+ if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) -+ { -+ mimeType = "media/audiocd"; -+ medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); -+ } -+ -+ medium->setIconName(QString::null); -+ -+ /* check if the disc id a vcd or a video dvd */ -+ DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); -+ switch (type) -+ { -+ case DiscType::VCD: -+ mimeType = "media/vcd"; -+ break; -+ case DiscType::SVCD: -+ mimeType = "media/svcd"; -+ break; -+ case DiscType::DVD: -+ mimeType = "media/dvdvideo"; -+ break; -+ } -+ } -+ else -+ { -+ mimeType = "media/hdd" + MOUNT_SUFFIX; -+ const char *physdev = libhal_drive_get_physical_device_udi(halDrive); -+ if (libhal_drive_is_hotpluggable(halDrive)) -+ { -+ mimeType = "media/removable" + MOUNT_SUFFIX; -+ medium->needMounting(); -+ switch (libhal_drive_get_type(halDrive)) { -+ case LIBHAL_DRIVE_TYPE_COMPACT_FLASH: -+ medium->setIconName("compact_flash" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_MEMORY_STICK: -+ medium->setIconName("memory_stick" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_SMART_MEDIA: -+ medium->setIconName("smart_media" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_SD_MMC: -+ medium->setIconName("sd_mmc" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER: -+ medium->setIconName("ipod" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_CAMERA: -+ mimeType = "media/camera" + MOUNT_SUFFIX; -+ medium->setIconName("camera" + MOUNT_ICON_SUFFIX); -+ // get model from camera -+ if (physdev && libhal_device_query_capability(m_halContext, physdev, "camera", NULL)) -+ { -+ if (libhal_device_property_exists(m_halContext, physdev, "usb_device.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, physdev, "usb_device.product")); -+ else if (libhal_device_property_exists(m_halContext, physdev, "usb.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, physdev, "usb.product")); -+ } -+ break; -+ case LIBHAL_DRIVE_TYPE_TAPE: -+ medium->setIconName(QString::null); //FIXME need icon -+ break; -+ default: -+ medium->setIconName(QString::null); -+ }; -+ }; -+ } -+ medium->setMimeType(mimeType); - -+ libhal_drive_free(halDrive); -+ libhal_volume_free(halVolume); - } - - // Handle floppies and zip drives - void HALBackend::setFloppyProperties(Medium* medium) - { -- kdDebug(1219) << "HALBackend::setFloppyProperties for " << medium->id() << endl; -+ kdDebug(1219) << "HALBackend::setFloppyProperties for " << medium->id() << endl; - -- const char* udi = medium->id().ascii(); -- /* Check if the device still exists */ -- if (!libhal_device_exists(m_halContext, udi, NULL)) -- return; -- -- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, udi); -- if (!halDrive) -- return; -- int numVolumes; -- char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); -- LibHalVolume* halVolume = NULL; -- kdDebug(1219) << " found " << numVolumes << " volumes" << endl; -- if (numVolumes) -- halVolume = libhal_volume_from_udi(m_halContext, volumes[0]); -- -- medium->setName( -- generateName(libhal_drive_get_device_file(halDrive)) ); -- -- if (halVolume) -- { -- medium->mountableState( -- libhal_volume_get_device_file(halVolume), /* Device node */ -- libhal_volume_get_mount_point(halVolume), /* Mount point */ -- libhal_volume_get_fstype(halVolume), /* Filesystem type */ -- libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -- } -- else -- { -- // HAL hates floppies - so we have to do it twice ;( -- medium->mountableState(libhal_drive_get_device_file(halDrive), QString::null, QString::null, false); -- setFstabProperties( medium ); -- } -- -- if (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") -- { -- if (medium->isMounted()) // don't use _SUFFIX here as it accesses the volume -- medium->setMimeType("media/floppy_mounted" ); -- else -- medium->setMimeType("media/floppy_unmounted"); -- } -- -- if (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") -- { -- if (medium->isMounted()) -- medium->setMimeType("media/zip_mounted" ); -- else -- medium->setMimeType("media/zip_unmounted"); -- } -- -- /** @todo And mimtype for JAZ drives ? */ -- -- medium->setIconName(QString::null); -- -- char *name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -- -- if (name) { -- medium->setLabel( QString::fromUtf8(name) ); -- free(name); -- } -- -- free(volumes); -- libhal_drive_free(halDrive); -- libhal_volume_free(halVolume); --} -+ const char* udi = medium->id().ascii(); -+ /* Check if the device still exists */ -+ if (!libhal_device_exists(m_halContext, udi, NULL)) -+ return; -+ -+ LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, udi); -+ if (!halDrive) -+ return; -+ int numVolumes; -+ char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); -+ LibHalVolume* halVolume = NULL; -+ kdDebug(1219) << " found " << numVolumes << " volumes" << endl; -+ if (numVolumes) -+ halVolume = libhal_volume_from_udi(m_halContext, volumes[0]); - --void HALBackend::setCameraProperties(Medium* medium) --{ -- kdDebug(1219) << "HALBackend::setCameraProperties for " << medium->id() << endl; -- -- const char* udi = medium->id().ascii(); -- /* Check if the device still exists */ -- if (!libhal_device_exists(m_halContext, udi, NULL)) -- return; -- -- /** @todo find name */ -- medium->setName("camera"); -- -- QString device = "camera:/"; -- -- char *cam = libhal_device_get_property_string(m_halContext, udi, "camera.libgphoto2.name", NULL); -- DBusError error; -- dbus_error_init(&error); -- if (cam && -- libhal_device_property_exists(m_halContext, udi, "usb.linux.device_number", NULL) && -- libhal_device_property_exists(m_halContext, udi, "usb.bus_number", NULL)) -- device.sprintf("camera://%s@[usb:%03d,%03d]/", cam, -- libhal_device_get_property_int(m_halContext, udi, "usb.bus_number", &error), -- libhal_device_get_property_int(m_halContext, udi, "usb.linux.device_number", &error)); -- -- libhal_free_string(cam); -- -- /** @todo find the rest of this URL */ -- medium->unmountableState(device); -- medium->setMimeType("media/gphoto2camera"); -- medium->setIconName(QString::null); -- if (libhal_device_property_exists(m_halContext, udi, "usb_device.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb_device.product")); -- else if (libhal_device_property_exists(m_halContext, udi, "usb.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb.product")); -- else -- medium->setLabel(i18n("Camera")); --} -+ medium->setName( -+ generateName(libhal_drive_get_device_file(halDrive)) ); - --QString HALBackend::generateName(const QString &devNode) --{ -- return KURL(devNode).fileName(); --} -+ if (halVolume) -+ { -+ medium->mountableState( -+ libhal_volume_get_device_file(halVolume), /* Device node */ -+ libhal_volume_get_mount_point(halVolume), /* Mount point */ -+ libhal_volume_get_fstype(halVolume), /* Filesystem type */ -+ libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -+ } -+ else -+ { -+ medium->mountableState( -+ libhal_drive_get_device_file(halDrive), /* Device node */ -+ "", /* Mount point */ -+ "", /* Filesystem type */ -+ false ); /* Mounted ? */ -+ } - --/****************************************** -- ** HAL CALL-BACKS ** -- ******************************************/ -+ if (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") -+ { -+ if (halVolume) -+ medium->setMimeType("media/floppy" + MOUNT_SUFFIX); -+ else -+ medium->setMimeType("media/floppy_unmounted"); -+ } - --void HALBackend::hal_device_added(LibHalContext *ctx, const char *udi) --{ -- kdDebug(1219) << "HALBackend::hal_device_added " << udi << endl; -- Q_UNUSED(ctx); -- s_HALBackend->AddDevice(udi); --} -+ if (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") -+ { -+ if (halVolume) -+ medium->setMimeType("media/zip" + MOUNT_SUFFIX); -+ else -+ medium->setMimeType("media/zip_unmounted"); -+ } - --void HALBackend::hal_device_removed(LibHalContext *ctx, const char *udi) --{ -- kdDebug(1219) << "HALBackend::hal_device_removed " << udi << endl; -- Q_UNUSED(ctx); -- s_HALBackend->RemoveDevice(udi); --} -+ /** @todo And mimtype for JAZ drives ? */ - --void HALBackend::hal_device_property_modified(LibHalContext *ctx, const char *udi, -- const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) --{ -- kdDebug(1219) << "HALBackend::hal_property_modified " << udi << " -- " << key << endl; -- Q_UNUSED(ctx); -- Q_UNUSED(is_removed); -- Q_UNUSED(is_added); -- s_HALBackend->ModifyDevice(udi, key); --} -+ medium->setIconName(QString::null); - --void HALBackend::hal_device_condition(LibHalContext *ctx, const char *udi, -- const char *condition_name, -- const char* message -- ) --{ -- kdDebug(1219) << "HALBackend::hal_device_condition " << udi << " -- " << condition_name << endl; -- Q_UNUSED(ctx); -- Q_UNUSED(message); -- s_HALBackend->DeviceCondition(udi, condition_name); -+ QString media_name; -+ if (halVolume) -+ { -+ char* name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -+ QString volume_name = QString::fromUtf8(name); -+ media_name = volume_name; -+ free(name); -+ } -+ else -+ { -+ char* name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -+ QString drive_name = QString::fromUtf8(name); -+ media_name = drive_name; -+ free(name); -+ } -+ medium->setLabel(media_name); -+ -+ free(volumes); -+ libhal_drive_free(halDrive); -+ libhal_volume_free(halVolume); - } - --QStringList HALBackend::mountoptions(const QString &name) -+void HALBackend::setCameraProperties(Medium* medium) - { -- const Medium* medium = m_mediaList.findById(name); -- if (medium && !isInFstab(medium).isNull()) -- return QStringList(); // not handled by HAL - fstab entry -- -- KConfig config("mediamanagerrc"); -- config.setGroup(name); -- -- char ** array = libhal_device_get_property_strlist(m_halContext, name.latin1(), "volume.mount.valid_options", NULL); -- QMap<QString,bool> valids; -- -- for (int index = 0; array && array[index]; ++index) { -- QString t = array[index]; -- if (t.endsWith("=")) -- t = t.left(t.length() - 1); -- valids[t] = true; -- kdDebug() << "valid " << t << endl; -- } -- libhal_free_string_array(array); -- QStringList result; -- QString tmp; -- -- QString fstype = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.fstype"); -- if (fstype.isNull()) -- fstype = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.policy.mount_filesystem"); -- -- -- QString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device"); -- -- bool removable = libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.removable", NULL) -- || libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.hotpluggable", NULL); -- -- config.setGroup(drive_udi); -- bool value = config.readBoolEntry("automount", false); -- config.setGroup(name); -- -- if (libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_blank", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_vcd", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_svcd", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_videodvd", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.has_audio", NULL)) -- value = false; -- -- result << QString("automount=%1").arg(value ? "true" : "false"); -- -- if (valids.contains("ro")) -- { -- value = config.readBoolEntry("ro", false); -- tmp = QString("ro=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- if (valids.contains("quiet")) -- { -- value = config.readBoolEntry("quiet", false); -- tmp = QString("quiet=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- if (valids.contains("flush")) -- { -- value = config.readBoolEntry("flush", fstype.endsWith("fat")); -- tmp = QString("flush=%1").arg(value ? "true" : "false"); -- result << tmp; -- } -- -- if (valids.contains("uid")) -- { -- value = config.readBoolEntry("uid", true); -- tmp = QString("uid=%1").arg(value ? "true" : "false"); -- result << tmp; -- } -- -- if (valids.contains("utf8")) -- { -- value = config.readBoolEntry("utf8", true); -- tmp = QString("utf8=%1").arg(value ? "true" : "false"); -- result << tmp; -- } -- -- if (valids.contains("shortname")) -- { -- QString svalue = config.readEntry("shortname", "lower").lower(); -- if (svalue == "winnt") -- result << "shortname=winnt"; -- else if (svalue == "win95") -- result << "shortname=win95"; -- else if (svalue == "mixed") -- result << "shortname=mixed"; -- else -- result << "shortname=lower"; -- } -- -- if (valids.contains("sync")) -- { -- value = config.readBoolEntry("sync", !fstype.endsWith("fat") && removable); -- tmp = QString("sync=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- if (valids.contains("noatime")) -- { -- value = config.readBoolEntry("atime", !fstype.endsWith("fat")); -- tmp = QString("atime=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- QString mount_point = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.mount_point"); -- if (mount_point.isEmpty()) -- mount_point = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.policy.desired_mount_point"); -- -- mount_point = config.readEntry("mountpoint", mount_point); -- -- if (!mount_point.startsWith("/")) -- mount_point = "/media/" + mount_point; -- -- result << QString("mountpoint=%1").arg(mount_point); -- result << QString("filesystem=%1").arg(fstype); -- -- if (valids.contains("data")) -- { -- QString svalue = config.readEntry("journaling").lower(); -- if (svalue == "ordered") -- result << "journaling=ordered"; -- else if (svalue == "writeback") -- result << "journaling=writeback"; -- else if (svalue == "data") -- result << "journaling=data"; -- else -- result << "journaling=ordered"; -- } -+ kdDebug(1219) << "HALBackend::setCameraProperties for " << medium->id() << endl; - -- return result; -+ const char* udi = medium->id().ascii(); -+ /* Check if the device still exists */ -+ if (!libhal_device_exists(m_halContext, udi, NULL)) -+ return; -+ -+ /** @todo find name */ -+ medium->setName("camera"); -+ /** @todo find the rest of this URL */ -+ medium->unmountableState("camera:/"); -+ medium->setMimeType("media/gphoto2camera"); -+ medium->setIconName(QString::null); -+ if (libhal_device_property_exists(m_halContext, udi, "usb_device.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, udi, "usb_device.product")); -+ else if (libhal_device_property_exists(m_halContext, udi, "usb.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, udi, "usb.product")); -+ else -+ medium->setLabel(i18n("Camera")); - } - --bool HALBackend::setMountoptions(const QString &name, const QStringList &options ) -+QString HALBackend::generateName(const QString &devNode) - { -- kdDebug() << "setMountoptions " << name << " " << options << endl; -- -- KConfig config("mediamanagerrc"); -- config.setGroup(name); -- -- QMap<QString,QString> valids = MediaManagerUtils::splitOptions(options); -- -- const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 }; -- for (int index = 0; names[index]; ++index) -- if (valids.contains(names[index])) -- config.writeEntry(names[index], valids[names[index]] == "true"); -- -- if (valids.contains("shortname")) -- config.writeEntry("shortname", valids["shortname"]); -- -- if (valids.contains("journaling")) -- config.writeEntry("journaling", valids["journaling"]); -- -- if (!mountoptions(name).contains(QString("mountpoint=%1").arg(valids["mountpoint"]))) -- config.writeEntry("mountpoint", valids["mountpoint"]); -- -- if (valids.contains("automount")) { -- QString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device"); -- config.setGroup(drive_udi); -- config.writeEntry("automount", valids["automount"]); -- } -- -- return true; -+ return KURL(devNode).fileName(); - } - --static QString mount_priv(const char *udi, const char *mount_point, const char **poptions, int noptions, -- DBusConnection *dbus_connection) --{ -- DBusMessage *dmesg, *reply; -- DBusError error; -- -- const char *fstype = ""; -- if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, -- "org.freedesktop.Hal.Device.Volume", -- "Mount"))) { -- kdDebug() << "mount failed for " << udi << ": could not create dbus message\n"; -- return i18n("Internal Error"); -- } -- -- if (!dbus_message_append_args (dmesg, DBUS_TYPE_STRING, &mount_point, DBUS_TYPE_STRING, &fstype, -- DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &poptions, noptions, -- DBUS_TYPE_INVALID)) -- { -- kdDebug() << "mount failed for " << udi << ": could not append args to dbus message\n"; -- dbus_message_unref (dmesg); -- return i18n("Internal Error"); -- } -- -- QString qerror; -- -- dbus_error_init (&error); -- if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) -- { -- QString qerror = error.message; -- kdError() << "mount failed for " << udi << ": " << error.name << " - " << qerror << endl; -- if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.UnknownFilesystemType")) -- qerror = i18n("Invalid filesystem type"); -- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.PermissionDenied")) -- qerror = i18n("Permissions denied"); -- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.AlreadyMounted")) -- qerror = i18n("Device is already mounted."); -- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.InvalidMountpoint") && strlen(mount_point)) { -- dbus_message_unref (dmesg); -- dbus_error_free (&error); -- return mount_priv(udi, "", poptions, noptions, dbus_connection); -- } -- dbus_message_unref (dmesg); -- dbus_error_free (&error); -- return qerror; -- } -- -- kdDebug() << "mount queued for " << udi << endl; -- -- dbus_message_unref (dmesg); -- dbus_message_unref (reply); -- -- return qerror; -+/****************************************** -+** HAL CALL-BACKS ** -+******************************************/ - -+#ifdef HAL_0_4 -+void HALBackend::hal_main_loop_integration(LibHalContext *ctx, -+ DBusConnection *dbus_connection) -+{ -+ kdDebug(1219) << "HALBackend::hal_main_loop_integration" << endl; -+ Q_UNUSED(ctx); -+ s_HALBackend->MainLoopIntegration(dbus_connection); - } -+#endif - --void HALBackend::slotResult(KIO::Job *job) -+void HALBackend::hal_device_added(LibHalContext *ctx, const char *udi) - { -- kdDebug() << "slotResult " << mount_jobs[job] << endl; -- if (job->error()) -- { -- KMessageBox::error(0, job->errorText()); -- } -- ResetProperties( mount_jobs[job].latin1() ); -- mount_jobs.remove(job); -+ kdDebug(1219) << "HALBackend::hal_device_added " << udi << endl; -+ Q_UNUSED(ctx); -+ s_HALBackend->AddDevice(udi); - } - --QString HALBackend::isInFstab(const Medium *medium) -+void HALBackend::hal_device_removed(LibHalContext *ctx, const char *udi) - { -- KMountPoint::List fstab = KMountPoint::possibleMountPoints(KMountPoint::NeedMountOptions|KMountPoint::NeedRealDeviceName); -- -- KMountPoint::List::iterator it = fstab.begin(); -- KMountPoint::List::iterator end = fstab.end(); -- -- for (; it!=end; ++it) -- { -- kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl; -- if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && (*it)->realDeviceName() == medium->deviceNode() ) ) -- { -- QStringList opts = (*it)->mountOptions(); -- if (opts.contains("user") || opts.contains("users")) -- return (*it)->mountPoint(); -- } -- } -- -- return QString::null; -+ kdDebug(1219) << "HALBackend::hal_device_removed " << udi << endl; -+ Q_UNUSED(ctx); -+ s_HALBackend->RemoveDevice(udi); - } - --QString HALBackend::mount(const Medium *medium) --{ -- if (medium->isMounted()) -- return QString(); // that was easy -- -- QString mountPoint = isInFstab(medium); -- if (!mountPoint.isNull()) -- { -- kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; -- KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint ); -- connect(job, SIGNAL( result (KIO::Job *)), -- SLOT( slotResult( KIO::Job *))); -- mount_jobs[job] = medium->id(); -- return QString(); // we won't report an error here -- } else if (medium->id().startsWith("/org/kde/") ) -- return i18n("Permissions denied"); -- -- QStringList soptions; -- -- kdDebug() << "mounting " << medium->id() << "..." << endl; -- -- QMap<QString,QString> valids = MediaManagerUtils::splitOptions(mountoptions(medium->id())); -- if (valids["flush"] == "true") -- soptions << "flush"; -- -- if (valids["uid"] == "true") -- { -- soptions << QString("uid=%1").arg(getuid()); -- } -- -- if (valids["ro"] == "true") -- soptions << "ro"; -- -- if (valids["atime"] != "true") -- soptions << "noatime"; -- -- if (valids["quiet"] == "true") -- soptions << "quiet"; -- -- if (valids["utf8"] == "true") -- soptions << "utf8"; -- -- if (valids["sync"] == "true") -- soptions << "sync"; -- -- QString mount_point = valids["mountpoint"]; -- if (mount_point.startsWith("/media/")) -- mount_point = mount_point.mid(7); -- -- if (valids.contains("shortname")) -- { -- soptions << QString("shortname=%1").arg(valids["shortname"]); -- } -- -- if (valids.contains("journaling")) -- { -- QString option = valids["journaling"]; -- if (option == "data") -- soptions << QString("data=journal"); -- else if (option == "writeback") -- soptions << QString("data=writeback"); -- else -- soptions << QString("data=ordered"); -- } -- -- const char **options = new const char*[soptions.size() + 1]; -- uint noptions = 0; -- for (QStringList::ConstIterator it = soptions.begin(); it != soptions.end(); ++it, ++noptions) -- options[noptions] = (*it).latin1(); -- options[noptions] = NULL; -- -- QString qerror = mount_priv(medium->id().latin1(), mount_point.utf8(), options, noptions, dbus_connection); -- if (!qerror.isEmpty()) { -- kdError() << "mounting " << medium->id() << " returned " << qerror << endl; -- return qerror; -- } -- -- medium->setHalMounted(true); -- ResetProperties(medium->id().latin1()); -- -- return QString(); --} -- --QString HALBackend::mount(const QString &_udi) -+void HALBackend::hal_device_property_modified(LibHalContext *ctx, const char *udi, -+ const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) - { -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- return i18n("No such medium: %1").arg(_udi); -- -- return mount(medium); -+ kdDebug(1219) << "HALBackend::hal_property_modified " << udi << " -- " << key << endl; -+ Q_UNUSED(ctx); -+ Q_UNUSED(is_removed); -+ Q_UNUSED(is_added); -+ s_HALBackend->ModifyDevice(udi, key); - } - --QString HALBackend::unmount(const QString &_udi) --{ -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- { // now we get fancy: if the udi is no volume, it _might_ be a device with only one -- // volume on it (think CDs) - so we're so nice to the caller to unmount that volume -- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, _udi.latin1()); -- if (halDrive) -- { -- int numVolumes; -- char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); -- if (numVolumes == 1) -- medium = m_mediaList.findById( volumes[0] ); -- } -- } -- -- if ( !medium ) -- return i18n("No such medium: %1").arg(_udi); -- -- if (!medium->isMounted()) -- return QString(); // that was easy -- -- QString mountPoint = isInFstab(medium); -- if (!mountPoint.isNull()) -- { -- kdDebug() << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl; -- KIO::Job *job = KIO::unmount( medium->mountPoint(), false ); -- connect(job, SIGNAL( result (KIO::Job *)), -- SLOT( slotResult( KIO::Job *))); -- mount_jobs[job] = medium->id(); -- return QString(); // we won't report an error here -- } -- -- DBusMessage *dmesg, *reply; -- DBusError error; -- const char *options[2]; -- -- const char *udi = medium->id().latin1(); -- kdDebug() << "unmounting " << udi << "..." << endl; -- -- dbus_error_init(&error); -- DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -- if (dbus_error_is_set(&error)) -- { -- dbus_error_free(&error); -- return false; -- } -- -- if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, -- "org.freedesktop.Hal.Device.Volume", -- "Unmount"))) { -- kdDebug() << "unmount failed for " << udi << ": could not create dbus message\n"; -- return i18n("Internal Error"); -- } -- -- options[0] = "force"; -- options[1] = 0; -- -- if (!dbus_message_append_args (dmesg, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, 0, -- DBUS_TYPE_INVALID)) -- { -- kdDebug() << "unmount failed for " << udi << ": could not append args to dbus message\n"; -- dbus_message_unref (dmesg); -- return i18n("Internal Error"); -- } -- -- dbus_error_init (&error); -- if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) -- { -- kdDebug() << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl; -- QString qerror = error.message; -- if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.Busy")) { -- qerror = QString("<qt>") + i18n("Device is Busy:"); -- QString cmdline = QString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint())); -- FILE *fuser = popen(cmdline.latin1(), "r"); -- uint counter = 0; -- if (fuser) { -- qerror += "<pre>"; -- QTextIStream is(fuser); -- QString tmp; -- while (!is.atEnd()) { -- tmp = is.readLine(); -- tmp = QStyleSheet::escape(tmp) + "\n"; -- -- qerror += tmp; -- if (counter++ > 20) -- { -- qerror += "..."; -- break; -- } -- } -- qerror += "</pre>"; -- (void)pclose( fuser ); -- } -- qerror += "</qt>"; -- } else if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.NotMounted")) { -- // this is faking. The error is that the device wasn't mounted by hal (but by the system) -- qerror = i18n("Permissions denied"); -- } -- -- dbus_message_unref (dmesg); -- dbus_error_free (&error); -- return qerror; -- } -- -- kdDebug() << "unmount queued for " << udi << endl; -- -- dbus_message_unref (dmesg); -- dbus_message_unref (reply); -- -- medium->setHalMounted(false); -- ResetProperties(udi); -- -- return QString(); -+void HALBackend::hal_device_condition(LibHalContext *ctx, const char *udi, -+ const char *condition_name, -+ #ifdef HAL_0_4 -+ DBusMessage *message -+ #else -+ const char* message -+ #endif -+ ) -+{ -+ kdDebug(1219) << "HALBackend::hal_device_condition " << udi << " -- " << condition_name << endl; -+ Q_UNUSED(ctx); -+ Q_UNUSED(message); -+ s_HALBackend->DeviceCondition(udi, condition_name); - } - - #include "halbackend.moc" -diff -urN kioslave/media/mediamanager/halbackend.h kioslave/media/mediamanager/halbackend.h ---- kioslave/media/mediamanager/halbackend.h Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/halbackend.h Mon Oct 10 17:04:01 2005 -@@ -45,9 +45,65 @@ - #include <libhal.h> - #include <libhal-storage.h> - --namespace KIO { -- class Job; --} -+/* The HAL API changed between 0.4 and 0.5 series. -+These defines enable backward compatibility */ -+#ifdef HAL_0_4 -+ // libhal-storage 0.4 API -+ #define LibHalStoragePolicy HalStoragePolicy -+ #define LibHalDrive HalDrive -+ #define LibHalVolume HalVolume -+ #define LibHalVolumeDiscType HalVolumeDiscType -+ #define libhal_storage_policy_free hal_storage_policy_free -+ #define libhal_storage_policy_new hal_storage_policy_new -+ #define libhal_drive_from_udi hal_drive_from_udi -+ #define libhal_drive_find_all_volumes hal_drive_find_all_volumes -+ #define libhal_drive_get_type hal_drive_get_type -+ #define libhal_drive_get_device_file hal_drive_get_device_file -+ #define libhal_drive_free hal_drive_free -+ #define libhal_drive_policy_compute_display_name hal_drive_policy_compute_display_name -+ #define libhal_drive_is_hotpluggable hal_drive_is_hotpluggable -+ #define libhal_drive_get_physical_device_udi hal_drive_get_physical_device_udi -+ #define libhal_volume_from_udi hal_volume_from_udi -+ #define libhal_volume_get_device_file hal_volume_get_device_file -+ #define libhal_volume_get_mount_point hal_volume_get_mount_point -+ #define libhal_volume_get_fstype hal_volume_get_fstype -+ #define libhal_volume_is_mounted hal_volume_is_mounted -+ #define libhal_volume_get_disc_type hal_volume_get_disc_type -+ #define libhal_volume_free hal_volume_free -+ #define libhal_volume_policy_compute_display_name hal_volume_policy_compute_display_name -+ #define libhal_volume_disc_has_data hal_volume_disc_has_data -+ #define libhal_volume_disc_has_audio hal_volume_disc_has_audio -+ #define libhal_volume_disc_is_blank hal_volume_disc_is_blank -+ #define libhal_volume_is_disc hal_volume_is_disc -+ #define libhal_volume_get_storage_device_udi hal_volume_get_storage_device_udi -+ #define LIBHAL_VOLUME_DISC_TYPE_CDROM HAL_VOLUME_DISC_TYPE_CDROM -+ #define LIBHAL_VOLUME_DISC_TYPE_CDR HAL_VOLUME_DISC_TYPE_CDR -+ #define LIBHAL_VOLUME_DISC_TYPE_CDRW HAL_VOLUME_DISC_TYPE_CDRW -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDROM HAL_VOLUME_DISC_TYPE_DVDROM -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDRAM HAL_VOLUME_DISC_TYPE_DVDRAM -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDR HAL_VOLUME_DISC_TYPE_DVDR -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDRW HAL_VOLUME_DISC_TYPE_DVDRW -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR HAL_VOLUME_DISC_TYPE_DVDPLUSR -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW HAL_VOLUME_DISC_TYPE_DVDPLUSRW -+ #define LIBHAL_DRIVE_TYPE_COMPACT_FLASH HAL_DRIVE_TYPE_COMPACT_FLASH -+ #define LIBHAL_DRIVE_TYPE_MEMORY_STICK HAL_DRIVE_TYPE_MEMORY_STICK -+ #define LIBHAL_DRIVE_TYPE_SMART_MEDIA HAL_DRIVE_TYPE_SMART_MEDIA -+ #define LIBHAL_DRIVE_TYPE_SD_MMC HAL_DRIVE_TYPE_SD_MMC -+ #define LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER HAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER -+ #define LIBHAL_DRIVE_TYPE_CAMERA HAL_DRIVE_TYPE_CAMERA -+ #define LIBHAL_DRIVE_TYPE_TAPE HAL_DRIVE_TYPE_TAPE -+ -+ // libhal 0.4 API -+ #define libhal_free_string hal_free_string -+ #define libhal_device_exists(ctx, udi, error) hal_device_exists(ctx, udi) -+ #define libhal_device_property_watch_all(ctx, error) hal_device_property_watch_all(ctx) -+ #define libhal_get_all_devices(ctx, num_devices, error) hal_get_all_devices(ctx, num_devices) -+ #define libhal_device_property_exists(ctx, udi, key, error) hal_device_property_exists(ctx, udi, key) -+ #define libhal_device_get_property_bool(ctx, udi, key, error) hal_device_get_property_bool(ctx, udi, key) -+ #define libhal_device_get_property_string(ctx, udi, key, error) hal_device_get_property_string(ctx, udi, key) -+ #define libhal_device_query_capability(ctx, udi, capability, error) hal_device_query_capability(ctx, udi, capability) -+#endif -+ - - /** - * A handy function to query a hal string -@@ -88,14 +144,6 @@ - */ - bool ListDevices(); - -- QStringList mountoptions(const QString &id); -- -- bool setMountoptions(const QString &id, const QStringList &options); -- -- QString mount(const QString &id); -- QString mount(const Medium *medium); -- QString unmount(const QString &id); -- - private: - /** - * Append a device in the media list. This function will check if the device -@@ -147,16 +195,20 @@ - - void setVolumeProperties(Medium* medium); - void setFloppyProperties(Medium* medium); -- bool setFstabProperties(Medium* medium); - void setCameraProperties(Medium* medium); - QString generateName(const QString &devNode); -- static QString isInFstab(const Medium *medium); -- --private slots: -- void slotResult(KIO::Job *job); - - /* Hal call-backs -- from gvm*/ - public: -+#ifdef HAL_0_4 -+ /** Invoked by libhal for integration with our mainloop. -+ * -+ * @param ctx LibHal context -+ * @param dbus_connection D-BUS connection to integrate -+ */ -+ static void hal_main_loop_integration(LibHalContext *ctx, DBusConnection *dbus_connection); -+#endif -+ - /** Invoked when a device is added to the Global Device List. - * - * @param ctx LibHal context -@@ -189,7 +241,11 @@ - */ - static void hal_device_condition(LibHalContext *ctx, const char *udi, - const char *condition_name, -+ #ifdef HAL_0_4 -+ DBusMessage *message -+ #else - const char* message -+ #endif - ); - - /* HAL and DBus structures */ -@@ -199,6 +255,13 @@ - */ - LibHalContext* m_halContext; - -+#ifdef HAL_0_4 -+ /** -+ * Structure defining the hal callback function for devices events -+ */ -+ LibHalFunctions m_halFunctions; -+#endif -+ - /** - * libhal-storage HAL policy, e.g. for icon names - */ -@@ -213,10 +276,6 @@ - * Object for the kded module - */ - QObject* m_parent; -- -- DBusConnection *dbus_connection; -- -- QMap<KIO::Job *, QString> mount_jobs; - }; - - #endif /* _HALBACKEND_H_ */ -diff -urN kioslave/media/mediamanager/linuxcdpolling.cpp kioslave/media/mediamanager/linuxcdpolling.cpp ---- kioslave/media/mediamanager/linuxcdpolling.cpp Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/linuxcdpolling.cpp Mon Oct 10 17:04:01 2005 -@@ -23,6 +23,7 @@ - - #include <qthread.h> - #include <qmutex.h> -+#include <qtimer.h> - #include <qfile.h> - - #include <kdebug.h> -@@ -188,7 +189,9 @@ - const QString &, bool, bool)), - this, SLOT(slotMediumStateChanged(const QString &)) ); - -- connect(&m_timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); -+ QTimer *timer = new QTimer(this); -+ connect(timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); -+ timer->start(500); - } - - LinuxCDPolling::~LinuxCDPolling() -@@ -226,7 +229,6 @@ - PollingThread *thread = new PollingThread(dev); - m_threads[id] = thread; - thread->start(); -- m_timer.start(500); - } - } - -@@ -266,7 +268,6 @@ - PollingThread *thread = new PollingThread(dev); - m_threads[id] = thread; - thread->start(); -- m_timer.start(500); - } - else if (m_threads.contains(id) && medium->isMounted()) - { -@@ -281,12 +282,6 @@ - void LinuxCDPolling::slotTimeout() - { - //kdDebug(1219) << "LinuxCDPolling::slotTimeout()" << endl; -- -- if (m_threads.isEmpty()) -- { -- m_timer.stop(); -- return; -- } - - QMap<QString, PollingThread*>::iterator it = m_threads.begin(); - QMap<QString, PollingThread*>::iterator end = m_threads.end(); -diff -urN kioslave/media/mediamanager/linuxcdpolling.h kioslave/media/mediamanager/linuxcdpolling.h ---- kioslave/media/mediamanager/linuxcdpolling.h Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/linuxcdpolling.h Mon Oct 10 17:04:01 2005 -@@ -24,7 +24,6 @@ - #include <qobject.h> - #include <qcstring.h> - #include <qmap.h> --#include <qtimer.h> - - class DiscType - { -@@ -80,7 +79,6 @@ - - QMap<QString, PollingThread*> m_threads; - QStringList m_excludeNotification; -- QTimer m_timer; - }; - - #endif -diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanager/mediamanager.cpp ---- kioslave/media/mediamanager/mediamanager.cpp Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/mediamanager.cpp Mon Oct 10 17:04:01 2005 -@@ -43,287 +43,201 @@ - MediaManager::MediaManager(const QCString &obj) - : KDEDModule(obj), m_dirNotify(m_mediaList) - { -- connect( &m_mediaList, SIGNAL(mediumAdded(const QString&, const QString&, bool)), -- SLOT(slotMediumAdded(const QString&, const QString&, bool)) ); -- connect( &m_mediaList, SIGNAL(mediumRemoved(const QString&, const QString&, bool)), -- SLOT(slotMediumRemoved(const QString&, const QString&, bool)) ); -- connect( &m_mediaList, -- SIGNAL(mediumStateChanged(const QString&, const QString&, bool, bool)), -- SLOT(slotMediumChanged(const QString&, const QString&, bool, bool)) ); -+ connect( &m_mediaList, SIGNAL(mediumAdded(const QString&, const QString&, bool)), -+ SLOT(slotMediumAdded(const QString&, const QString&, bool)) ); -+ connect( &m_mediaList, SIGNAL(mediumRemoved(const QString&, const QString&, bool)), -+ SLOT(slotMediumRemoved(const QString&, const QString&, bool)) ); -+ connect( &m_mediaList, -+ SIGNAL(mediumStateChanged(const QString&, const QString&, bool, bool)), -+ SLOT(slotMediumChanged(const QString&, const QString&, bool, bool)) ); - -- QTimer::singleShot( 10, this, SLOT( loadBackends() ) ); -+ QTimer::singleShot( 10, this, SLOT( loadBackends() ) ); - } - - MediaManager::~MediaManager() - { -- while ( !m_backends.isEmpty() ) -- { -- BackendBase *b = m_backends.first(); -- m_backends.remove( b ); -- delete b; -- } -+ while ( !m_backends.isEmpty() ) -+ { -+ BackendBase *b = m_backends.first(); -+ m_backends.remove( b ); -+ delete b; -+ } - } - - void MediaManager::loadBackends() - { - m_mediaList.blockSignals(true); - -- while ( !m_backends.isEmpty() ) -- { -- BackendBase *b = m_backends.first(); -- m_backends.remove( b ); -- delete b; -- } -- -- mp_removableBackend = 0L; -- m_halbackend = 0L; -- m_fstabbackend = 0L; -+ while ( !m_backends.isEmpty() ) -+ { -+ BackendBase *b = m_backends.first(); -+ m_backends.remove( b ); -+ delete b; -+ } -+ -+ mp_removableBackend = 0L; - - #ifdef COMPILE_HALBACKEND -- if ( MediaManagerSettings::self()->halBackendEnabled() ) -- { -- m_halbackend = new HALBackend(m_mediaList, this); -- if (m_halbackend->InitHal()) -- { -- m_backends.append( m_halbackend ); -- m_fstabbackend = new FstabBackend(m_mediaList, true); -- m_backends.append( m_fstabbackend ); -- // No need to load something else... -- m_mediaList.blockSignals(false); -- return; -- } -- else -- { -- delete m_halbackend; -- m_halbackend = 0; -- } -- } -+ if ( MediaManagerSettings::self()->halBackendEnabled() ) -+ { -+ HALBackend* hal_backend = new HALBackend(m_mediaList, this); -+ if (hal_backend->InitHal()) -+ { -+ m_backends.append( hal_backend ); -+ m_backends.append( new FstabBackend(m_mediaList, true) ); -+ // No need to load something else... -+ m_mediaList.blockSignals(false); -+ return; -+ } -+ else -+ { -+ delete hal_backend; -+ } -+ } - #endif // COMPILE_HALBACKEND - -- mp_removableBackend = new RemovableBackend(m_mediaList); -- m_backends.append( mp_removableBackend ); -+ mp_removableBackend = new RemovableBackend(m_mediaList); -+ m_backends.append( mp_removableBackend ); - - #ifdef COMPILE_LINUXCDPOLLING -- if ( MediaManagerSettings::self()->cdPollingEnabled() ) -- { -- m_backends.append( new LinuxCDPolling(m_mediaList) ); -- } -+ if ( MediaManagerSettings::self()->cdPollingEnabled() ) -+ { -+ m_backends.append( new LinuxCDPolling(m_mediaList) ); -+ } - #endif //COMPILE_LINUXCDPOLLING - -- m_fstabbackend = new FstabBackend(m_mediaList); -- m_backends.append( m_fstabbackend ); -- m_mediaList.blockSignals(false); -+ m_backends.append( new FstabBackend(m_mediaList) ); -+ m_mediaList.blockSignals(false); - } - - - QStringList MediaManager::fullList() - { -- QPtrList<Medium> list = m_mediaList.list(); -+ QPtrList<Medium> list = m_mediaList.list(); - -- QStringList result; -+ QStringList result; - -- QPtrList<Medium>::const_iterator it = list.begin(); -- QPtrList<Medium>::const_iterator end = list.end(); -- for (; it!=end; ++it) -- { -- result+= (*it)->properties(); -- result+= Medium::SEPARATOR; -- } -+ QPtrList<Medium>::const_iterator it = list.begin(); -+ QPtrList<Medium>::const_iterator end = list.end(); -+ for (; it!=end; ++it) -+ { -+ result+= (*it)->properties(); -+ result+= Medium::SEPARATOR; -+ } - -- return result; -+ return result; - } - - QStringList MediaManager::properties(const QString &name) - { -- const Medium *m = m_mediaList.findByName(name); -- -- if (!m) -- { -- KURL u(name); -- kdDebug() << "Media::prop " << name << " " << u.isValid() << endl; -- if (u.isValid()) -- { -- if (u.protocol() == "system") -- { -- QString path = u.path(); -- if (path.startsWith("/media/")) -- path = path.mid(strlen("/media/")); -- m = m_mediaList.findByName(path); -- kdDebug() << "findByName " << path << m << endl; -- } -- else if (u.protocol() == "media") -- { -- m = m_mediaList.findByName(u.filename()); -- kdDebug() << "findByName " << u.filename() << m << endl; -- } -- else if (u.protocol() == "file") -- { -- // look for the mount point -- QPtrList<Medium> list = m_mediaList.list(); -- QPtrList<Medium>::const_iterator it = list.begin(); -- QPtrList<Medium>::const_iterator end = list.end(); -- for (; it!=end; ++it) -- { -- kdDebug() << "comparing " << (*it)->mountPoint() << " " << u.path() << " " << (*it)->deviceNode() << endl; -- if ((*it)->mountPoint() == u.path() || (*it)->deviceNode() == u.path()) { -- m = *it; -- break; -- } -- } -- } -- } -- } -- -- if (m) -- return m->properties(); -- else -- return QStringList(); --} -+ const Medium *m = m_mediaList.findByName(name); - --QStringList MediaManager::mountoptions(const QString &name) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return QStringList(); -- return m_halbackend->mountoptions(name); --#else -- return QStringList(); --#endif --} -- --bool MediaManager::setMountoptions(const QString &name, const QStringList &options) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return false; -- return m_halbackend->setMountoptions(name, options); --#else -- return false; --#endif --} -- --QString MediaManager::mount(const QString &name) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return i18n("Feature only available with HAL"); -- return m_halbackend->mount(name); --#else -- if ( !m_fstabbackend ) // lying :) -- return i18n("Feature only available with HAL"); -- return m_fstabbackend->mount( name ); --#endif --} -- --QString MediaManager::unmount(const QString &name) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return i18n("Feature only available with HAL"); -- return m_halbackend->unmount(name); --#else -- if ( !m_fstabbackend ) // lying :) -- return i18n("Feature only available with HAL"); -- return m_fstabbackend->unmount( name ); --#endif -+ if (m!=0L) -+ { -+ return m->properties(); -+ } -+ else -+ { -+ return QStringList(); -+ } - } - - QString MediaManager::nameForLabel(const QString &label) - { -- const QPtrList<Medium> media = m_mediaList.list(); -+ const QPtrList<Medium> media = m_mediaList.list(); - -- QPtrList<Medium>::const_iterator it = media.begin(); -- QPtrList<Medium>::const_iterator end = media.end(); -- for (; it!=end; ++it) -- { -- const Medium *m = *it; -- -- if (m->prettyLabel()==label) -- { -- return m->name(); -- } -- } -+ QPtrList<Medium>::const_iterator it = media.begin(); -+ QPtrList<Medium>::const_iterator end = media.end(); -+ for (; it!=end; ++it) -+ { -+ const Medium *m = *it; -+ -+ if (m->prettyLabel()==label) -+ { -+ return m->name(); -+ } -+ } - -- return QString::null; -+ return QString::null; - } - - ASYNC MediaManager::setUserLabel(const QString &name, const QString &label) - { -- m_mediaList.setUserLabel(name, label); -+ m_mediaList.setUserLabel(name, label); - } - - ASYNC MediaManager::reloadBackends() - { -- MediaManagerSettings::self()->readConfig(); -- loadBackends(); -+ MediaManagerSettings::self()->readConfig(); -+ loadBackends(); - } - - bool MediaManager::removablePlug(const QString &devNode, const QString &label) - { -- if (mp_removableBackend) -- { -- return mp_removableBackend->plug(devNode, label); -- } -- return false; -+ if (mp_removableBackend) -+ { -+ return mp_removableBackend->plug(devNode, label); -+ } -+ return false; - } - - bool MediaManager::removableUnplug(const QString &devNode) - { -- if (mp_removableBackend) -- { -- return mp_removableBackend->unplug(devNode); -- } -- return false; -+ if (mp_removableBackend) -+ { -+ return mp_removableBackend->unplug(devNode); -+ } -+ return false; - } - - bool MediaManager::removableCamera(const QString &devNode) - { -- if (mp_removableBackend) -- { -- return mp_removableBackend->camera(devNode); -- } -- return false; -+ if (mp_removableBackend) -+ { -+ return mp_removableBackend->camera(devNode); -+ } -+ return false; - } - - - void MediaManager::slotMediumAdded(const QString &/*id*/, const QString &name, - bool allowNotification) - { -- kdDebug(1219) << "MediaManager::slotMediumAdded: " << name << endl; -+ kdDebug(1219) << "MediaManager::slotMediumAdded: " << name << endl; - -- KDirNotify_stub notifier("*", "*"); -- notifier.FilesAdded( KURL("media:/") ); -+ KDirNotify_stub notifier("*", "*"); -+ notifier.FilesAdded( KURL("media:/") ); - -- emit mediumAdded(name, allowNotification); -- emit mediumAdded(name); -+ emit mediumAdded(name, allowNotification); -+ emit mediumAdded(name); - } - - void MediaManager::slotMediumRemoved(const QString &/*id*/, const QString &name, - bool allowNotification) - { -- kdDebug(1219) << "MediaManager::slotMediumRemoved: " << name << endl; -+ kdDebug(1219) << "MediaManager::slotMediumRemoved: " << name << endl; - -- KDirNotify_stub notifier("*", "*"); -- notifier.FilesRemoved( KURL("media:/"+name) ); -+ KDirNotify_stub notifier("*", "*"); -+ notifier.FilesRemoved( KURL("media:/"+name) ); - -- emit mediumRemoved(name, allowNotification); -- emit mediumRemoved(name); -+ emit mediumRemoved(name, allowNotification); -+ emit mediumRemoved(name); - } - - void MediaManager::slotMediumChanged(const QString &/*id*/, const QString &name, - bool mounted, bool allowNotification) - { -- kdDebug(1219) << "MediaManager::slotMediumChanged: " << name << endl; -+ kdDebug(1219) << "MediaManager::slotMediumChanged: " << name << endl; - -- KDirNotify_stub notifier("*", "*"); -- if (!mounted) -- { -- notifier.FilesRemoved( KURL("media:/"+name) ); -- } -- notifier.FilesChanged( KURL("media:/"+name) ); -+ KDirNotify_stub notifier("*", "*"); -+ if (!mounted) -+ { -+ notifier.FilesRemoved( KURL("media:/"+name) ); -+ } -+ notifier.FilesChanged( KURL("media:/"+name) ); - -- emit mediumChanged(name, allowNotification); -- emit mediumChanged(name); -+ emit mediumChanged(name, allowNotification); -+ emit mediumChanged(name); - } - - -diff -urN kioslave/media/mediamanager/mediamanager.desktop kioslave/media/mediamanager/mediamanager.desktop ---- kioslave/media/mediamanager/mediamanager.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/mediamanager.desktop Tue May 23 13:33:34 2006 -@@ -16,13 +16,11 @@ - Name[es]=Administrador de recursos KDED - Name[et]=KDED andmekandjate haldur - Name[eu]=KDED media kudeatzailea --Name[fa]=مدیر رسانه KDED - Name[fi]=KDED-tallennusmedianhallinta - Name[fr]=Gestionnaire de médias KDED - Name[fy]=KDEDED-mediabehearder - Name[ga]=Bainisteoir Meán KDED - Name[gl]=Xestor de Meios de KDED --Name[he]=מנהל המדיה של KDED - Name[hi]=केडीईडी मीडिया प्रबंधक - Name[hr]=KDED upravitelj medija - Name[hu]=KDED médiakezelő -@@ -45,7 +43,6 @@ - Name[ru]=Управление подключаемыми устройствами - Name[rw]=Mugenga Igihuza KDED - Name[se]=KDED-mediagieđahalli --Name[sk]=KDED správca médií - Name[sl]=Upravitelj medijev KDED - Name[sr]=Менаџер медијума, KDED - Name[sr@Latn]=Menadžer medijuma, KDED -@@ -73,18 +70,16 @@ - Comment[es]=Monitoriza las actividades de los recursos y permite (des)montarlos (media:/) - Comment[et]=Hoiab silma peal andmekandjate aktiivsusel ja võimaldab neid ühendada/lahutada (media:/) - Comment[eu]=Montatzeak begiztatzen ditu (media:/) eta desmontatzen uzten du --Comment[fa]=حفظ رد فعالیتهای رسانه و اجازه سو ار(پیاده) کردن (media:/) - Comment[fi]=Pidä kirjaa tallennustapahtumista ja salli tallennusvälineen liittäminen/irrotus (devices:/) - Comment[fr]=Gardez une trace des montages et permettre le (dé)montage (media:/) - Comment[fy]=Hâld de media-aktiviteiten by en stien ta om media oan- en ôf te keppelje (media:/) - Comment[gl]=Seguimento das actividades dos meios e permite-lle (des)montar (media:/) --Comment[he]=מנטר אחר פעילויות מדיה, ומאפשר לחבר או לנתק התקנים (media:/) - Comment[hi]=मीडिया क्रियाओं की जानकारी रखे तथा (अन)माउन्ट करने दे (मीडिया:/) - Comment[hr]=Praćenje aktivnosti medija i omogućavanje pristupanja i napuštanja - Comment[hu]=Az adathordozók követése, csatlakoztatása és leválasztása (media:/) - Comment[is]=Fylgjast með breytingum á tækjum og bjóða upp á (af)tengingu (media:/) - Comment[it]=Tiene traccia delle attività dei supporti e permette di montarli o smontarli (device:/) --Comment[ja]=メディアの活動を追跡し、(media:/) をマウントしたりアンマウントします -+Comment[ja]=メディアの活動を捕捉し、マウントしたりアンマウントします。(media:/) - Comment[km]=តាមដានសកម្មភាពព័ត៌មាន និងអនុញ្ញាតឲ្យរៀបចំ (មិនរៀបចំ) (media:/) - Comment[lt]=Stebi laikmenose vykdomus veiksmus ir leidžia (iš)montuoti (media:/) - Comment[lv]=Seko datu nesēju aktivitātēm un ļauj montēt/nomontēt tos (media:/) -@@ -103,7 +98,6 @@ - Comment[ru]=Автоматическое подключение устройств (media:/) - Comment[rw]=Kugumana inzira y'ibikorwa by'ibitangazamakuru no kwemerera gushyiramo(gukuramo) (ibitangazamakuru:/) - Comment[se]=Gozit mii dáhpáhuvvá median ja diktá du gálgat ja čadnat daid (media:/) --Comment[sk]=Sledovanie pripojenia/odpojenia medií (media:/) - Comment[sl]=Nadzoruj dejanja medija in dovilo priklop/odklop (media:/) - Comment[sr]=Прати активност медијума и омогућава (де)монтирање (media:/) - Comment[sr@Latn]=Prati aktivnost medijuma i omogućava (de)montiranje (media:/) -@@ -122,4 +116,3 @@ - X-KDE-FactoryName=mediamanager - X-KDE-Kded-autoload=true - X-KDE-Kded-load-on-demand=true --X-KDE-Kded-phase=1 -diff -urN kioslave/media/mediamanager/mediamanager.h kioslave/media/mediamanager/mediamanager.h ---- kioslave/media/mediamanager/mediamanager.h Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/mediamanager.h Mon Oct 10 17:04:01 2005 -@@ -28,8 +28,6 @@ - #include "removablebackend.h" - #include "mediadirnotify.h" - --class HALBackend; --class FstabBackend; - - class MediaManager : public KDEDModule - { -@@ -42,12 +40,6 @@ - k_dcop: - QStringList fullList(); - QStringList properties(const QString &name); -- QStringList mountoptions(const QString &name); -- bool setMountoptions(const QString &name, const QStringList &options); -- -- QString mount(const QString &uid); -- QString unmount(const QString &uid); -- - QString nameForLabel(const QString &label); - ASYNC setUserLabel(const QString &name, const QString &label); - -@@ -82,9 +74,7 @@ - MediaList m_mediaList; - QValueList<BackendBase*> m_backends; - RemovableBackend *mp_removableBackend; -- HALBackend *m_halbackend; - MediaDirNotify m_dirNotify; -- FstabBackend *m_fstabbackend; - }; - - #endif -diff -urN kioslave/media/medianotifier/Makefile.in kioslave/media/medianotifier/Makefile.in ---- kioslave/media/medianotifier/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/medianotifier/Makefile.in Fri May 26 09:54:31 2006 -@@ -254,6 +254,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/medianotifier/medianotifier.cpp kioslave/media/medianotifier/medianotifier.cpp ---- kioslave/media/medianotifier/medianotifier.cpp Sun Oct 1 19:31:53 2006 -+++ kioslave/media/medianotifier/medianotifier.cpp Fri Mar 17 11:17:33 2006 -@@ -48,21 +48,13 @@ - - MediaNotifier::~MediaNotifier() - { -- disconnectDCOPSignal( "kded", "mediamanager", "mediumAdded(QString, bool)", -- "onMediumChange(QString, bool)" ); -- -- disconnectDCOPSignal( "kded", "mediamanager", "mediumChanged(QString, bool)", -- "onMediumChange(QString, bool)" ); - } - - void MediaNotifier::onMediumChange( const QString &name, bool allowNotification ) - { - kdDebug() << "MediaNotifier::onMediumChange( " << name << ", " - << allowNotification << ")" << endl; -- -- if ( !allowNotification ) -- return; -- -+ - // Update user activity timestamp, otherwise the notification dialog will be shown - // in the background due to focus stealing prevention. Entering a new media can - // be seen as a kind of user activity after all. It'd be better to update the timestamp -@@ -103,11 +95,11 @@ - { - QString mimetype = medium.mimetype(); - -- bool is_cdrom = mimetype.startsWith( "cd" ) || mimetype.startsWith( "dvd" ); -+ bool is_cdrom = mimetype.contains( "cd" ) || mimetype.contains( "dvd" ); - bool is_mounted = mimetype.endsWith( "_mounted" ); - - // We autorun only on CD/DVD or removable disks (USB, Firewire) -- if ( !( is_cdrom || is_mounted ) -+ if ( !( is_cdrom && is_mounted ) - && mimetype!="media/removable_mounted" ) - { - return false; -diff -urN kioslave/media/medianotifier/medianotifier.desktop kioslave/media/medianotifier/medianotifier.desktop ---- kioslave/media/medianotifier/medianotifier.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/medianotifier/medianotifier.desktop Mon May 22 20:12:42 2006 -@@ -18,12 +18,10 @@ - Name[es]=Demonio de notificaciones de medios - Name[et]=Andmekandjate märguannete deemon - Name[eu]=Euskarrien jakinarazpen daemon-a --Name[fa]=شبح اخطاردهنده رسانه - Name[fi]=Mediahuomautin - Name[fr]=Démon de notifications des média - Name[fy]=Medianotifikaasje-daemon - Name[gl]=Daemon Notificador de Medios --Name[he]=שירות הודעות מערכת - Name[hr]=Demon obavijesti o medijima - Name[hu]=Lemezfigyelő szolgáltatás - Name[is]=Miðils tilkynningarpúki -@@ -34,12 +32,10 @@ - Name[nb]=Medievarslingsnisse - Name[nds]=Medien-Narichtendämoon - Name[nl]=Medianotificatie-daemon --Name[nn]=Mediepåminningsnisse - Name[pl]=Usługa powiadamiania o nośnikach - Name[pt]=Servidor de Notificação de Dispositivos - Name[pt_BR]=Servidor de Notificação de Dispositivos - Name[ru]=Демон уведомлений от подключаемых устройств --Name[sk]=Notifikátor medií - Name[sl]=Demon za obveščanje o nosilcih - Name[sr]=Демон за обавештења о медијумима - Name[sr@Latn]=Demon za obaveštenja o medijumima -@@ -47,7 +43,6 @@ - Name[uk]=Даемон сповіщення про носії інформації - Name[vi]=Trình nền Thông báo Ổ lưu trữ - Name[zh_CN]=介质通知守护程序 --Name[zh_TW]=媒體通知伺服程式 - Comment=A media plugged notifier - Comment[af]='n Inpropbare media inkennissteller - Comment[bg]=Мултимедиен демон за уведомяване при поставяне/включване на ново мултимедийно устройство -@@ -61,7 +56,6 @@ - Comment[es]=Un notificador de medios empotrable - Comment[et]=Andmekandja ühendamisest märkuandev deemon - Comment[eu]=Euskarri konektatze jakinarazlea --Comment[fa]=یک اخطاردهنده وصلشده رسانه - Comment[fi]=Liitetyn median huomautin - Comment[fr]=Notification de connexion de média - Comment[fy]=Meidieling fan oankeppele media -@@ -70,7 +64,7 @@ - Comment[hu]=Lemezérzékelő - Comment[is]=Tilkynnari um tengda miðla - Comment[it]=Notifiche dei dispositivi attaccati --Comment[ja]=メディアの接続を通知します -+Comment[ja]=メディアの接続を通知する - Comment[lt]=Perspėjimo apie media prijungimą priedas - Comment[mk]=Известување за приклучен медиум - Comment[nb]=En medievarsler som programtillegg -@@ -82,7 +76,6 @@ - Comment[pt]=Um notificador ligado aos dispositivos - Comment[pt_BR]=um notificador para mídia que é espetada (plug) - Comment[ru]=Система обработки уведомлений от подключаемых устройств --Comment[sk]=Notifikátor pripojených médií - Comment[sl]=Obveščanje o vstavljenih/priklopljenih nosilcih - Comment[sr]=Обавештавач о укљученим медијима - Comment[sr@Latn]=Obaveštavač o uključenim medijima -diff -urN kioslave/media/medianotifier/notificationdialog.cpp kioslave/media/medianotifier/notificationdialog.cpp ---- kioslave/media/medianotifier/notificationdialog.cpp Sat Oct 7 16:23:12 2006 -+++ kioslave/media/medianotifier/notificationdialog.cpp Mon Oct 10 17:04:00 2005 -@@ -26,7 +26,6 @@ - #include <klistbox.h> - #include <qlabel.h> - #include <qcheckbox.h> --#include <qpushbutton.h> - - #include "actionlistboxitem.h" - #include "notificationdialogview.h" -@@ -71,8 +70,6 @@ - this, SLOT( delayedDestruct() ) ); - - m_actionWatcher->startScan(); -- QPushButton * btn = actionButton( Ok ); -- btn->setFocus(); - } - - NotificationDialog::~NotificationDialog() -diff -urN kioslave/media/mimetypes/Makefile.in kioslave/media/mimetypes/Makefile.in ---- kioslave/media/mimetypes/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/mimetypes/Makefile.in Fri May 26 09:54:31 2006 -@@ -211,6 +211,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/mimetypes/audiocd.desktop kioslave/media/mimetypes/audiocd.desktop ---- kioslave/media/mimetypes/audiocd.desktop Mon Oct 2 12:44:33 2006 -+++ kioslave/media/mimetypes/audiocd.desktop Mon May 22 20:12:42 2006 -@@ -11,7 +11,6 @@ - Comment[cs]=Zvukové CD - Comment[da]=Lyd-cd - Comment[el]=CD ήχου --Comment[fa]=دیسک فشرده صوتی - Comment[fi]=CD-äänilevy - Comment[fr]=CD audio - Comment[fy]=Audio-Kompaktskiif -@@ -25,7 +24,6 @@ - Comment[it]=CD audio - Comment[ja]=オーディオ CD - Comment[km]=ស៊ីឌីអូឌីយ៉ូ --Comment[mk]=Аудио ЦД - Comment[ms]=CD Audio - Comment[nb]=Lyd-CD - Comment[nds]=Audio-CD -@@ -33,7 +31,7 @@ - Comment[nn]=Lyd-CD - Comment[pa]=ਆਡੀਓ CD - Comment[pl]=Płyta CD Audio --Comment[pt]=CD de áudio -+Comment[pt]=CD áudio - Comment[pt_BR]=CD de Áudio - Comment[ro]=CD Audio - Comment[ru]=Аудио CD -diff -urN kioslave/media/mimetypes/blankcd.desktop kioslave/media/mimetypes/blankcd.desktop ---- kioslave/media/mimetypes/blankcd.desktop Mon Oct 2 12:44:33 2006 -+++ kioslave/media/mimetypes/blankcd.desktop Mon May 22 20:12:43 2006 -@@ -16,7 +16,6 @@ - Comment[es]=CD vacío - Comment[et]=Tühi CD - Comment[eu]=CD hutsik --Comment[fa]=دیسک فشرده خام - Comment[fi]=Tyhjä CD - Comment[fr]=CD vierge - Comment[fy]=Blanke Kompaktskiif -@@ -32,7 +31,6 @@ - Comment[km]=ស៊ីឌីទទេ - Comment[lt]=Tuščias CD - Comment[lv]=Tukšs CD --Comment[mk]=Празно ЦД - Comment[ms]=CD Kosong - Comment[nb]=Tom CD - Comment[nds]=Leddige CD -@@ -46,7 +44,6 @@ - Comment[ru]=Чистый CD - Comment[rw]=CD Itanditseho - Comment[se]=Guorus CD --Comment[sk]=Čisté CD - Comment[sl]=Prazen CD - Comment[sr]=Празан CD - Comment[sr@Latn]=Prazan CD -diff -urN kioslave/media/mimetypes/blankdvd.desktop kioslave/media/mimetypes/blankdvd.desktop ---- kioslave/media/mimetypes/blankdvd.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/blankdvd.desktop Mon May 22 20:12:42 2006 -@@ -16,7 +16,6 @@ - Comment[es]=DVD vacío - Comment[et]=Tühi DVD - Comment[eu]=DVD hutsik --Comment[fa]=DVD خام - Comment[fi]=Tyhjä DVD-levy - Comment[fr]=DVD vierge - Comment[fy]=Blanke Dûbelskiif -@@ -32,7 +31,6 @@ - Comment[km]=ឌីវីឌីទទេ - Comment[lt]=Tuščias DVD - Comment[lv]=Tukšs DVD --Comment[mk]=Празно DVD - Comment[ms]=DVD Kosong - Comment[nb]=Tom DVD - Comment[nds]=Leddige DVD -@@ -46,7 +44,6 @@ - Comment[ru]=Чистый DVD - Comment[rw]=DVD Itanditseho - Comment[se]=Guorus DVD --Comment[sk]=Čisté DVD - Comment[sl]=Prazen DVD - Comment[sr]=Празан DVD - Comment[sr@Latn]=Prazan DVD -diff -urN kioslave/media/mimetypes/camera_mounted.desktop kioslave/media/mimetypes/camera_mounted.desktop ---- kioslave/media/mimetypes/camera_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/camera_mounted.desktop Mon May 22 20:12:42 2006 -@@ -16,7 +16,6 @@ - Comment[es]=Cámara montada - Comment[et]=Ühendatud kaamera - Comment[eu]=Kamara muntatuta --Comment[fa]=دوربین سوارشده - Comment[fi]=Liitetty kamera - Comment[fr]=Appareil photo monté - Comment[fy]=Oankeppele kamera -@@ -41,7 +40,6 @@ - Comment[pt_BR]=Câmera montada - Comment[ru]=Подключённая камера - Comment[se]=Čatnon govvenapperáhtta --Comment[sk]=Pripojený digitálny fotoaparát - Comment[sl]=Priklopljen fotoaparat - Comment[sr]=Монтирана камера - Comment[sr@Latn]=Montirana kamera -diff -urN kioslave/media/mimetypes/camera_unmounted.desktop kioslave/media/mimetypes/camera_unmounted.desktop ---- kioslave/media/mimetypes/camera_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/camera_unmounted.desktop Mon May 22 20:12:42 2006 -@@ -16,7 +16,6 @@ - Comment[es]=Cámara desmontada - Comment[et]=Lahutatud kaamera - Comment[eu]=Kamara desmuntatua --Comment[fa]=دوربین پیادهشده - Comment[fi]=Irrotettu kamera - Comment[fr]=Appareil photo non monté - Comment[fy]=Ofkeppele kamera -@@ -41,7 +40,6 @@ - Comment[pt_BR]=Câmera desmontada - Comment[ru]=Неподключённая камера - Comment[se]=Gálgajuvvon govvenapperáhtta --Comment[sk]=Odpojený digitálny fotoaparát - Comment[sl]=Odklopljen fotoaparat - Comment[sr]=Демонтирана камера - Comment[sr@Latn]=Demontirana kamera -diff -urN kioslave/media/mimetypes/cdrom_mounted.desktop kioslave/media/mimetypes/cdrom_mounted.desktop ---- kioslave/media/mimetypes/cdrom_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/cdrom_mounted.desktop Mon May 22 20:12:43 2006 -@@ -21,7 +21,7 @@ - Comment[es]=CD-ROM montado - Comment[et]=Ühendatud CD-ROM - Comment[eu]=CD-ROM muntatua --Comment[fa]=CD-ROM سوارشده -+Comment[fa]=CD سوار شده - Comment[fi]=Liitetty CD-ROM - Comment[fr]=CD-ROM monté - Comment[fy]=Oankeppele Kompaktskiif -diff -urN kioslave/media/mimetypes/cdrom_unmounted.desktop kioslave/media/mimetypes/cdrom_unmounted.desktop ---- kioslave/media/mimetypes/cdrom_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/cdrom_unmounted.desktop Mon May 22 20:12:43 2006 -@@ -21,7 +21,7 @@ - Comment[es]=CD-ROM desmontado - Comment[et]=Lahutatud CD-ROM - Comment[eu]=CD-ROM desmuntatua --Comment[fa]=CD-ROM پیادهشده -+Comment[fa]= CD پیاده شده - Comment[fi]=Irrotettu CD-ROM - Comment[fr]=CD-ROM non monté - Comment[fy]=Ofkeppele Kompaktskiif -diff -urN kioslave/media/mimetypes/cdwriter_mounted.desktop kioslave/media/mimetypes/cdwriter_mounted.desktop ---- kioslave/media/mimetypes/cdwriter_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/cdwriter_mounted.desktop Mon May 22 20:12:42 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Escritor de CDs montado - Comment[et]=Ühendatud CD kirjutaja - Comment[eu]=CD erretzaile muntatua --Comment[fa]=CD Writer سوارشده -+Comment[fa]=CD Writer سوار شده - Comment[fi]=Liitetty CD-kirjoitin - Comment[fr]=Graveur de CD monté - Comment[fy]=Oankeppele Kompaktskiif -diff -urN kioslave/media/mimetypes/cdwriter_unmounted.desktop kioslave/media/mimetypes/cdwriter_unmounted.desktop ---- kioslave/media/mimetypes/cdwriter_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/cdwriter_unmounted.desktop Mon May 22 20:12:42 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Escritor de CDs desmontado - Comment[et]=Lahutatud CD kirjutaja - Comment[eu]=CD erretzaile desmuntatua --Comment[fa]=CD Writer پیادهشده -+Comment[fa]=CD Writer پیاده شده - Comment[fi]=Irrotettu CD-kirjoitin - Comment[fr]=Graveur de CD non monté - Comment[fy]=Ofkeppele Kompaktskiif -diff -urN kioslave/media/mimetypes/dvd_mounted.desktop kioslave/media/mimetypes/dvd_mounted.desktop ---- kioslave/media/mimetypes/dvd_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/dvd_mounted.desktop Mon May 22 20:12:42 2006 -@@ -21,7 +21,7 @@ - Comment[es]=DVD montado - Comment[et]=Ühendatud DVD - Comment[eu]=DVD muntatua --Comment[fa]=DVD سوارشده -+Comment[fa]=DVD سوار شده - Comment[fi]=Liitetty DVD-levy - Comment[fr]=DVD-ROM monté(s) - Comment[fy]=Oankeppele Dûbelskiif -diff -urN kioslave/media/mimetypes/dvd_unmounted.desktop kioslave/media/mimetypes/dvd_unmounted.desktop ---- kioslave/media/mimetypes/dvd_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/dvd_unmounted.desktop Tue May 23 13:33:34 2006 -@@ -21,7 +21,7 @@ - Comment[es]=DVD desmontado - Comment[et]=Lahutatud DVD - Comment[eu]=DVD desmuntatua --Comment[fa]=DVD پیادهشده -+Comment[fa]=DVD پیاده شده - Comment[fi]=Irrotettu DVD-levy - Comment[fr]=DVD-ROM non monté(s) - Comment[fy]=Ofkeppele Dûbelskiif -diff -urN kioslave/media/mimetypes/dvdvideo.desktop kioslave/media/mimetypes/dvdvideo.desktop ---- kioslave/media/mimetypes/dvdvideo.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/dvdvideo.desktop Mon May 22 20:12:43 2006 -@@ -16,7 +16,6 @@ - Comment[es]=Disco de video DVD - Comment[et]=DVD videoplaat - Comment[eu]=DVD bideo diska --Comment[fa]=دیسک ویدئویی DVD - Comment[fi]=DVD-videolevy - Comment[fr]=DVD vidéo - Comment[fy]=Dûbelskiif Fideoskiif -@@ -32,7 +31,6 @@ - Comment[km]=ថាសវីដេអូ ឌីវីឌី - Comment[lt]=DVD video diskas - Comment[lv]=DVD Video Disks --Comment[mk]=DVD Видеодиск - Comment[ms]=Cakera Video DVD - Comment[nb]=DVD-videoplate - Comment[nds]=DVD-Videodisk -@@ -40,13 +38,12 @@ - Comment[nn]=DVD-videoplate - Comment[pa]=DVD ਵੀਡਿਓ ਡਿਸਕ - Comment[pl]=Płyta DVD Video --Comment[pt]=Disco DVD de Vídeo -+Comment[pt]=Disco DVD Vídeo - Comment[pt_BR]=DVD de vídeo - Comment[ro]=Disc video DVD - Comment[ru]=DVD с видео - Comment[rw]=Disiki Videwo DVD - Comment[se]=DVD-videoskearru --Comment[sk]=DVD Video disk - Comment[sl]=DVD Video disk - Comment[sr]=DVD видео диск - Comment[sr@Latn]=DVD video disk -diff -urN kioslave/media/mimetypes/floppy5_mounted.desktop kioslave/media/mimetypes/floppy5_mounted.desktop ---- kioslave/media/mimetypes/floppy5_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/floppy5_mounted.desktop Mon May 22 20:12:42 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disquete 5¼" montado - Comment[et]=Ühendatud 5¼" flopi - Comment[eu]=5¼"ko diskete muntatua --Comment[fa]=فلاپی 5¼" سوارشده -+Comment[fa]=فلاپی 5¼"سوار شده - Comment[fi]=Liitetty 5¼"-levyke - Comment[fr]=Disquette 5¼" montée - Comment[fy]=Oankeppele 5¼" Skiif -diff -urN kioslave/media/mimetypes/floppy5_unmounted.desktop kioslave/media/mimetypes/floppy5_unmounted.desktop ---- kioslave/media/mimetypes/floppy5_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/floppy5_unmounted.desktop Tue May 23 13:33:35 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disquete 5¼" desmontado - Comment[et]=Lahutatud 5¼" flopi - Comment[eu]=5¼"ko diskete desmuntatua --Comment[fa]=فلاپی 5¼" پیادهشده -+Comment[fa]=فلاپی 5¼" پیاده شده - Comment[fi]=Irrotettu 5¼"-levyke - Comment[fr]=Disquette 5¼" non montée - Comment[fy]=Ofkeppele 5¼" Skiif -diff -urN kioslave/media/mimetypes/floppy_mounted.desktop kioslave/media/mimetypes/floppy_mounted.desktop ---- kioslave/media/mimetypes/floppy_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/floppy_mounted.desktop Mon May 22 20:12:43 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disquete montado - Comment[et]=Ühendatud flopi - Comment[eu]=Diskete muntatua --Comment[fa]=فلاپی سوارشده -+Comment[fa]=فلاپی سوار شده - Comment[fi]=Liitetty levyke - Comment[fr]=Disquette montée - Comment[fy]=Oankeppele Skiif -diff -urN kioslave/media/mimetypes/floppy_unmounted.desktop kioslave/media/mimetypes/floppy_unmounted.desktop ---- kioslave/media/mimetypes/floppy_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/floppy_unmounted.desktop Tue May 23 13:33:34 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disquete desmontado - Comment[et]=Lahutatud flopi - Comment[eu]=Diskete desmuntatua --Comment[fa]=فلاپی پیادهشده -+Comment[fa]=فلاپی پیاده شده - Comment[fi]=Irrotettu levyke - Comment[fr]=Disquette non montée - Comment[fy]=Ofkeppele Skiif -diff -urN kioslave/media/mimetypes/gphoto2camera.desktop kioslave/media/mimetypes/gphoto2camera.desktop ---- kioslave/media/mimetypes/gphoto2camera.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/gphoto2camera.desktop Mon May 22 20:12:43 2006 -@@ -18,7 +18,6 @@ - Comment[es]=Cámara - Comment[et]=Kaamera - Comment[eu]=Kamara --Comment[fa]=دوربین - Comment[fi]=Kamera - Comment[fr]=Nouvel appareil photo - Comment[fy]=Kamera -@@ -41,13 +40,12 @@ - Comment[nn]=Kamera - Comment[pa]=ਕੈਮਰਾ - Comment[pl]=Aparat fotograficzny --Comment[pt]=Máquina fotográfica -+Comment[pt]=Máquina Fotográfica - Comment[pt_BR]=Câmera - Comment[ro]=Aparat foto - Comment[ru]=Камера - Comment[rw]=Kamera - Comment[se]=Govvanaperáhtta --Comment[sk]=Digitálny fotoaparát - Comment[sl]=Fotoaparat - Comment[sr]=Камера - Comment[sr@Latn]=Kamera -diff -urN kioslave/media/mimetypes/hdd_mounted.desktop kioslave/media/mimetypes/hdd_mounted.desktop ---- kioslave/media/mimetypes/hdd_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/hdd_mounted.desktop Mon May 22 20:12:43 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Volumen de disco duro montado - Comment[et]=Ühendatud kõvaketta partitsioon - Comment[eu]=Diska gogorraren zatiketa muntatua --Comment[fa]=حجم دیسک سخت سوارشده - Comment[fi]=Liitetty kiintoleyosio - Comment[fr]=Partition de disque dur montée - Comment[fy]=Oankeppele Fêsteskiif folume -@@ -44,13 +43,12 @@ - Comment[nn]=Montert harddiskvolum - Comment[pa]=ਮਾਊਟ ਕੀਤਾ ਹਾਰਡ ਡਿਸਕ ਭਾਗ - Comment[pl]=Zamontowana partycja dysku twardego --Comment[pt]=Volume de disco rígido montado -+Comment[pt]=Volume de Disco Rígido Montado - Comment[pt_BR]=Volume do HD Montado - Comment[ro]=Volum de hard disc montat - Comment[ru]=Смонтированный раздел жёсткого диска - Comment[rw]=Ububiko Disiki Bwashyizwemo - Comment[se]=Čatnon garraskearrooassi --Comment[sk]=Pripojený oddiel pevného disku - Comment[sl]=Priklopljen pogon trdega diska - Comment[sr]=Монтирана партиција хард диска - Comment[sr@Latn]=Montirana particija hard diska -diff -urN kioslave/media/mimetypes/hdd_unmounted.desktop kioslave/media/mimetypes/hdd_unmounted.desktop ---- kioslave/media/mimetypes/hdd_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/hdd_unmounted.desktop Mon May 22 20:12:43 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Volumen de disco duro desmontado - Comment[et]=Lahutatud kõvaketta partitsioon - Comment[eu]=Diska gogorraren zatiketa desmuntatua --Comment[fa]=حجم دیسک سخت پیاده شده - Comment[fi]=Irrotettu kiintolevyosio - Comment[fr]=Partition de disque dur non montée - Comment[fy]=Ofkeppele Fêsteskiif folume -@@ -44,13 +43,12 @@ - Comment[nn]=Umontert harddiskvolum - Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ ਹਾਰਡ ਡਿਸਕ ਭਾਗ - Comment[pl]=Odmontowana partycja dysku twardego --Comment[pt]=Volume de disco rígido desmontado -+Comment[pt]=Volume de Disco Rígido Desmontado - Comment[pt_BR]=Volume do HD Desmontado - Comment[ro]=Volum de hard disc nemontat - Comment[ru]=Отмонтированный раздел жёсткого диска - Comment[rw]=Ububiko Disiki Bwakuwemo - Comment[se]=Gálgajuvvon garraskearrooassi --Comment[sk]=Odpojený oddiel pevného disku - Comment[sl]=Odklopljen pogon trdega diska - Comment[sr]=Демонтирана партиција хард диска - Comment[sr@Latn]=Demontirana particija hard diska -diff -urN kioslave/media/mimetypes/nfs_mounted.desktop kioslave/media/mimetypes/nfs_mounted.desktop ---- kioslave/media/mimetypes/nfs_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/nfs_mounted.desktop Tue May 23 13:33:34 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Recurso NFS montado - Comment[et]=Ühendatud NFS ressurss - Comment[eu]=NFS baliabide muntatua --Comment[fa]=مشترک NFS سوارشده - Comment[fi]=Liitetty NFS-jako - Comment[fr]=Ressource NFS montée - Comment[fy]=Oankeppele NFS-boarne -@@ -44,13 +43,12 @@ - Comment[nn]=Montert delt NFS-ressurs - Comment[pa]=ਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਝ - Comment[pl]=Zamontowany system plików NFS --Comment[pt]=Partilha de NFS montada -+Comment[pt]=Partilha de NFS Montada - Comment[pt_BR]=Volume NFS Montado - Comment[ro]=Partajare NFS montată - Comment[ru]=Смонтированный ресурс NFS - Comment[rw]=Umugabane NFS Washyizwemo - Comment[se]=Čatnon NFS-resursa --Comment[sk]=Pripojený zdroj NFS - Comment[sl]=Priklopljen vir NFS - Comment[sr]=Монтирано NFS дељење - Comment[sr@Latn]=Montirano NFS deljenje -diff -urN kioslave/media/mimetypes/nfs_unmounted.desktop kioslave/media/mimetypes/nfs_unmounted.desktop ---- kioslave/media/mimetypes/nfs_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/nfs_unmounted.desktop Tue May 23 13:33:35 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Recurso NFS desmontado - Comment[et]=Lahutatud NFS ressurss - Comment[eu]=NFS baliabide desmuntatua --Comment[fa]=مشترک NFS پیاده شده - Comment[fi]=Irrotettu NFS-jako - Comment[fr]=Ressource NFS non montée - Comment[fy]=Oankeppele NFS-boarne -@@ -44,13 +43,12 @@ - Comment[nn]=Umontert delt NFS-ressurs - Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਝ - Comment[pl]=Odmontowany system plików NFS --Comment[pt]=Partilha de NFS desmontada -+Comment[pt]=Partilha de NFS Desmontada - Comment[pt_BR]=Volume NFS Desmontado - Comment[ro]=Partajare NFS nemontată - Comment[ru]=Отмонтированный ресурс NFS - Comment[rw]=Umugabane NFS Wakuwemo - Comment[se]=Gálgajuvvon NFS-resursa --Comment[sk]=Odpojený zdroj NFS - Comment[sl]=Odklopljen vir NFS - Comment[sr]=Демонтирано NFS дељење - Comment[sr@Latn]=Demontirano NFS deljenje -diff -urN kioslave/media/mimetypes/removable_mounted.desktop kioslave/media/mimetypes/removable_mounted.desktop ---- kioslave/media/mimetypes/removable_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/removable_mounted.desktop Mon May 22 20:12:42 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Recurso extraíble montado - Comment[et]=Ühendatud eemaldatav andmekandja - Comment[eu]=Euskarri aldagarria muntatua --Comment[fa]=رسانه برداشتنی سوارشده - Comment[fi]=Liitetty irrotettava resurssi - Comment[fr]=Média amovible monté - Comment[fy]=Oankeppele ferwiderber medium -@@ -44,13 +43,12 @@ - Comment[nn]=Montert flyttbart medium - Comment[pa]=ਮਾਊਟ ਕੀਤੇ ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ - Comment[pl]=Zamontowany nośnik wymienny --Comment[pt]=Dispositivo amovível montado -+Comment[pt]=Dispositivo Amovível Montado - Comment[pt_BR]=Mídia Removível Montada - Comment[ro]=Mediu amovibil montat - Comment[ru]=Смонтированный внешний диск - Comment[rw]=Igitangazamakuru Kivanwamo Cyashyizwemo - Comment[se]=Čátnon sirdehahtti medium --Comment[sk]=Pripojené vyberateľné médium - Comment[sl]=Priklopljen odstranljiv medij - Comment[sr]=Монтиран уклоњиви медијум - Comment[sr@Latn]=Montiran uklonjivi medijum -diff -urN kioslave/media/mimetypes/removable_unmounted.desktop kioslave/media/mimetypes/removable_unmounted.desktop ---- kioslave/media/mimetypes/removable_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/removable_unmounted.desktop Mon May 22 20:12:42 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Recurso extraíble desmontado - Comment[et]=Lahutatud eemaldatav andmekandja - Comment[eu]=Euskarri aldagarria desmuntatua --Comment[fa]=رسانه برداشتنی پیاده شده - Comment[fi]=Irrotettu irrotettava resurssi - Comment[fr]=Média amovible non monté - Comment[fy]=Ofkeppele ferwiderber medium -@@ -44,13 +43,12 @@ - Comment[nn]=Umontert flyttbart medium - Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ - Comment[pl]=Odmontowany nośnik wymienny --Comment[pt]=Dispositivo amovível desmontado -+Comment[pt]=Dispositivo Amovível Desmontado - Comment[pt_BR]=Mídia Removível Desmontada - Comment[ro]=Mediu amovibil nemontat - Comment[ru]=Отмонтированный внешний диск - Comment[rw]=Igitangazamakuru Kivanwamo Cyavanwemo - Comment[se]=Gálgaduvvon sirdehahtti medium --Comment[sk]=Odpojené vyberateľné médium - Comment[sl]=Odklopljen odstranljiv medij - Comment[sr]=Демонтиран уклоњиви медијум - Comment[sr@Latn]=Demontiran uklonjivi medijum -diff -urN kioslave/media/mimetypes/smb_mounted.desktop kioslave/media/mimetypes/smb_mounted.desktop ---- kioslave/media/mimetypes/smb_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/smb_mounted.desktop Tue May 23 13:33:34 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Recurso de Samba montado (Red de Microsoft) - Comment[et]=Ühendatud Samba (Microsoft Network) ressurss - Comment[eu]=Samba (Microsoft sarea) partekaketa muntatua --Comment[fa]=مشترک Samba (Microsoft Network) سوار شده -+Comment[fa]=اشتراک سامبای ویندوز سوار شده - Comment[fi]=Liitetty Samba-jako (Microsoft-verkko) - Comment[fr]=Partage Samba (réseau Microsoft) monté - Comment[fy]=Oankeppele Samba-netwurkboarne (Microsoft-netwurken) -diff -urN kioslave/media/mimetypes/smb_unmounted.desktop kioslave/media/mimetypes/smb_unmounted.desktop ---- kioslave/media/mimetypes/smb_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/smb_unmounted.desktop Tue May 23 13:33:34 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Recurso de Samba desmontado (Red de Microsoft) - Comment[et]=Lahutatud Samba (Microsoft Network) ressurss - Comment[eu]=Samba (Microsoft sarea) partekaketa desmuntatua --Comment[fa]=مشترک Samba (Microsoft Network) پیاده شده -+Comment[fa]=اشتراک سامبای ویندوز پیاده شده - Comment[fi]=Irrotettu Samba-jako (Microsoft-verkko) - Comment[fr]=Partage Samba (réseau Microsoft) non monté - Comment[fy]=Ofkeppele Samba-netwurkboarne (Microsoft-netwurken) -diff -urN kioslave/media/mimetypes/svcd.desktop kioslave/media/mimetypes/svcd.desktop ---- kioslave/media/mimetypes/svcd.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/svcd.desktop Mon May 22 20:12:43 2006 -@@ -7,7 +7,6 @@ - Comment[bn]=সুপার ভিডিও সিডি - Comment[ca]=CD Súper Vídeo - Comment[da]=Super Video-cd --Comment[fa]=دیسک فشرده ابرویدئو - Comment[fr]=Super CD vidéo - Comment[fy]=Super Fideo-kompaktskiif - Comment[gl]=Super Vídeo CD -@@ -17,7 +16,6 @@ - Comment[it]=Super video CD - Comment[ja]=スーパービデオ CD - Comment[km]=ស៊ីឌីវីដេអូគុណភាពខ្ពស់ --Comment[mk]=Супер видео ЦД - Comment[ms]=CD Supervideo - Comment[nb]=Super video CD - Comment[nds]=Super-Video-CD -diff -urN kioslave/media/mimetypes/vcd.desktop kioslave/media/mimetypes/vcd.desktop ---- kioslave/media/mimetypes/vcd.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/vcd.desktop Mon May 22 20:12:42 2006 -@@ -9,7 +9,6 @@ - Comment[ca]=CD Vídeo - Comment[da]=Video-cd - Comment[el]=Βίντεο CD --Comment[fa]=دیسک فشرده ویدئویی - Comment[fr]=CD vidéo - Comment[fy]=Fideo-kompaktskiif - Comment[ga]=Dlúthdhiosca Físe -@@ -19,7 +18,6 @@ - Comment[is]=Vídeó CD - Comment[ja]=ビデオ CD - Comment[km]=ស៊ីឌីវីដេអូ --Comment[mk]=Видео ЦД - Comment[ms]=CD Video - Comment[nds]=Video-CD - Comment[nl]=Video-cd -diff -urN kioslave/media/mimetypes/zip_mounted.desktop kioslave/media/mimetypes/zip_mounted.desktop ---- kioslave/media/mimetypes/zip_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/zip_mounted.desktop Tue May 23 13:33:35 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disco Zip montado - Comment[et]=Ühendatud Zip-ketas - Comment[eu]=Zip diska muntatua --Comment[fa]=دیسک فشرده سوارشده -+Comment[fa]=دیسک زیپ سوار شده - Comment[fi]=Liitetty Zip-levy - Comment[fr]=Disque Zip monté - Comment[fy]=Oankeppelee Zip-skiif -diff -urN kioslave/media/mimetypes/zip_unmounted.desktop kioslave/media/mimetypes/zip_unmounted.desktop ---- kioslave/media/mimetypes/zip_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/zip_unmounted.desktop Tue May 23 13:33:35 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disco Zip desmontado - Comment[et]=Lahutatud Zip-ketas - Comment[eu]=Zip diska desmuntatua --Comment[fa]=دیسک فشرده پیاده شده -+Comment[fa]= دیسک زیپ پیاده شده - Comment[fi]=Irrotettu Zip-levy - Comment[fr]=Disque Zip non monté - Comment[fy]=Ofkeppele Zip-skiif -@@ -33,7 +33,7 @@ - Comment[hu]=Leválasztott Zip-lemez - Comment[is]=Aftengdur Zip diskur - Comment[it]=Disco Zip non montato --Comment[ja]=マウントされていない Zip ディスク -+Comment[ja]=マウントされていないZipディスク - Comment[km]=ថាស Zip មិនបានរៀបចំ - Comment[lo]= ຫັງກາລີ - Comment[lt]=Išmontuotas Zip diskas -diff -urN kioslave/media/mounthelper/Makefile.in kioslave/media/mounthelper/Makefile.in ---- kioslave/media/mounthelper/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/mounthelper/Makefile.in Fri May 26 09:54:31 2006 -@@ -57,8 +57,8 @@ - #>+ 1 - kio_media_mounthelper_OBJECTS = kio_media_mounthelper.$(OBJEXT) - am__DEPENDENCIES_1 = --kio_media_mounthelper_DEPENDENCIES = \ -- ../libmediacommon/libmediacommon.la $(am__DEPENDENCIES_1) -+kio_media_mounthelper_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -+ ../libmediacommon/libmediacommon.la - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - am__depfiles_maybe = depfiles -@@ -236,6 +236,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -@@ -575,7 +576,7 @@ - AM_LDFLAGS = $(all_libraries) - kio_media_mounthelper_SOURCES = kio_media_mounthelper.cpp - kio_media_mounthelper_LDFLAGS = $(KDE_RPATH) $(all_libraries) --kio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) -+kio_media_mounthelper_LDADD = $(LIB_KIO) ../libmediacommon/libmediacommon.la - #>- METASOURCES = AUTO - #>- all: all-am - #>+ 1 -diff -urN kioslave/media/mounthelper/kio_media_mounthelper.cpp kioslave/media/mounthelper/kio_media_mounthelper.cpp ---- kioslave/media/mounthelper/kio_media_mounthelper.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/mounthelper/kio_media_mounthelper.cpp Fri Mar 17 11:17:33 2006 -@@ -27,7 +27,6 @@ - #include <dcopclient.h> - #include <dcopref.h> - #include <qtimer.h> --#include <stdlib.h> - #include <kdebug.h> - #include <kglobal.h> - #include <kprocess.h> -@@ -79,30 +78,31 @@ - - if (args->isSet("u")) - { -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "unmount", medium.id()); -- if (reply.isValid()) -- reply.get(m_errorStr); -- kdDebug() << "medium unmount " << m_errorStr << endl; -- if (m_errorStr.isNull()) -- ::exit(0); -- else -- error(); -+ KIO::Job * job = KIO::unmount( mount_point ); -+ -+ connect( job, SIGNAL( result( KIO::Job * ) ), -+ this, SLOT( slotResult( KIO::Job * ) ) ); - } - else if (args->isSet("s") || args->isSet("e")) - { -- invokeEject(device, true); -+ if (medium.isMounted()) -+ { -+ KIO::Job * job = KIO::unmount( mount_point ); -+ -+ m_device = device; -+ connect( job, SIGNAL( result( KIO::Job * ) ), -+ this, SLOT( slotResultSafe( KIO::Job * ) ) ); -+ } -+ else -+ { -+ invokeEject(device, true); -+ } - } - else - { -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "mount", medium.id()); -- if (reply.isValid()) -- reply.get(m_errorStr); -- if (m_errorStr.isNull()) -- ::exit(0); -- else -- error(); -+ KIO::Job* job = KIO::mount( false, 0, device, mount_point); -+ connect( job, SIGNAL( result( KIO::Job * ) ), -+ this, SLOT( slotResult( KIO::Job * ) ) ); - } - } - -@@ -173,12 +173,12 @@ - void MountHelper::error() - { - KMessageBox::error(0, m_errorStr); -- ::exit(1); -+ kapp->exit(1); - } - - void MountHelper::finished() - { -- ::exit(0); -+ kapp->quit(); - } - - static KCmdLineOptions options[] = -@@ -207,7 +207,7 @@ - - KStartupInfo::appStarted(); - app->dcopClient()->attach(); -- return app->exec(); -+ app->exec(); - } - - #include "kio_media_mounthelper.moc" -diff -urN kioslave/media/propsdlgplugin/Makefile.in kioslave/media/propsdlgplugin/Makefile.in ---- kioslave/media/propsdlgplugin/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/propsdlgplugin/Makefile.in Thu Jan 1 01:00:00 1970 -@@ -1,1063 +0,0 @@ --# Makefile.in generated by automake 1.9.6 from Makefile.am. --# KDE tags expanded automatically by am_edit - $Revision: 483858 $ --# @configure_input@ -- --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005 Free Software Foundation, Inc. --# This Makefile.in is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY, to the extent permitted by law; without --# even the implied warranty of MERCHANTABILITY or FITNESS FOR A --# PARTICULAR PURPOSE. -- --@SET_MAKE@ -- -- --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ --VPATH = @srcdir@ --pkgdatadir = $(datadir)/@PACKAGE@ --pkglibdir = $(libdir)/@PACKAGE@ --pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../../.. --am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ --install_sh_DATA = $(install_sh) -c -m 644 --install_sh_PROGRAM = $(install_sh) -c --install_sh_SCRIPT = $(install_sh) -c --INSTALL_HEADER = $(INSTALL_DATA) --transform = $(program_transform_name) --NORMAL_INSTALL = : --PRE_INSTALL = : --POST_INSTALL = : --NORMAL_UNINSTALL = : --PRE_UNINSTALL = : --POST_UNINSTALL = : --build_triplet = @build@ --host_triplet = @host@ --target_triplet = @target@ --subdir = kioslave/media/propsdlgplugin --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(kde_moduledir)" \ -- "$(DESTDIR)$(kde_servicesdir)" --kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(kde_module_LTLIBRARIES) --am__DEPENDENCIES_1 = --media_propsdlgplugin_la_DEPENDENCIES = \ -- ../libmediacommon/libmediacommon.la $(am__DEPENDENCIES_1) --am_media_propsdlgplugin_la_OBJECTS = propertiespage.lo \ -- propsdlgshareplugin.lo --#>- media_propsdlgplugin_la_OBJECTS = \ --#>- $(am_media_propsdlgplugin_la_OBJECTS) --#>+ 5 --media_propsdlgplugin_la_final_OBJECTS = media_propsdlgplugin_la.all_cpp.lo --media_propsdlgplugin_la_nofinal_OBJECTS = propertiespage.lo \ -- propsdlgshareplugin.lo propertiespagegui.lo --@KDE_USE_FINAL_FALSE@media_propsdlgplugin_la_OBJECTS = $(media_propsdlgplugin_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@media_propsdlgplugin_la_OBJECTS = $(media_propsdlgplugin_la_final_OBJECTS) --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --am__depfiles_maybe = depfiles --#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ --#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --#>+ 2 --CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ --#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ --#>- $(AM_CXXFLAGS) $(CXXFLAGS) --#>+ 3 --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --CXXLD = $(CXX) --#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ --#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --#>+ 2 --CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --SOURCES = $(media_propsdlgplugin_la_SOURCES) --DIST_SOURCES = $(media_propsdlgplugin_la_SOURCES) --kde_servicesDATA_INSTALL = $(INSTALL_DATA) --DATA = $(kde_services_DATA) --ETAGS = etags --CTAGS = ctags --#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) --#>+ 1 --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) --ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ --AMTAR = @AMTAR@ --AR = @AR@ --ARTSCCONFIG = @ARTSCCONFIG@ --ARTS_CFLAGS = @ARTS_CFLAGS@ --AUTOCONF = @AUTOCONF@ --AUTODIRS = @AUTODIRS@ --AUTOHEADER = @AUTOHEADER@ --AUTOMAKE = @AUTOMAKE@ --AWK = @AWK@ --CC = @CC@ --CCDEPMODE = @CCDEPMODE@ --CFLAGS = @CFLAGS@ --COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@ --COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@ --CONF_FILES = @CONF_FILES@ --CPP = @CPP@ --CPPFLAGS = @CPPFLAGS@ --CXX = @CXX@ --CXXCPP = @CXXCPP@ --CXXDEPMODE = @CXXDEPMODE@ --CXXFLAGS = @CXXFLAGS@ --CYGPATH_W = @CYGPATH_W@ --DBUSQT_INCS = @DBUSQT_INCS@ --DBUSQT_LIBS = @DBUSQT_LIBS@ --DBUS_CFLAGS = @DBUS_CFLAGS@ --DBUS_INCS = @DBUS_INCS@ --DBUS_LIBS = @DBUS_LIBS@ --DCOPIDL = @DCOPIDL@ --DCOPIDL2CPP = @DCOPIDL2CPP@ --DCOPIDLNG = @DCOPIDLNG@ --DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ --DEFS = @DEFS@ --DEPDIR = @DEPDIR@ --DOXYGEN = @DOXYGEN@ --DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ --DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ --DPMSINC = @DPMSINC@ --DPMSLIB = @DPMSLIB@ --ECHO = @ECHO@ --ECHO_C = @ECHO_C@ --ECHO_N = @ECHO_N@ --ECHO_T = @ECHO_T@ --EGREP = @EGREP@ --ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ --EXEEXT = @EXEEXT@ --EXR_FLAGS = @EXR_FLAGS@ --F77 = @F77@ --FFLAGS = @FFLAGS@ --FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ --GLINC = @GLINC@ --GLLIB = @GLLIB@ --GMSGFMT = @GMSGFMT@ --HALBACKEND = @HALBACKEND@ --HAL_CFLAGS = @HAL_CFLAGS@ --HAL_INCS = @HAL_INCS@ --HAL_LIBS = @HAL_LIBS@ --HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@ --HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@ --HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ --INSTALL_DATA = @INSTALL_DATA@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_SCRIPT = @INSTALL_SCRIPT@ --INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ --JAR = @JAR@ --JAVAC = @JAVAC@ --JAVAH = @JAVAH@ --JVMLIBS = @JVMLIBS@ --KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ --KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@ --KCONFIG_COMPILER = @KCONFIG_COMPILER@ --KDECONFIG = @KDECONFIG@ --KDE_BINDIR = @KDE_BINDIR@ --KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@ --KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ --KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ --KDE_HAVE_DOT = @KDE_HAVE_DOT@ --KDE_INCLUDES = @KDE_INCLUDES@ --KDE_LDFLAGS = @KDE_LDFLAGS@ --KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ --KDE_MT_LIBS = @KDE_MT_LIBS@ --KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ --KDE_PLUGIN = @KDE_PLUGIN@ --KDE_RPATH = @KDE_RPATH@ --KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ --KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ --KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ --KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ --KDE_USE_FPIE = @KDE_USE_FPIE@ --KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ --KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ --KDE_USE_PIE = @KDE_USE_PIE@ --KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ --KDM_PAM_SERVICE = @KDM_PAM_SERVICE@ --KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@ --KRB4_INCS = @KRB4_INCS@ --KRB4_LIBS = @KRB4_LIBS@ --KRB4_RPATH = @KRB4_RPATH@ --KRB5_INCS = @KRB5_INCS@ --KRB5_LIBS = @KRB5_LIBS@ --KRB5_RPATH = @KRB5_RPATH@ --KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@ --LDAP_INCS = @LDAP_INCS@ --LDAP_LIBS = @LDAP_LIBS@ --LDAP_RPATH = @LDAP_RPATH@ --LDFLAGS = @LDFLAGS@ --LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ --LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ --LIBALIB = @LIBALIB@ --LIBART_CFLAGS = @LIBART_CFLAGS@ --LIBART_LIBS = @LIBART_LIBS@ --LIBART_RPATH = @LIBART_RPATH@ --LIBBZ2 = @LIBBZ2@ --LIBCFG = @LIBCFG@ --LIBCOMPAT = @LIBCOMPAT@ --LIBCRYPT = @LIBCRYPT@ --LIBCURSES = @LIBCURSES@ --LIBDEVINFO = @LIBDEVINFO@ --LIBDL = @LIBDL@ --LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@ --LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@ --LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@ --LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@ --LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@ --LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@ --LIBGEN = @LIBGEN@ --LIBHOSTS = @LIBHOSTS@ --LIBJPEG = @LIBJPEG@ --LIBKSTAT = @LIBKSTAT@ --LIBMALLOC = @LIBMALLOC@ --LIBOBJS = @LIBOBJS@ --LIBODM = @LIBODM@ --LIBOSSAUDIO = @LIBOSSAUDIO@ --LIBPNG = @LIBPNG@ --LIBPOSIX4 = @LIBPOSIX4@ --LIBPTHREAD = @LIBPTHREAD@ --LIBRESOLV = @LIBRESOLV@ --LIBRPC = @LIBRPC@ --LIBS = @LIBS@ --LIBSENSORS = @LIBSENSORS@ --LIBSHADOW = @LIBSHADOW@ --LIBSM = @LIBSM@ --LIBSOCKET = @LIBSOCKET@ --LIBSSL = @LIBSSL@ --LIBTOOL = @LIBTOOL@ --LIBUCB = @LIBUCB@ --LIBUSBCONFIG = @LIBUSBCONFIG@ --LIBUTIL = @LIBUTIL@ --LIBXDMCP = @LIBXDMCP@ --LIBXFT_LIB = @LIBXFT_LIB@ --LIBZ = @LIBZ@ --LIB_ARTS = @LIB_ARTS@ --LIB_DNSSD = @LIB_DNSSD@ --LIB_EXR = @LIB_EXR@ --LIB_FONT_ENC = @LIB_FONT_ENC@ --LIB_KAB = @LIB_KAB@ --LIB_KABC = @LIB_KABC@ --LIB_KDECORE = @LIB_KDECORE@ --LIB_KDED = @LIB_KDED@ --LIB_KDEPIM = @LIB_KDEPIM@ --LIB_KDEPRINT = @LIB_KDEPRINT@ --LIB_KDEUI = @LIB_KDEUI@ --LIB_KDNSSD = @LIB_KDNSSD@ --LIB_KFILE = @LIB_KFILE@ --LIB_KFM = @LIB_KFM@ --LIB_KHTML = @LIB_KHTML@ --LIB_KIMPROXY = @LIB_KIMPROXY@ --LIB_KIO = @LIB_KIO@ --LIB_KJS = @LIB_KJS@ --LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ --LIB_KPARTS = @LIB_KPARTS@ --LIB_KSPELL = @LIB_KSPELL@ --LIB_KSYCOCA = @LIB_KSYCOCA@ --LIB_KUNITTEST = @LIB_KUNITTEST@ --LIB_KUTILS = @LIB_KUTILS@ --LIB_KVM = @LIB_KVM@ --LIB_LBER = @LIB_LBER@ --LIB_LIBS = @LIB_LIBS@ --LIB_POLL = @LIB_POLL@ --LIB_QPE = @LIB_QPE@ --LIB_QT = @LIB_QT@ --LIB_SMB = @LIB_SMB@ --LIB_TRU64_MACH = @LIB_TRU64_MACH@ --LIB_X11 = @LIB_X11@ --LIB_XCOMPOSITE = @LIB_XCOMPOSITE@ --LIB_XCURSOR = @LIB_XCURSOR@ --LIB_XEXT = @LIB_XEXT@ --LIB_XF86MISC = @LIB_XF86MISC@ --LIB_XFIXES = @LIB_XFIXES@ --LIB_XINERAMA = @LIB_XINERAMA@ --LIB_XRANDR = @LIB_XRANDR@ --LIB_XRENDER = @LIB_XRENDER@ --LIB_XSS = @LIB_XSS@ --LINUXCDPOLLING = @LINUXCDPOLLING@ --LN_S = @LN_S@ --LTLIBOBJS = @LTLIBOBJS@ --MAKEINFO = @MAKEINFO@ --MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ --MCOPIDL = @MCOPIDL@ --MD5SUM = @MD5SUM@ --MD5SUM_CUT = @MD5SUM_CUT@ --MEINPROC = @MEINPROC@ --MOC = @MOC@ --MSGFMT = @MSGFMT@ --NOOPT_CFLAGS = @NOOPT_CFLAGS@ --NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ --OBJEXT = @OBJEXT@ --PACKAGE = @PACKAGE@ --PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ --PACKAGE_NAME = @PACKAGE_NAME@ --PACKAGE_STRING = @PACKAGE_STRING@ --PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_VERSION = @PACKAGE_VERSION@ --PAMLIBS = @PAMLIBS@ --PASSWDLIBS = @PASSWDLIBS@ --PATH_SEPARATOR = @PATH_SEPARATOR@ --PERL = @PERL@ --PKG_CONFIG = @PKG_CONFIG@ --QTDOCDIR = @QTDOCDIR@ --QTE_NORTTI = @QTE_NORTTI@ --QT_INCLUDES = @QT_INCLUDES@ --QT_LDFLAGS = @QT_LDFLAGS@ --RANLIB = @RANLIB@ --RUN_KAPPFINDER = @RUN_KAPPFINDER@ --SASL2_LIBS = @SASL2_LIBS@ --SETUIDFLAGS = @SETUIDFLAGS@ --SET_MAKE = @SET_MAKE@ --SHELL = @SHELL@ --SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@ --SSL_INCLUDES = @SSL_INCLUDES@ --SSL_LDFLAGS = @SSL_LDFLAGS@ --STRIP = @STRIP@ --TOPSUBDIRS = @TOPSUBDIRS@ --UIC = @UIC@ --UIC_TR = @UIC_TR@ --UNAME = @UNAME@ --USB_CFLAGS = @USB_CFLAGS@ --USB_LIBS = @USB_LIBS@ --USER_INCLUDES = @USER_INCLUDES@ --USER_LDFLAGS = @USER_LDFLAGS@ --USE_EXCEPTIONS = @USE_EXCEPTIONS@ --USE_RTTI = @USE_RTTI@ --USE_THREADS = @USE_THREADS@ --VERSION = @VERSION@ --WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ --XGETTEXT = @XGETTEXT@ --XMLLINT = @XMLLINT@ --XTESTLIB = @XTESTLIB@ --X_EXTRA_LIBS = @X_EXTRA_LIBS@ --X_INCLUDES = @X_INCLUDES@ --X_LDFLAGS = @X_LDFLAGS@ --X_PRE_LIBS = @X_PRE_LIBS@ --X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ --ac_ct_CC = @ac_ct_CC@ --ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ --all_includes = @all_includes@ --all_libraries = @all_libraries@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ --am__include = @am__include@ --am__leading_dot = @am__leading_dot@ --am__quote = @am__quote@ --am__tar = @am__tar@ --am__untar = @am__untar@ --applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@ --applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@ --bindir = @bindir@ --build = @build@ --build_alias = @build_alias@ --build_cpu = @build_cpu@ --build_os = @build_os@ --build_vendor = @build_vendor@ --datadir = @datadir@ --doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ --doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ --drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ --drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ --exec_prefix = @exec_prefix@ --have_xcursor_FALSE = @have_xcursor_FALSE@ --have_xcursor_TRUE = @have_xcursor_TRUE@ --host = @host@ --host_alias = @host_alias@ --host_cpu = @host_cpu@ --host_os = @host_os@ --host_vendor = @host_vendor@ --include_ARTS_FALSE = @include_ARTS_FALSE@ --include_ARTS_TRUE = @include_ARTS_TRUE@ --include_BZIP2_FALSE = @include_BZIP2_FALSE@ --include_BZIP2_TRUE = @include_BZIP2_TRUE@ --include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@ --include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@ --include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@ --include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@ --include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@ --include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@ --include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@ --include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@ --include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@ --include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@ --include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@ --include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@ --include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@ --include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@ --include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@ --include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@ --include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@ --include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@ --include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@ --include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@ --include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@ --include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@ --include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@ --include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@ --include_kompmgr_FALSE = @include_kompmgr_FALSE@ --include_kompmgr_TRUE = @include_kompmgr_TRUE@ --include_ksysguardd_FALSE = @include_ksysguardd_FALSE@ --include_ksysguardd_TRUE = @include_ksysguardd_TRUE@ --include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@ --include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@ --include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@ --include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@ --include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@ --include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@ --include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@ --include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@ --include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@ --include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@ --include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@ --include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@ --include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@ --include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@ --include_media_halbackend_FALSE = @include_media_halbackend_FALSE@ --include_media_halbackend_TRUE = @include_media_halbackend_TRUE@ --include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@ --include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@ --include_x11_FALSE = @include_x11_FALSE@ --include_x11_TRUE = @include_x11_TRUE@ --includedir = @includedir@ --infodir = @infodir@ --install_sh = @install_sh@ --install_usbids_FALSE = @install_usbids_FALSE@ --install_usbids_TRUE = @install_usbids_TRUE@ --jni_includes = @jni_includes@ --kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@ --kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@ --kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@ --kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@ --kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@ --kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@ --kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@ --kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@ --kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@ --kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@ --kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@ --kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@ --kde_appsdir = @kde_appsdir@ --kde_bindir = @kde_bindir@ --kde_confdir = @kde_confdir@ --kde_datadir = @kde_datadir@ --kde_htmldir = @kde_htmldir@ --kde_icondir = @kde_icondir@ --kde_includes = @kde_includes@ --kde_kcfgdir = @kde_kcfgdir@ --kde_libraries = @kde_libraries@ --kde_libs_htmldir = @kde_libs_htmldir@ --kde_libs_prefix = @kde_libs_prefix@ --kde_locale = @kde_locale@ --kde_mimedir = @kde_mimedir@ --kde_moduledir = @kde_moduledir@ --kde_qtver = @kde_qtver@ --kde_servicesdir = @kde_servicesdir@ --kde_servicetypesdir = @kde_servicetypesdir@ --kde_sounddir = @kde_sounddir@ --kde_styledir = @kde_styledir@ --kde_templatesdir = @kde_templatesdir@ --kde_wallpaperdir = @kde_wallpaperdir@ --kde_widgetdir = @kde_widgetdir@ --kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@ --kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@ --kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@ --kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@ --kdeinitdir = @kdeinitdir@ --kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@ --kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@ --kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@ --kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@ --kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@ --kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@ --kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@ --kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@ --kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@ --kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@ --kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@ --kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@ --kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@ --kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@ --kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@ --kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@ --khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@ --khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@ --khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@ --khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@ --kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@ --kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@ --kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@ --kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@ --klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@ --klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@ --kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@ --kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@ --knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@ --knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@ --konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@ --konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@ --konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@ --konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@ --kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@ --kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@ --kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@ --kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@ --kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@ --kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@ --kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@ --kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@ --ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@ --ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@ --ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@ --ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@ --kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@ --kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@ --ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@ --ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@ --ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@ --ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@ --ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@ --ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@ --kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@ --kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@ --kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@ --kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@ --l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@ --l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@ --libdir = @libdir@ --libexecdir = @libexecdir@ --libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ --libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ --localstatedir = @localstatedir@ --mandir = @mandir@ --mkdir_p = @mkdir_p@ --nogroup = @nogroup@ --nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ --nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ --oldincludedir = @oldincludedir@ --pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ --pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ --prefix = @prefix@ --program_transform_name = @program_transform_name@ --qt_includes = @qt_includes@ --qt_libraries = @qt_libraries@ --sbindir = @sbindir@ --sharedstatedir = @sharedstatedir@ --supports_i8k_FALSE = @supports_i8k_FALSE@ --supports_i8k_TRUE = @supports_i8k_TRUE@ --sysconfdir = @sysconfdir@ --target = @target@ --target_alias = @target_alias@ --target_cpu = @target_cpu@ --target_os = @target_os@ --target_vendor = @target_vendor@ --unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ --unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ --x_includes = @x_includes@ --x_libraries = @x_libraries@ --xdg_appsdir = @xdg_appsdir@ --xdg_directorydir = @xdg_directorydir@ --xdg_menudir = @xdg_menudir@ --#>- METASOURCES = AUTO --kde_module_LTLIBRARIES = media_propsdlgplugin.la --media_propsdlgplugin_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) --media_propsdlgplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) --AM_CPPFLAGS = $(all_includes) --kde_services_DATA = media_propsdlgplugin.desktop --#>- media_propsdlgplugin_la_SOURCES = propertiespage.cpp propertiespagegui.ui propsdlgshareplugin.cpp --#>+ 1 --media_propsdlgplugin_la_SOURCES=propertiespage.cpp propsdlgshareplugin.cpp propertiespagegui.cpp --#>- all: all-am --#>+ 1 --all: docs-am all-am -- --.SUFFIXES: --.SUFFIXES: .cpp .lo .o .obj --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) --#>- @for dep in $?; do \ --#>- case '$(am__configure_deps)' in \ --#>- *$$dep*) \ --#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ --#>- && exit 0; \ --#>- exit 1;; \ --#>- esac; \ --#>- done; \ --#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ --#>- cd $(top_srcdir) && \ --#>- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile --#>+ 12 -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ -- cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile -- cd $(top_srcdir) && perl admin/am_edit kioslave/media/propsdlgplugin/Makefile.in --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) -- @$(NORMAL_INSTALL) -- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)" -- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ -- else :; fi; \ -- done -- --uninstall-kde_moduleLTLIBRARIES: -- @$(NORMAL_UNINSTALL) -- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ -- done -- --clean-kde_moduleLTLIBRARIES: -- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES) -- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --#>- media_propsdlgplugin.la: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) --#>+ 2 --@KDE_USE_CLOSURE_TRUE@media_propsdlgplugin.la: media_propsdlgplugin.la.closure $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) --@KDE_USE_CLOSURE_FALSE@media_propsdlgplugin.la: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(kde_moduledir) $(media_propsdlgplugin_la_LDFLAGS) $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_LIBADD) $(LIBS) -- --mostlyclean-compile: -- -rm -f *.$(OBJEXT) -- --distclean-compile: -- -rm -f *.tab.c -- --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/propertiespage.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/propsdlgshareplugin.Plo@am__quote@ -- --.cpp.o: --@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -- --.cpp.obj: --@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -- --.cpp.lo: --@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -- --mostlyclean-libtool: -- -rm -f *.lo -- --clean-libtool: -- -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: --install-kde_servicesDATA: $(kde_services_DATA) -- @$(NORMAL_INSTALL) -- test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)" -- @list='$(kde_services_DATA)'; for p in $$list; do \ -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \ -- $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \ -- done -- --uninstall-kde_servicesDATA: -- @$(NORMAL_UNINSTALL) -- @list='$(kde_services_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \ -- done -- --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- tags=; \ -- here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- tags=; \ -- here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(CTAGS_ARGS)$$tags$$unique" \ -- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -- $$tags $$unique -- --GTAGS: -- here=`$(am__cd) $(top_builddir) && pwd` \ -- && cd $(top_srcdir) \ -- && gtags -i $(GTAGS_ARGS) $$here -- --distclean-tags: -- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -- --distdir: $(DISTFILES) -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkdir_p) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ -- if test -d $$d/$$file; then \ -- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ -- fi; \ -- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ -- else \ -- test -f $(distdir)/$$file \ -- || cp -p $$d/$$file $(distdir)/$$file \ -- || exit 1; \ -- fi; \ -- done --check-am: all-am --check: check-am --all-am: Makefile $(LTLIBRARIES) $(DATA) --installdirs: -- for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \ -- test -z "$$dir" || $(mkdir_p) "$$dir"; \ -- done --install: install-am --install-exec: install-exec-am --install-data: install-data-am --uninstall: uninstall-am -- --install-am: all-am -- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -- --installcheck: installcheck-am --install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install --mostlyclean-generic: -- --clean-generic: -- --distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -- --maintainer-clean-generic: -- @echo "This command is intended for maintainers to use" -- @echo "it deletes files that may require special tools to rebuild." --#>- clean: clean-am --#>+ 1 --clean: kde-rpo-clean clean-am -- --#>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ --#>- mostlyclean-am --#>+ 2 --clean-am: clean-metasources clean-ui clean-closures clean-bcheck clean-final clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ -- mostlyclean-am -- --distclean: distclean-am -- -rm -rf ./$(DEPDIR) -- -rm -f Makefile --distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -- --dvi: dvi-am -- --dvi-am: -- --html: html-am -- --info: info-am -- --info-am: -- --#>- install-data-am: install-kde_moduleLTLIBRARIES \ --#>- install-kde_servicesDATA --#>+ 2 --install-data-am: \ -- install-kde_servicesDATA -- --#>- install-exec-am: --#>+ 1 --install-exec-am: install-kde_moduleLTLIBRARIES -- --install-info: install-info-am -- --install-man: -- --installcheck-am: -- --maintainer-clean: maintainer-clean-am -- -rm -rf ./$(DEPDIR) -- -rm -f Makefile --maintainer-clean-am: distclean-am maintainer-clean-generic -- --mostlyclean: mostlyclean-am -- --mostlyclean-am: mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool -- --pdf: pdf-am -- --pdf-am: -- --ps: ps-am -- --ps-am: -- --uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ -- uninstall-kde_servicesDATA -- --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-exec \ -- install-exec-am install-info install-info-am \ -- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \ -- install-man install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ -- uninstall-am uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ -- uninstall-kde_servicesDATA -- --# Tell versions [3.59,3.63) of GNU make to not export all variables. --# Otherwise a system limit (for SysV at least) may be exceeded. --.NOEXPORT: -- --#>+ 8 --media_propsdlgplugin.la.closure: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) -- @echo "int main() {return 0;}" > media_propsdlgplugin_la_closure.cpp -- @$(LTCXXCOMPILE) -c media_propsdlgplugin_la_closure.cpp -- $(CXXLINK) media_propsdlgplugin_la_closure.lo $(media_propsdlgplugin_la_LDFLAGS) $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_LIBADD) $(LIBS) -- @rm -f media_propsdlgplugin_la_closure.* media_propsdlgplugin.la.closure -- @echo "timestamp" > media_propsdlgplugin.la.closure -- -- --#>+ 3 --propsdlgshareplugin.moc: $(srcdir)/propsdlgshareplugin.h -- $(MOC) $(srcdir)/propsdlgshareplugin.h -o propsdlgshareplugin.moc -- --#>+ 2 --mocs: propsdlgshareplugin.moc -- --#>+ 3 --propertiespage.moc: $(srcdir)/propertiespage.h -- $(MOC) $(srcdir)/propertiespage.h -o propertiespage.moc -- --#>+ 2 --mocs: propertiespage.moc -- --#>+ 3 --clean-metasources: -- -rm -f propsdlgshareplugin.moc propertiespage.moc -- --#>+ 2 --KDE_DIST=propertiespagegui.ui Makefile.in propertiespage.h propsdlgshareplugin.h media_propsdlgplugin.desktop propertiespagegui.ui.h Makefile.am -- --#>+ 4 --clean-ui: -- -rm -f \ -- propertiespagegui.cpp propertiespagegui.h propertiespagegui.moc -- --#>+ 3 --clean-closures: -- -rm -f media_propsdlgplugin.la.closure -- --#>+ 2 --docs-am: -- --#>+ 15 --force-reedit: -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ -- cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile -- cd $(top_srcdir) && perl admin/am_edit kioslave/media/propsdlgplugin/Makefile.in -- -- --#>+ 21 --clean-bcheck: -- rm -f *.bchecktest.cc *.bchecktest.cc.class a.out -- --bcheck: bcheck-am -- --bcheck-am: -- @for i in ; do \ -- if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ -- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ -- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ -- echo "$$i"; \ -- if ! $(CXXCOMPILE) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ -- rm -f $$i.bchecktest.cc; exit 1; \ -- fi ; \ -- echo "" >> $$i.bchecktest.cc.class; \ -- perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ -- rm -f a.out; \ -- fi ; \ -- done -- -- --#>+ 11 --media_propsdlgplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/propertiespage.cpp $(srcdir)/propsdlgshareplugin.cpp propertiespagegui.cpp propsdlgshareplugin.moc propertiespagegui.moc propertiespage.moc -- @echo 'creating media_propsdlgplugin_la.all_cpp.cpp ...'; \ -- rm -f media_propsdlgplugin_la.all_cpp.files media_propsdlgplugin_la.all_cpp.final; \ -- echo "#define KDE_USE_FINAL 1" >> media_propsdlgplugin_la.all_cpp.final; \ -- for file in propertiespage.cpp propsdlgshareplugin.cpp propertiespagegui.cpp ; do \ -- echo "#include \"$$file\"" >> media_propsdlgplugin_la.all_cpp.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> media_propsdlgplugin_la.all_cpp.final; \ -- done; \ -- cat media_propsdlgplugin_la.all_cpp.final media_propsdlgplugin_la.all_cpp.files > media_propsdlgplugin_la.all_cpp.cpp; \ -- rm -f media_propsdlgplugin_la.all_cpp.final media_propsdlgplugin_la.all_cpp.files -- --#>+ 3 --clean-final: -- -rm -f media_propsdlgplugin_la.all_cpp.cpp -- --#>+ 3 --final: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_final_OBJECTS)" all-am -- --#>+ 3 --final-install: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_final_OBJECTS)" install-am -- --#>+ 3 --no-final: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_nofinal_OBJECTS)" all-am -- --#>+ 3 --no-final-install: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_nofinal_OBJECTS)" install-am -- --#>+ 3 --kde-rpo-clean: -- -rm -f *.rpo -- --#>+ 9 --nmcheck: --propsdlgshareplugin.o: propsdlgshareplugin.moc --nmcheck-am: nmcheck --propsdlgshareplugin.lo: propsdlgshareplugin.moc --propertiespage.lo: propertiespage.moc --$(srcdir)/propertiespage.cpp: propertiespagegui.h --$(srcdir)/propsdlgshareplugin.cpp: propertiespagegui.h --propertiespage.o: propertiespage.moc -- --#>+ 15 --propertiespagegui.cpp: $(srcdir)/propertiespagegui.ui propertiespagegui.h propertiespagegui.moc -- rm -f propertiespagegui.cpp -- echo '#include <kdialog.h>' > propertiespagegui.cpp -- echo '#include <klocale.h>' >> propertiespagegui.cpp -- $(UIC) -tr ${UIC_TR} -i propertiespagegui.h $(srcdir)/propertiespagegui.ui > propertiespagegui.cpp.temp ; ret=$$?; \ -- $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" propertiespagegui.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_propertiespagegui,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> propertiespagegui.cpp ;\ -- rm -f propertiespagegui.cpp.temp ;\ -- if test "$$ret" = 0; then echo '#include "propertiespagegui.moc"' >> propertiespagegui.cpp; else rm -f propertiespagegui.cpp ; exit $$ret ; fi -- --propertiespagegui.h: $(srcdir)/propertiespagegui.ui -- rm -rf propertiespagegui.h; -- $(UIC) $(srcdir)/propertiespagegui.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> propertiespagegui.h ; --propertiespagegui.moc: propertiespagegui.h -- $(MOC) propertiespagegui.h -o propertiespagegui.moc -diff -urN kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop ---- kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Thu Jan 1 01:00:00 1970 -@@ -1,73 +0,0 @@ --[Desktop Entry] --Encoding=UTF-8 --Type=Service --Name=Media Properties Page --Name[ca]=Pàgina de propietats de suport --Name[cs]=Stránka vlastností média --Name[da]=Medieegenskabsside --Name[de]=Eigenschaften von Medien --Name[el]=Σελίδα ιδιοτήτων μέσων --Name[es]=Página de propiedades de medios --Name[et]=Andmekandjate omadused --Name[fa]=صفحۀ ویژگیهای رسانه --Name[fi]=Mediaominaisuudet --Name[fr]=Page de propriétés du média --Name[he]=דף מאפייני מדיה --Name[hr]=Stranica svojstva medija --Name[hu]=Médiajellemzők lap --Name[is]=Eiginleikar miðils --Name[it]=Pagina delle proprietà dei dispositivi di archiviazione --Name[ja]=メディア属性ページ --Name[km]=ទំព័រលក្ខណៈសម្បត្តិមេឌៀ --Name[nb]=Side for medievarsling --Name[nds]=Medienegenschappen-Siet --Name[nl]=Pagina met media-eigenschappen --Name[nn]=Side for medieeigenskapar --Name[pl]=Strona właściwości nośnika --Name[pt]=Página de Propriedades de Suportes Físicos --Name[pt_BR]=Página de Propriedades de Suportes Físicos --Name[ru]=Свойства носителя --Name[sk]=Strana vlastností média --Name[sl]=Stran z lastnostmi nosilca --Name[sr]=Страна са својствима медијума --Name[sr@Latn]=Strana sa svojstvima medijuma --Name[sv]=Sida för mediaegenskaper --Name[uk]=Сторінка властивостей носіїв інформації --Name[vi]=Trang tài sản phương tiện --Name[zh_TW]=媒體內容頁 --Comment=Konqueror properties dialog plugin to configure mount behaviour --Comment[ca]=Diàleg de propietats de l'endollable Konqueror per a configurar el comportament de muntatge --Comment[cs]=Dialog nastavení chování připojení modulu pro Konqueror --Comment[da]=Konqueror plugin med egenskabsdialog til at indstille monteringsopførsel --Comment[de]=Konqueror-Modul zum Einstellen des Verhaltens beim Einbinden --Comment[el]=Πρόσθετο διαλόγου ιδιοτήτων του Konqueror για τη ρύθμιση της συμπεριφοράς προσάρτησης --Comment[es]=Plugin de diálogo de propiedades de Konqueror para configurar el comportamiento del montaje --Comment[et]=Konquerori seadistustedialoogi plugin andmekandjate ühendamise seadistamiseks --Comment[fa]=وصلۀ محاورۀ ویژگیهای Konqueror برای پیکربندی رفتار سوار کردن --Comment[fi]=Konquerorin ominaisuussovelma, joka tarkkailee liitospisteitä --Comment[fr]=Module de Konqueror pour configurer le comportement du montage --Comment[he]=תוסף חלון מאפיינים של Konqueror לקביעת אפשרויות חיבור --Comment[hr]=Konqueror dodatak dijaloga svojstava za konfiguriranje načina pristupanja --Comment[hu]=Konqueror beállítómodul a csatlakoztatási mód megadásához --Comment[is]=Konqueror eiginleikagluggi til að stilla tengihegðun --Comment[it]=Plugin della configurazione di Konqueror per configurare il montaggio --Comment[ja]=mountの挙動を設定する、Konqueror属性ダイアログ プラグイン --Comment[km]=កម្មវិធីជំនួយឲ្យមានប្រអប់លក្ខណៈសម្បត្តិ Konqueror ដើម្បីកំណត់រចនាសម្ព័ន្ធឥរិយាបថម៉ោន --Comment[nb]=Et programtillegg for å sette opp montering av enheter i Konqueror --Comment[nds]=Egenschappendialoog-Plugin för Konqueror för't Instellen vun't Inhangbedregen --Comment[nl]=Dialoogvenster voor Konqueror om het aankoppelgedrag in te stellen --Comment[nn]=Programtillegg for oppsett av montering i Konqueror --Comment[pl]=Wtyczka okna właściwości Konquerora do konfiguracji zachowania montowania --Comment[pt]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem --Comment[pt_BR]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem --Comment[ru]=Модуль свойств для Konqueror, отвечающий за поведение при подключении файловых систем --Comment[sk]=Modul Konqueror dialógu vlastností pre konfiguráciu správania pripojenia --Comment[sl]=Vstavek za Konqueror s katerim se nastavlja obnašanje priklopa medijev --Comment[sr]=Прикључак са својствима Konqueror-а за подешавање понашања при монтирању --Comment[sr@Latn]=Priključak sa svojstvima Konqueror-a za podešavanje ponašanja pri montiranju --Comment[sv]=Konqueror insticksprogram med egenskapsdialogruta för att anpassa monteringsbeteende --Comment[uk]=Втулок вікна властивостей Konqueror для налаштування поведінки монтування --Comment[vi]=bổ sung hộp thoại tài sản Konqueror để cấu hình ứng xử gắn kết --Comment[zh_TW]=Konqueror 內容對話框外掛程式，用於設定掛載的行為 --X-KDE-Library=media_propsdlgplugin --ServiceTypes=KPropsDlg/Plugin,media/audiocd,media/hdd_mounted,media/hdd_unmounted,media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/nfs_mounted,media/cdwriter_unmounted,media/nfs_unmounted,media/removable_mounted,media/dvd_mounted,media/removable_unmounted,media/dvd_unmounted,media/smb_mounted,media/dvdvideo,media/smb_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/floppy_mounted,media/zip_mounted,media/floppy_unmounted,media/zip_unmounted,media/camera_mounted,media/camera_unmounted -diff -urN kioslave/media/propsdlgplugin/propertiespage.cpp kioslave/media/propsdlgplugin/propertiespage.cpp ---- kioslave/media/propsdlgplugin/propertiespage.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespage.cpp Thu Jan 1 01:00:00 1970 -@@ -1,217 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program 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 General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ -- --#include <qcheckbox.h> --#include <qtooltip.h> --#include <qbuttongroup.h> --#include <qlineedit.h> --#include <qfileinfo.h> --#include <qlabel.h> --#include <qregexp.h> --#include <kpushbutton.h> --#include <kmessagebox.h> --#include <klocale.h> --#include <qcombobox.h> --#include <qtimer.h> --#include <kdebug.h> --#include "propertiespage.h" --#include <dcopref.h> -- --// keep in sync with .ui and kded module --const char *short_names[] = {"lower", "win95", "winnt", "mixed", 0 }; --const char *journales[] = {"data", "ordered", "writeback", 0 }; -- --PropertiesPage::PropertiesPage(QWidget* parent, const QString &_id) -- : PropertiesPageGUI(parent), id(_id) --{ -- kdDebug() << "props page " << id << endl; -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "mountoptions", id); -- -- QStringList list; -- -- if (reply.isValid()) -- list = reply; -- -- if (list.size()) { -- kdDebug() << "list " << list << endl; -- -- for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it) -- { -- QString key = (*it).left((*it).find('=')); -- QString value = (*it).mid((*it).find('=') + 1); -- kdDebug() << "key '" << key << "' value '" << value << "'\n"; -- options[key] = value; -- } -- -- if (!options.contains("ro")) -- option_ro->hide(); -- else -- option_ro->setChecked(options["ro"] == "true"); -- connect( option_ro, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("quiet")) -- option_quiet->hide(); -- else -- option_quiet->setChecked(options["quiet"] == "true"); -- connect( option_quiet, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("sync")) -- option_sync->hide(); -- else -- option_sync->setChecked(options["sync"] == "true"); -- connect( option_sync, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("atime")) -- option_atime->hide(); -- else -- option_atime->setChecked(options["atime"] == "true"); -- connect( option_atime, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("flush")) -- option_flush->hide(); -- else -- option_flush->setChecked(options["flush"] == "true"); -- connect( option_flush, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("utf8")) -- option_utf8->hide(); -- else -- option_utf8->setChecked(options["utf8"] == "true"); -- connect( option_utf8, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("uid")) -- option_uid->hide(); -- else -- option_uid->setChecked(options["uid"] == "true"); -- connect( option_uid, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("shortname")) -- { -- option_shortname->hide(); -- text_shortname->hide(); -- } -- else -- { -- for (int index = 0; short_names[index]; ++index) -- if (options["shortname"] == short_names[index]) -- { -- option_shortname->setCurrentItem(index); -- break; -- } -- connect( option_shortname, SIGNAL( activated(int) ), SIGNAL( changed() ) ); -- } -- -- if (!options.contains("journaling")) -- { -- text_journaling->hide(); -- option_journaling->hide(); -- } -- else -- { -- for (int index = 0; journales[index]; ++index) -- if (options["journaling"] == journales[index]) -- { -- option_journaling->setCurrentItem(index); -- break; -- } -- connect( option_journaling, SIGNAL( activated(int) ), SIGNAL( changed() ) ); -- } -- -- label_filesystem->setText(i18n("Filesystem: %1").arg(options["filesystem"])); -- option_mountpoint->setText(options["mountpoint"]); -- connect( option_mountpoint, SIGNAL( textChanged( const QString &) ), SIGNAL( changed() ) ); -- option_automount->setChecked(options["automount"] == "true"); -- connect( option_automount, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("journaling") && -- !options.contains("shortname") && -- !options.contains("uid") && -- !options.contains("utf8") && -- !options.contains("flush")) -- groupbox_specific->hide(); -- -- } else { -- -- groupbox_generic->setEnabled(false); -- groupbox_specific->setEnabled(false); -- label_filesystem->hide(); -- } --} -- --PropertiesPage::~PropertiesPage() --{ --} -- --bool PropertiesPage::save() --{ -- QStringList result; -- -- if (options.contains("ro")) -- result << QString("ro=%1").arg(option_ro->isChecked() ? "true" : "false"); -- -- if (options.contains("quiet")) -- result << QString("quiet=%1").arg(option_quiet->isChecked() ? "true" : "false"); -- -- if (options.contains("sync")) -- result << QString("sync=%1").arg(option_sync->isChecked() ? "true" : "false"); -- -- if (options.contains("atime")) -- result << QString("atime=%1").arg(option_atime->isChecked() ? "true" : "false"); -- -- if (options.contains("flush")) -- result << QString("flush=%1").arg(option_flush->isChecked() ? "true" : "false"); -- -- if (options.contains("utf8")) -- result << QString("utf8=%1").arg(option_utf8->isChecked() ? "true" : "false"); -- -- if (options.contains("uid")) -- result << QString("uid=%1").arg(option_uid->isChecked() ? "true" : "false"); -- -- if (options.contains("shortname")) -- result << QString("shortname=%1").arg(short_names[option_shortname->currentItem()]); -- -- if (options.contains("journaling")) -- result << QString("journaling=%1").arg(journales[option_journaling->currentItem()]); -- -- QString mp = option_mountpoint->text(); -- if (!mp.startsWith("/media/")) -- { -- KMessageBox::sorry(this, i18n("Mountpoint has to be below /media")); -- return false; -- } -- result << QString("mountpoint=%1").arg(mp); -- result << QString("automount=%1").arg(option_automount->isChecked() ? "true" : "false"); -- -- kdDebug() << result << endl; -- -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "setMountoptions", id, result); -- -- if (reply.isValid()) -- return (bool)reply; -- else { -- KMessageBox::sorry(this, -- i18n("Saving the changes failed")); -- -- return false; -- } --} -- --#include "propertiespage.moc" -diff -urN kioslave/media/propsdlgplugin/propertiespage.h kioslave/media/propsdlgplugin/propertiespage.h ---- kioslave/media/propsdlgplugin/propertiespage.h Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespage.h Thu Jan 1 01:00:00 1970 -@@ -1,46 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program 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 General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ -- --#ifndef PROPERTIESPAGE_H --#define PROPERTIESPAGE_H -- --#include "propertiespagegui.h" --#include <qmap.h> -- --class QCheckBox; --class Medium; -- --class PropertiesPage : public PropertiesPageGUI --{ -- Q_OBJECT -- --public: -- PropertiesPage(QWidget* parent, const QString &_id); -- virtual ~PropertiesPage(); -- -- bool save(); -- --protected: -- -- QMap<QString,QString> options; -- QString id; -- --}; -- --#endif -diff -urN kioslave/media/propsdlgplugin/propertiespagegui.ui kioslave/media/propsdlgplugin/propertiespagegui.ui ---- kioslave/media/propsdlgplugin/propertiespagegui.ui Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespagegui.ui Thu Jan 1 01:00:00 1970 -@@ -1,387 +0,0 @@ --<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> --<class>PropertiesPageGUI</class> --<widget class="QWidget"> -- <property name="name"> -- <cstring>PropertiesPageGUI</cstring> -- </property> -- <property name="geometry"> -- <rect> -- <x>0</x> -- <y>0</y> -- <width>527</width> -- <height>476</height> -- </rect> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <property name="margin"> -- <number>0</number> -- </property> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout17</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QGroupBox"> -- <property name="name"> -- <cstring>groupbox_generic</cstring> -- </property> -- <property name="title"> -- <string>Generic Mount Options</string> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout15</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_ro</cstring> -- </property> -- <property name="text"> -- <string>Read only</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Mount the file system read-only.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_quiet</cstring> -- </property> -- <property name="text"> -- <string>Quiet</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Attempts to chown or chmod files do not return errors, although they fail. Use with caution!</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_sync</cstring> -- </property> -- <property name="text"> -- <string>Synchronous</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>All I/O to the file system should be done synchronously.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_atime</cstring> -- </property> -- <property name="text"> -- <string>Access time updates</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Update inode access time for each access.</string> -- </property> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout14</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>textLabel3</cstring> -- </property> -- <property name="text"> -- <string>Mountpoint:</string> -- </property> -- <property name="buddy" stdset="0"> -- <cstring>option_mountpoint</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Under what directory this file system shall be mounted. Please note that there is no guarantee that the system will respect your wish. For one the directory has to be below /media - and it does not yet have to exist.</string> -- </property> -- </widget> -- <widget class="QLineEdit"> -- <property name="name"> -- <cstring>option_mountpoint</cstring> -- </property> -- <property name="text"> -- <string></string> -- </property> -- </widget> -- </hbox> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_automount</cstring> -- </property> -- <property name="text"> -- <string>Mount automatically</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Mount this file system automatically.</string> -- </property> -- </widget> -- </vbox> -- </widget> -- </vbox> -- </widget> -- <widget class="QGroupBox"> -- <property name="name"> -- <cstring>groupbox_specific</cstring> -- </property> -- <property name="title"> -- <string>Filesystem Specific Mount Options</string> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout11</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_flush</cstring> -- </property> -- <property name="text"> -- <string>Flushed IO</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Always flush all data to the hot plug devices immediately and don't cache it.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_utf8</cstring> -- </property> -- <property name="text"> -- <string>UTF-8 charset</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the console. It can be be enabled for the filesystem with this option.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_uid</cstring> -- </property> -- <property name="text"> -- <string>Mount as user</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Mount this file system as user.</string> -- </property> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout7</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>text_journaling</cstring> -- </property> -- <property name="text"> -- <string>Journaling:</string> -- </property> -- <property name="buddy" stdset="0"> -- <cstring>option_journaling</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> -- --<h3><b>All Data</b></h3> -- All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. -- --<h3><b>Ordered</b></h3> -- All data is forced directly out to the main file system prior to its metadata being committed to the journal. -- --<h3><b>Write Back</b></h3> -- Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery.</string> -- </property> -- </widget> -- <widget class="QComboBox"> -- <item> -- <property name="text"> -- <string>All Data</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Ordered</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Write Back</string> -- </property> -- </item> -- <property name="name"> -- <cstring>option_journaling</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> -- --<h3><b>All Data</b></h3> -- All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. -- --<h3><b>Ordered</b></h3> -- All data is forced directly out to the main file system prior to its metadata being committed to the journal. -- --<h3><b>Write Back</b></h3> -- Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery.</string> -- </property> -- </widget> -- </hbox> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout14</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>text_shortname</cstring> -- </property> -- <property name="text"> -- <string>Short names:</string> -- </property> -- <property name="buddy" stdset="0"> -- <cstring>option_shortname</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> -- --<h3><b>Lower</b></h3> --Force the short name to lower case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows 95</b></h3> --Force the short name to upper case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows NT</b></h3> --Display the shortname as is; store a long name when the short name is not all lower case or all upper case. -- --<h3><b>Mixed</b></h3> --Display the short name as is; store a long name when the short name is not all upper case.</string> -- </property> -- </widget> -- <widget class="QComboBox"> -- <item> -- <property name="text"> -- <string>Lower</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Windows 95</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Windows NT</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Mixed</string> -- </property> -- </item> -- <property name="name"> -- <cstring>option_shortname</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> -- --<h3><b>Lower</b></h3> --Force the short name to lower case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows 95</b></h3> --Force the short name to upper case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows NT</b></h3> --Display the shortname as is; store a long name when the short name is not all lower case or all upper case. -- --<h3><b>Mixed</b></h3> --Display the short name as is; store a long name when the short name is not all upper case.</string> -- </property> -- </widget> -- </hbox> -- </widget> -- </vbox> -- </widget> -- </vbox> -- </widget> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>label_filesystem</cstring> -- </property> -- <property name="text"> -- <string>Filesystem: iso9660</string> -- </property> -- </widget> -- <spacer> -- <property name="name"> -- <cstring>spacer1</cstring> -- </property> -- <property name="orientation"> -- <enum>Vertical</enum> -- </property> -- <property name="sizeType"> -- <enum>Expanding</enum> -- </property> -- <property name="sizeHint"> -- <size> -- <width>20</width> -- <height>20</height> -- </size> -- </property> -- </spacer> -- </vbox> -- </widget> -- </hbox> --</widget> --<connections> -- <connection> -- <sender>option_ro</sender> -- <signal>stateChanged(int)</signal> -- <receiver>PropertiesPageGUI</receiver> -- <slot>changedSlot()</slot> -- </connection> --</connections> --<variables> -- <variable>bool m_hasChanged;</variable> --</variables> --<signals> -- <signal>changed()</signal> --</signals> --<slots> -- <slot access="protected">changedSlot()</slot> --</slots> --<functions> -- <function returnType="bool">hasChanged()</function> --</functions> --<layoutdefaults spacing="6" margin="11"/> --</UI> -diff -urN kioslave/media/propsdlgplugin/propertiespagegui.ui.h kioslave/media/propsdlgplugin/propertiespagegui.ui.h ---- kioslave/media/propsdlgplugin/propertiespagegui.ui.h Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespagegui.ui.h Thu Jan 1 01:00:00 1970 -@@ -1,22 +0,0 @@ --/**************************************************************************** --** ui.h extension file, included from the uic-generated form implementation. --** --** If you wish to add, delete or rename functions or slots use --** Qt Designer which will update this file, preserving your code. Create an --** init() function in place of a constructor, and a destroy() function in --** place of a destructor. --*****************************************************************************/ -- -- --void PropertiesPageGUI::changedSlot() --{ -- m_hasChanged = true; -- emit changed(); --} -- --bool PropertiesPageGUI::hasChanged() --{ -- return m_hasChanged; --} -- -- -diff -urN kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp ---- kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp Thu Jan 1 01:00:00 1970 -@@ -1,100 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program 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 General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ --#include <qstring.h> --#include <qvbox.h> --#include <qlayout.h> --#include <qlabel.h> --#include <qtimer.h> -- --#include <kgenericfactory.h> --#include <kdebug.h> --#include <kpushbutton.h> --#include <kfileshare.h> --#include <kmessagebox.h> --#include <kprocess.h> --#include <kstandarddirs.h> --#include <kdialog.h> --#include <kglobal.h> --#include <dcopref.h> -- --#include "propertiespage.h" --#include "propsdlgshareplugin.h" --#include "../libmediacommon/medium.h" -- --typedef KGenericFactory<PropsDlgSharePlugin, KPropertiesDialog> PropsDlgSharePluginFactory; -- --K_EXPORT_COMPONENT_FACTORY( media_propsdlgplugin, -- PropsDlgSharePluginFactory("media_propsdlgplugin") ) -- --class PropsDlgSharePlugin::Private --{ -- public: -- PropertiesPage* page; --}; -- --PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg, -- const char *, const QStringList & ) -- : KPropsDlgPlugin(dlg), d(0) --{ -- if (properties->items().count() != 1) -- return; -- -- KFileItem *item = properties->items().first(); -- -- DCOPRef mediamanager("kded", "mediamanager"); -- kdDebug() << "properties " << item->url() << endl; -- DCOPReply reply = mediamanager.call( "properties", item->url().url() ); -- -- if ( !reply.isValid() ) -- return; -- -- QVBox* vbox = properties->addVBoxPage(i18n("&Mounting")); -- -- d = new Private(); -- -- d->page = new PropertiesPage(vbox, Medium::create(reply).id()); -- connect(d->page, SIGNAL(changed()), -- SLOT(slotChanged())); -- -- // QTimer::singleShot(100, this, SLOT(slotChanged())); -- --} -- --void PropsDlgSharePlugin::slotChanged() --{ -- kdDebug() << "slotChanged()\n"; -- setDirty(true); --} -- --PropsDlgSharePlugin::~PropsDlgSharePlugin() --{ -- delete d; --} -- --void PropsDlgSharePlugin::applyChanges() --{ -- kdDebug() << "applychanges\n"; -- if (!d->page->save()) { -- properties->abortApplying(); -- } --} -- -- --#include "propsdlgshareplugin.moc" -- -diff -urN kioslave/media/propsdlgplugin/propsdlgshareplugin.h kioslave/media/propsdlgplugin/propsdlgshareplugin.h ---- kioslave/media/propsdlgplugin/propsdlgshareplugin.h Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propsdlgshareplugin.h Thu Jan 1 01:00:00 1970 -@@ -1,44 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program 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 General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ -- --#ifndef KONQFILESHAREPLUGIN_H --#define KONQFILESHAREPLUGIN_H -- --#include <kpropertiesdialog.h> -- --class PropsDlgSharePlugin : public KPropsDlgPlugin --{ --Q_OBJECT --public: -- PropsDlgSharePlugin( KPropertiesDialog *dlg, const char *, const QStringList & ); -- virtual ~PropsDlgSharePlugin(); -- virtual void applyChanges(); -- --public slots: -- void slotChanged(); -- --private: -- class Private; -- Private *d; -- --}; -- --#endif -- -- -diff -urN kioslave/media/services/Makefile.in kioslave/media/services/Makefile.in ---- kioslave/media/services/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/services/Makefile.in Fri May 26 09:54:31 2006 -@@ -211,6 +211,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/services/media_eject.desktop kioslave/media/services/media_eject.desktop ---- kioslave/media/services/media_eject.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/services/media_eject.desktop Mon May 22 20:12:42 2006 -@@ -24,7 +24,7 @@ - Name[es]=Expulsar - Name[et]=Väljastamine - Name[eu]=Egotzi --Name[fa]=پس زدن -+Name[fa]=اخراج - Name[fi]=Poista - Name[fr]=Éjecter - Name[fy]=Utsmytknop -diff -urN kioslave/media/services/media_safelyremove.desktop kioslave/media/services/media_safelyremove.desktop ---- kioslave/media/services/media_safelyremove.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/services/media_safelyremove.desktop Tue May 23 13:33:34 2006 -@@ -18,10 +18,8 @@ - Name[es]=Extracción segura - Name[et]=Eemalda turvaliselt - Name[eu]=Atera arriskurik gabe --Name[fa]=حذف امن - Name[fi]=Poista turvallisesti - Name[fr]=Enlever en toute sécurité --Name[fy]=Feilich verwiderje - Name[ga]=Bain Amach go Sábháilte - Name[gl]=Eliminar de Maneira Segura - Name[he]=שליפה בבטחה -@@ -46,7 +44,6 @@ - Name[ru]=Безопасно извлечь - Name[rw]=Gukuramo Neza - Name[se]=Dorvvošlaš eretváldin --Name[sk]=Bezpečne odpojiť - Name[sl]=Varno odstrani - Name[sr]=Безбедно уклони - Name[sr@Latn]=Bezbedno ukloni diff --git a/x11/kde4-baseapps/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kde4-baseapps/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp deleted file mode 100644 index 5a6937d40f75..000000000000 --- a/x11/kde4-baseapps/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- kioslave/media/mediamanager/fstabbackend.cpp.orig Mon May 22 20:12:42 2006 -+++ kioslave/media/mediamanager/fstabbackend.cpp Fri Jun 16 08:56:20 2006 -@@ -111,6 +111,7 @@ - if ( mount->mountType() == "swap" - || mount->mountType() == "tmpfs" - || mount->mountType() == "sysfs" -+ || mount->mountType() == "fdescfs" - || mount->mountType() == "kernfs" - || mount->mountType() == "usbfs" - || mount->mountType().contains( "proc" ) diff --git a/x11/kde4-baseapps/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp b/x11/kde4-baseapps/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp index 00685d0fd8a2..e2580f9277c0 100644 --- a/x11/kde4-baseapps/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp +++ b/x11/kde4-baseapps/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp @@ -1,5 +1,5 @@ ---- kioslave/media/mediamanager/halbackend.cpp.orig Sun Oct 1 21:31:54 2006 -+++ kioslave/media/mediamanager/halbackend.cpp Fri Feb 9 22:01:27 2007 +--- kioslave/media/mediamanager/halbackend.cpp.orig Mon Jan 15 12:31:32 2007 ++++ kioslave/media/mediamanager/halbackend.cpp Sat Mar 3 18:00:49 2007 @@ -17,9 +17,14 @@ */ @@ -14,9 +14,9 @@ +#include <langinfo.h> +#endif - #include <qfile.h> - #include <klocale.h> -@@ -66,6 +71,10 @@ + #include <kapplication.h> + #include <qeventloop.h> +@@ -71,6 +76,10 @@ /* Close HAL connection */ if (m_halContext) { @@ -27,7 +27,7 @@ const QPtrList<Medium> medlist = m_mediaList.list(); QPtrListIterator<Medium> it (medlist); for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) -@@ -185,6 +194,10 @@ +@@ -184,6 +193,10 @@ libhal_free_string_array( halDeviceList ); @@ -38,9 +38,9 @@ return true; } -@@ -242,11 +255,11 @@ - Medium* medium = new Medium(udi, ""); - +@@ -251,11 +264,11 @@ + } + } QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi)); - kdDebug() << "automount " << options["automount"] << endl; + kdDebug(1219) << "automount " << options["automount"] << endl; @@ -50,9 +50,9 @@ - kdDebug() << "error " << error << endl; + kdDebug(1219) << "error " << error << endl; } - setVolumeProperties(medium); m_mediaList.addMedium(medium, allowNotification); -@@ -264,6 +277,11 @@ + +@@ -272,6 +285,11 @@ Medium* medium = new Medium(udi, ""); setFloppyProperties(medium); m_mediaList.addMedium(medium, allowNotification); @@ -64,7 +64,7 @@ return; } -@@ -285,12 +303,23 @@ +@@ -293,12 +311,23 @@ void HALBackend::RemoveDevice(const char *udi) { @@ -89,7 +89,7 @@ const char* mediumUdi = findMediumUdiFromUdi(udi); if (!mediumUdi) return; -@@ -326,7 +355,7 @@ +@@ -334,7 +363,7 @@ } const char* mediumUdi = findMediumUdiFromUdi(udi); @@ -98,7 +98,7 @@ if (!mediumUdi) return; -@@ -384,7 +413,7 @@ +@@ -392,7 +421,7 @@ { Medium m( *cmedium ); if ( setFstabProperties( &m ) ) { @@ -107,7 +107,7 @@ m_mediaList.changeMediumState(m, false); } return; -@@ -399,6 +428,7 @@ +@@ -407,6 +436,7 @@ setFloppyProperties(m); if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) setCameraProperties(m); @@ -115,7 +115,7 @@ m_mediaList.changeMediumState(*m, false); -@@ -469,28 +499,23 @@ +@@ -479,28 +509,23 @@ else mimeType = "media/dvd" + MOUNT_SUFFIX; @@ -155,7 +155,7 @@ } else { -@@ -575,7 +600,7 @@ +@@ -584,7 +609,7 @@ } } @@ -164,7 +164,7 @@ QString fstype = medium->fsType(); if ( fstype.isNull() ) fstype = "auto"; -@@ -762,7 +787,7 @@ +@@ -794,7 +819,7 @@ if (t.endsWith("=")) t = t.left(t.length() - 1); valids[t] = true; @@ -173,7 +173,7 @@ } libhal_free_string_array(array); QStringList result; -@@ -882,12 +908,20 @@ +@@ -915,12 +940,20 @@ result << "journaling=ordered"; } @@ -195,7 +195,7 @@ KConfig config("mediamanagerrc"); config.setGroup(name); -@@ -927,7 +959,7 @@ +@@ -960,7 +993,7 @@ if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, "org.freedesktop.Hal.Device.Volume", "Mount"))) { @@ -204,7 +204,7 @@ return i18n("Internal Error"); } -@@ -935,7 +967,7 @@ +@@ -968,7 +1001,7 @@ DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &poptions, noptions, DBUS_TYPE_INVALID)) { @@ -213,7 +213,7 @@ dbus_message_unref (dmesg); return i18n("Internal Error"); } -@@ -963,7 +995,7 @@ +@@ -996,7 +1029,7 @@ return qerror; } @@ -222,18 +222,25 @@ dbus_message_unref (dmesg); dbus_message_unref (reply); -@@ -974,15 +1006,33 @@ +@@ -1044,7 +1077,7 @@ void HALBackend::slotResult(KIO::Job *job) { - kdDebug() << "slotResult " << mount_jobs[job] << endl; + kdDebug(1219) << "slotResult " << mount_jobs[job] << endl; - if (job->error()) - { - KMessageBox::error(0, job->errorText()); + + struct mount_job_data *data = mount_jobs[job]; + QString& qerror = data->errorMessage; +@@ -1071,7 +1104,6 @@ + qerror = job->errorText(); } -- ResetProperties( mount_jobs[job].latin1() ); + +- ResetProperties( medium->id().latin1() ); mount_jobs.remove(job); + + /* Job completed. Notify the caller */ +@@ -1080,6 +1112,25 @@ + kapp->eventLoop()->exitLoop(); } +#ifdef Q_OS_FREEBSD @@ -247,7 +254,7 @@ + { + bool mounted = false; + const char *dev = (*it)->deviceNode().ascii(); -+ for (int n = mntNum-1; n >= 0 && !mounted; n--) ++ for (int n = mntNum-1; n >= 0 && !mounted; n--) + mounted = !strcmp(dev, mntBuf[n].f_mntfromname); + if ((*it)->isMounted() != mounted) + ResetProperties((*it)->id().latin1()); @@ -258,31 +265,32 @@ QString HALBackend::isInFstab(const Medium *medium) { KMountPoint::List fstab = KMountPoint::possibleMountPoints(KMountPoint::NeedMountOptions|KMountPoint::NeedRealDeviceName); -@@ -992,11 +1042,13 @@ - - for (; it!=end; ++it) - { -- kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl; -+ kdDebug(1219) << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl; - if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && (*it)->realDeviceName() == medium->deviceNode() ) ) +@@ -1092,12 +1143,14 @@ + QString reald = (*it)->realDeviceName(); + if ( reald.endsWith( "/" ) ) + reald = reald.left( reald.length() - 1 ); +- kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << reald << "- -" << (*it)->mountedFrom() << "-" << endl; ++ kdDebug(1219) << "isInFstab -" << medium->deviceNode() << "- -" << reald << "- -" << (*it)->mountedFrom() << "-" << endl; + if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && reald == medium->deviceNode() ) ) { +#ifndef Q_OS_FREEBSD QStringList opts = (*it)->mountOptions(); if (opts.contains("user") || opts.contains("users")) -+#endif return (*it)->mountPoint(); ++#endif } } -@@ -1012,7 +1064,7 @@ - QString mountPoint = isInFstab(medium); - if (!mountPoint.isNull()) - { + +@@ -1116,7 +1169,7 @@ + data.completed = false; + data.medium = medium; + - kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; + kdDebug(1219) << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint ); connect(job, SIGNAL( result (KIO::Job *)), SLOT( slotResult( KIO::Job *))); -@@ -1023,7 +1075,7 @@ +@@ -1134,7 +1187,7 @@ QStringList soptions; @@ -291,7 +299,7 @@ QMap<QString,QString> valids = MediaManagerUtils::splitOptions(mountoptions(medium->id())); if (valids["flush"] == "true") -@@ -1036,10 +1088,10 @@ +@@ -1147,10 +1200,10 @@ if (valids["ro"] == "true") soptions << "ro"; @@ -304,7 +312,7 @@ if (valids["quiet"] == "true") soptions << "quiet"; -@@ -1069,6 +1121,13 @@ +@@ -1180,6 +1233,13 @@ soptions << QString("data=ordered"); } @@ -318,7 +326,7 @@ const char **options = new const char*[soptions.size() + 1]; uint noptions = 0; for (QStringList::ConstIterator it = soptions.begin(); it != soptions.end(); ++it, ++noptions) -@@ -1081,9 +1140,6 @@ +@@ -1192,9 +1252,6 @@ return qerror; } @@ -328,16 +336,7 @@ return QString(); } -@@ -1121,7 +1177,7 @@ - QString mountPoint = isInFstab(medium); - if (!mountPoint.isNull()) - { -- kdDebug() << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl; -+ kdDebug(1219) << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl; - KIO::Job *job = KIO::unmount( medium->mountPoint(), false ); - connect(job, SIGNAL( result (KIO::Job *)), - SLOT( slotResult( KIO::Job *))); -@@ -1134,7 +1190,7 @@ +@@ -1255,7 +1312,7 @@ const char *options[2]; const char *udi = medium->id().latin1(); @@ -346,7 +345,7 @@ dbus_error_init(&error); DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -@@ -1147,7 +1203,7 @@ +@@ -1268,7 +1325,7 @@ if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, "org.freedesktop.Hal.Device.Volume", "Unmount"))) { @@ -355,7 +354,7 @@ return i18n("Internal Error"); } -@@ -1157,7 +1213,7 @@ +@@ -1278,7 +1335,7 @@ if (!dbus_message_append_args (dmesg, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, 0, DBUS_TYPE_INVALID)) { @@ -364,16 +363,16 @@ dbus_message_unref (dmesg); return i18n("Internal Error"); } -@@ -1165,7 +1221,7 @@ - dbus_error_init (&error); - if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) +@@ -1288,7 +1345,7 @@ { + QString qerror, reason; + - kdDebug() << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl; + kdDebug(1219) << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl; - QString qerror = error.message; - if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.Busy")) { - qerror = QString("<qt>") + i18n("Device is Busy:"); -@@ -1201,13 +1257,10 @@ + qerror = "<qt>"; + qerror += i18n("Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and " + "currently mounted at <b>%4</b> could not be unmounted. ").arg( +@@ -1318,13 +1375,10 @@ return qerror; } diff --git a/x11/kde4-baseapps/files/extrapatch-kioslave_media_mediamanager-halbackend.h b/x11/kde4-baseapps/files/extrapatch-kioslave_media_mediamanager-halbackend.h index df548eb39905..21672b565977 100644 --- a/x11/kde4-baseapps/files/extrapatch-kioslave_media_mediamanager-halbackend.h +++ b/x11/kde4-baseapps/files/extrapatch-kioslave_media_mediamanager-halbackend.h @@ -1,5 +1,5 @@ ---- kioslave/media/mediamanager/halbackend.h.orig Sun Jan 28 23:58:13 2007 -+++ kioslave/media/mediamanager/halbackend.h Thu Feb 1 02:51:48 2007 +--- kioslave/media/mediamanager/halbackend.h.orig Mon Jan 15 12:31:32 2007 ++++ kioslave/media/mediamanager/halbackend.h Wed Feb 21 15:01:12 2007 @@ -34,6 +34,9 @@ #include <qobject.h> #include <qstringlist.h> @@ -10,7 +10,7 @@ #include <config.h> -@@ -154,6 +157,9 @@ +@@ -156,6 +159,9 @@ private slots: void slotResult(KIO::Job *job); @@ -20,10 +20,10 @@ /* Hal call-backs -- from gvm*/ public: -@@ -217,6 +223,10 @@ - DBusConnection *dbus_connection; +@@ -233,6 +239,10 @@ + }; - QMap<KIO::Job *, QString> mount_jobs; + QMap<KIO::Job *, struct mount_job_data*> mount_jobs; +#ifdef Q_OS_FREEBSD + QTimer m_pollTimer; + QPtrList<Medium> m_pollMediaList; diff --git a/x11/kde4-baseapps/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp b/x11/kde4-baseapps/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp index 508019a14f3c..7d0fbfa81767 100644 --- a/x11/kde4-baseapps/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp +++ b/x11/kde4-baseapps/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp @@ -1,6 +1,6 @@ ---- kioslave/media/mounthelper/kio_media_mounthelper.cpp.orig Sat Jan 27 01:58:24 2007 -+++ kioslave/media/mounthelper/kio_media_mounthelper.cpp Sat Jan 27 02:35:28 2007 -@@ -77,7 +77,9 @@ +--- kioslave/media/mounthelper/kio_media_mounthelper.cpp.orig Mon Jan 15 12:31:31 2007 ++++ kioslave/media/mounthelper/kio_media_mounthelper.cpp Wed Feb 21 15:17:23 2007 +@@ -89,7 +89,9 @@ m_isCdrom = medium.mimeType().find("dvd")!=-1 || medium.mimeType().find("cd")!=-1; @@ -11,7 +11,7 @@ { DCOPRef mediamanager("kded", "mediamanager"); DCOPReply reply = mediamanager.call( "unmount", medium.id()); -@@ -85,13 +87,14 @@ +@@ -97,30 +99,14 @@ reply.get(m_errorStr); kdDebug() << "medium unmount " << m_errorStr << endl; if (m_errorStr.isNull()) @@ -26,6 +26,23 @@ - } - else if (args->isSet("s") || args->isSet("e")) - { +- /* +- * We want to call mediamanager unmount before invoking eject. That's +- * because unmount would provide an informative error message in case of +- * failure. However, there are cases when unmount would fail +- * (supermount, slackware, see bug#116209) but eject would succeed. +- * Thus if unmount fails, save unmount error message and invokeEject() +- * anyway. Only if both unmount and eject fail, notify the user by +- * displaying the saved error message (see ejectFinished()). +- */ +- if (medium.isMounted()) +- { +- DCOPRef mediamanager("kded", "mediamanager"); +- DCOPReply reply = mediamanager.call( "unmount", medium.id()); +- if (reply.isValid()) +- reply.get(m_errorStr); +- m_device = device; +- } - invokeEject(device, true); } else diff --git a/x11/kde4-baseapps/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kde4-baseapps/files/patch-kdm-kfrontend-genkdmconf.c deleted file mode 100644 index e0179de4e074..000000000000 --- a/x11/kde4-baseapps/files/patch-kdm-kfrontend-genkdmconf.c +++ /dev/null @@ -1,11 +0,0 @@ ---- kdm/kfrontend/genkdmconf.c.orig Mon Jun 5 14:34:06 2006 -+++ kdm/kfrontend/genkdmconf.c Mon Jun 5 14:35:52 2006 -@@ -1684,7 +1684,7 @@ - linkfile( ce ); - else { - tmpf = locate( "mktemp" ) ? -- "`mktemp`" : -+ "`mktemp /tmp/xsess-env-XXXXXX`" : - locate( "tempfile" ) ? - "`tempfile`" : - "$HOME/.xsession-env-$DISPLAY"; diff --git a/x11/kde4-baseapps/files/patch-kwin-client.cpp b/x11/kde4-baseapps/files/patch-kwin-client.cpp deleted file mode 100644 index d8e0f91db691..000000000000 --- a/x11/kde4-baseapps/files/patch-kwin-client.cpp +++ /dev/null @@ -1,39 +0,0 @@ ---- kwin/client.cpp.orig Mon Oct 2 03:02:07 2006 -+++ kwin/client.cpp Mon Jan 8 10:54:19 2007 -@@ -477,17 +477,30 @@ - // calls it or when the decoration is created/destroyed - - if( Shape::version() >= 0x11 ) // 1.1, has input shape support -- { // there appears to be no way to find out if a window has input -- // shape set or not, so always set propagate the input shape -- // (it's the same like the bounding shape by default) -- XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, 0, 0, -+ { // There appears to be no way to find out if a window has input -+ // shape set or not, so always propagate the input shape -+ // (it's the same like the bounding shape by default). -+ // Also, build the shape using a helper window, not directly -+ // in the frame window, because the sequence set-shape-to-frame, -+ // remove-shape-of-client, add-input-shape-of-client has the problem -+ // that after the second step there's a hole in the input shape -+ // until the real shape of the client is added and that can make -+ // the window lose focus (which is a problem with mouse focus policies) -+ static Window helper_window = None; -+ if( helper_window == None ) -+ helper_window = XCreateSimpleWindow( qt_xdisplay(), qt_xrootwin(), -+ 0, 0, 1, 1, 0, 0, 0 ); -+ XResizeWindow( qt_xdisplay(), helper_window, width(), height()); -+ XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput, 0, 0, - frameId(), ShapeBounding, ShapeSet ); -- XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, -+ XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput, - clientPos().x(), clientPos().y(), - window(), ShapeBounding, ShapeSubtract ); -- XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, -+ XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput, - clientPos().x(), clientPos().y(), - window(), ShapeInput, ShapeUnion ); -+ XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, 0, 0, -+ helper_window, ShapeInput, ShapeSet ); - } - } - diff --git a/x11/kde4-baseapps/pkg-plist b/x11/kde4-baseapps/pkg-plist index 46ca7f96cbe8..bd60a8fa6ce8 100644 --- a/x11/kde4-baseapps/pkg-plist +++ b/x11/kde4-baseapps/pkg-plist @@ -440,6 +440,9 @@ lib/kde3/kicker.so lib/kde3/kickermenu_find.a lib/kde3/kickermenu_find.la lib/kde3/kickermenu_find.so +lib/kde3/kickermenu_kate.a +lib/kde3/kickermenu_kate.la +lib/kde3/kickermenu_kate.so lib/kde3/kickermenu_kdeprint.a lib/kde3/kickermenu_kdeprint.la lib/kde3/kickermenu_kdeprint.so @@ -1158,6 +1161,7 @@ share/apps/kappfinder/apps/Internet/mozilla.desktop share/apps/kappfinder/apps/Internet/netscape.desktop share/apps/kappfinder/apps/Internet/netscape6.desktop share/apps/kappfinder/apps/Internet/opera.desktop +share/apps/kappfinder/apps/Internet/wireshark.desktop share/apps/kappfinder/apps/Internet/xbiff.desktop share/apps/kappfinder/apps/Internet/xchat.desktop share/apps/kappfinder/apps/Internet/xfmail.desktop @@ -1628,6 +1632,7 @@ share/apps/kicker/icons/locolor/16x16/actions/modified.png share/apps/kicker/menuext/find.desktop share/apps/kicker/menuext/find/kfind.desktop share/apps/kicker/menuext/find/websearch.desktop +share/apps/kicker/menuext/katesessionmenu.desktop share/apps/kicker/menuext/konquerormenu.desktop share/apps/kicker/menuext/konsolemenu.desktop share/apps/kicker/menuext/prefmenu.desktop @@ -2081,7 +2086,7 @@ share/desktop-directories/kde-edutainment.directory share/desktop-directories/kde-games-arcade.directory share/desktop-directories/kde-games-board.directory share/desktop-directories/kde-games-card.directory -share/desktop-directories/kde-games-kidsgames.directory +share/desktop-directories/kde-games-kids.directory share/desktop-directories/kde-games-roguelikes.directory share/desktop-directories/kde-games-strategy.directory share/desktop-directories/kde-games.directory @@ -2420,6 +2425,7 @@ share/doc/HTML/en/khelpcenter/userguide/common share/doc/HTML/en/khelpcenter/userguide/control-center.docbook share/doc/HTML/en/khelpcenter/userguide/creating-graphics.docbook share/doc/HTML/en/khelpcenter/userguide/credits-and-license.docbook +share/doc/HTML/en/khelpcenter/userguide/customizing-desktop.docbook share/doc/HTML/en/khelpcenter/userguide/desktop.png share/doc/HTML/en/khelpcenter/userguide/email.docbook share/doc/HTML/en/khelpcenter/userguide/extragear-applications.docbook @@ -2480,6 +2486,7 @@ share/doc/HTML/en/khelpcenter/userguide/ripsettings.png share/doc/HTML/en/khelpcenter/userguide/screen-captures.docbook share/doc/HTML/en/khelpcenter/userguide/services.png share/doc/HTML/en/khelpcenter/userguide/shared-sessions.docbook +share/doc/HTML/en/khelpcenter/userguide/splash-screen.png share/doc/HTML/en/khelpcenter/userguide/standard-menu-entries.docbook share/doc/HTML/en/khelpcenter/userguide/switching-sessions.docbook share/doc/HTML/en/khelpcenter/userguide/the-filemanager.docbook @@ -2492,7 +2499,6 @@ share/doc/HTML/en/khelpcenter/userguide/where-next.docbook share/doc/HTML/en/khelpcenter/userguide/windows-how-to.docbook share/doc/HTML/en/khelpcenter/userguide/your-kde-account.docbook share/doc/HTML/en/khelpcenter/visualdict/common -share/doc/HTML/en/khelpcenter/visualdict/contextmenu.png share/doc/HTML/en/khelpcenter/visualdict/index.cache.bz2 share/doc/HTML/en/khelpcenter/visualdict/index.docbook share/doc/HTML/en/khelpcenter/visualdict/pict1.png @@ -2508,6 +2514,9 @@ share/doc/HTML/en/khelpcenter/visualdict/pict18.png share/doc/HTML/en/khelpcenter/visualdict/pict19.png share/doc/HTML/en/khelpcenter/visualdict/pict2.png share/doc/HTML/en/khelpcenter/visualdict/pict20.png +share/doc/HTML/en/khelpcenter/visualdict/pict21.png +share/doc/HTML/en/khelpcenter/visualdict/pict22.png +share/doc/HTML/en/khelpcenter/visualdict/pict23.png share/doc/HTML/en/khelpcenter/visualdict/pict3.png share/doc/HTML/en/khelpcenter/visualdict/pict4.png share/doc/HTML/en/khelpcenter/visualdict/pict5.png @@ -2649,6 +2658,7 @@ share/doc/HTML/en/knetattach/common share/doc/HTML/en/knetattach/index.cache.bz2 share/doc/HTML/en/knetattach/index.docbook share/doc/HTML/en/knetattach/screenshot.png +share/doc/HTML/en/knetattach/screenshot1.png share/doc/HTML/en/knetattach/screenshot2.png share/doc/HTML/en/knetattach/screenshot3.png share/doc/HTML/en/knetattach/screenshot4.png @@ -2742,7 +2752,6 @@ share/icons/crystalsvg/128x128/apps/licq.png share/icons/crystalsvg/128x128/apps/linuxconf.png share/icons/crystalsvg/128x128/apps/locale.png share/icons/crystalsvg/128x128/apps/looknfeel.png -share/icons/crystalsvg/128x128/apps/mozilla.png share/icons/crystalsvg/128x128/apps/multimedia.png share/icons/crystalsvg/128x128/apps/netscape.png share/icons/crystalsvg/128x128/apps/package.png @@ -2808,7 +2817,6 @@ share/icons/crystalsvg/16x16/apps/enhanced_browsing.png share/icons/crystalsvg/16x16/apps/evolution.png share/icons/crystalsvg/16x16/apps/fifteenpieces.png share/icons/crystalsvg/16x16/apps/filetypes.png -share/icons/crystalsvg/16x16/apps/firefox.png share/icons/crystalsvg/16x16/apps/fonts.png share/icons/crystalsvg/16x16/apps/gabber.png share/icons/crystalsvg/16x16/apps/gaim.png @@ -2862,9 +2870,6 @@ share/icons/crystalsvg/16x16/apps/looknfeel.png share/icons/crystalsvg/16x16/apps/lyx.png share/icons/crystalsvg/16x16/apps/mac.png share/icons/crystalsvg/16x16/apps/mathematica.png -share/icons/crystalsvg/16x16/apps/mozilla.png -share/icons/crystalsvg/16x16/apps/mozilla_m.png -share/icons/crystalsvg/16x16/apps/mozilla_mail.png share/icons/crystalsvg/16x16/apps/multimedia.png share/icons/crystalsvg/16x16/apps/nedit.png share/icons/crystalsvg/16x16/apps/netscape.png @@ -2911,7 +2916,6 @@ share/icons/crystalsvg/16x16/apps/stylesheet.png share/icons/crystalsvg/16x16/apps/systemtray.png share/icons/crystalsvg/16x16/apps/taskbar.png share/icons/crystalsvg/16x16/apps/terminal.png -share/icons/crystalsvg/16x16/apps/thunderbird.png share/icons/crystalsvg/16x16/apps/tux.png share/icons/crystalsvg/16x16/apps/usb.png share/icons/crystalsvg/16x16/apps/vnc.png @@ -3016,7 +3020,6 @@ share/icons/crystalsvg/32x32/apps/error.png share/icons/crystalsvg/32x32/apps/evolution.png share/icons/crystalsvg/32x32/apps/fifteenpieces.png share/icons/crystalsvg/32x32/apps/filetypes.png -share/icons/crystalsvg/32x32/apps/firefox.png share/icons/crystalsvg/32x32/apps/fonts.png share/icons/crystalsvg/32x32/apps/gabber.png share/icons/crystalsvg/32x32/apps/gaim.png @@ -3071,9 +3074,6 @@ share/icons/crystalsvg/32x32/apps/looknfeel.png share/icons/crystalsvg/32x32/apps/lyx.png share/icons/crystalsvg/32x32/apps/mac.png share/icons/crystalsvg/32x32/apps/mathematica.png -share/icons/crystalsvg/32x32/apps/mozilla.png -share/icons/crystalsvg/32x32/apps/mozilla_m.png -share/icons/crystalsvg/32x32/apps/mozilla_mail.png share/icons/crystalsvg/32x32/apps/multimedia.png share/icons/crystalsvg/32x32/apps/nedit.png share/icons/crystalsvg/32x32/apps/netscape.png @@ -3118,7 +3118,6 @@ share/icons/crystalsvg/32x32/apps/stylesheet.png share/icons/crystalsvg/32x32/apps/systemtray.png share/icons/crystalsvg/32x32/apps/taskbar.png share/icons/crystalsvg/32x32/apps/terminal.png -share/icons/crystalsvg/32x32/apps/thunderbird.png share/icons/crystalsvg/32x32/apps/tux.png share/icons/crystalsvg/32x32/apps/usb.png share/icons/crystalsvg/32x32/apps/vnc.png @@ -3177,7 +3176,6 @@ share/icons/crystalsvg/48x48/apps/enhanced_browsing.png share/icons/crystalsvg/48x48/apps/evolution.png share/icons/crystalsvg/48x48/apps/fifteenpieces.png share/icons/crystalsvg/48x48/apps/filetypes.png -share/icons/crystalsvg/48x48/apps/firefox.png share/icons/crystalsvg/48x48/apps/fonts.png share/icons/crystalsvg/48x48/apps/gabber.png share/icons/crystalsvg/48x48/apps/gaim.png @@ -3226,9 +3224,6 @@ share/icons/crystalsvg/48x48/apps/licq.png share/icons/crystalsvg/48x48/apps/linuxconf.png share/icons/crystalsvg/48x48/apps/locale.png share/icons/crystalsvg/48x48/apps/looknfeel.png -share/icons/crystalsvg/48x48/apps/mozilla.png -share/icons/crystalsvg/48x48/apps/mozilla_m.png -share/icons/crystalsvg/48x48/apps/mozilla_mail.png share/icons/crystalsvg/48x48/apps/multimedia.png share/icons/crystalsvg/48x48/apps/nedit.png share/icons/crystalsvg/48x48/apps/netscape.png @@ -3330,7 +3325,6 @@ share/icons/crystalsvg/64x64/apps/licq.png share/icons/crystalsvg/64x64/apps/linuxconf.png share/icons/crystalsvg/64x64/apps/locale.png share/icons/crystalsvg/64x64/apps/looknfeel.png -share/icons/crystalsvg/64x64/apps/mozilla.png share/icons/crystalsvg/64x64/apps/multimedia.png share/icons/crystalsvg/64x64/apps/nedit.png share/icons/crystalsvg/64x64/apps/netscape.png diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 53cec9a18b5f..b4baad2d68d0 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 4 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -42,7 +41,7 @@ PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp @@ -52,7 +51,7 @@ CONFIGURE_ARGS+=--without-java \ --with-ssl-dir=${OPENSSLBASE} OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ - HAL "Use HAL backend for media:/ (FreeBSD 5+ only)" off \ + HAL "Use HAL backend for media:/ (FreeBSD 5+ only)" on \ HTDIG "Depend on htdig, used to build manual indices" off .include "${.CURDIR}/../../x11/kde3/Makefile.kde" @@ -70,7 +69,7 @@ RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper RUN_DEPENDS+= htdig:${PORTSDIR}/textproc/htdig .endif -.if defined(WITH_HAL) && ${OSVERSION} > 500035 +.if !defined(WITHOUT_HAL) && ${OSVERSION} > 500035 EXTRA_PATCHES= ${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.cpp \ ${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.h \ ${FILESDIR}/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp @@ -79,12 +78,9 @@ LIB_DEPENDS+= dbus-qt-1.1:${PORTSDIR}/devel/dbus-qt3 \ PLIST_SUB+= MEDIA="" .else CONFIGURE_ARGS+=--without-hal -EXTRA_PATCHES= ${FILESDIR}/extrapatch-kio_media \ - ${FILESDIR}/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp PLIST_SUB+= MEDIA="@comment " .endif - post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo index 6f53a73368ff..9051c799c5c2 100644 --- a/x11/kde4-runtime/distinfo +++ b/x11/kde4-runtime/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.5.tar.bz2) = 0c685af1cbca75f9c77b3ed231ba0468 -SHA256 (KDE/kdebase-3.5.5.tar.bz2) = f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0 -SIZE (KDE/kdebase-3.5.5.tar.bz2) = 23851886 +MD5 (KDE/kdebase-3.5.6.tar.bz2) = a53f589f58012e655a52220a6a151019 +SHA256 (KDE/kdebase-3.5.6.tar.bz2) = 245b35f8b2e1533f9ae92b3b07bee5339a716dfb8db363d0126d2e7409b7bd7e +SIZE (KDE/kdebase-3.5.6.tar.bz2) = 24155599 diff --git a/x11/kde4-runtime/files/extrapatch-kio_media b/x11/kde4-runtime/files/extrapatch-kio_media deleted file mode 100644 index ab1a03b094cb..000000000000 --- a/x11/kde4-runtime/files/extrapatch-kio_media +++ /dev/null @@ -1,5814 +0,0 @@ -diff -urN kioslave/media/Makefile.in kioslave/media/Makefile.in ---- kioslave/media/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/Makefile.in Fri May 26 09:54:31 2006 -@@ -122,8 +122,7 @@ - DATA = $(kde_services_DATA) - ETAGS = etags - CTAGS = ctags --DIST_SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ -- kfile-plugin kcmodule mimetypes services propsdlgplugin -+DIST_SUBDIRS = $(SUBDIRS) - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 1 - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -276,6 +275,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -@@ -611,9 +611,8 @@ - xdg_appsdir = @xdg_appsdir@ - xdg_directorydir = @xdg_directorydir@ - xdg_menudir = @xdg_menudir@ --@include_media_halbackend_TRUE@PROPSDLGPLUGINDIR = propsdlgplugin - SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ -- kfile-plugin kcmodule mimetypes services $(PROPSDLGPLUGINDIR) -+ kfile-plugin kcmodule mimetypes services - - INCLUDES = -I$(srcdir)/libmediacommon $(all_includes) - #>- METASOURCES = AUTO -@@ -1092,8 +1091,7 @@ - ./testmedia - - messages: rc.cpp -- $(EXTRACTRC) propsdlgplugin/propertiespagegui.ui >> rc.cpp -- $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp propsdlgplugin/*.cpp -o $(podir)/kio_media.pot -+ $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp -o $(podir)/kio_media.pot - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -diff -urN kioslave/media/kcmodule/Makefile.in kioslave/media/kcmodule/Makefile.in ---- kioslave/media/kcmodule/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/kcmodule/Makefile.in Fri May 26 09:54:31 2006 -@@ -253,6 +253,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/kcmodule/managermodule.cpp kioslave/media/kcmodule/managermodule.cpp ---- kioslave/media/kcmodule/managermodule.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/managermodule.cpp Sun Nov 20 20:14:21 2005 -@@ -39,15 +39,15 @@ - QString hal_text = view->kcfg_HalBackendEnabled->text(); - hal_text += " ("+i18n("No support for HAL on this system")+")"; - view->kcfg_HalBackendEnabled->setText( hal_text ); --#endif - view->kcfg_HalBackendEnabled->setEnabled( false ); -+#endif - - #ifndef COMPILE_LINUXCDPOLLING - QString poll_text = view->kcfg_CdPollingEnabled->text(); - poll_text += " ("+i18n("No support for CD polling on this system")+")"; - view->kcfg_CdPollingEnabled->setText( poll_text ); --#endif - view->kcfg_CdPollingEnabled->setEnabled( false ); -+#endif - - load(); - } -diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.desktop ---- kioslave/media/kcmodule/media.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/kcmodule/media.desktop Mon May 22 20:12:42 2006 -@@ -24,7 +24,6 @@ - Name[es]=Dispositivos de almacenamiento - Name[et]=Andmekandjad - Name[eu]=Biltegiratze-euskarria --Name[fa]=رسانه ذخیرهگاه - Name[fi]=Tallennusmedia - Name[fr]=Support de stockage - Name[fy]=Opslachapparaten -@@ -33,7 +32,7 @@ - Name[he]=התקנים - Name[hi]=भंडार मीडिया - Name[hr]=Mediji za pohranjivanje --Name[hu]=Tárolóeszközök -+Name[hu]=Tárolóeszköz - Name[is]=Geymslumiðlar - Name[it]=Dispositivi di archiviazione - Name[ja]=記憶メディア -@@ -43,7 +42,7 @@ - Name[mk]=Медиуми за податоци - Name[ms]=Media Storan - Name[nb]=Lagringsenheter --Name[nds]=Spiekermedien -+Name[nds]=Spiekerreedschappen - Name[nl]=Opslagapparaten - Name[nn]=Lagringsmedium - Name[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ -@@ -54,7 +53,6 @@ - Name[ru]=Устройства хранения данных - Name[rw]=Uburyo bwo Kubika - Name[se]=Vurkenmedia --Name[sk]=Zálohovacie médiá - Name[sl]=Nosilci za shranjevanje - Name[sr]=Складишни медијуми - Name[sr@Latn]=Skladišni medijumi -@@ -82,13 +80,11 @@ - Comment[es]=Configuración de las medios de almacenamiento - Comment[et]=Salvestusandmekandjate seadistused - Comment[eu]=Konfiguratu biltegiratze-euskarria --Comment[fa]=پیکربندی رسانه ذخیرهگاه - Comment[fi]=Aseta tallennusmedia - Comment[fr]=Configurer le média de stockage - Comment[fy]=Opslachmedia ynstelle - Comment[ga]=Cumraigh Meáin Stórála - Comment[gl]=Configurar Medios de Armacenaxe --Comment[he]=שינוי הגדרות מדיות אחסון - Comment[hr]=Konfiguriranje medija za pohranu - Comment[hu]=A tárolóeszközök beállítása - Comment[is]=Stillingar geymslumiðla -@@ -98,16 +94,15 @@ - Comment[lt]=Konfigūruoti saugojimo įrenginius - Comment[mk]=Конфигурирајте ги медиумите за податоци - Comment[nb]=Sett opp lagringsmedier --Comment[nds]=Spiekermedien instellen -+Comment[nds]=Spiekerreedschappen instellen - Comment[nl]=Opslagmedia instellen - Comment[nn]=Set opp lagringsmedium - Comment[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ ਸੰਰਚਨਾ - Comment[pl]=Konfiguracja nośników danych --Comment[pt]=Configurar os Suportes de Armazenamento -+Comment[pt]=Configurar os Meios de Armazenamento - Comment[pt_BR]=Configura as mídias de armazenamento - Comment[ru]=Настройка подключаемых устройств хранения - Comment[se]=Heivet vurkenmediaid --Comment[sk]=Nastavenie zálohovacích médií - Comment[sl]=Nastavitve nosilcev za shranjevanje - Comment[sr]=Подешавање медијума за складиштење - Comment[sr@Latn]=Podešavanje medijuma za skladištenje -@@ -132,13 +127,11 @@ - Keywords[es]=almacenamiento,medios,usb,cdrom,dispositivo - Keywords[et]=salvestamine,andmekandja,usb,cd,seade - Keywords[eu]=biltegiratzea,euskarriak,usb,cdrom,gailua --Keywords[fa]=ذخیره گاه، رسانه، گذرگاه سریال جهانی، دیسک فشرده، دستگاه - Keywords[fi]=varasto,media,usb,cdrom,laite - Keywords[fr]=stockage,media,medium,usb,cdrom,périphérique - Keywords[fy]=storage,opslach,media,usb,cd-rom,kompakt-skiif,device,apparaat,mp3-speler,usb-stick,geheugenkaart - Keywords[ga]=stóráil,stóras,meáin,meán,usb,cdrom,dlúthdhiosca,gléas - Keywords[gl]=armacenaxe,medios,usb,cdrom,dispositivo --Keywords[he]=storage,media,usb,cdrom,device,מדיה,התקן,סידירום,תקליטור - Keywords[hr]=storage,media,usb,cdrom,device,pohrana,snimanje,mediji,uređaj - Keywords[hu]=tároló,adathordozó,USB,CD-ROM,eszköz - Keywords[is]=geymsla,miðill,usb,cdrom,tæki -@@ -153,7 +146,7 @@ - Keywords[nn]=lagring,media,usb,CD-spiller,CD-ROM,einingar,minnepinnar,harddiskar,HD,eksterne harddiskar,zip-diskar - Keywords[pa]=ਸਟੋਰੇਜ਼,ਮੀਡਿਆ,ਜੰਤਰ,usb,cdrom - Keywords[pl]=dane,przechowywanie danych,nośnik danych,nośniki danych,usb,cdrom,urządzenie --Keywords[pt]=armazenamento,meio,suporte,usb,cdrom,dispositivo -+Keywords[pt]=armazenamento,meio,usb,cdrom,dispositivo - Keywords[pt_BR]=armazenamento,mídia,usb,cd-rom,device,dispositivo - Keywords[ru]=storage,media,usb,cdrom,device,устройство хранения - Keywords[sl]=shranjevanje,nosilec,usb,cdrom,naprava -diff -urN kioslave/media/kcmodule/notifiermodule.cpp kioslave/media/kcmodule/notifiermodule.cpp ---- kioslave/media/kcmodule/notifiermodule.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/notifiermodule.cpp Mon May 22 20:12:42 2006 -@@ -174,8 +174,8 @@ - ActionListBoxItem *action_item - = static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem()); - -- NotifierServiceAction * action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); -- if ( action ) -+ NotifierServiceAction * action; -+ if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() ) ) ) - { - ServiceConfigDialog dialog(action, m_settings.supportedMimetypes(), this); - -@@ -195,8 +195,7 @@ - = static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem()); - - NotifierServiceAction *action; -- action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); -- if ( action ) -+ if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() )) ) - { - m_settings.deleteAction( action ); - updateListBox(); -diff -urN kioslave/media/kfile-plugin/Makefile.in kioslave/media/kfile-plugin/Makefile.in ---- kioslave/media/kfile-plugin/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/kfile-plugin/Makefile.in Fri May 26 09:54:31 2006 -@@ -248,6 +248,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/kfile-plugin/kfile_media.desktop kioslave/media/kfile-plugin/kfile_media.desktop ---- kioslave/media/kfile-plugin/kfile_media.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/kfile-plugin/kfile_media.desktop Mon May 22 20:12:42 2006 -@@ -16,7 +16,6 @@ - Name[es]=Información de recursos - Name[et]=Andmekandja info - Name[eu]=Media informazioa --Name[fa]=اطلاعات رسانه - Name[fi]=Tallenteiden tiedot - Name[fr]=Informations sur le média - Name[fy]=Mediumynformaasje -@@ -47,7 +46,6 @@ - Name[ru]=Сведения о носителе - Name[rw]=Amakuru y'igitangazamakuru - Name[se]=Mediumdieđut --Name[sk]=Informácie o médiu - Name[sl]=Informacije o mediju - Name[sr]=Информације о медијуму - Name[sr@Latn]=Informacije o medijumu -@@ -63,4 +61,4 @@ - Name[zh_TW]=媒體資訊 - ServiceTypes=KFilePlugin - X-KDE-Library=kfile_media --MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera;media/camera_mounted;media/camera_unmounted -+MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera -diff -urN kioslave/media/kfile-plugin/kfilemediaplugin.cpp kioslave/media/kfile-plugin/kfilemediaplugin.cpp ---- kioslave/media/kfile-plugin/kfilemediaplugin.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/kfile-plugin/kfilemediaplugin.cpp Tue Nov 8 23:36:07 2005 -@@ -64,16 +64,12 @@ - addMimeType( "media/floppy_unmounted" ); - addMimeType( "media/zip_unmounted" ); - addMimeType( "media/gphoto2camera" ); -- addMimeType( "media/camera_mounted" ); -- addMimeType( "media/camera_unmounted" ); - } - - bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/) - { -- const Medium medium = askMedium(info); -+ const Medium medium = askMedium(info); - -- kdDebug() << "KFileMediaPlugin::readInfo " << medium.id() << endl; -- - if (medium.id().isNull()) return false; - - QString mount_point = medium.mountPoint(); -@@ -165,8 +161,7 @@ - const Medium KFileMediaPlugin::askMedium(KFileMetaInfo &info) - { - DCOPRef mediamanager("kded", "mediamanager"); -- kdDebug() << "properties " << info.url() << endl; -- DCOPReply reply = mediamanager.call( "properties", info.url().url() ); -+ DCOPReply reply = mediamanager.call( "properties", info.url().fileName() ); - - if ( !reply.isValid() ) - { -diff -urN kioslave/media/libmediacommon/Makefile.in kioslave/media/libmediacommon/Makefile.in ---- kioslave/media/libmediacommon/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/libmediacommon/Makefile.in Fri May 26 09:54:31 2006 -@@ -250,6 +250,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/libmediacommon/medium.cpp kioslave/media/libmediacommon/medium.cpp ---- kioslave/media/libmediacommon/medium.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/libmediacommon/medium.cpp Mon Oct 10 17:04:00 2005 -@@ -40,8 +40,6 @@ - m_properties+= QString::null; /* ICON_NAME */ - - loadUserLabel(); -- -- m_halmounted = false; - } - - Medium::Medium() -@@ -59,8 +57,6 @@ - m_properties+= QString::null; /* BASE_URL */ - m_properties+= QString::null; /* MIME_TYPE */ - m_properties+= QString::null; /* ICON_NAME */ -- -- m_halmounted = false; - } - - const Medium Medium::create(const QStringList &properties) -@@ -163,7 +159,7 @@ - bool Medium::mountableState(bool mounted) - { - if ( m_properties[DEVICE_NODE].isEmpty() -- || ( mounted && m_properties[MOUNT_POINT].isEmpty() ) ) -+ || m_properties[MOUNT_POINT].isEmpty() ) - { - return false; - } -@@ -208,10 +204,14 @@ - - KURL Medium::prettyBaseURL() const - { -- if ( !baseURL().isEmpty() ) -- return baseURL(); -- -+ if ( isMountable() ) -+ { - return KURL( mountPoint() ); -+ } -+ else -+ { -+ return KURL( baseURL() ); -+ } - } - - QString Medium::prettyLabel() const -diff -urN kioslave/media/libmediacommon/medium.h kioslave/media/libmediacommon/medium.h ---- kioslave/media/libmediacommon/medium.h Sat Jul 22 10:15:42 2006 -+++ kioslave/media/libmediacommon/medium.h Mon Oct 10 17:04:00 2005 -@@ -22,7 +22,6 @@ - #include <qstring.h> - #include <qstringlist.h> - #include <kurl.h> --#include <qmap.h> - - class Medium - { -@@ -79,32 +78,14 @@ - - void setMimeType(const QString &mimeType); - void setIconName(const QString &iconName); -- void setHalMounted(bool flag) const { m_halmounted = flag; } -- bool halMounted() const { return m_halmounted; } - - private: - Medium(); - void loadUserLabel(); - - QStringList m_properties; -- mutable bool m_halmounted; -- -+ - friend class QValueListNode<const Medium>; - }; -- --namespace MediaManagerUtils { -- static inline QMap<QString,QString> splitOptions(const QStringList & options) -- { -- QMap<QString,QString> valids; -- -- for (QStringList::ConstIterator it = options.begin(); it != options.end(); ++it) -- { -- QString key = (*it).left((*it).find('=')); -- QString value = (*it).mid((*it).find('=') + 1); -- valids[key] = value; -- } -- return valids; -- } --} - - #endif -diff -urN kioslave/media/mediaimpl.cpp kioslave/media/mediaimpl.cpp ---- kioslave/media/mediaimpl.cpp Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediaimpl.cpp Mon Oct 10 17:04:01 2005 -@@ -226,8 +226,6 @@ - - mp_mounting = &medium; - -- -- /* - KIO::Job* job = KIO::mount(false, 0, - medium.deviceNode(), - medium.mountPoint()); -@@ -236,7 +234,6 @@ - this, SLOT( slotMountResult( KIO::Job * ) ) ); - connect( job, SIGNAL( warning( KIO::Job *, const QString & ) ), - this, SLOT( slotWarning( KIO::Job *, const QString & ) ) ); -- */ - kapp->dcopClient() - ->connectDCOPSignal("kded", "mediamanager", - "mediumChanged(QString, bool)", -@@ -244,17 +241,7 @@ - "slotMediumChanged(QString)", - false); - -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "mount", medium.id()); -- if (reply.isValid()) -- reply.get(m_lastErrorMessage); -- else -- m_lastErrorMessage = i18n("Internal Error"); -- if (!m_lastErrorMessage.isEmpty()) -- m_lastErrorCode = KIO::ERR_SLAVE_DEFINED; -- else { -- qApp->eventLoop()->enterLoop(); -- } -+ qApp->eventLoop()->enterLoop(); - - mp_mounting = 0L; - -diff -urN kioslave/media/mediamanager/Makefile.in kioslave/media/mediamanager/Makefile.in ---- kioslave/media/mediamanager/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/mediamanager/Makefile.in Fri May 26 09:54:31 2006 -@@ -284,6 +284,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/mediamanager/fstabbackend.cpp kioslave/media/mediamanager/fstabbackend.cpp ---- kioslave/media/mediamanager/fstabbackend.cpp Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/fstabbackend.cpp Mon May 22 20:12:42 2006 -@@ -37,9 +37,6 @@ - #endif - - #include <klocale.h> --#include <kio/job.h> --#include <kio/netaccess.h> --#include <kdebug.h> - #include <kdirwatch.h> - #include <kurl.h> - #include <kmountpoint.h> -@@ -97,26 +94,6 @@ - KDirWatch::self()->removeFile(MTAB); - } - --QString FstabBackend::mount( const QString &_udi ) --{ -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- return i18n("No such medium: %1").arg(_udi); -- KIO::Job* job = KIO::mount( false, 0, medium->deviceNode(), medium->mountPoint()); -- KIO::NetAccess::synchronousRun( job, 0 ); -- return QString::null; --} -- --QString FstabBackend::unmount( const QString &_udi ) --{ -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- return i18n("No such medium: %1").arg(_udi); -- KIO::Job* job = KIO::unmount( medium->mountPoint(), false); -- KIO::NetAccess::synchronousRun( job, 0 ); -- return QString::null; --} -- - void FstabBackend::slotDirty(const QString &path) - { - if (path==MTAB) -@@ -134,7 +111,6 @@ - if ( mount->mountType() == "swap" - || mount->mountType() == "tmpfs" - || mount->mountType() == "sysfs" -- || mount->mountType() == "fdescfs" - || mount->mountType() == "kernfs" - || mount->mountType() == "usbfs" - || mount->mountType().contains( "proc" ) -@@ -147,7 +123,6 @@ - || mount->mountPoint() == "/dev/swap" - || mount->mountPoint() == "/dev/pts" - || mount->mountPoint().find("/proc") == 0 -- || mount->mountPoint().find("/sys") == 0 - - // We might want to display only network shares - // since HAL doesn't handle them -@@ -169,7 +144,7 @@ - - void FstabBackend::handleMtabChange(bool allowNotification) - { -- QStringList new_mtabIds; -+ QStringList new_mtabIds, new_mtabEntries; - KMountPoint::List mtab = KMountPoint::currentMountPoints(); - - KMountPoint::List::iterator it = mtab.begin(); -@@ -187,19 +162,18 @@ - nothing has changed, do not stat the mount point. Avoids - hang if network shares are stalling */ - QString mtabEntry = dev + "*" + mp + "*" + fs; -- if(m_mtabEntries.contains(mtabEntry)) { -- new_mtabIds += m_mtabEntries[mtabEntry]; -- continue; -- } -+ bool isOldEntry = m_mtabEntries.contains(mtabEntry); -+ new_mtabEntries+=mtabEntry; -+ if (isOldEntry) continue; - - QString id = generateId(dev, mp); - new_mtabIds+=id; -- m_mtabEntries[mtabEntry] = id; - - if ( !m_mtabIds.contains(id) && m_fstabIds.contains(id) ) - { - QString mime, icon, label; - guess(dev, mp, fs, true, mime, icon, label); -+ - m_mediaList.changeMediumState(id, true, false, - mime, icon, label); - } -@@ -237,10 +211,6 @@ - QString mp = medium->mountPoint(); - QString fs = medium->fsType(); - -- -- QString mtabEntry = dev + "*" + mp + "*" + fs; -- m_mtabEntries.remove(mtabEntry); -- - QString mime, icon, label; - guess(dev, mp, fs, false, mime, icon, label); - -@@ -256,6 +226,7 @@ - } - - m_mtabIds = new_mtabIds; -+ m_mtabEntries = new_mtabEntries; - } - - void FstabBackend::handleFstabChange(bool allowNotification) -diff -urN kioslave/media/mediamanager/fstabbackend.h kioslave/media/mediamanager/fstabbackend.h ---- kioslave/media/mediamanager/fstabbackend.h Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/fstabbackend.h Mon May 22 20:12:42 2006 -@@ -23,7 +23,6 @@ - - #include <qobject.h> - #include <qstringlist.h> --#include <qmap.h> - - #ifdef Q_OS_FREEBSD - #include <qtimer.h> -@@ -41,10 +40,6 @@ - const QString &fsType, bool mounted, - QString &mimeType, QString &iconName, - QString &label); -- -- QString mount(const QString &id); -- QString unmount(const QString &id); -- - private slots: - void slotDirty(const QString &path); - void handleFstabChange(bool allowNotification = true); -@@ -58,7 +53,7 @@ - - bool m_networkSharesOnly; - QStringList m_mtabIds; -- QMap<QString, QString> m_mtabEntries; -+ QStringList m_mtabEntries; - QStringList m_fstabIds; - #ifdef Q_OS_FREEBSD - QTimer m_mtabTimer; -diff -urN kioslave/media/mediamanager/halbackend.cpp kioslave/media/mediamanager/halbackend.cpp ---- kioslave/media/mediamanager/halbackend.cpp Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/halbackend.cpp Thu Jan 19 18:00:58 2006 -@@ -21,16 +21,9 @@ - - #include <stdlib.h> - --#include <qfile.h> - #include <klocale.h> - #include <kurl.h> - #include <kdebug.h> --#include <kprocess.h> --#include <kconfig.h> --#include <qstylesheet.h> --#include <kmountpoint.h> --#include <kmessagebox.h> --#include <kio/job.h> - - #define MOUNT_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mounted") : QString("_unmounted")) - #define MOUNT_ICON_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mount") : QString("_unmount")) -@@ -39,1177 +32,615 @@ - static HALBackend* s_HALBackend; - - /* A macro function to convert HAL string properties to QString */ --QString libhal_device_get_property_QString(LibHalContext *ctx, const char* udi, const char *key) -+QString hal_device_get_property_QString(LibHalContext *ctx, const char* udi, const char *key) - { -- char* _ppt_string; -- QString _ppt_QString; -- _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL); -- _ppt_QString = QString(_ppt_string ? _ppt_string : ""); -- libhal_free_string(_ppt_string); -- return _ppt_QString; -+ char* _ppt_string; -+ QString _ppt_QString; -+ _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL); -+ _ppt_QString = QString(_ppt_string ? _ppt_string : ""); -+ libhal_free_string(_ppt_string); -+ return _ppt_QString; - } - - /* Constructor */ - HALBackend::HALBackend(MediaList &list, QObject* parent) -- : QObject() -- , BackendBase(list) -- , m_halContext(NULL) -- , m_halStoragePolicy(NULL) -- , m_parent(parent) -+ : QObject() -+ , BackendBase(list) -+ , m_halContext(NULL) -+ , m_halStoragePolicy(NULL) -+ , m_parent(parent) - { -- s_HALBackend = this; -+ s_HALBackend = this; - } - - /* Destructor */ - HALBackend::~HALBackend() - { -- /* Close HAL connection */ -- if (m_halContext) -- { -- const QPtrList<Medium> medlist = m_mediaList.list(); -- QPtrListIterator<Medium> it (medlist); -- for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) -- unmount(current_medium->id()); -- -- -- /* Remove all the registered media first */ -- int numDevices; -- char** halDeviceList = libhal_get_all_devices( m_halContext, &numDevices, NULL ); -- -- if ( halDeviceList ) -- { -- for ( int i = 0; i < numDevices; i++ ) -- { -- m_mediaList.removeMedium( halDeviceList[i], false ); -- } -- } -- -- libhal_free_string_array( halDeviceList ); -- -- DBusError error; -- dbus_error_init(&error); -- libhal_ctx_shutdown(m_halContext, &error); -- libhal_ctx_free(m_halContext); -- } -- -- if (m_halStoragePolicy) -- libhal_storage_policy_free(m_halStoragePolicy); -+ /* Close HAL connection */ -+ if (m_halContext) -+ { -+ /* Remove all the registered media first */ -+ int numDevices; -+ char** halDeviceList = libhal_get_all_devices( m_halContext, &numDevices, NULL ); -+ -+ if ( halDeviceList ) -+ { -+ for ( int i = 0; i < numDevices; i++ ) -+ { -+ m_mediaList.removeMedium( halDeviceList[i], false ); -+ } -+ } -+ -+ #ifdef HAL_0_4 -+ hal_shutdown(m_halContext); -+ #else -+ libhal_ctx_shutdown(m_halContext, NULL); -+ libhal_ctx_free(m_halContext); -+ #endif -+ } -+ -+ if (m_halStoragePolicy) -+ libhal_storage_policy_free(m_halStoragePolicy); - } - - /* Connect to the HAL */ - bool HALBackend::InitHal() - { -- kdDebug(1219) << "Context new" << endl; -- m_halContext = libhal_ctx_new(); -- if (!m_halContext) -- { -- kdDebug(1219) << "Failed to initialize HAL!" << endl; -- return false; -- } -- -- // Main loop integration -- kdDebug(1219) << "Main loop integration" << endl; -- DBusError error; -- dbus_error_init(&error); -- dbus_connection = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error); -- -- if (!dbus_connection || dbus_error_is_set(&error)) { -- dbus_error_free(&error); -- libhal_ctx_free(m_halContext); -- m_halContext = NULL; -- return false; -- } -- -- dbus_bus_register(dbus_connection, &error); -- -- if (dbus_error_is_set(&error)) { -- dbus_error_free(&error); -- libhal_ctx_free(m_halContext); -- m_halContext = NULL; -- return false; -- } -- MainLoopIntegration(dbus_connection); -- libhal_ctx_set_dbus_connection(m_halContext, dbus_connection); -- -- // HAL callback functions -- kdDebug(1219) << "Callback functions" << endl; -- libhal_ctx_set_device_added(m_halContext, HALBackend::hal_device_added); -- libhal_ctx_set_device_removed(m_halContext, HALBackend::hal_device_removed); -- libhal_ctx_set_device_new_capability (m_halContext, NULL); -- libhal_ctx_set_device_lost_capability (m_halContext, NULL); -- libhal_ctx_set_device_property_modified (m_halContext, HALBackend::hal_device_property_modified); -- libhal_ctx_set_device_condition(m_halContext, HALBackend::hal_device_condition); -- -- kdDebug(1219) << "Context Init" << endl; -- if (!libhal_ctx_init(m_halContext, &error)) -- { -- if (dbus_error_is_set(&error)) -- dbus_error_free(&error); -- libhal_ctx_free(m_halContext); -- m_halContext = NULL; -- kdDebug(1219) << "Failed to init HAL context!" << endl; -- return false; -- } -- -- /** @todo customize watch policy */ -- kdDebug(1219) << "Watch properties" << endl; -- if (!libhal_device_property_watch_all(m_halContext, &error)) -- { -- kdDebug(1219) << "Failed to watch HAL properties!" << endl; -- return false; -- } -- -- /* libhal-storage initialization */ -- kdDebug(1219) << "Storage Policy" << endl; -- m_halStoragePolicy = libhal_storage_policy_new(); -- /** @todo define libhal-storage icon policy */ -+#ifdef HAL_0_4 /* HAL API 0.4 */ -+ /* libhal initialization */ -+ m_halFunctions.main_loop_integration = HALBackend::hal_main_loop_integration; -+ m_halFunctions.device_added = HALBackend::hal_device_added; -+ m_halFunctions.device_removed = HALBackend::hal_device_removed; -+ m_halFunctions.device_new_capability = NULL; -+ m_halFunctions.device_lost_capability = NULL; -+ m_halFunctions.device_property_modified = HALBackend::hal_device_property_modified; -+ m_halFunctions.device_condition = HALBackend::hal_device_condition; -+ -+ m_halContext = hal_initialize(&m_halFunctions, false); -+ if (!m_halContext) -+ { -+ kdDebug(1219) << "Failed to initialize HAL!" << endl; -+ return false; -+ } -+ -+ /** @todo customize watch policy */ -+ kdDebug(1219) << "Watch properties" << endl; -+ if (libhal_device_property_watch_all(m_halContext, NULL)) -+ { -+ kdDebug(1219) << "Failed to watch HAL properties!" << endl; -+ return false; -+ } -+#else /* HAL API >= 0.5 */ -+ kdDebug(1219) << "Context new" << endl; -+ m_halContext = libhal_ctx_new(); -+ if (!m_halContext) -+ { -+ kdDebug(1219) << "Failed to initialize HAL!" << endl; -+ return false; -+ } -+ -+ // Main loop integration -+ kdDebug(1219) << "Main loop integration" << endl; -+ DBusError error; -+ dbus_error_init(&error); -+ DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -+ if (dbus_error_is_set(&error)) { -+ dbus_error_free(&error); -+ libhal_ctx_free(m_halContext); -+ m_halContext = NULL; -+ return false; -+ } -+ MainLoopIntegration(dbus_connection); -+ libhal_ctx_set_dbus_connection(m_halContext, dbus_connection); -+ -+ // HAL callback functions -+ kdDebug(1219) << "Callback functions" << endl; -+ libhal_ctx_set_device_added(m_halContext, HALBackend::hal_device_added); -+ libhal_ctx_set_device_removed(m_halContext, HALBackend::hal_device_removed); -+ libhal_ctx_set_device_new_capability (m_halContext, NULL); -+ libhal_ctx_set_device_lost_capability (m_halContext, NULL); -+ libhal_ctx_set_device_property_modified (m_halContext, HALBackend::hal_device_property_modified); -+ libhal_ctx_set_device_condition(m_halContext, HALBackend::hal_device_condition); - -- /* List devices at startup */ -- return ListDevices(); -+ kdDebug(1219) << "Context Init" << endl; -+ if (!libhal_ctx_init(m_halContext, &error)) -+ { -+ if (dbus_error_is_set(&error)) -+ dbus_error_free(&error); -+ libhal_ctx_free(m_halContext); -+ m_halContext = NULL; -+ kdDebug(1219) << "Failed to init HAL context!" << endl; -+ return false; -+ } -+ -+ /** @todo customize watch policy */ -+ kdDebug(1219) << "Watch properties" << endl; -+ if (!libhal_device_property_watch_all(m_halContext, &error)) -+ { -+ kdDebug(1219) << "Failed to watch HAL properties!" << endl; -+ return false; -+ } -+#endif -+ -+ /* libhal-storage initialization */ -+ kdDebug(1219) << "Storage Policy" << endl; -+ m_halStoragePolicy = libhal_storage_policy_new(); -+ /** @todo define libhal-storage icon policy */ -+ -+ /* List devices at startup */ -+ return ListDevices(); - } - - /* List devices (at startup)*/ - bool HALBackend::ListDevices() - { -- kdDebug(1219) << "ListDevices" << endl; -+ kdDebug(1219) << "ListDevices" << endl; - -- int numDevices; -- char** halDeviceList = libhal_get_all_devices(m_halContext, &numDevices, NULL); -+ int numDevices; -+ char** halDeviceList = libhal_get_all_devices(m_halContext, &numDevices, NULL); - -- if (!halDeviceList) -- return false; -+ if (!halDeviceList) -+ return false; - -- kdDebug(1219) << "HALBackend::ListDevices : " << numDevices << " devices found" << endl; -- for (int i = 0; i < numDevices; i++) -- AddDevice(halDeviceList[i], false); -+ kdDebug(1219) << "HALBackend::ListDevices : " << numDevices << " devices found" << endl; -+ for (int i = 0; i < numDevices; i++) -+ AddDevice(halDeviceList[i], false); - -- libhal_free_string_array( halDeviceList ); -- -- return true; -+ return true; - } - - /* Create a media instance for the HAL device "udi". -- This functions checks whether the device is worth listing */ -+This functions checks whether the device is worth listing */ - void HALBackend::AddDevice(const char *udi, bool allowNotification) - { -- /* We don't deal with devices that do not expose their capabilities. -- If we don't check this, we will get a lot of warning messages from libhal */ -- if (!libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -- return; -- -- /* If the device is already listed, do not process. -- This should not happen, but who knows... */ -- /** @todo : refresh properties instead ? */ -- if (m_mediaList.findById(udi)) -- return; -- -- if (libhal_device_get_property_bool(m_halContext, "/org/freedesktop/Hal/devices/computer", "storage.disable_volume_handling", NULL)) -- allowNotification=false; -- -- /* Add volume block devices */ -- if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -- { -- /* We only list volume that have a filesystem or volume that have an audio track*/ -- if ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem" && -- !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio", NULL) && -- !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL) ) -- return; -- -- if ( ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") == "filesystem" && -- !libhal_device_get_property_bool(m_halContext, udi, "volume.is_mounted", NULL ) ) && -- ( libhal_device_get_property_bool(m_halContext, udi, "volume.ignore", NULL ) ) ) -- return; -- -- /* Query drive udi */ -- QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -- /* We don't list floppy volumes because we list floppy drives */ -- if ((libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "floppy") || -- (libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "zip") || -- (libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "jaz")) -- return; -- -- // if the device is locked do not act upon it -- if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "info.locked", NULL)) -- allowNotification=false; -- -- // if the device is locked do not act upon it -- if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "storage.partition_table_changed", NULL)) -- allowNotification=false; -- -- /** @todo check exclusion list **/ -- -- /* Create medium */ -- Medium* medium = new Medium(udi, ""); -- -- QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi)); -- kdDebug() << "automount " << options["automount"] << endl; -- if (options["automount"] == "true" && allowNotification ) { -- QString error = mount(medium); -- if (!error.isEmpty()) -- kdDebug() << "error " << error << endl; -- } -- setVolumeProperties(medium); -- m_mediaList.addMedium(medium, allowNotification); -- -- return; -- } -- -- /* Floppy & zip drives */ -- if (libhal_device_query_capability(m_halContext, udi, "storage", NULL)) -- if ((libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") || -- (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") || -- (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "jaz")) -- { -- /* Create medium */ -- Medium* medium = new Medium(udi, ""); -- setFloppyProperties(medium); -- m_mediaList.addMedium(medium, allowNotification); -- return; -- } -- -- /* Camera handled by gphoto2*/ -- if (libhal_device_query_capability(m_halContext, udi, "camera", NULL) && -- ((libhal_device_get_property_QString(m_halContext, udi, "camera.access_method")=="ptp") || -- -- (libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2.support", NULL) && -- libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2.support", NULL))) -- ) -- { -- /* Create medium */ -- Medium* medium = new Medium(udi, ""); -- setCameraProperties(medium); -- m_mediaList.addMedium(medium, allowNotification); -- return; -- } -+ /* We don't deal with devices that do not expose their capabilities. -+ If we don't check this, we will get a lot of warning messages from libhal */ -+ if (!libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -+ return; -+ -+ /* If the device is already listed, do not process. -+ This should not happen, but who knows... */ -+ /** @todo : refresh properties instead ? */ -+ if (m_mediaList.findById(udi)) -+ return; -+ -+ /* Add volume block devices */ -+ if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -+ { -+ /* We only list volume that have a filesystem or volume that have an audio track*/ -+ if ( (hal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem") && -+ (!libhal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio", NULL)) && -+ (!libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL)) ) -+ return; -+ /* Query drive udi */ -+ QString driveUdi = hal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -+ /* We don't list floppy volumes because we list floppy drives */ -+ if ((hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "floppy") || -+ (hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "zip") || -+ (hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "jaz")) -+ return; -+ -+ /** @todo check exclusion list **/ -+ -+ /* Create medium */ -+ Medium* medium = new Medium(udi, ""); -+ setVolumeProperties(medium); -+ m_mediaList.addMedium(medium, allowNotification); -+ -+ return; -+ } -+ -+ /* Floppy & zip drives */ -+ if (libhal_device_query_capability(m_halContext, udi, "storage", NULL)) -+ if ((hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") || -+ (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") || -+ (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "jaz")) -+ { -+ /* Create medium */ -+ Medium* medium = new Medium(udi, ""); -+ setFloppyProperties(medium); -+ m_mediaList.addMedium(medium, allowNotification); -+ return; -+ } -+ -+ /* Camera handled by gphoto2*/ -+ if (libhal_device_query_capability(m_halContext, udi, "camera", NULL) && -+#ifdef HAL_0_4 -+ libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2_support", NULL) && -+ libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2_support", NULL) -+#else -+ ((hal_device_get_property_QString(m_halContext, udi, "camera.access_method")=="ptp") || -+ -+ (libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2.support", NULL) && -+ libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2.support", NULL))) -+#endif -+ ) -+ { -+ /* Create medium */ -+ Medium* medium = new Medium(udi, ""); -+ setCameraProperties(medium); -+ m_mediaList.addMedium(medium, allowNotification); -+ return; -+ } - } - - void HALBackend::RemoveDevice(const char *udi) - { -- m_mediaList.removeMedium(udi, true); -+ m_mediaList.removeMedium(udi, true); - } - - void HALBackend::ModifyDevice(const char *udi, const char* key) - { -- Q_UNUSED(key); -- const char* mediumUdi = findMediumUdiFromUdi(udi); -- if (!mediumUdi) -- return; -- ResetProperties(mediumUdi); -+ Q_UNUSED(key); -+ const char* mediumUdi = findMediumUdiFromUdi(udi); -+ if (!mediumUdi) -+ return; -+ ResetProperties(mediumUdi); - } - - void HALBackend::DeviceCondition(const char* udi, const char* condition) - { -- QString conditionName = QString(condition); -- kdDebug(1219) << "Processing device condition " << conditionName << " for " << udi << endl; -- -- if (conditionName == "EjectPressed") { -- const Medium* medium = m_mediaList.findById(udi); -- if (!medium) { -- /* the ejectpressed appears on the drive and we need to find the volume */ -- const QPtrList<Medium> medlist = m_mediaList.list(); -- QPtrListIterator<Medium> it (medlist); -- for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) -- { -- QString driveUdi = libhal_device_get_property_QString(m_halContext, current_medium->id().latin1(), "block.storage_device"); -- if (driveUdi == udi) -- { -- medium = current_medium; -- break; -- } -- } -- } -- if (medium) { -- KProcess p; -- p << "kio_media_mounthelper" << "-e" << medium->name(); -- p.start(KProcess::DontCare); -- } -- } -- -- const char* mediumUdi = findMediumUdiFromUdi(udi); -- kdDebug() << "findMedumUdiFromUdi " << udi << " returned " << mediumUdi << endl; -- if (!mediumUdi) -- return; -- -- /* TODO: Warn the user that (s)he should unmount devices before unplugging */ -- if (conditionName == "VolumeUnmountForced") -- ResetProperties(mediumUdi); -- -- /* Reset properties after mounting */ -- if (conditionName == "VolumeMount") -- ResetProperties(mediumUdi); -- -- /* Reset properties after unmounting */ -- if (conditionName == "VolumeUnmount") -- ResetProperties(mediumUdi); -- -+ const char* mediumUdi = findMediumUdiFromUdi(udi); -+ if (!mediumUdi) -+ return; -+ -+ QString conditionName = QString(condition); -+ kdDebug(1219) << "Processing device condition " << conditionName << " for " << udi << endl; -+ -+ /* TODO: Warn the user that (s)he should unmount devices before unplugging */ -+ if (conditionName == "VolumeUnmountForced") -+ ResetProperties(mediumUdi); -+ -+ /* Reset properties after mounting */ -+ if (conditionName == "VolumeMount") -+ ResetProperties(mediumUdi); -+ -+ /* Reset properties after unmounting */ -+ if (conditionName == "VolumeUnmount") -+ ResetProperties(mediumUdi); - } - - void HALBackend::MainLoopIntegration(DBusConnection *dbusConnection) - { -- m_dBusQtConnection = new DBusQt::Connection(m_parent); -- m_dBusQtConnection->dbus_connection_setup_with_qt_main(dbusConnection); -+ m_dBusQtConnection = new DBusQt::Connection(m_parent); -+ m_dBusQtConnection->dbus_connection_setup_with_qt_main(dbusConnection); - } - - /****************************************** -- ** Properties attribution ** -- ******************************************/ -+** Properties attribution ** -+******************************************/ - - /* Return the medium udi that should be updated when recieving a call for -- device udi */ -+device udi */ - const char* HALBackend::findMediumUdiFromUdi(const char* udi) - { -- /* Easy part : this Udi is already registered as a device */ -- const Medium* medium = m_mediaList.findById(udi); -- if (medium) -- return medium->id().ascii(); -- -- /* Hard part : this is a volume whose drive is registered */ -- if (libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -- if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -- { -- QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -- return findMediumUdiFromUdi(driveUdi.ascii()); -- } -+ /* Easy part : this Udi is already registered as a device */ -+ const Medium* medium = m_mediaList.findById(udi); -+ if (medium) -+ return medium->id().ascii(); -+ -+ /* Hard part : this is a volume whose drive is registered */ -+ if (libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -+ if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -+ { -+ QString driveUdi = hal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -+ return findMediumUdiFromUdi(driveUdi.ascii()); -+ } - -- return NULL; -+ return NULL; - } - - void HALBackend::ResetProperties(const char* mediumUdi) - { -- kdDebug(1219) << "HALBackend::setProperties" << endl; -- if ( QString::fromLatin1( mediumUdi ).startsWith( "/org/kde/" ) ) -- { -- const Medium *cmedium = m_mediaList.findById(mediumUdi); -- if ( cmedium ) -- { -- Medium m( *cmedium ); -- if ( setFstabProperties( &m ) ) { -- kdDebug() << "setFstabProperties worked" << endl; -- m_mediaList.changeMediumState(m, false); -- } -- return; -- } -- } -- -- Medium* m = new Medium(mediumUdi, ""); -- -- if (libhal_device_query_capability(m_halContext, mediumUdi, "volume", NULL)) -- setVolumeProperties(m); -- if (libhal_device_query_capability(m_halContext, mediumUdi, "storage", NULL)) -- setFloppyProperties(m); -- if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) -- setCameraProperties(m); -+ kdDebug(1219) << "HALBackend::setProperties" << endl; - -- m_mediaList.changeMediumState(*m, false); -+ Medium* m = new Medium(mediumUdi, ""); -+ -+ if (libhal_device_query_capability(m_halContext, mediumUdi, "volume", NULL)) -+ setVolumeProperties(m); -+ if (libhal_device_query_capability(m_halContext, mediumUdi, "storage", NULL)) -+ setFloppyProperties(m); -+ if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) -+ setCameraProperties(m); - -- delete m; --} -+ m_mediaList.changeMediumState(*m, false); - --void HALBackend::setVolumeProperties(Medium* medium) --{ -- kdDebug(1219) << "HALBackend::setVolumeProperties for " << medium->id() << endl; -- -- const char* udi = medium->id().ascii(); -- /* Check if the device still exists */ -- if (!libhal_device_exists(m_halContext, udi, NULL)) -- return; -- -- /* Get device information from libhal-storage */ -- LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi); -- if (!halVolume) -- return; -- QString driveUdi = libhal_volume_get_storage_device_udi(halVolume); -- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, driveUdi.ascii()); -- if (!halDrive) { -- // at times HAL sends an UnmountForced event before the device is removed -- libhal_volume_free(halVolume); -- return; -- } -- -- medium->setName( -- generateName(libhal_volume_get_device_file(halVolume)) ); -- -- medium->mountableState( -- libhal_volume_get_device_file(halVolume), /* Device node */ -- libhal_volume_get_mount_point(halVolume), /* Mount point */ -- libhal_volume_get_fstype(halVolume), /* Filesystem type */ -- libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -- -- char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -- QString volume_name = QString::fromUtf8(name); -- QString media_name = volume_name; -- medium->setLabel(media_name); -- free(name); -- -- QString mimeType; -- if (libhal_volume_is_disc(halVolume)) -- { -- mimeType = "media/cdrom" + MOUNT_SUFFIX; -- -- LibHalVolumeDiscType discType = libhal_volume_get_disc_type(halVolume); -- if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_CDR) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_CDRW)) -- if (libhal_volume_disc_is_blank(halVolume)) -- { -- mimeType = "media/blankcd"; -- medium->unmountableState(""); -- } -- else -- mimeType = "media/cdwriter" + MOUNT_SUFFIX; -- -- if ((discType == LIBHAL_VOLUME_DISC_TYPE_DVDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRAM) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_DVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRW) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW) ) -- if (libhal_volume_disc_is_blank(halVolume)) -- { -- mimeType = "media/blankdvd"; -- medium->unmountableState(""); -- } -- else -- mimeType = "media/dvd" + MOUNT_SUFFIX; -- -- if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) -- { -- mimeType = "media/audiocd"; -- medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); -- } -- -- medium->setIconName(QString::null); -- -- /* check if the disc id a vcd or a video dvd */ -- DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); -- switch (type) -- { -- case DiscType::VCD: -- mimeType = "media/vcd"; -- break; -- case DiscType::SVCD: -- mimeType = "media/svcd"; -- break; -- case DiscType::DVD: -- mimeType = "media/dvdvideo"; -- break; -- } -- } -- else -- { -- mimeType = "media/hdd" + MOUNT_SUFFIX; -- if (libhal_drive_is_hotpluggable(halDrive)) -- { -- mimeType = "media/removable" + MOUNT_SUFFIX; -- medium->needMounting(); -- switch (libhal_drive_get_type(halDrive)) { -- case LIBHAL_DRIVE_TYPE_COMPACT_FLASH: -- medium->setIconName("compact_flash" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_MEMORY_STICK: -- medium->setIconName("memory_stick" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_SMART_MEDIA: -- medium->setIconName("smart_media" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_SD_MMC: -- medium->setIconName("sd_mmc" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER: -- { -- medium->setIconName("ipod" + MOUNT_ICON_SUFFIX); -- break; -- } -- case LIBHAL_DRIVE_TYPE_CAMERA: -- { -- mimeType = "media/camera" + MOUNT_SUFFIX; -- medium->setIconName("camera" + MOUNT_ICON_SUFFIX); -- const char *physdev = libhal_drive_get_physical_device_udi(halDrive); -- // get model from camera -- if (physdev && libhal_device_query_capability(m_halContext, physdev, "camera", NULL)) -- { -- if (libhal_device_property_exists(m_halContext, physdev, "usb_device.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, "usb_device.product")); -- else if (libhal_device_property_exists(m_halContext, physdev, "usb.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, "usb.product")); -- } -- break; -- } -- case LIBHAL_DRIVE_TYPE_TAPE: -- medium->setIconName(QString::null); //FIXME need icon -- break; -- default: -- medium->setIconName(QString::null); -- } -- -- if (medium->isMounted() && QFile::exists(medium->mountPoint() + "/dcim")) -- { -- mimeType = "media/camera" + MOUNT_SUFFIX; -- medium->setIconName("camera" + MOUNT_ICON_SUFFIX); -- } -- } -- } -- medium->setMimeType(mimeType); -- -- libhal_drive_free(halDrive); -- libhal_volume_free(halVolume); -+ delete m; - } - --bool HALBackend::setFstabProperties( Medium *medium ) -+void HALBackend::setVolumeProperties(Medium* medium) - { -- QString mp = isInFstab(medium); -+ kdDebug(1219) << "HALBackend::setVolumeProperties for " << medium->id() << endl; - -- if (!mp.isNull() && !medium->id().startsWith( "/org/kde" ) ) -- { -- // now that we know it's in fstab, we have to find out if it's mounted -- KMountPoint::List mtab = KMountPoint::currentMountPoints(); -- -- KMountPoint::List::iterator it = mtab.begin(); -- KMountPoint::List::iterator end = mtab.end(); -- -- bool mounted = false; -- -- for (; it!=end; ++it) -- { -- if ((*it)->mountedFrom() == medium->deviceNode() && (*it)->mountPoint() == mp ) -- { -- mounted = true; -- break; -- } -- } -- -- kdDebug() << mp << " " << mounted << " " << medium->deviceNode() << " " << endl; -- QString fstype = medium->fsType(); -- if ( fstype.isNull() ) -- fstype = "auto"; -- -- medium->mountableState( -- medium->deviceNode(), -- mp, /* Mount point */ -- fstype, /* Filesystem type */ -- mounted ); /* Mounted ? */ -+ const char* udi = medium->id().ascii(); -+ /* Check if the device still exists */ -+ if (!libhal_device_exists(m_halContext, udi, NULL)) -+ return; -+ -+ /* Get device information from libhal-storage */ -+ LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi); -+ if (!halVolume) -+ return; -+ QString driveUdi = libhal_volume_get_storage_device_udi(halVolume); -+ LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, driveUdi.ascii()); -+ -+ medium->setName( -+ generateName(libhal_volume_get_device_file(halVolume)) ); -+ -+ medium->mountableState( -+ libhal_volume_get_device_file(halVolume), /* Device node */ -+ libhal_volume_get_mount_point(halVolume), /* Mount point */ -+ libhal_volume_get_fstype(halVolume), /* Filesystem type */ -+ libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -+ -+ char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -+ QString volume_name = QString::fromUtf8(name); -+ QString media_name = volume_name; -+ medium->setLabel(media_name); -+ free(name); - -- return true; -- } -+ QString mimeType; -+ if (libhal_volume_is_disc(halVolume)) -+ { -+ mimeType = "media/cdrom" + MOUNT_SUFFIX; - -- return false; -+ LibHalVolumeDiscType discType = libhal_volume_get_disc_type(halVolume); -+ if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_CDR) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_CDRW)) -+ if (libhal_volume_disc_is_blank(halVolume)) -+ { -+ mimeType = "media/blankcd"; -+ medium->unmountableState(""); -+ } -+ else -+ mimeType = "media/cdwriter" + MOUNT_SUFFIX; -+ -+ if ((discType == LIBHAL_VOLUME_DISC_TYPE_DVDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRAM) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_DVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRW) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW) ) -+ if (libhal_volume_disc_is_blank(halVolume)) -+ { -+ mimeType = "media/blankdvd"; -+ medium->unmountableState(""); -+ } -+ else -+ mimeType = "media/dvd" + MOUNT_SUFFIX; -+ -+ if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) -+ { -+ mimeType = "media/audiocd"; -+ medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); -+ } -+ -+ medium->setIconName(QString::null); -+ -+ /* check if the disc id a vcd or a video dvd */ -+ DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); -+ switch (type) -+ { -+ case DiscType::VCD: -+ mimeType = "media/vcd"; -+ break; -+ case DiscType::SVCD: -+ mimeType = "media/svcd"; -+ break; -+ case DiscType::DVD: -+ mimeType = "media/dvdvideo"; -+ break; -+ } -+ } -+ else -+ { -+ mimeType = "media/hdd" + MOUNT_SUFFIX; -+ const char *physdev = libhal_drive_get_physical_device_udi(halDrive); -+ if (libhal_drive_is_hotpluggable(halDrive)) -+ { -+ mimeType = "media/removable" + MOUNT_SUFFIX; -+ medium->needMounting(); -+ switch (libhal_drive_get_type(halDrive)) { -+ case LIBHAL_DRIVE_TYPE_COMPACT_FLASH: -+ medium->setIconName("compact_flash" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_MEMORY_STICK: -+ medium->setIconName("memory_stick" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_SMART_MEDIA: -+ medium->setIconName("smart_media" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_SD_MMC: -+ medium->setIconName("sd_mmc" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER: -+ medium->setIconName("ipod" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_CAMERA: -+ mimeType = "media/camera" + MOUNT_SUFFIX; -+ medium->setIconName("camera" + MOUNT_ICON_SUFFIX); -+ // get model from camera -+ if (physdev && libhal_device_query_capability(m_halContext, physdev, "camera", NULL)) -+ { -+ if (libhal_device_property_exists(m_halContext, physdev, "usb_device.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, physdev, "usb_device.product")); -+ else if (libhal_device_property_exists(m_halContext, physdev, "usb.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, physdev, "usb.product")); -+ } -+ break; -+ case LIBHAL_DRIVE_TYPE_TAPE: -+ medium->setIconName(QString::null); //FIXME need icon -+ break; -+ default: -+ medium->setIconName(QString::null); -+ }; -+ }; -+ } -+ medium->setMimeType(mimeType); - -+ libhal_drive_free(halDrive); -+ libhal_volume_free(halVolume); - } - - // Handle floppies and zip drives - void HALBackend::setFloppyProperties(Medium* medium) - { -- kdDebug(1219) << "HALBackend::setFloppyProperties for " << medium->id() << endl; -+ kdDebug(1219) << "HALBackend::setFloppyProperties for " << medium->id() << endl; - -- const char* udi = medium->id().ascii(); -- /* Check if the device still exists */ -- if (!libhal_device_exists(m_halContext, udi, NULL)) -- return; -- -- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, udi); -- if (!halDrive) -- return; -- int numVolumes; -- char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); -- LibHalVolume* halVolume = NULL; -- kdDebug(1219) << " found " << numVolumes << " volumes" << endl; -- if (numVolumes) -- halVolume = libhal_volume_from_udi(m_halContext, volumes[0]); -- -- medium->setName( -- generateName(libhal_drive_get_device_file(halDrive)) ); -- -- if (halVolume) -- { -- medium->mountableState( -- libhal_volume_get_device_file(halVolume), /* Device node */ -- libhal_volume_get_mount_point(halVolume), /* Mount point */ -- libhal_volume_get_fstype(halVolume), /* Filesystem type */ -- libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -- } -- else -- { -- // HAL hates floppies - so we have to do it twice ;( -- medium->mountableState(libhal_drive_get_device_file(halDrive), QString::null, QString::null, false); -- setFstabProperties( medium ); -- } -- -- if (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") -- { -- if (medium->isMounted()) // don't use _SUFFIX here as it accesses the volume -- medium->setMimeType("media/floppy_mounted" ); -- else -- medium->setMimeType("media/floppy_unmounted"); -- } -- -- if (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") -- { -- if (medium->isMounted()) -- medium->setMimeType("media/zip_mounted" ); -- else -- medium->setMimeType("media/zip_unmounted"); -- } -- -- /** @todo And mimtype for JAZ drives ? */ -- -- medium->setIconName(QString::null); -- -- char *name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -- -- if (name) { -- medium->setLabel( QString::fromUtf8(name) ); -- free(name); -- } -- -- free(volumes); -- libhal_drive_free(halDrive); -- libhal_volume_free(halVolume); --} -+ const char* udi = medium->id().ascii(); -+ /* Check if the device still exists */ -+ if (!libhal_device_exists(m_halContext, udi, NULL)) -+ return; -+ -+ LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, udi); -+ if (!halDrive) -+ return; -+ int numVolumes; -+ char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); -+ LibHalVolume* halVolume = NULL; -+ kdDebug(1219) << " found " << numVolumes << " volumes" << endl; -+ if (numVolumes) -+ halVolume = libhal_volume_from_udi(m_halContext, volumes[0]); - --void HALBackend::setCameraProperties(Medium* medium) --{ -- kdDebug(1219) << "HALBackend::setCameraProperties for " << medium->id() << endl; -- -- const char* udi = medium->id().ascii(); -- /* Check if the device still exists */ -- if (!libhal_device_exists(m_halContext, udi, NULL)) -- return; -- -- /** @todo find name */ -- medium->setName("camera"); -- -- QString device = "camera:/"; -- -- char *cam = libhal_device_get_property_string(m_halContext, udi, "camera.libgphoto2.name", NULL); -- DBusError error; -- dbus_error_init(&error); -- if (cam && -- libhal_device_property_exists(m_halContext, udi, "usb.linux.device_number", NULL) && -- libhal_device_property_exists(m_halContext, udi, "usb.bus_number", NULL)) -- device.sprintf("camera://%s@[usb:%03d,%03d]/", cam, -- libhal_device_get_property_int(m_halContext, udi, "usb.bus_number", &error), -- libhal_device_get_property_int(m_halContext, udi, "usb.linux.device_number", &error)); -- -- libhal_free_string(cam); -- -- /** @todo find the rest of this URL */ -- medium->unmountableState(device); -- medium->setMimeType("media/gphoto2camera"); -- medium->setIconName(QString::null); -- if (libhal_device_property_exists(m_halContext, udi, "usb_device.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb_device.product")); -- else if (libhal_device_property_exists(m_halContext, udi, "usb.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb.product")); -- else -- medium->setLabel(i18n("Camera")); --} -+ medium->setName( -+ generateName(libhal_drive_get_device_file(halDrive)) ); - --QString HALBackend::generateName(const QString &devNode) --{ -- return KURL(devNode).fileName(); --} -+ if (halVolume) -+ { -+ medium->mountableState( -+ libhal_volume_get_device_file(halVolume), /* Device node */ -+ libhal_volume_get_mount_point(halVolume), /* Mount point */ -+ libhal_volume_get_fstype(halVolume), /* Filesystem type */ -+ libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -+ } -+ else -+ { -+ medium->mountableState( -+ libhal_drive_get_device_file(halDrive), /* Device node */ -+ "", /* Mount point */ -+ "", /* Filesystem type */ -+ false ); /* Mounted ? */ -+ } - --/****************************************** -- ** HAL CALL-BACKS ** -- ******************************************/ -+ if (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") -+ { -+ if (halVolume) -+ medium->setMimeType("media/floppy" + MOUNT_SUFFIX); -+ else -+ medium->setMimeType("media/floppy_unmounted"); -+ } - --void HALBackend::hal_device_added(LibHalContext *ctx, const char *udi) --{ -- kdDebug(1219) << "HALBackend::hal_device_added " << udi << endl; -- Q_UNUSED(ctx); -- s_HALBackend->AddDevice(udi); --} -+ if (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") -+ { -+ if (halVolume) -+ medium->setMimeType("media/zip" + MOUNT_SUFFIX); -+ else -+ medium->setMimeType("media/zip_unmounted"); -+ } - --void HALBackend::hal_device_removed(LibHalContext *ctx, const char *udi) --{ -- kdDebug(1219) << "HALBackend::hal_device_removed " << udi << endl; -- Q_UNUSED(ctx); -- s_HALBackend->RemoveDevice(udi); --} -+ /** @todo And mimtype for JAZ drives ? */ - --void HALBackend::hal_device_property_modified(LibHalContext *ctx, const char *udi, -- const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) --{ -- kdDebug(1219) << "HALBackend::hal_property_modified " << udi << " -- " << key << endl; -- Q_UNUSED(ctx); -- Q_UNUSED(is_removed); -- Q_UNUSED(is_added); -- s_HALBackend->ModifyDevice(udi, key); --} -+ medium->setIconName(QString::null); - --void HALBackend::hal_device_condition(LibHalContext *ctx, const char *udi, -- const char *condition_name, -- const char* message -- ) --{ -- kdDebug(1219) << "HALBackend::hal_device_condition " << udi << " -- " << condition_name << endl; -- Q_UNUSED(ctx); -- Q_UNUSED(message); -- s_HALBackend->DeviceCondition(udi, condition_name); -+ QString media_name; -+ if (halVolume) -+ { -+ char* name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -+ QString volume_name = QString::fromUtf8(name); -+ media_name = volume_name; -+ free(name); -+ } -+ else -+ { -+ char* name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -+ QString drive_name = QString::fromUtf8(name); -+ media_name = drive_name; -+ free(name); -+ } -+ medium->setLabel(media_name); -+ -+ free(volumes); -+ libhal_drive_free(halDrive); -+ libhal_volume_free(halVolume); - } - --QStringList HALBackend::mountoptions(const QString &name) -+void HALBackend::setCameraProperties(Medium* medium) - { -- const Medium* medium = m_mediaList.findById(name); -- if (medium && !isInFstab(medium).isNull()) -- return QStringList(); // not handled by HAL - fstab entry -- -- KConfig config("mediamanagerrc"); -- config.setGroup(name); -- -- char ** array = libhal_device_get_property_strlist(m_halContext, name.latin1(), "volume.mount.valid_options", NULL); -- QMap<QString,bool> valids; -- -- for (int index = 0; array && array[index]; ++index) { -- QString t = array[index]; -- if (t.endsWith("=")) -- t = t.left(t.length() - 1); -- valids[t] = true; -- kdDebug() << "valid " << t << endl; -- } -- libhal_free_string_array(array); -- QStringList result; -- QString tmp; -- -- QString fstype = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.fstype"); -- if (fstype.isNull()) -- fstype = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.policy.mount_filesystem"); -- -- -- QString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device"); -- -- bool removable = libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.removable", NULL) -- || libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.hotpluggable", NULL); -- -- config.setGroup(drive_udi); -- bool value = config.readBoolEntry("automount", false); -- config.setGroup(name); -- -- if (libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_blank", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_vcd", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_svcd", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_videodvd", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.has_audio", NULL)) -- value = false; -- -- result << QString("automount=%1").arg(value ? "true" : "false"); -- -- if (valids.contains("ro")) -- { -- value = config.readBoolEntry("ro", false); -- tmp = QString("ro=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- if (valids.contains("quiet")) -- { -- value = config.readBoolEntry("quiet", false); -- tmp = QString("quiet=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- if (valids.contains("flush")) -- { -- value = config.readBoolEntry("flush", fstype.endsWith("fat")); -- tmp = QString("flush=%1").arg(value ? "true" : "false"); -- result << tmp; -- } -- -- if (valids.contains("uid")) -- { -- value = config.readBoolEntry("uid", true); -- tmp = QString("uid=%1").arg(value ? "true" : "false"); -- result << tmp; -- } -- -- if (valids.contains("utf8")) -- { -- value = config.readBoolEntry("utf8", true); -- tmp = QString("utf8=%1").arg(value ? "true" : "false"); -- result << tmp; -- } -- -- if (valids.contains("shortname")) -- { -- QString svalue = config.readEntry("shortname", "lower").lower(); -- if (svalue == "winnt") -- result << "shortname=winnt"; -- else if (svalue == "win95") -- result << "shortname=win95"; -- else if (svalue == "mixed") -- result << "shortname=mixed"; -- else -- result << "shortname=lower"; -- } -- -- if (valids.contains("sync")) -- { -- value = config.readBoolEntry("sync", !fstype.endsWith("fat") && removable); -- tmp = QString("sync=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- if (valids.contains("noatime")) -- { -- value = config.readBoolEntry("atime", !fstype.endsWith("fat")); -- tmp = QString("atime=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- QString mount_point = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.mount_point"); -- if (mount_point.isEmpty()) -- mount_point = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.policy.desired_mount_point"); -- -- mount_point = config.readEntry("mountpoint", mount_point); -- -- if (!mount_point.startsWith("/")) -- mount_point = "/media/" + mount_point; -- -- result << QString("mountpoint=%1").arg(mount_point); -- result << QString("filesystem=%1").arg(fstype); -- -- if (valids.contains("data")) -- { -- QString svalue = config.readEntry("journaling").lower(); -- if (svalue == "ordered") -- result << "journaling=ordered"; -- else if (svalue == "writeback") -- result << "journaling=writeback"; -- else if (svalue == "data") -- result << "journaling=data"; -- else -- result << "journaling=ordered"; -- } -+ kdDebug(1219) << "HALBackend::setCameraProperties for " << medium->id() << endl; - -- return result; -+ const char* udi = medium->id().ascii(); -+ /* Check if the device still exists */ -+ if (!libhal_device_exists(m_halContext, udi, NULL)) -+ return; -+ -+ /** @todo find name */ -+ medium->setName("camera"); -+ /** @todo find the rest of this URL */ -+ medium->unmountableState("camera:/"); -+ medium->setMimeType("media/gphoto2camera"); -+ medium->setIconName(QString::null); -+ if (libhal_device_property_exists(m_halContext, udi, "usb_device.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, udi, "usb_device.product")); -+ else if (libhal_device_property_exists(m_halContext, udi, "usb.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, udi, "usb.product")); -+ else -+ medium->setLabel(i18n("Camera")); - } - --bool HALBackend::setMountoptions(const QString &name, const QStringList &options ) -+QString HALBackend::generateName(const QString &devNode) - { -- kdDebug() << "setMountoptions " << name << " " << options << endl; -- -- KConfig config("mediamanagerrc"); -- config.setGroup(name); -- -- QMap<QString,QString> valids = MediaManagerUtils::splitOptions(options); -- -- const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 }; -- for (int index = 0; names[index]; ++index) -- if (valids.contains(names[index])) -- config.writeEntry(names[index], valids[names[index]] == "true"); -- -- if (valids.contains("shortname")) -- config.writeEntry("shortname", valids["shortname"]); -- -- if (valids.contains("journaling")) -- config.writeEntry("journaling", valids["journaling"]); -- -- if (!mountoptions(name).contains(QString("mountpoint=%1").arg(valids["mountpoint"]))) -- config.writeEntry("mountpoint", valids["mountpoint"]); -- -- if (valids.contains("automount")) { -- QString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device"); -- config.setGroup(drive_udi); -- config.writeEntry("automount", valids["automount"]); -- } -- -- return true; -+ return KURL(devNode).fileName(); - } - --static QString mount_priv(const char *udi, const char *mount_point, const char **poptions, int noptions, -- DBusConnection *dbus_connection) --{ -- DBusMessage *dmesg, *reply; -- DBusError error; -- -- const char *fstype = ""; -- if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, -- "org.freedesktop.Hal.Device.Volume", -- "Mount"))) { -- kdDebug() << "mount failed for " << udi << ": could not create dbus message\n"; -- return i18n("Internal Error"); -- } -- -- if (!dbus_message_append_args (dmesg, DBUS_TYPE_STRING, &mount_point, DBUS_TYPE_STRING, &fstype, -- DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &poptions, noptions, -- DBUS_TYPE_INVALID)) -- { -- kdDebug() << "mount failed for " << udi << ": could not append args to dbus message\n"; -- dbus_message_unref (dmesg); -- return i18n("Internal Error"); -- } -- -- QString qerror; -- -- dbus_error_init (&error); -- if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) -- { -- QString qerror = error.message; -- kdError() << "mount failed for " << udi << ": " << error.name << " - " << qerror << endl; -- if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.UnknownFilesystemType")) -- qerror = i18n("Invalid filesystem type"); -- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.PermissionDenied")) -- qerror = i18n("Permissions denied"); -- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.AlreadyMounted")) -- qerror = i18n("Device is already mounted."); -- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.InvalidMountpoint") && strlen(mount_point)) { -- dbus_message_unref (dmesg); -- dbus_error_free (&error); -- return mount_priv(udi, "", poptions, noptions, dbus_connection); -- } -- dbus_message_unref (dmesg); -- dbus_error_free (&error); -- return qerror; -- } -- -- kdDebug() << "mount queued for " << udi << endl; -- -- dbus_message_unref (dmesg); -- dbus_message_unref (reply); -- -- return qerror; -+/****************************************** -+** HAL CALL-BACKS ** -+******************************************/ - -+#ifdef HAL_0_4 -+void HALBackend::hal_main_loop_integration(LibHalContext *ctx, -+ DBusConnection *dbus_connection) -+{ -+ kdDebug(1219) << "HALBackend::hal_main_loop_integration" << endl; -+ Q_UNUSED(ctx); -+ s_HALBackend->MainLoopIntegration(dbus_connection); - } -+#endif - --void HALBackend::slotResult(KIO::Job *job) -+void HALBackend::hal_device_added(LibHalContext *ctx, const char *udi) - { -- kdDebug() << "slotResult " << mount_jobs[job] << endl; -- if (job->error()) -- { -- KMessageBox::error(0, job->errorText()); -- } -- ResetProperties( mount_jobs[job].latin1() ); -- mount_jobs.remove(job); -+ kdDebug(1219) << "HALBackend::hal_device_added " << udi << endl; -+ Q_UNUSED(ctx); -+ s_HALBackend->AddDevice(udi); - } - --QString HALBackend::isInFstab(const Medium *medium) -+void HALBackend::hal_device_removed(LibHalContext *ctx, const char *udi) - { -- KMountPoint::List fstab = KMountPoint::possibleMountPoints(KMountPoint::NeedMountOptions|KMountPoint::NeedRealDeviceName); -- -- KMountPoint::List::iterator it = fstab.begin(); -- KMountPoint::List::iterator end = fstab.end(); -- -- for (; it!=end; ++it) -- { -- kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl; -- if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && (*it)->realDeviceName() == medium->deviceNode() ) ) -- { -- QStringList opts = (*it)->mountOptions(); -- if (opts.contains("user") || opts.contains("users")) -- return (*it)->mountPoint(); -- } -- } -- -- return QString::null; -+ kdDebug(1219) << "HALBackend::hal_device_removed " << udi << endl; -+ Q_UNUSED(ctx); -+ s_HALBackend->RemoveDevice(udi); - } - --QString HALBackend::mount(const Medium *medium) --{ -- if (medium->isMounted()) -- return QString(); // that was easy -- -- QString mountPoint = isInFstab(medium); -- if (!mountPoint.isNull()) -- { -- kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; -- KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint ); -- connect(job, SIGNAL( result (KIO::Job *)), -- SLOT( slotResult( KIO::Job *))); -- mount_jobs[job] = medium->id(); -- return QString(); // we won't report an error here -- } else if (medium->id().startsWith("/org/kde/") ) -- return i18n("Permissions denied"); -- -- QStringList soptions; -- -- kdDebug() << "mounting " << medium->id() << "..." << endl; -- -- QMap<QString,QString> valids = MediaManagerUtils::splitOptions(mountoptions(medium->id())); -- if (valids["flush"] == "true") -- soptions << "flush"; -- -- if (valids["uid"] == "true") -- { -- soptions << QString("uid=%1").arg(getuid()); -- } -- -- if (valids["ro"] == "true") -- soptions << "ro"; -- -- if (valids["atime"] != "true") -- soptions << "noatime"; -- -- if (valids["quiet"] == "true") -- soptions << "quiet"; -- -- if (valids["utf8"] == "true") -- soptions << "utf8"; -- -- if (valids["sync"] == "true") -- soptions << "sync"; -- -- QString mount_point = valids["mountpoint"]; -- if (mount_point.startsWith("/media/")) -- mount_point = mount_point.mid(7); -- -- if (valids.contains("shortname")) -- { -- soptions << QString("shortname=%1").arg(valids["shortname"]); -- } -- -- if (valids.contains("journaling")) -- { -- QString option = valids["journaling"]; -- if (option == "data") -- soptions << QString("data=journal"); -- else if (option == "writeback") -- soptions << QString("data=writeback"); -- else -- soptions << QString("data=ordered"); -- } -- -- const char **options = new const char*[soptions.size() + 1]; -- uint noptions = 0; -- for (QStringList::ConstIterator it = soptions.begin(); it != soptions.end(); ++it, ++noptions) -- options[noptions] = (*it).latin1(); -- options[noptions] = NULL; -- -- QString qerror = mount_priv(medium->id().latin1(), mount_point.utf8(), options, noptions, dbus_connection); -- if (!qerror.isEmpty()) { -- kdError() << "mounting " << medium->id() << " returned " << qerror << endl; -- return qerror; -- } -- -- medium->setHalMounted(true); -- ResetProperties(medium->id().latin1()); -- -- return QString(); --} -- --QString HALBackend::mount(const QString &_udi) -+void HALBackend::hal_device_property_modified(LibHalContext *ctx, const char *udi, -+ const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) - { -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- return i18n("No such medium: %1").arg(_udi); -- -- return mount(medium); -+ kdDebug(1219) << "HALBackend::hal_property_modified " << udi << " -- " << key << endl; -+ Q_UNUSED(ctx); -+ Q_UNUSED(is_removed); -+ Q_UNUSED(is_added); -+ s_HALBackend->ModifyDevice(udi, key); - } - --QString HALBackend::unmount(const QString &_udi) --{ -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- { // now we get fancy: if the udi is no volume, it _might_ be a device with only one -- // volume on it (think CDs) - so we're so nice to the caller to unmount that volume -- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, _udi.latin1()); -- if (halDrive) -- { -- int numVolumes; -- char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); -- if (numVolumes == 1) -- medium = m_mediaList.findById( volumes[0] ); -- } -- } -- -- if ( !medium ) -- return i18n("No such medium: %1").arg(_udi); -- -- if (!medium->isMounted()) -- return QString(); // that was easy -- -- QString mountPoint = isInFstab(medium); -- if (!mountPoint.isNull()) -- { -- kdDebug() << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl; -- KIO::Job *job = KIO::unmount( medium->mountPoint(), false ); -- connect(job, SIGNAL( result (KIO::Job *)), -- SLOT( slotResult( KIO::Job *))); -- mount_jobs[job] = medium->id(); -- return QString(); // we won't report an error here -- } -- -- DBusMessage *dmesg, *reply; -- DBusError error; -- const char *options[2]; -- -- const char *udi = medium->id().latin1(); -- kdDebug() << "unmounting " << udi << "..." << endl; -- -- dbus_error_init(&error); -- DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -- if (dbus_error_is_set(&error)) -- { -- dbus_error_free(&error); -- return false; -- } -- -- if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, -- "org.freedesktop.Hal.Device.Volume", -- "Unmount"))) { -- kdDebug() << "unmount failed for " << udi << ": could not create dbus message\n"; -- return i18n("Internal Error"); -- } -- -- options[0] = "force"; -- options[1] = 0; -- -- if (!dbus_message_append_args (dmesg, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, 0, -- DBUS_TYPE_INVALID)) -- { -- kdDebug() << "unmount failed for " << udi << ": could not append args to dbus message\n"; -- dbus_message_unref (dmesg); -- return i18n("Internal Error"); -- } -- -- dbus_error_init (&error); -- if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) -- { -- kdDebug() << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl; -- QString qerror = error.message; -- if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.Busy")) { -- qerror = QString("<qt>") + i18n("Device is Busy:"); -- QString cmdline = QString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint())); -- FILE *fuser = popen(cmdline.latin1(), "r"); -- uint counter = 0; -- if (fuser) { -- qerror += "<pre>"; -- QTextIStream is(fuser); -- QString tmp; -- while (!is.atEnd()) { -- tmp = is.readLine(); -- tmp = QStyleSheet::escape(tmp) + "\n"; -- -- qerror += tmp; -- if (counter++ > 20) -- { -- qerror += "..."; -- break; -- } -- } -- qerror += "</pre>"; -- (void)pclose( fuser ); -- } -- qerror += "</qt>"; -- } else if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.NotMounted")) { -- // this is faking. The error is that the device wasn't mounted by hal (but by the system) -- qerror = i18n("Permissions denied"); -- } -- -- dbus_message_unref (dmesg); -- dbus_error_free (&error); -- return qerror; -- } -- -- kdDebug() << "unmount queued for " << udi << endl; -- -- dbus_message_unref (dmesg); -- dbus_message_unref (reply); -- -- medium->setHalMounted(false); -- ResetProperties(udi); -- -- return QString(); -+void HALBackend::hal_device_condition(LibHalContext *ctx, const char *udi, -+ const char *condition_name, -+ #ifdef HAL_0_4 -+ DBusMessage *message -+ #else -+ const char* message -+ #endif -+ ) -+{ -+ kdDebug(1219) << "HALBackend::hal_device_condition " << udi << " -- " << condition_name << endl; -+ Q_UNUSED(ctx); -+ Q_UNUSED(message); -+ s_HALBackend->DeviceCondition(udi, condition_name); - } - - #include "halbackend.moc" -diff -urN kioslave/media/mediamanager/halbackend.h kioslave/media/mediamanager/halbackend.h ---- kioslave/media/mediamanager/halbackend.h Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/halbackend.h Mon Oct 10 17:04:01 2005 -@@ -45,9 +45,65 @@ - #include <libhal.h> - #include <libhal-storage.h> - --namespace KIO { -- class Job; --} -+/* The HAL API changed between 0.4 and 0.5 series. -+These defines enable backward compatibility */ -+#ifdef HAL_0_4 -+ // libhal-storage 0.4 API -+ #define LibHalStoragePolicy HalStoragePolicy -+ #define LibHalDrive HalDrive -+ #define LibHalVolume HalVolume -+ #define LibHalVolumeDiscType HalVolumeDiscType -+ #define libhal_storage_policy_free hal_storage_policy_free -+ #define libhal_storage_policy_new hal_storage_policy_new -+ #define libhal_drive_from_udi hal_drive_from_udi -+ #define libhal_drive_find_all_volumes hal_drive_find_all_volumes -+ #define libhal_drive_get_type hal_drive_get_type -+ #define libhal_drive_get_device_file hal_drive_get_device_file -+ #define libhal_drive_free hal_drive_free -+ #define libhal_drive_policy_compute_display_name hal_drive_policy_compute_display_name -+ #define libhal_drive_is_hotpluggable hal_drive_is_hotpluggable -+ #define libhal_drive_get_physical_device_udi hal_drive_get_physical_device_udi -+ #define libhal_volume_from_udi hal_volume_from_udi -+ #define libhal_volume_get_device_file hal_volume_get_device_file -+ #define libhal_volume_get_mount_point hal_volume_get_mount_point -+ #define libhal_volume_get_fstype hal_volume_get_fstype -+ #define libhal_volume_is_mounted hal_volume_is_mounted -+ #define libhal_volume_get_disc_type hal_volume_get_disc_type -+ #define libhal_volume_free hal_volume_free -+ #define libhal_volume_policy_compute_display_name hal_volume_policy_compute_display_name -+ #define libhal_volume_disc_has_data hal_volume_disc_has_data -+ #define libhal_volume_disc_has_audio hal_volume_disc_has_audio -+ #define libhal_volume_disc_is_blank hal_volume_disc_is_blank -+ #define libhal_volume_is_disc hal_volume_is_disc -+ #define libhal_volume_get_storage_device_udi hal_volume_get_storage_device_udi -+ #define LIBHAL_VOLUME_DISC_TYPE_CDROM HAL_VOLUME_DISC_TYPE_CDROM -+ #define LIBHAL_VOLUME_DISC_TYPE_CDR HAL_VOLUME_DISC_TYPE_CDR -+ #define LIBHAL_VOLUME_DISC_TYPE_CDRW HAL_VOLUME_DISC_TYPE_CDRW -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDROM HAL_VOLUME_DISC_TYPE_DVDROM -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDRAM HAL_VOLUME_DISC_TYPE_DVDRAM -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDR HAL_VOLUME_DISC_TYPE_DVDR -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDRW HAL_VOLUME_DISC_TYPE_DVDRW -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR HAL_VOLUME_DISC_TYPE_DVDPLUSR -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW HAL_VOLUME_DISC_TYPE_DVDPLUSRW -+ #define LIBHAL_DRIVE_TYPE_COMPACT_FLASH HAL_DRIVE_TYPE_COMPACT_FLASH -+ #define LIBHAL_DRIVE_TYPE_MEMORY_STICK HAL_DRIVE_TYPE_MEMORY_STICK -+ #define LIBHAL_DRIVE_TYPE_SMART_MEDIA HAL_DRIVE_TYPE_SMART_MEDIA -+ #define LIBHAL_DRIVE_TYPE_SD_MMC HAL_DRIVE_TYPE_SD_MMC -+ #define LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER HAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER -+ #define LIBHAL_DRIVE_TYPE_CAMERA HAL_DRIVE_TYPE_CAMERA -+ #define LIBHAL_DRIVE_TYPE_TAPE HAL_DRIVE_TYPE_TAPE -+ -+ // libhal 0.4 API -+ #define libhal_free_string hal_free_string -+ #define libhal_device_exists(ctx, udi, error) hal_device_exists(ctx, udi) -+ #define libhal_device_property_watch_all(ctx, error) hal_device_property_watch_all(ctx) -+ #define libhal_get_all_devices(ctx, num_devices, error) hal_get_all_devices(ctx, num_devices) -+ #define libhal_device_property_exists(ctx, udi, key, error) hal_device_property_exists(ctx, udi, key) -+ #define libhal_device_get_property_bool(ctx, udi, key, error) hal_device_get_property_bool(ctx, udi, key) -+ #define libhal_device_get_property_string(ctx, udi, key, error) hal_device_get_property_string(ctx, udi, key) -+ #define libhal_device_query_capability(ctx, udi, capability, error) hal_device_query_capability(ctx, udi, capability) -+#endif -+ - - /** - * A handy function to query a hal string -@@ -88,14 +144,6 @@ - */ - bool ListDevices(); - -- QStringList mountoptions(const QString &id); -- -- bool setMountoptions(const QString &id, const QStringList &options); -- -- QString mount(const QString &id); -- QString mount(const Medium *medium); -- QString unmount(const QString &id); -- - private: - /** - * Append a device in the media list. This function will check if the device -@@ -147,16 +195,20 @@ - - void setVolumeProperties(Medium* medium); - void setFloppyProperties(Medium* medium); -- bool setFstabProperties(Medium* medium); - void setCameraProperties(Medium* medium); - QString generateName(const QString &devNode); -- static QString isInFstab(const Medium *medium); -- --private slots: -- void slotResult(KIO::Job *job); - - /* Hal call-backs -- from gvm*/ - public: -+#ifdef HAL_0_4 -+ /** Invoked by libhal for integration with our mainloop. -+ * -+ * @param ctx LibHal context -+ * @param dbus_connection D-BUS connection to integrate -+ */ -+ static void hal_main_loop_integration(LibHalContext *ctx, DBusConnection *dbus_connection); -+#endif -+ - /** Invoked when a device is added to the Global Device List. - * - * @param ctx LibHal context -@@ -189,7 +241,11 @@ - */ - static void hal_device_condition(LibHalContext *ctx, const char *udi, - const char *condition_name, -+ #ifdef HAL_0_4 -+ DBusMessage *message -+ #else - const char* message -+ #endif - ); - - /* HAL and DBus structures */ -@@ -199,6 +255,13 @@ - */ - LibHalContext* m_halContext; - -+#ifdef HAL_0_4 -+ /** -+ * Structure defining the hal callback function for devices events -+ */ -+ LibHalFunctions m_halFunctions; -+#endif -+ - /** - * libhal-storage HAL policy, e.g. for icon names - */ -@@ -213,10 +276,6 @@ - * Object for the kded module - */ - QObject* m_parent; -- -- DBusConnection *dbus_connection; -- -- QMap<KIO::Job *, QString> mount_jobs; - }; - - #endif /* _HALBACKEND_H_ */ -diff -urN kioslave/media/mediamanager/linuxcdpolling.cpp kioslave/media/mediamanager/linuxcdpolling.cpp ---- kioslave/media/mediamanager/linuxcdpolling.cpp Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/linuxcdpolling.cpp Mon Oct 10 17:04:01 2005 -@@ -23,6 +23,7 @@ - - #include <qthread.h> - #include <qmutex.h> -+#include <qtimer.h> - #include <qfile.h> - - #include <kdebug.h> -@@ -188,7 +189,9 @@ - const QString &, bool, bool)), - this, SLOT(slotMediumStateChanged(const QString &)) ); - -- connect(&m_timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); -+ QTimer *timer = new QTimer(this); -+ connect(timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); -+ timer->start(500); - } - - LinuxCDPolling::~LinuxCDPolling() -@@ -226,7 +229,6 @@ - PollingThread *thread = new PollingThread(dev); - m_threads[id] = thread; - thread->start(); -- m_timer.start(500); - } - } - -@@ -266,7 +268,6 @@ - PollingThread *thread = new PollingThread(dev); - m_threads[id] = thread; - thread->start(); -- m_timer.start(500); - } - else if (m_threads.contains(id) && medium->isMounted()) - { -@@ -281,12 +282,6 @@ - void LinuxCDPolling::slotTimeout() - { - //kdDebug(1219) << "LinuxCDPolling::slotTimeout()" << endl; -- -- if (m_threads.isEmpty()) -- { -- m_timer.stop(); -- return; -- } - - QMap<QString, PollingThread*>::iterator it = m_threads.begin(); - QMap<QString, PollingThread*>::iterator end = m_threads.end(); -diff -urN kioslave/media/mediamanager/linuxcdpolling.h kioslave/media/mediamanager/linuxcdpolling.h ---- kioslave/media/mediamanager/linuxcdpolling.h Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/linuxcdpolling.h Mon Oct 10 17:04:01 2005 -@@ -24,7 +24,6 @@ - #include <qobject.h> - #include <qcstring.h> - #include <qmap.h> --#include <qtimer.h> - - class DiscType - { -@@ -80,7 +79,6 @@ - - QMap<QString, PollingThread*> m_threads; - QStringList m_excludeNotification; -- QTimer m_timer; - }; - - #endif -diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanager/mediamanager.cpp ---- kioslave/media/mediamanager/mediamanager.cpp Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/mediamanager.cpp Mon Oct 10 17:04:01 2005 -@@ -43,287 +43,201 @@ - MediaManager::MediaManager(const QCString &obj) - : KDEDModule(obj), m_dirNotify(m_mediaList) - { -- connect( &m_mediaList, SIGNAL(mediumAdded(const QString&, const QString&, bool)), -- SLOT(slotMediumAdded(const QString&, const QString&, bool)) ); -- connect( &m_mediaList, SIGNAL(mediumRemoved(const QString&, const QString&, bool)), -- SLOT(slotMediumRemoved(const QString&, const QString&, bool)) ); -- connect( &m_mediaList, -- SIGNAL(mediumStateChanged(const QString&, const QString&, bool, bool)), -- SLOT(slotMediumChanged(const QString&, const QString&, bool, bool)) ); -+ connect( &m_mediaList, SIGNAL(mediumAdded(const QString&, const QString&, bool)), -+ SLOT(slotMediumAdded(const QString&, const QString&, bool)) ); -+ connect( &m_mediaList, SIGNAL(mediumRemoved(const QString&, const QString&, bool)), -+ SLOT(slotMediumRemoved(const QString&, const QString&, bool)) ); -+ connect( &m_mediaList, -+ SIGNAL(mediumStateChanged(const QString&, const QString&, bool, bool)), -+ SLOT(slotMediumChanged(const QString&, const QString&, bool, bool)) ); - -- QTimer::singleShot( 10, this, SLOT( loadBackends() ) ); -+ QTimer::singleShot( 10, this, SLOT( loadBackends() ) ); - } - - MediaManager::~MediaManager() - { -- while ( !m_backends.isEmpty() ) -- { -- BackendBase *b = m_backends.first(); -- m_backends.remove( b ); -- delete b; -- } -+ while ( !m_backends.isEmpty() ) -+ { -+ BackendBase *b = m_backends.first(); -+ m_backends.remove( b ); -+ delete b; -+ } - } - - void MediaManager::loadBackends() - { - m_mediaList.blockSignals(true); - -- while ( !m_backends.isEmpty() ) -- { -- BackendBase *b = m_backends.first(); -- m_backends.remove( b ); -- delete b; -- } -- -- mp_removableBackend = 0L; -- m_halbackend = 0L; -- m_fstabbackend = 0L; -+ while ( !m_backends.isEmpty() ) -+ { -+ BackendBase *b = m_backends.first(); -+ m_backends.remove( b ); -+ delete b; -+ } -+ -+ mp_removableBackend = 0L; - - #ifdef COMPILE_HALBACKEND -- if ( MediaManagerSettings::self()->halBackendEnabled() ) -- { -- m_halbackend = new HALBackend(m_mediaList, this); -- if (m_halbackend->InitHal()) -- { -- m_backends.append( m_halbackend ); -- m_fstabbackend = new FstabBackend(m_mediaList, true); -- m_backends.append( m_fstabbackend ); -- // No need to load something else... -- m_mediaList.blockSignals(false); -- return; -- } -- else -- { -- delete m_halbackend; -- m_halbackend = 0; -- } -- } -+ if ( MediaManagerSettings::self()->halBackendEnabled() ) -+ { -+ HALBackend* hal_backend = new HALBackend(m_mediaList, this); -+ if (hal_backend->InitHal()) -+ { -+ m_backends.append( hal_backend ); -+ m_backends.append( new FstabBackend(m_mediaList, true) ); -+ // No need to load something else... -+ m_mediaList.blockSignals(false); -+ return; -+ } -+ else -+ { -+ delete hal_backend; -+ } -+ } - #endif // COMPILE_HALBACKEND - -- mp_removableBackend = new RemovableBackend(m_mediaList); -- m_backends.append( mp_removableBackend ); -+ mp_removableBackend = new RemovableBackend(m_mediaList); -+ m_backends.append( mp_removableBackend ); - - #ifdef COMPILE_LINUXCDPOLLING -- if ( MediaManagerSettings::self()->cdPollingEnabled() ) -- { -- m_backends.append( new LinuxCDPolling(m_mediaList) ); -- } -+ if ( MediaManagerSettings::self()->cdPollingEnabled() ) -+ { -+ m_backends.append( new LinuxCDPolling(m_mediaList) ); -+ } - #endif //COMPILE_LINUXCDPOLLING - -- m_fstabbackend = new FstabBackend(m_mediaList); -- m_backends.append( m_fstabbackend ); -- m_mediaList.blockSignals(false); -+ m_backends.append( new FstabBackend(m_mediaList) ); -+ m_mediaList.blockSignals(false); - } - - - QStringList MediaManager::fullList() - { -- QPtrList<Medium> list = m_mediaList.list(); -+ QPtrList<Medium> list = m_mediaList.list(); - -- QStringList result; -+ QStringList result; - -- QPtrList<Medium>::const_iterator it = list.begin(); -- QPtrList<Medium>::const_iterator end = list.end(); -- for (; it!=end; ++it) -- { -- result+= (*it)->properties(); -- result+= Medium::SEPARATOR; -- } -+ QPtrList<Medium>::const_iterator it = list.begin(); -+ QPtrList<Medium>::const_iterator end = list.end(); -+ for (; it!=end; ++it) -+ { -+ result+= (*it)->properties(); -+ result+= Medium::SEPARATOR; -+ } - -- return result; -+ return result; - } - - QStringList MediaManager::properties(const QString &name) - { -- const Medium *m = m_mediaList.findByName(name); -- -- if (!m) -- { -- KURL u(name); -- kdDebug() << "Media::prop " << name << " " << u.isValid() << endl; -- if (u.isValid()) -- { -- if (u.protocol() == "system") -- { -- QString path = u.path(); -- if (path.startsWith("/media/")) -- path = path.mid(strlen("/media/")); -- m = m_mediaList.findByName(path); -- kdDebug() << "findByName " << path << m << endl; -- } -- else if (u.protocol() == "media") -- { -- m = m_mediaList.findByName(u.filename()); -- kdDebug() << "findByName " << u.filename() << m << endl; -- } -- else if (u.protocol() == "file") -- { -- // look for the mount point -- QPtrList<Medium> list = m_mediaList.list(); -- QPtrList<Medium>::const_iterator it = list.begin(); -- QPtrList<Medium>::const_iterator end = list.end(); -- for (; it!=end; ++it) -- { -- kdDebug() << "comparing " << (*it)->mountPoint() << " " << u.path() << " " << (*it)->deviceNode() << endl; -- if ((*it)->mountPoint() == u.path() || (*it)->deviceNode() == u.path()) { -- m = *it; -- break; -- } -- } -- } -- } -- } -- -- if (m) -- return m->properties(); -- else -- return QStringList(); --} -+ const Medium *m = m_mediaList.findByName(name); - --QStringList MediaManager::mountoptions(const QString &name) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return QStringList(); -- return m_halbackend->mountoptions(name); --#else -- return QStringList(); --#endif --} -- --bool MediaManager::setMountoptions(const QString &name, const QStringList &options) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return false; -- return m_halbackend->setMountoptions(name, options); --#else -- return false; --#endif --} -- --QString MediaManager::mount(const QString &name) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return i18n("Feature only available with HAL"); -- return m_halbackend->mount(name); --#else -- if ( !m_fstabbackend ) // lying :) -- return i18n("Feature only available with HAL"); -- return m_fstabbackend->mount( name ); --#endif --} -- --QString MediaManager::unmount(const QString &name) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return i18n("Feature only available with HAL"); -- return m_halbackend->unmount(name); --#else -- if ( !m_fstabbackend ) // lying :) -- return i18n("Feature only available with HAL"); -- return m_fstabbackend->unmount( name ); --#endif -+ if (m!=0L) -+ { -+ return m->properties(); -+ } -+ else -+ { -+ return QStringList(); -+ } - } - - QString MediaManager::nameForLabel(const QString &label) - { -- const QPtrList<Medium> media = m_mediaList.list(); -+ const QPtrList<Medium> media = m_mediaList.list(); - -- QPtrList<Medium>::const_iterator it = media.begin(); -- QPtrList<Medium>::const_iterator end = media.end(); -- for (; it!=end; ++it) -- { -- const Medium *m = *it; -- -- if (m->prettyLabel()==label) -- { -- return m->name(); -- } -- } -+ QPtrList<Medium>::const_iterator it = media.begin(); -+ QPtrList<Medium>::const_iterator end = media.end(); -+ for (; it!=end; ++it) -+ { -+ const Medium *m = *it; -+ -+ if (m->prettyLabel()==label) -+ { -+ return m->name(); -+ } -+ } - -- return QString::null; -+ return QString::null; - } - - ASYNC MediaManager::setUserLabel(const QString &name, const QString &label) - { -- m_mediaList.setUserLabel(name, label); -+ m_mediaList.setUserLabel(name, label); - } - - ASYNC MediaManager::reloadBackends() - { -- MediaManagerSettings::self()->readConfig(); -- loadBackends(); -+ MediaManagerSettings::self()->readConfig(); -+ loadBackends(); - } - - bool MediaManager::removablePlug(const QString &devNode, const QString &label) - { -- if (mp_removableBackend) -- { -- return mp_removableBackend->plug(devNode, label); -- } -- return false; -+ if (mp_removableBackend) -+ { -+ return mp_removableBackend->plug(devNode, label); -+ } -+ return false; - } - - bool MediaManager::removableUnplug(const QString &devNode) - { -- if (mp_removableBackend) -- { -- return mp_removableBackend->unplug(devNode); -- } -- return false; -+ if (mp_removableBackend) -+ { -+ return mp_removableBackend->unplug(devNode); -+ } -+ return false; - } - - bool MediaManager::removableCamera(const QString &devNode) - { -- if (mp_removableBackend) -- { -- return mp_removableBackend->camera(devNode); -- } -- return false; -+ if (mp_removableBackend) -+ { -+ return mp_removableBackend->camera(devNode); -+ } -+ return false; - } - - - void MediaManager::slotMediumAdded(const QString &/*id*/, const QString &name, - bool allowNotification) - { -- kdDebug(1219) << "MediaManager::slotMediumAdded: " << name << endl; -+ kdDebug(1219) << "MediaManager::slotMediumAdded: " << name << endl; - -- KDirNotify_stub notifier("*", "*"); -- notifier.FilesAdded( KURL("media:/") ); -+ KDirNotify_stub notifier("*", "*"); -+ notifier.FilesAdded( KURL("media:/") ); - -- emit mediumAdded(name, allowNotification); -- emit mediumAdded(name); -+ emit mediumAdded(name, allowNotification); -+ emit mediumAdded(name); - } - - void MediaManager::slotMediumRemoved(const QString &/*id*/, const QString &name, - bool allowNotification) - { -- kdDebug(1219) << "MediaManager::slotMediumRemoved: " << name << endl; -+ kdDebug(1219) << "MediaManager::slotMediumRemoved: " << name << endl; - -- KDirNotify_stub notifier("*", "*"); -- notifier.FilesRemoved( KURL("media:/"+name) ); -+ KDirNotify_stub notifier("*", "*"); -+ notifier.FilesRemoved( KURL("media:/"+name) ); - -- emit mediumRemoved(name, allowNotification); -- emit mediumRemoved(name); -+ emit mediumRemoved(name, allowNotification); -+ emit mediumRemoved(name); - } - - void MediaManager::slotMediumChanged(const QString &/*id*/, const QString &name, - bool mounted, bool allowNotification) - { -- kdDebug(1219) << "MediaManager::slotMediumChanged: " << name << endl; -+ kdDebug(1219) << "MediaManager::slotMediumChanged: " << name << endl; - -- KDirNotify_stub notifier("*", "*"); -- if (!mounted) -- { -- notifier.FilesRemoved( KURL("media:/"+name) ); -- } -- notifier.FilesChanged( KURL("media:/"+name) ); -+ KDirNotify_stub notifier("*", "*"); -+ if (!mounted) -+ { -+ notifier.FilesRemoved( KURL("media:/"+name) ); -+ } -+ notifier.FilesChanged( KURL("media:/"+name) ); - -- emit mediumChanged(name, allowNotification); -- emit mediumChanged(name); -+ emit mediumChanged(name, allowNotification); -+ emit mediumChanged(name); - } - - -diff -urN kioslave/media/mediamanager/mediamanager.desktop kioslave/media/mediamanager/mediamanager.desktop ---- kioslave/media/mediamanager/mediamanager.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/mediamanager.desktop Tue May 23 13:33:34 2006 -@@ -16,13 +16,11 @@ - Name[es]=Administrador de recursos KDED - Name[et]=KDED andmekandjate haldur - Name[eu]=KDED media kudeatzailea --Name[fa]=مدیر رسانه KDED - Name[fi]=KDED-tallennusmedianhallinta - Name[fr]=Gestionnaire de médias KDED - Name[fy]=KDEDED-mediabehearder - Name[ga]=Bainisteoir Meán KDED - Name[gl]=Xestor de Meios de KDED --Name[he]=מנהל המדיה של KDED - Name[hi]=केडीईडी मीडिया प्रबंधक - Name[hr]=KDED upravitelj medija - Name[hu]=KDED médiakezelő -@@ -45,7 +43,6 @@ - Name[ru]=Управление подключаемыми устройствами - Name[rw]=Mugenga Igihuza KDED - Name[se]=KDED-mediagieđahalli --Name[sk]=KDED správca médií - Name[sl]=Upravitelj medijev KDED - Name[sr]=Менаџер медијума, KDED - Name[sr@Latn]=Menadžer medijuma, KDED -@@ -73,18 +70,16 @@ - Comment[es]=Monitoriza las actividades de los recursos y permite (des)montarlos (media:/) - Comment[et]=Hoiab silma peal andmekandjate aktiivsusel ja võimaldab neid ühendada/lahutada (media:/) - Comment[eu]=Montatzeak begiztatzen ditu (media:/) eta desmontatzen uzten du --Comment[fa]=حفظ رد فعالیتهای رسانه و اجازه سو ار(پیاده) کردن (media:/) - Comment[fi]=Pidä kirjaa tallennustapahtumista ja salli tallennusvälineen liittäminen/irrotus (devices:/) - Comment[fr]=Gardez une trace des montages et permettre le (dé)montage (media:/) - Comment[fy]=Hâld de media-aktiviteiten by en stien ta om media oan- en ôf te keppelje (media:/) - Comment[gl]=Seguimento das actividades dos meios e permite-lle (des)montar (media:/) --Comment[he]=מנטר אחר פעילויות מדיה, ומאפשר לחבר או לנתק התקנים (media:/) - Comment[hi]=मीडिया क्रियाओं की जानकारी रखे तथा (अन)माउन्ट करने दे (मीडिया:/) - Comment[hr]=Praćenje aktivnosti medija i omogućavanje pristupanja i napuštanja - Comment[hu]=Az adathordozók követése, csatlakoztatása és leválasztása (media:/) - Comment[is]=Fylgjast með breytingum á tækjum og bjóða upp á (af)tengingu (media:/) - Comment[it]=Tiene traccia delle attività dei supporti e permette di montarli o smontarli (device:/) --Comment[ja]=メディアの活動を追跡し、(media:/) をマウントしたりアンマウントします -+Comment[ja]=メディアの活動を捕捉し、マウントしたりアンマウントします。(media:/) - Comment[km]=តាមដានសកម្មភាពព័ត៌មាន និងអនុញ្ញាតឲ្យរៀបចំ (មិនរៀបចំ) (media:/) - Comment[lt]=Stebi laikmenose vykdomus veiksmus ir leidžia (iš)montuoti (media:/) - Comment[lv]=Seko datu nesēju aktivitātēm un ļauj montēt/nomontēt tos (media:/) -@@ -103,7 +98,6 @@ - Comment[ru]=Автоматическое подключение устройств (media:/) - Comment[rw]=Kugumana inzira y'ibikorwa by'ibitangazamakuru no kwemerera gushyiramo(gukuramo) (ibitangazamakuru:/) - Comment[se]=Gozit mii dáhpáhuvvá median ja diktá du gálgat ja čadnat daid (media:/) --Comment[sk]=Sledovanie pripojenia/odpojenia medií (media:/) - Comment[sl]=Nadzoruj dejanja medija in dovilo priklop/odklop (media:/) - Comment[sr]=Прати активност медијума и омогућава (де)монтирање (media:/) - Comment[sr@Latn]=Prati aktivnost medijuma i omogućava (de)montiranje (media:/) -@@ -122,4 +116,3 @@ - X-KDE-FactoryName=mediamanager - X-KDE-Kded-autoload=true - X-KDE-Kded-load-on-demand=true --X-KDE-Kded-phase=1 -diff -urN kioslave/media/mediamanager/mediamanager.h kioslave/media/mediamanager/mediamanager.h ---- kioslave/media/mediamanager/mediamanager.h Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/mediamanager.h Mon Oct 10 17:04:01 2005 -@@ -28,8 +28,6 @@ - #include "removablebackend.h" - #include "mediadirnotify.h" - --class HALBackend; --class FstabBackend; - - class MediaManager : public KDEDModule - { -@@ -42,12 +40,6 @@ - k_dcop: - QStringList fullList(); - QStringList properties(const QString &name); -- QStringList mountoptions(const QString &name); -- bool setMountoptions(const QString &name, const QStringList &options); -- -- QString mount(const QString &uid); -- QString unmount(const QString &uid); -- - QString nameForLabel(const QString &label); - ASYNC setUserLabel(const QString &name, const QString &label); - -@@ -82,9 +74,7 @@ - MediaList m_mediaList; - QValueList<BackendBase*> m_backends; - RemovableBackend *mp_removableBackend; -- HALBackend *m_halbackend; - MediaDirNotify m_dirNotify; -- FstabBackend *m_fstabbackend; - }; - - #endif -diff -urN kioslave/media/medianotifier/Makefile.in kioslave/media/medianotifier/Makefile.in ---- kioslave/media/medianotifier/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/medianotifier/Makefile.in Fri May 26 09:54:31 2006 -@@ -254,6 +254,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/medianotifier/medianotifier.cpp kioslave/media/medianotifier/medianotifier.cpp ---- kioslave/media/medianotifier/medianotifier.cpp Sun Oct 1 19:31:53 2006 -+++ kioslave/media/medianotifier/medianotifier.cpp Fri Mar 17 11:17:33 2006 -@@ -48,21 +48,13 @@ - - MediaNotifier::~MediaNotifier() - { -- disconnectDCOPSignal( "kded", "mediamanager", "mediumAdded(QString, bool)", -- "onMediumChange(QString, bool)" ); -- -- disconnectDCOPSignal( "kded", "mediamanager", "mediumChanged(QString, bool)", -- "onMediumChange(QString, bool)" ); - } - - void MediaNotifier::onMediumChange( const QString &name, bool allowNotification ) - { - kdDebug() << "MediaNotifier::onMediumChange( " << name << ", " - << allowNotification << ")" << endl; -- -- if ( !allowNotification ) -- return; -- -+ - // Update user activity timestamp, otherwise the notification dialog will be shown - // in the background due to focus stealing prevention. Entering a new media can - // be seen as a kind of user activity after all. It'd be better to update the timestamp -@@ -103,11 +95,11 @@ - { - QString mimetype = medium.mimetype(); - -- bool is_cdrom = mimetype.startsWith( "cd" ) || mimetype.startsWith( "dvd" ); -+ bool is_cdrom = mimetype.contains( "cd" ) || mimetype.contains( "dvd" ); - bool is_mounted = mimetype.endsWith( "_mounted" ); - - // We autorun only on CD/DVD or removable disks (USB, Firewire) -- if ( !( is_cdrom || is_mounted ) -+ if ( !( is_cdrom && is_mounted ) - && mimetype!="media/removable_mounted" ) - { - return false; -diff -urN kioslave/media/medianotifier/medianotifier.desktop kioslave/media/medianotifier/medianotifier.desktop ---- kioslave/media/medianotifier/medianotifier.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/medianotifier/medianotifier.desktop Mon May 22 20:12:42 2006 -@@ -18,12 +18,10 @@ - Name[es]=Demonio de notificaciones de medios - Name[et]=Andmekandjate märguannete deemon - Name[eu]=Euskarrien jakinarazpen daemon-a --Name[fa]=شبح اخطاردهنده رسانه - Name[fi]=Mediahuomautin - Name[fr]=Démon de notifications des média - Name[fy]=Medianotifikaasje-daemon - Name[gl]=Daemon Notificador de Medios --Name[he]=שירות הודעות מערכת - Name[hr]=Demon obavijesti o medijima - Name[hu]=Lemezfigyelő szolgáltatás - Name[is]=Miðils tilkynningarpúki -@@ -34,12 +32,10 @@ - Name[nb]=Medievarslingsnisse - Name[nds]=Medien-Narichtendämoon - Name[nl]=Medianotificatie-daemon --Name[nn]=Mediepåminningsnisse - Name[pl]=Usługa powiadamiania o nośnikach - Name[pt]=Servidor de Notificação de Dispositivos - Name[pt_BR]=Servidor de Notificação de Dispositivos - Name[ru]=Демон уведомлений от подключаемых устройств --Name[sk]=Notifikátor medií - Name[sl]=Demon za obveščanje o nosilcih - Name[sr]=Демон за обавештења о медијумима - Name[sr@Latn]=Demon za obaveštenja o medijumima -@@ -47,7 +43,6 @@ - Name[uk]=Даемон сповіщення про носії інформації - Name[vi]=Trình nền Thông báo Ổ lưu trữ - Name[zh_CN]=介质通知守护程序 --Name[zh_TW]=媒體通知伺服程式 - Comment=A media plugged notifier - Comment[af]='n Inpropbare media inkennissteller - Comment[bg]=Мултимедиен демон за уведомяване при поставяне/включване на ново мултимедийно устройство -@@ -61,7 +56,6 @@ - Comment[es]=Un notificador de medios empotrable - Comment[et]=Andmekandja ühendamisest märkuandev deemon - Comment[eu]=Euskarri konektatze jakinarazlea --Comment[fa]=یک اخطاردهنده وصلشده رسانه - Comment[fi]=Liitetyn median huomautin - Comment[fr]=Notification de connexion de média - Comment[fy]=Meidieling fan oankeppele media -@@ -70,7 +64,7 @@ - Comment[hu]=Lemezérzékelő - Comment[is]=Tilkynnari um tengda miðla - Comment[it]=Notifiche dei dispositivi attaccati --Comment[ja]=メディアの接続を通知します -+Comment[ja]=メディアの接続を通知する - Comment[lt]=Perspėjimo apie media prijungimą priedas - Comment[mk]=Известување за приклучен медиум - Comment[nb]=En medievarsler som programtillegg -@@ -82,7 +76,6 @@ - Comment[pt]=Um notificador ligado aos dispositivos - Comment[pt_BR]=um notificador para mídia que é espetada (plug) - Comment[ru]=Система обработки уведомлений от подключаемых устройств --Comment[sk]=Notifikátor pripojených médií - Comment[sl]=Obveščanje o vstavljenih/priklopljenih nosilcih - Comment[sr]=Обавештавач о укљученим медијима - Comment[sr@Latn]=Obaveštavač o uključenim medijima -diff -urN kioslave/media/medianotifier/notificationdialog.cpp kioslave/media/medianotifier/notificationdialog.cpp ---- kioslave/media/medianotifier/notificationdialog.cpp Sat Oct 7 16:23:12 2006 -+++ kioslave/media/medianotifier/notificationdialog.cpp Mon Oct 10 17:04:00 2005 -@@ -26,7 +26,6 @@ - #include <klistbox.h> - #include <qlabel.h> - #include <qcheckbox.h> --#include <qpushbutton.h> - - #include "actionlistboxitem.h" - #include "notificationdialogview.h" -@@ -71,8 +70,6 @@ - this, SLOT( delayedDestruct() ) ); - - m_actionWatcher->startScan(); -- QPushButton * btn = actionButton( Ok ); -- btn->setFocus(); - } - - NotificationDialog::~NotificationDialog() -diff -urN kioslave/media/mimetypes/Makefile.in kioslave/media/mimetypes/Makefile.in ---- kioslave/media/mimetypes/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/mimetypes/Makefile.in Fri May 26 09:54:31 2006 -@@ -211,6 +211,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/mimetypes/audiocd.desktop kioslave/media/mimetypes/audiocd.desktop ---- kioslave/media/mimetypes/audiocd.desktop Mon Oct 2 12:44:33 2006 -+++ kioslave/media/mimetypes/audiocd.desktop Mon May 22 20:12:42 2006 -@@ -11,7 +11,6 @@ - Comment[cs]=Zvukové CD - Comment[da]=Lyd-cd - Comment[el]=CD ήχου --Comment[fa]=دیسک فشرده صوتی - Comment[fi]=CD-äänilevy - Comment[fr]=CD audio - Comment[fy]=Audio-Kompaktskiif -@@ -25,7 +24,6 @@ - Comment[it]=CD audio - Comment[ja]=オーディオ CD - Comment[km]=ស៊ីឌីអូឌីយ៉ូ --Comment[mk]=Аудио ЦД - Comment[ms]=CD Audio - Comment[nb]=Lyd-CD - Comment[nds]=Audio-CD -@@ -33,7 +31,7 @@ - Comment[nn]=Lyd-CD - Comment[pa]=ਆਡੀਓ CD - Comment[pl]=Płyta CD Audio --Comment[pt]=CD de áudio -+Comment[pt]=CD áudio - Comment[pt_BR]=CD de Áudio - Comment[ro]=CD Audio - Comment[ru]=Аудио CD -diff -urN kioslave/media/mimetypes/blankcd.desktop kioslave/media/mimetypes/blankcd.desktop ---- kioslave/media/mimetypes/blankcd.desktop Mon Oct 2 12:44:33 2006 -+++ kioslave/media/mimetypes/blankcd.desktop Mon May 22 20:12:43 2006 -@@ -16,7 +16,6 @@ - Comment[es]=CD vacío - Comment[et]=Tühi CD - Comment[eu]=CD hutsik --Comment[fa]=دیسک فشرده خام - Comment[fi]=Tyhjä CD - Comment[fr]=CD vierge - Comment[fy]=Blanke Kompaktskiif -@@ -32,7 +31,6 @@ - Comment[km]=ស៊ីឌីទទេ - Comment[lt]=Tuščias CD - Comment[lv]=Tukšs CD --Comment[mk]=Празно ЦД - Comment[ms]=CD Kosong - Comment[nb]=Tom CD - Comment[nds]=Leddige CD -@@ -46,7 +44,6 @@ - Comment[ru]=Чистый CD - Comment[rw]=CD Itanditseho - Comment[se]=Guorus CD --Comment[sk]=Čisté CD - Comment[sl]=Prazen CD - Comment[sr]=Празан CD - Comment[sr@Latn]=Prazan CD -diff -urN kioslave/media/mimetypes/blankdvd.desktop kioslave/media/mimetypes/blankdvd.desktop ---- kioslave/media/mimetypes/blankdvd.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/blankdvd.desktop Mon May 22 20:12:42 2006 -@@ -16,7 +16,6 @@ - Comment[es]=DVD vacío - Comment[et]=Tühi DVD - Comment[eu]=DVD hutsik --Comment[fa]=DVD خام - Comment[fi]=Tyhjä DVD-levy - Comment[fr]=DVD vierge - Comment[fy]=Blanke Dûbelskiif -@@ -32,7 +31,6 @@ - Comment[km]=ឌីវីឌីទទេ - Comment[lt]=Tuščias DVD - Comment[lv]=Tukšs DVD --Comment[mk]=Празно DVD - Comment[ms]=DVD Kosong - Comment[nb]=Tom DVD - Comment[nds]=Leddige DVD -@@ -46,7 +44,6 @@ - Comment[ru]=Чистый DVD - Comment[rw]=DVD Itanditseho - Comment[se]=Guorus DVD --Comment[sk]=Čisté DVD - Comment[sl]=Prazen DVD - Comment[sr]=Празан DVD - Comment[sr@Latn]=Prazan DVD -diff -urN kioslave/media/mimetypes/camera_mounted.desktop kioslave/media/mimetypes/camera_mounted.desktop ---- kioslave/media/mimetypes/camera_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/camera_mounted.desktop Mon May 22 20:12:42 2006 -@@ -16,7 +16,6 @@ - Comment[es]=Cámara montada - Comment[et]=Ühendatud kaamera - Comment[eu]=Kamara muntatuta --Comment[fa]=دوربین سوارشده - Comment[fi]=Liitetty kamera - Comment[fr]=Appareil photo monté - Comment[fy]=Oankeppele kamera -@@ -41,7 +40,6 @@ - Comment[pt_BR]=Câmera montada - Comment[ru]=Подключённая камера - Comment[se]=Čatnon govvenapperáhtta --Comment[sk]=Pripojený digitálny fotoaparát - Comment[sl]=Priklopljen fotoaparat - Comment[sr]=Монтирана камера - Comment[sr@Latn]=Montirana kamera -diff -urN kioslave/media/mimetypes/camera_unmounted.desktop kioslave/media/mimetypes/camera_unmounted.desktop ---- kioslave/media/mimetypes/camera_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/camera_unmounted.desktop Mon May 22 20:12:42 2006 -@@ -16,7 +16,6 @@ - Comment[es]=Cámara desmontada - Comment[et]=Lahutatud kaamera - Comment[eu]=Kamara desmuntatua --Comment[fa]=دوربین پیادهشده - Comment[fi]=Irrotettu kamera - Comment[fr]=Appareil photo non monté - Comment[fy]=Ofkeppele kamera -@@ -41,7 +40,6 @@ - Comment[pt_BR]=Câmera desmontada - Comment[ru]=Неподключённая камера - Comment[se]=Gálgajuvvon govvenapperáhtta --Comment[sk]=Odpojený digitálny fotoaparát - Comment[sl]=Odklopljen fotoaparat - Comment[sr]=Демонтирана камера - Comment[sr@Latn]=Demontirana kamera -diff -urN kioslave/media/mimetypes/cdrom_mounted.desktop kioslave/media/mimetypes/cdrom_mounted.desktop ---- kioslave/media/mimetypes/cdrom_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/cdrom_mounted.desktop Mon May 22 20:12:43 2006 -@@ -21,7 +21,7 @@ - Comment[es]=CD-ROM montado - Comment[et]=Ühendatud CD-ROM - Comment[eu]=CD-ROM muntatua --Comment[fa]=CD-ROM سوارشده -+Comment[fa]=CD سوار شده - Comment[fi]=Liitetty CD-ROM - Comment[fr]=CD-ROM monté - Comment[fy]=Oankeppele Kompaktskiif -diff -urN kioslave/media/mimetypes/cdrom_unmounted.desktop kioslave/media/mimetypes/cdrom_unmounted.desktop ---- kioslave/media/mimetypes/cdrom_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/cdrom_unmounted.desktop Mon May 22 20:12:43 2006 -@@ -21,7 +21,7 @@ - Comment[es]=CD-ROM desmontado - Comment[et]=Lahutatud CD-ROM - Comment[eu]=CD-ROM desmuntatua --Comment[fa]=CD-ROM پیادهشده -+Comment[fa]= CD پیاده شده - Comment[fi]=Irrotettu CD-ROM - Comment[fr]=CD-ROM non monté - Comment[fy]=Ofkeppele Kompaktskiif -diff -urN kioslave/media/mimetypes/cdwriter_mounted.desktop kioslave/media/mimetypes/cdwriter_mounted.desktop ---- kioslave/media/mimetypes/cdwriter_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/cdwriter_mounted.desktop Mon May 22 20:12:42 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Escritor de CDs montado - Comment[et]=Ühendatud CD kirjutaja - Comment[eu]=CD erretzaile muntatua --Comment[fa]=CD Writer سوارشده -+Comment[fa]=CD Writer سوار شده - Comment[fi]=Liitetty CD-kirjoitin - Comment[fr]=Graveur de CD monté - Comment[fy]=Oankeppele Kompaktskiif -diff -urN kioslave/media/mimetypes/cdwriter_unmounted.desktop kioslave/media/mimetypes/cdwriter_unmounted.desktop ---- kioslave/media/mimetypes/cdwriter_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/cdwriter_unmounted.desktop Mon May 22 20:12:42 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Escritor de CDs desmontado - Comment[et]=Lahutatud CD kirjutaja - Comment[eu]=CD erretzaile desmuntatua --Comment[fa]=CD Writer پیادهشده -+Comment[fa]=CD Writer پیاده شده - Comment[fi]=Irrotettu CD-kirjoitin - Comment[fr]=Graveur de CD non monté - Comment[fy]=Ofkeppele Kompaktskiif -diff -urN kioslave/media/mimetypes/dvd_mounted.desktop kioslave/media/mimetypes/dvd_mounted.desktop ---- kioslave/media/mimetypes/dvd_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/dvd_mounted.desktop Mon May 22 20:12:42 2006 -@@ -21,7 +21,7 @@ - Comment[es]=DVD montado - Comment[et]=Ühendatud DVD - Comment[eu]=DVD muntatua --Comment[fa]=DVD سوارشده -+Comment[fa]=DVD سوار شده - Comment[fi]=Liitetty DVD-levy - Comment[fr]=DVD-ROM monté(s) - Comment[fy]=Oankeppele Dûbelskiif -diff -urN kioslave/media/mimetypes/dvd_unmounted.desktop kioslave/media/mimetypes/dvd_unmounted.desktop ---- kioslave/media/mimetypes/dvd_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/dvd_unmounted.desktop Tue May 23 13:33:34 2006 -@@ -21,7 +21,7 @@ - Comment[es]=DVD desmontado - Comment[et]=Lahutatud DVD - Comment[eu]=DVD desmuntatua --Comment[fa]=DVD پیادهشده -+Comment[fa]=DVD پیاده شده - Comment[fi]=Irrotettu DVD-levy - Comment[fr]=DVD-ROM non monté(s) - Comment[fy]=Ofkeppele Dûbelskiif -diff -urN kioslave/media/mimetypes/dvdvideo.desktop kioslave/media/mimetypes/dvdvideo.desktop ---- kioslave/media/mimetypes/dvdvideo.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/dvdvideo.desktop Mon May 22 20:12:43 2006 -@@ -16,7 +16,6 @@ - Comment[es]=Disco de video DVD - Comment[et]=DVD videoplaat - Comment[eu]=DVD bideo diska --Comment[fa]=دیسک ویدئویی DVD - Comment[fi]=DVD-videolevy - Comment[fr]=DVD vidéo - Comment[fy]=Dûbelskiif Fideoskiif -@@ -32,7 +31,6 @@ - Comment[km]=ថាសវីដេអូ ឌីវីឌី - Comment[lt]=DVD video diskas - Comment[lv]=DVD Video Disks --Comment[mk]=DVD Видеодиск - Comment[ms]=Cakera Video DVD - Comment[nb]=DVD-videoplate - Comment[nds]=DVD-Videodisk -@@ -40,13 +38,12 @@ - Comment[nn]=DVD-videoplate - Comment[pa]=DVD ਵੀਡਿਓ ਡਿਸਕ - Comment[pl]=Płyta DVD Video --Comment[pt]=Disco DVD de Vídeo -+Comment[pt]=Disco DVD Vídeo - Comment[pt_BR]=DVD de vídeo - Comment[ro]=Disc video DVD - Comment[ru]=DVD с видео - Comment[rw]=Disiki Videwo DVD - Comment[se]=DVD-videoskearru --Comment[sk]=DVD Video disk - Comment[sl]=DVD Video disk - Comment[sr]=DVD видео диск - Comment[sr@Latn]=DVD video disk -diff -urN kioslave/media/mimetypes/floppy5_mounted.desktop kioslave/media/mimetypes/floppy5_mounted.desktop ---- kioslave/media/mimetypes/floppy5_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/floppy5_mounted.desktop Mon May 22 20:12:42 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disquete 5¼" montado - Comment[et]=Ühendatud 5¼" flopi - Comment[eu]=5¼"ko diskete muntatua --Comment[fa]=فلاپی 5¼" سوارشده -+Comment[fa]=فلاپی 5¼"سوار شده - Comment[fi]=Liitetty 5¼"-levyke - Comment[fr]=Disquette 5¼" montée - Comment[fy]=Oankeppele 5¼" Skiif -diff -urN kioslave/media/mimetypes/floppy5_unmounted.desktop kioslave/media/mimetypes/floppy5_unmounted.desktop ---- kioslave/media/mimetypes/floppy5_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/floppy5_unmounted.desktop Tue May 23 13:33:35 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disquete 5¼" desmontado - Comment[et]=Lahutatud 5¼" flopi - Comment[eu]=5¼"ko diskete desmuntatua --Comment[fa]=فلاپی 5¼" پیادهشده -+Comment[fa]=فلاپی 5¼" پیاده شده - Comment[fi]=Irrotettu 5¼"-levyke - Comment[fr]=Disquette 5¼" non montée - Comment[fy]=Ofkeppele 5¼" Skiif -diff -urN kioslave/media/mimetypes/floppy_mounted.desktop kioslave/media/mimetypes/floppy_mounted.desktop ---- kioslave/media/mimetypes/floppy_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/floppy_mounted.desktop Mon May 22 20:12:43 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disquete montado - Comment[et]=Ühendatud flopi - Comment[eu]=Diskete muntatua --Comment[fa]=فلاپی سوارشده -+Comment[fa]=فلاپی سوار شده - Comment[fi]=Liitetty levyke - Comment[fr]=Disquette montée - Comment[fy]=Oankeppele Skiif -diff -urN kioslave/media/mimetypes/floppy_unmounted.desktop kioslave/media/mimetypes/floppy_unmounted.desktop ---- kioslave/media/mimetypes/floppy_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/floppy_unmounted.desktop Tue May 23 13:33:34 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disquete desmontado - Comment[et]=Lahutatud flopi - Comment[eu]=Diskete desmuntatua --Comment[fa]=فلاپی پیادهشده -+Comment[fa]=فلاپی پیاده شده - Comment[fi]=Irrotettu levyke - Comment[fr]=Disquette non montée - Comment[fy]=Ofkeppele Skiif -diff -urN kioslave/media/mimetypes/gphoto2camera.desktop kioslave/media/mimetypes/gphoto2camera.desktop ---- kioslave/media/mimetypes/gphoto2camera.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/gphoto2camera.desktop Mon May 22 20:12:43 2006 -@@ -18,7 +18,6 @@ - Comment[es]=Cámara - Comment[et]=Kaamera - Comment[eu]=Kamara --Comment[fa]=دوربین - Comment[fi]=Kamera - Comment[fr]=Nouvel appareil photo - Comment[fy]=Kamera -@@ -41,13 +40,12 @@ - Comment[nn]=Kamera - Comment[pa]=ਕੈਮਰਾ - Comment[pl]=Aparat fotograficzny --Comment[pt]=Máquina fotográfica -+Comment[pt]=Máquina Fotográfica - Comment[pt_BR]=Câmera - Comment[ro]=Aparat foto - Comment[ru]=Камера - Comment[rw]=Kamera - Comment[se]=Govvanaperáhtta --Comment[sk]=Digitálny fotoaparát - Comment[sl]=Fotoaparat - Comment[sr]=Камера - Comment[sr@Latn]=Kamera -diff -urN kioslave/media/mimetypes/hdd_mounted.desktop kioslave/media/mimetypes/hdd_mounted.desktop ---- kioslave/media/mimetypes/hdd_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/hdd_mounted.desktop Mon May 22 20:12:43 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Volumen de disco duro montado - Comment[et]=Ühendatud kõvaketta partitsioon - Comment[eu]=Diska gogorraren zatiketa muntatua --Comment[fa]=حجم دیسک سخت سوارشده - Comment[fi]=Liitetty kiintoleyosio - Comment[fr]=Partition de disque dur montée - Comment[fy]=Oankeppele Fêsteskiif folume -@@ -44,13 +43,12 @@ - Comment[nn]=Montert harddiskvolum - Comment[pa]=ਮਾਊਟ ਕੀਤਾ ਹਾਰਡ ਡਿਸਕ ਭਾਗ - Comment[pl]=Zamontowana partycja dysku twardego --Comment[pt]=Volume de disco rígido montado -+Comment[pt]=Volume de Disco Rígido Montado - Comment[pt_BR]=Volume do HD Montado - Comment[ro]=Volum de hard disc montat - Comment[ru]=Смонтированный раздел жёсткого диска - Comment[rw]=Ububiko Disiki Bwashyizwemo - Comment[se]=Čatnon garraskearrooassi --Comment[sk]=Pripojený oddiel pevného disku - Comment[sl]=Priklopljen pogon trdega diska - Comment[sr]=Монтирана партиција хард диска - Comment[sr@Latn]=Montirana particija hard diska -diff -urN kioslave/media/mimetypes/hdd_unmounted.desktop kioslave/media/mimetypes/hdd_unmounted.desktop ---- kioslave/media/mimetypes/hdd_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/hdd_unmounted.desktop Mon May 22 20:12:43 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Volumen de disco duro desmontado - Comment[et]=Lahutatud kõvaketta partitsioon - Comment[eu]=Diska gogorraren zatiketa desmuntatua --Comment[fa]=حجم دیسک سخت پیاده شده - Comment[fi]=Irrotettu kiintolevyosio - Comment[fr]=Partition de disque dur non montée - Comment[fy]=Ofkeppele Fêsteskiif folume -@@ -44,13 +43,12 @@ - Comment[nn]=Umontert harddiskvolum - Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ ਹਾਰਡ ਡਿਸਕ ਭਾਗ - Comment[pl]=Odmontowana partycja dysku twardego --Comment[pt]=Volume de disco rígido desmontado -+Comment[pt]=Volume de Disco Rígido Desmontado - Comment[pt_BR]=Volume do HD Desmontado - Comment[ro]=Volum de hard disc nemontat - Comment[ru]=Отмонтированный раздел жёсткого диска - Comment[rw]=Ububiko Disiki Bwakuwemo - Comment[se]=Gálgajuvvon garraskearrooassi --Comment[sk]=Odpojený oddiel pevného disku - Comment[sl]=Odklopljen pogon trdega diska - Comment[sr]=Демонтирана партиција хард диска - Comment[sr@Latn]=Demontirana particija hard diska -diff -urN kioslave/media/mimetypes/nfs_mounted.desktop kioslave/media/mimetypes/nfs_mounted.desktop ---- kioslave/media/mimetypes/nfs_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/nfs_mounted.desktop Tue May 23 13:33:34 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Recurso NFS montado - Comment[et]=Ühendatud NFS ressurss - Comment[eu]=NFS baliabide muntatua --Comment[fa]=مشترک NFS سوارشده - Comment[fi]=Liitetty NFS-jako - Comment[fr]=Ressource NFS montée - Comment[fy]=Oankeppele NFS-boarne -@@ -44,13 +43,12 @@ - Comment[nn]=Montert delt NFS-ressurs - Comment[pa]=ਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਝ - Comment[pl]=Zamontowany system plików NFS --Comment[pt]=Partilha de NFS montada -+Comment[pt]=Partilha de NFS Montada - Comment[pt_BR]=Volume NFS Montado - Comment[ro]=Partajare NFS montată - Comment[ru]=Смонтированный ресурс NFS - Comment[rw]=Umugabane NFS Washyizwemo - Comment[se]=Čatnon NFS-resursa --Comment[sk]=Pripojený zdroj NFS - Comment[sl]=Priklopljen vir NFS - Comment[sr]=Монтирано NFS дељење - Comment[sr@Latn]=Montirano NFS deljenje -diff -urN kioslave/media/mimetypes/nfs_unmounted.desktop kioslave/media/mimetypes/nfs_unmounted.desktop ---- kioslave/media/mimetypes/nfs_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/nfs_unmounted.desktop Tue May 23 13:33:35 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Recurso NFS desmontado - Comment[et]=Lahutatud NFS ressurss - Comment[eu]=NFS baliabide desmuntatua --Comment[fa]=مشترک NFS پیاده شده - Comment[fi]=Irrotettu NFS-jako - Comment[fr]=Ressource NFS non montée - Comment[fy]=Oankeppele NFS-boarne -@@ -44,13 +43,12 @@ - Comment[nn]=Umontert delt NFS-ressurs - Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਝ - Comment[pl]=Odmontowany system plików NFS --Comment[pt]=Partilha de NFS desmontada -+Comment[pt]=Partilha de NFS Desmontada - Comment[pt_BR]=Volume NFS Desmontado - Comment[ro]=Partajare NFS nemontată - Comment[ru]=Отмонтированный ресурс NFS - Comment[rw]=Umugabane NFS Wakuwemo - Comment[se]=Gálgajuvvon NFS-resursa --Comment[sk]=Odpojený zdroj NFS - Comment[sl]=Odklopljen vir NFS - Comment[sr]=Демонтирано NFS дељење - Comment[sr@Latn]=Demontirano NFS deljenje -diff -urN kioslave/media/mimetypes/removable_mounted.desktop kioslave/media/mimetypes/removable_mounted.desktop ---- kioslave/media/mimetypes/removable_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/removable_mounted.desktop Mon May 22 20:12:42 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Recurso extraíble montado - Comment[et]=Ühendatud eemaldatav andmekandja - Comment[eu]=Euskarri aldagarria muntatua --Comment[fa]=رسانه برداشتنی سوارشده - Comment[fi]=Liitetty irrotettava resurssi - Comment[fr]=Média amovible monté - Comment[fy]=Oankeppele ferwiderber medium -@@ -44,13 +43,12 @@ - Comment[nn]=Montert flyttbart medium - Comment[pa]=ਮਾਊਟ ਕੀਤੇ ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ - Comment[pl]=Zamontowany nośnik wymienny --Comment[pt]=Dispositivo amovível montado -+Comment[pt]=Dispositivo Amovível Montado - Comment[pt_BR]=Mídia Removível Montada - Comment[ro]=Mediu amovibil montat - Comment[ru]=Смонтированный внешний диск - Comment[rw]=Igitangazamakuru Kivanwamo Cyashyizwemo - Comment[se]=Čátnon sirdehahtti medium --Comment[sk]=Pripojené vyberateľné médium - Comment[sl]=Priklopljen odstranljiv medij - Comment[sr]=Монтиран уклоњиви медијум - Comment[sr@Latn]=Montiran uklonjivi medijum -diff -urN kioslave/media/mimetypes/removable_unmounted.desktop kioslave/media/mimetypes/removable_unmounted.desktop ---- kioslave/media/mimetypes/removable_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/removable_unmounted.desktop Mon May 22 20:12:42 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Recurso extraíble desmontado - Comment[et]=Lahutatud eemaldatav andmekandja - Comment[eu]=Euskarri aldagarria desmuntatua --Comment[fa]=رسانه برداشتنی پیاده شده - Comment[fi]=Irrotettu irrotettava resurssi - Comment[fr]=Média amovible non monté - Comment[fy]=Ofkeppele ferwiderber medium -@@ -44,13 +43,12 @@ - Comment[nn]=Umontert flyttbart medium - Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ - Comment[pl]=Odmontowany nośnik wymienny --Comment[pt]=Dispositivo amovível desmontado -+Comment[pt]=Dispositivo Amovível Desmontado - Comment[pt_BR]=Mídia Removível Desmontada - Comment[ro]=Mediu amovibil nemontat - Comment[ru]=Отмонтированный внешний диск - Comment[rw]=Igitangazamakuru Kivanwamo Cyavanwemo - Comment[se]=Gálgaduvvon sirdehahtti medium --Comment[sk]=Odpojené vyberateľné médium - Comment[sl]=Odklopljen odstranljiv medij - Comment[sr]=Демонтиран уклоњиви медијум - Comment[sr@Latn]=Demontiran uklonjivi medijum -diff -urN kioslave/media/mimetypes/smb_mounted.desktop kioslave/media/mimetypes/smb_mounted.desktop ---- kioslave/media/mimetypes/smb_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/smb_mounted.desktop Tue May 23 13:33:34 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Recurso de Samba montado (Red de Microsoft) - Comment[et]=Ühendatud Samba (Microsoft Network) ressurss - Comment[eu]=Samba (Microsoft sarea) partekaketa muntatua --Comment[fa]=مشترک Samba (Microsoft Network) سوار شده -+Comment[fa]=اشتراک سامبای ویندوز سوار شده - Comment[fi]=Liitetty Samba-jako (Microsoft-verkko) - Comment[fr]=Partage Samba (réseau Microsoft) monté - Comment[fy]=Oankeppele Samba-netwurkboarne (Microsoft-netwurken) -diff -urN kioslave/media/mimetypes/smb_unmounted.desktop kioslave/media/mimetypes/smb_unmounted.desktop ---- kioslave/media/mimetypes/smb_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/smb_unmounted.desktop Tue May 23 13:33:34 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Recurso de Samba desmontado (Red de Microsoft) - Comment[et]=Lahutatud Samba (Microsoft Network) ressurss - Comment[eu]=Samba (Microsoft sarea) partekaketa desmuntatua --Comment[fa]=مشترک Samba (Microsoft Network) پیاده شده -+Comment[fa]=اشتراک سامبای ویندوز پیاده شده - Comment[fi]=Irrotettu Samba-jako (Microsoft-verkko) - Comment[fr]=Partage Samba (réseau Microsoft) non monté - Comment[fy]=Ofkeppele Samba-netwurkboarne (Microsoft-netwurken) -diff -urN kioslave/media/mimetypes/svcd.desktop kioslave/media/mimetypes/svcd.desktop ---- kioslave/media/mimetypes/svcd.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/svcd.desktop Mon May 22 20:12:43 2006 -@@ -7,7 +7,6 @@ - Comment[bn]=সুপার ভিডিও সিডি - Comment[ca]=CD Súper Vídeo - Comment[da]=Super Video-cd --Comment[fa]=دیسک فشرده ابرویدئو - Comment[fr]=Super CD vidéo - Comment[fy]=Super Fideo-kompaktskiif - Comment[gl]=Super Vídeo CD -@@ -17,7 +16,6 @@ - Comment[it]=Super video CD - Comment[ja]=スーパービデオ CD - Comment[km]=ស៊ីឌីវីដេអូគុណភាពខ្ពស់ --Comment[mk]=Супер видео ЦД - Comment[ms]=CD Supervideo - Comment[nb]=Super video CD - Comment[nds]=Super-Video-CD -diff -urN kioslave/media/mimetypes/vcd.desktop kioslave/media/mimetypes/vcd.desktop ---- kioslave/media/mimetypes/vcd.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/vcd.desktop Mon May 22 20:12:42 2006 -@@ -9,7 +9,6 @@ - Comment[ca]=CD Vídeo - Comment[da]=Video-cd - Comment[el]=Βίντεο CD --Comment[fa]=دیسک فشرده ویدئویی - Comment[fr]=CD vidéo - Comment[fy]=Fideo-kompaktskiif - Comment[ga]=Dlúthdhiosca Físe -@@ -19,7 +18,6 @@ - Comment[is]=Vídeó CD - Comment[ja]=ビデオ CD - Comment[km]=ស៊ីឌីវីដេអូ --Comment[mk]=Видео ЦД - Comment[ms]=CD Video - Comment[nds]=Video-CD - Comment[nl]=Video-cd -diff -urN kioslave/media/mimetypes/zip_mounted.desktop kioslave/media/mimetypes/zip_mounted.desktop ---- kioslave/media/mimetypes/zip_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/zip_mounted.desktop Tue May 23 13:33:35 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disco Zip montado - Comment[et]=Ühendatud Zip-ketas - Comment[eu]=Zip diska muntatua --Comment[fa]=دیسک فشرده سوارشده -+Comment[fa]=دیسک زیپ سوار شده - Comment[fi]=Liitetty Zip-levy - Comment[fr]=Disque Zip monté - Comment[fy]=Oankeppelee Zip-skiif -diff -urN kioslave/media/mimetypes/zip_unmounted.desktop kioslave/media/mimetypes/zip_unmounted.desktop ---- kioslave/media/mimetypes/zip_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/zip_unmounted.desktop Tue May 23 13:33:35 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disco Zip desmontado - Comment[et]=Lahutatud Zip-ketas - Comment[eu]=Zip diska desmuntatua --Comment[fa]=دیسک فشرده پیاده شده -+Comment[fa]= دیسک زیپ پیاده شده - Comment[fi]=Irrotettu Zip-levy - Comment[fr]=Disque Zip non monté - Comment[fy]=Ofkeppele Zip-skiif -@@ -33,7 +33,7 @@ - Comment[hu]=Leválasztott Zip-lemez - Comment[is]=Aftengdur Zip diskur - Comment[it]=Disco Zip non montato --Comment[ja]=マウントされていない Zip ディスク -+Comment[ja]=マウントされていないZipディスク - Comment[km]=ថាស Zip មិនបានរៀបចំ - Comment[lo]= ຫັງກາລີ - Comment[lt]=Išmontuotas Zip diskas -diff -urN kioslave/media/mounthelper/Makefile.in kioslave/media/mounthelper/Makefile.in ---- kioslave/media/mounthelper/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/mounthelper/Makefile.in Fri May 26 09:54:31 2006 -@@ -57,8 +57,8 @@ - #>+ 1 - kio_media_mounthelper_OBJECTS = kio_media_mounthelper.$(OBJEXT) - am__DEPENDENCIES_1 = --kio_media_mounthelper_DEPENDENCIES = \ -- ../libmediacommon/libmediacommon.la $(am__DEPENDENCIES_1) -+kio_media_mounthelper_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -+ ../libmediacommon/libmediacommon.la - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - am__depfiles_maybe = depfiles -@@ -236,6 +236,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -@@ -575,7 +576,7 @@ - AM_LDFLAGS = $(all_libraries) - kio_media_mounthelper_SOURCES = kio_media_mounthelper.cpp - kio_media_mounthelper_LDFLAGS = $(KDE_RPATH) $(all_libraries) --kio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) -+kio_media_mounthelper_LDADD = $(LIB_KIO) ../libmediacommon/libmediacommon.la - #>- METASOURCES = AUTO - #>- all: all-am - #>+ 1 -diff -urN kioslave/media/mounthelper/kio_media_mounthelper.cpp kioslave/media/mounthelper/kio_media_mounthelper.cpp ---- kioslave/media/mounthelper/kio_media_mounthelper.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/mounthelper/kio_media_mounthelper.cpp Fri Mar 17 11:17:33 2006 -@@ -27,7 +27,6 @@ - #include <dcopclient.h> - #include <dcopref.h> - #include <qtimer.h> --#include <stdlib.h> - #include <kdebug.h> - #include <kglobal.h> - #include <kprocess.h> -@@ -79,30 +78,31 @@ - - if (args->isSet("u")) - { -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "unmount", medium.id()); -- if (reply.isValid()) -- reply.get(m_errorStr); -- kdDebug() << "medium unmount " << m_errorStr << endl; -- if (m_errorStr.isNull()) -- ::exit(0); -- else -- error(); -+ KIO::Job * job = KIO::unmount( mount_point ); -+ -+ connect( job, SIGNAL( result( KIO::Job * ) ), -+ this, SLOT( slotResult( KIO::Job * ) ) ); - } - else if (args->isSet("s") || args->isSet("e")) - { -- invokeEject(device, true); -+ if (medium.isMounted()) -+ { -+ KIO::Job * job = KIO::unmount( mount_point ); -+ -+ m_device = device; -+ connect( job, SIGNAL( result( KIO::Job * ) ), -+ this, SLOT( slotResultSafe( KIO::Job * ) ) ); -+ } -+ else -+ { -+ invokeEject(device, true); -+ } - } - else - { -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "mount", medium.id()); -- if (reply.isValid()) -- reply.get(m_errorStr); -- if (m_errorStr.isNull()) -- ::exit(0); -- else -- error(); -+ KIO::Job* job = KIO::mount( false, 0, device, mount_point); -+ connect( job, SIGNAL( result( KIO::Job * ) ), -+ this, SLOT( slotResult( KIO::Job * ) ) ); - } - } - -@@ -173,12 +173,12 @@ - void MountHelper::error() - { - KMessageBox::error(0, m_errorStr); -- ::exit(1); -+ kapp->exit(1); - } - - void MountHelper::finished() - { -- ::exit(0); -+ kapp->quit(); - } - - static KCmdLineOptions options[] = -@@ -207,7 +207,7 @@ - - KStartupInfo::appStarted(); - app->dcopClient()->attach(); -- return app->exec(); -+ app->exec(); - } - - #include "kio_media_mounthelper.moc" -diff -urN kioslave/media/propsdlgplugin/Makefile.in kioslave/media/propsdlgplugin/Makefile.in ---- kioslave/media/propsdlgplugin/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/propsdlgplugin/Makefile.in Thu Jan 1 01:00:00 1970 -@@ -1,1063 +0,0 @@ --# Makefile.in generated by automake 1.9.6 from Makefile.am. --# KDE tags expanded automatically by am_edit - $Revision: 483858 $ --# @configure_input@ -- --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005 Free Software Foundation, Inc. --# This Makefile.in is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY, to the extent permitted by law; without --# even the implied warranty of MERCHANTABILITY or FITNESS FOR A --# PARTICULAR PURPOSE. -- --@SET_MAKE@ -- -- --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ --VPATH = @srcdir@ --pkgdatadir = $(datadir)/@PACKAGE@ --pkglibdir = $(libdir)/@PACKAGE@ --pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../../.. --am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ --install_sh_DATA = $(install_sh) -c -m 644 --install_sh_PROGRAM = $(install_sh) -c --install_sh_SCRIPT = $(install_sh) -c --INSTALL_HEADER = $(INSTALL_DATA) --transform = $(program_transform_name) --NORMAL_INSTALL = : --PRE_INSTALL = : --POST_INSTALL = : --NORMAL_UNINSTALL = : --PRE_UNINSTALL = : --POST_UNINSTALL = : --build_triplet = @build@ --host_triplet = @host@ --target_triplet = @target@ --subdir = kioslave/media/propsdlgplugin --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(kde_moduledir)" \ -- "$(DESTDIR)$(kde_servicesdir)" --kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(kde_module_LTLIBRARIES) --am__DEPENDENCIES_1 = --media_propsdlgplugin_la_DEPENDENCIES = \ -- ../libmediacommon/libmediacommon.la $(am__DEPENDENCIES_1) --am_media_propsdlgplugin_la_OBJECTS = propertiespage.lo \ -- propsdlgshareplugin.lo --#>- media_propsdlgplugin_la_OBJECTS = \ --#>- $(am_media_propsdlgplugin_la_OBJECTS) --#>+ 5 --media_propsdlgplugin_la_final_OBJECTS = media_propsdlgplugin_la.all_cpp.lo --media_propsdlgplugin_la_nofinal_OBJECTS = propertiespage.lo \ -- propsdlgshareplugin.lo propertiespagegui.lo --@KDE_USE_FINAL_FALSE@media_propsdlgplugin_la_OBJECTS = $(media_propsdlgplugin_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@media_propsdlgplugin_la_OBJECTS = $(media_propsdlgplugin_la_final_OBJECTS) --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --am__depfiles_maybe = depfiles --#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ --#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --#>+ 2 --CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ --#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ --#>- $(AM_CXXFLAGS) $(CXXFLAGS) --#>+ 3 --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --CXXLD = $(CXX) --#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ --#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --#>+ 2 --CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --SOURCES = $(media_propsdlgplugin_la_SOURCES) --DIST_SOURCES = $(media_propsdlgplugin_la_SOURCES) --kde_servicesDATA_INSTALL = $(INSTALL_DATA) --DATA = $(kde_services_DATA) --ETAGS = etags --CTAGS = ctags --#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) --#>+ 1 --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) --ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ --AMTAR = @AMTAR@ --AR = @AR@ --ARTSCCONFIG = @ARTSCCONFIG@ --ARTS_CFLAGS = @ARTS_CFLAGS@ --AUTOCONF = @AUTOCONF@ --AUTODIRS = @AUTODIRS@ --AUTOHEADER = @AUTOHEADER@ --AUTOMAKE = @AUTOMAKE@ --AWK = @AWK@ --CC = @CC@ --CCDEPMODE = @CCDEPMODE@ --CFLAGS = @CFLAGS@ --COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@ --COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@ --CONF_FILES = @CONF_FILES@ --CPP = @CPP@ --CPPFLAGS = @CPPFLAGS@ --CXX = @CXX@ --CXXCPP = @CXXCPP@ --CXXDEPMODE = @CXXDEPMODE@ --CXXFLAGS = @CXXFLAGS@ --CYGPATH_W = @CYGPATH_W@ --DBUSQT_INCS = @DBUSQT_INCS@ --DBUSQT_LIBS = @DBUSQT_LIBS@ --DBUS_CFLAGS = @DBUS_CFLAGS@ --DBUS_INCS = @DBUS_INCS@ --DBUS_LIBS = @DBUS_LIBS@ --DCOPIDL = @DCOPIDL@ --DCOPIDL2CPP = @DCOPIDL2CPP@ --DCOPIDLNG = @DCOPIDLNG@ --DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ --DEFS = @DEFS@ --DEPDIR = @DEPDIR@ --DOXYGEN = @DOXYGEN@ --DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ --DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ --DPMSINC = @DPMSINC@ --DPMSLIB = @DPMSLIB@ --ECHO = @ECHO@ --ECHO_C = @ECHO_C@ --ECHO_N = @ECHO_N@ --ECHO_T = @ECHO_T@ --EGREP = @EGREP@ --ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ --EXEEXT = @EXEEXT@ --EXR_FLAGS = @EXR_FLAGS@ --F77 = @F77@ --FFLAGS = @FFLAGS@ --FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ --GLINC = @GLINC@ --GLLIB = @GLLIB@ --GMSGFMT = @GMSGFMT@ --HALBACKEND = @HALBACKEND@ --HAL_CFLAGS = @HAL_CFLAGS@ --HAL_INCS = @HAL_INCS@ --HAL_LIBS = @HAL_LIBS@ --HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@ --HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@ --HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ --INSTALL_DATA = @INSTALL_DATA@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_SCRIPT = @INSTALL_SCRIPT@ --INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ --JAR = @JAR@ --JAVAC = @JAVAC@ --JAVAH = @JAVAH@ --JVMLIBS = @JVMLIBS@ --KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ --KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@ --KCONFIG_COMPILER = @KCONFIG_COMPILER@ --KDECONFIG = @KDECONFIG@ --KDE_BINDIR = @KDE_BINDIR@ --KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@ --KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ --KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ --KDE_HAVE_DOT = @KDE_HAVE_DOT@ --KDE_INCLUDES = @KDE_INCLUDES@ --KDE_LDFLAGS = @KDE_LDFLAGS@ --KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ --KDE_MT_LIBS = @KDE_MT_LIBS@ --KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ --KDE_PLUGIN = @KDE_PLUGIN@ --KDE_RPATH = @KDE_RPATH@ --KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ --KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ --KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ --KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ --KDE_USE_FPIE = @KDE_USE_FPIE@ --KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ --KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ --KDE_USE_PIE = @KDE_USE_PIE@ --KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ --KDM_PAM_SERVICE = @KDM_PAM_SERVICE@ --KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@ --KRB4_INCS = @KRB4_INCS@ --KRB4_LIBS = @KRB4_LIBS@ --KRB4_RPATH = @KRB4_RPATH@ --KRB5_INCS = @KRB5_INCS@ --KRB5_LIBS = @KRB5_LIBS@ --KRB5_RPATH = @KRB5_RPATH@ --KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@ --LDAP_INCS = @LDAP_INCS@ --LDAP_LIBS = @LDAP_LIBS@ --LDAP_RPATH = @LDAP_RPATH@ --LDFLAGS = @LDFLAGS@ --LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ --LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ --LIBALIB = @LIBALIB@ --LIBART_CFLAGS = @LIBART_CFLAGS@ --LIBART_LIBS = @LIBART_LIBS@ --LIBART_RPATH = @LIBART_RPATH@ --LIBBZ2 = @LIBBZ2@ --LIBCFG = @LIBCFG@ --LIBCOMPAT = @LIBCOMPAT@ --LIBCRYPT = @LIBCRYPT@ --LIBCURSES = @LIBCURSES@ --LIBDEVINFO = @LIBDEVINFO@ --LIBDL = @LIBDL@ --LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@ --LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@ --LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@ --LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@ --LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@ --LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@ --LIBGEN = @LIBGEN@ --LIBHOSTS = @LIBHOSTS@ --LIBJPEG = @LIBJPEG@ --LIBKSTAT = @LIBKSTAT@ --LIBMALLOC = @LIBMALLOC@ --LIBOBJS = @LIBOBJS@ --LIBODM = @LIBODM@ --LIBOSSAUDIO = @LIBOSSAUDIO@ --LIBPNG = @LIBPNG@ --LIBPOSIX4 = @LIBPOSIX4@ --LIBPTHREAD = @LIBPTHREAD@ --LIBRESOLV = @LIBRESOLV@ --LIBRPC = @LIBRPC@ --LIBS = @LIBS@ --LIBSENSORS = @LIBSENSORS@ --LIBSHADOW = @LIBSHADOW@ --LIBSM = @LIBSM@ --LIBSOCKET = @LIBSOCKET@ --LIBSSL = @LIBSSL@ --LIBTOOL = @LIBTOOL@ --LIBUCB = @LIBUCB@ --LIBUSBCONFIG = @LIBUSBCONFIG@ --LIBUTIL = @LIBUTIL@ --LIBXDMCP = @LIBXDMCP@ --LIBXFT_LIB = @LIBXFT_LIB@ --LIBZ = @LIBZ@ --LIB_ARTS = @LIB_ARTS@ --LIB_DNSSD = @LIB_DNSSD@ --LIB_EXR = @LIB_EXR@ --LIB_FONT_ENC = @LIB_FONT_ENC@ --LIB_KAB = @LIB_KAB@ --LIB_KABC = @LIB_KABC@ --LIB_KDECORE = @LIB_KDECORE@ --LIB_KDED = @LIB_KDED@ --LIB_KDEPIM = @LIB_KDEPIM@ --LIB_KDEPRINT = @LIB_KDEPRINT@ --LIB_KDEUI = @LIB_KDEUI@ --LIB_KDNSSD = @LIB_KDNSSD@ --LIB_KFILE = @LIB_KFILE@ --LIB_KFM = @LIB_KFM@ --LIB_KHTML = @LIB_KHTML@ --LIB_KIMPROXY = @LIB_KIMPROXY@ --LIB_KIO = @LIB_KIO@ --LIB_KJS = @LIB_KJS@ --LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ --LIB_KPARTS = @LIB_KPARTS@ --LIB_KSPELL = @LIB_KSPELL@ --LIB_KSYCOCA = @LIB_KSYCOCA@ --LIB_KUNITTEST = @LIB_KUNITTEST@ --LIB_KUTILS = @LIB_KUTILS@ --LIB_KVM = @LIB_KVM@ --LIB_LBER = @LIB_LBER@ --LIB_LIBS = @LIB_LIBS@ --LIB_POLL = @LIB_POLL@ --LIB_QPE = @LIB_QPE@ --LIB_QT = @LIB_QT@ --LIB_SMB = @LIB_SMB@ --LIB_TRU64_MACH = @LIB_TRU64_MACH@ --LIB_X11 = @LIB_X11@ --LIB_XCOMPOSITE = @LIB_XCOMPOSITE@ --LIB_XCURSOR = @LIB_XCURSOR@ --LIB_XEXT = @LIB_XEXT@ --LIB_XF86MISC = @LIB_XF86MISC@ --LIB_XFIXES = @LIB_XFIXES@ --LIB_XINERAMA = @LIB_XINERAMA@ --LIB_XRANDR = @LIB_XRANDR@ --LIB_XRENDER = @LIB_XRENDER@ --LIB_XSS = @LIB_XSS@ --LINUXCDPOLLING = @LINUXCDPOLLING@ --LN_S = @LN_S@ --LTLIBOBJS = @LTLIBOBJS@ --MAKEINFO = @MAKEINFO@ --MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ --MCOPIDL = @MCOPIDL@ --MD5SUM = @MD5SUM@ --MD5SUM_CUT = @MD5SUM_CUT@ --MEINPROC = @MEINPROC@ --MOC = @MOC@ --MSGFMT = @MSGFMT@ --NOOPT_CFLAGS = @NOOPT_CFLAGS@ --NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ --OBJEXT = @OBJEXT@ --PACKAGE = @PACKAGE@ --PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ --PACKAGE_NAME = @PACKAGE_NAME@ --PACKAGE_STRING = @PACKAGE_STRING@ --PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_VERSION = @PACKAGE_VERSION@ --PAMLIBS = @PAMLIBS@ --PASSWDLIBS = @PASSWDLIBS@ --PATH_SEPARATOR = @PATH_SEPARATOR@ --PERL = @PERL@ --PKG_CONFIG = @PKG_CONFIG@ --QTDOCDIR = @QTDOCDIR@ --QTE_NORTTI = @QTE_NORTTI@ --QT_INCLUDES = @QT_INCLUDES@ --QT_LDFLAGS = @QT_LDFLAGS@ --RANLIB = @RANLIB@ --RUN_KAPPFINDER = @RUN_KAPPFINDER@ --SASL2_LIBS = @SASL2_LIBS@ --SETUIDFLAGS = @SETUIDFLAGS@ --SET_MAKE = @SET_MAKE@ --SHELL = @SHELL@ --SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@ --SSL_INCLUDES = @SSL_INCLUDES@ --SSL_LDFLAGS = @SSL_LDFLAGS@ --STRIP = @STRIP@ --TOPSUBDIRS = @TOPSUBDIRS@ --UIC = @UIC@ --UIC_TR = @UIC_TR@ --UNAME = @UNAME@ --USB_CFLAGS = @USB_CFLAGS@ --USB_LIBS = @USB_LIBS@ --USER_INCLUDES = @USER_INCLUDES@ --USER_LDFLAGS = @USER_LDFLAGS@ --USE_EXCEPTIONS = @USE_EXCEPTIONS@ --USE_RTTI = @USE_RTTI@ --USE_THREADS = @USE_THREADS@ --VERSION = @VERSION@ --WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ --XGETTEXT = @XGETTEXT@ --XMLLINT = @XMLLINT@ --XTESTLIB = @XTESTLIB@ --X_EXTRA_LIBS = @X_EXTRA_LIBS@ --X_INCLUDES = @X_INCLUDES@ --X_LDFLAGS = @X_LDFLAGS@ --X_PRE_LIBS = @X_PRE_LIBS@ --X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ --ac_ct_CC = @ac_ct_CC@ --ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ --all_includes = @all_includes@ --all_libraries = @all_libraries@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ --am__include = @am__include@ --am__leading_dot = @am__leading_dot@ --am__quote = @am__quote@ --am__tar = @am__tar@ --am__untar = @am__untar@ --applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@ --applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@ --bindir = @bindir@ --build = @build@ --build_alias = @build_alias@ --build_cpu = @build_cpu@ --build_os = @build_os@ --build_vendor = @build_vendor@ --datadir = @datadir@ --doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ --doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ --drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ --drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ --exec_prefix = @exec_prefix@ --have_xcursor_FALSE = @have_xcursor_FALSE@ --have_xcursor_TRUE = @have_xcursor_TRUE@ --host = @host@ --host_alias = @host_alias@ --host_cpu = @host_cpu@ --host_os = @host_os@ --host_vendor = @host_vendor@ --include_ARTS_FALSE = @include_ARTS_FALSE@ --include_ARTS_TRUE = @include_ARTS_TRUE@ --include_BZIP2_FALSE = @include_BZIP2_FALSE@ --include_BZIP2_TRUE = @include_BZIP2_TRUE@ --include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@ --include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@ --include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@ --include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@ --include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@ --include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@ --include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@ --include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@ --include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@ --include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@ --include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@ --include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@ --include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@ --include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@ --include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@ --include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@ --include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@ --include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@ --include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@ --include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@ --include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@ --include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@ --include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@ --include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@ --include_kompmgr_FALSE = @include_kompmgr_FALSE@ --include_kompmgr_TRUE = @include_kompmgr_TRUE@ --include_ksysguardd_FALSE = @include_ksysguardd_FALSE@ --include_ksysguardd_TRUE = @include_ksysguardd_TRUE@ --include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@ --include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@ --include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@ --include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@ --include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@ --include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@ --include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@ --include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@ --include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@ --include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@ --include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@ --include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@ --include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@ --include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@ --include_media_halbackend_FALSE = @include_media_halbackend_FALSE@ --include_media_halbackend_TRUE = @include_media_halbackend_TRUE@ --include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@ --include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@ --include_x11_FALSE = @include_x11_FALSE@ --include_x11_TRUE = @include_x11_TRUE@ --includedir = @includedir@ --infodir = @infodir@ --install_sh = @install_sh@ --install_usbids_FALSE = @install_usbids_FALSE@ --install_usbids_TRUE = @install_usbids_TRUE@ --jni_includes = @jni_includes@ --kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@ --kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@ --kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@ --kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@ --kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@ --kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@ --kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@ --kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@ --kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@ --kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@ --kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@ --kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@ --kde_appsdir = @kde_appsdir@ --kde_bindir = @kde_bindir@ --kde_confdir = @kde_confdir@ --kde_datadir = @kde_datadir@ --kde_htmldir = @kde_htmldir@ --kde_icondir = @kde_icondir@ --kde_includes = @kde_includes@ --kde_kcfgdir = @kde_kcfgdir@ --kde_libraries = @kde_libraries@ --kde_libs_htmldir = @kde_libs_htmldir@ --kde_libs_prefix = @kde_libs_prefix@ --kde_locale = @kde_locale@ --kde_mimedir = @kde_mimedir@ --kde_moduledir = @kde_moduledir@ --kde_qtver = @kde_qtver@ --kde_servicesdir = @kde_servicesdir@ --kde_servicetypesdir = @kde_servicetypesdir@ --kde_sounddir = @kde_sounddir@ --kde_styledir = @kde_styledir@ --kde_templatesdir = @kde_templatesdir@ --kde_wallpaperdir = @kde_wallpaperdir@ --kde_widgetdir = @kde_widgetdir@ --kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@ --kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@ --kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@ --kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@ --kdeinitdir = @kdeinitdir@ --kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@ --kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@ --kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@ --kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@ --kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@ --kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@ --kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@ --kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@ --kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@ --kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@ --kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@ --kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@ --kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@ --kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@ --kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@ --kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@ --khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@ --khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@ --khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@ --khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@ --kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@ --kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@ --kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@ --kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@ --klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@ --klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@ --kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@ --kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@ --knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@ --knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@ --konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@ --konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@ --konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@ --konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@ --kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@ --kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@ --kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@ --kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@ --kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@ --kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@ --kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@ --kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@ --ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@ --ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@ --ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@ --ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@ --kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@ --kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@ --ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@ --ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@ --ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@ --ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@ --ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@ --ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@ --kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@ --kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@ --kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@ --kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@ --l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@ --l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@ --libdir = @libdir@ --libexecdir = @libexecdir@ --libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ --libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ --localstatedir = @localstatedir@ --mandir = @mandir@ --mkdir_p = @mkdir_p@ --nogroup = @nogroup@ --nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ --nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ --oldincludedir = @oldincludedir@ --pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ --pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ --prefix = @prefix@ --program_transform_name = @program_transform_name@ --qt_includes = @qt_includes@ --qt_libraries = @qt_libraries@ --sbindir = @sbindir@ --sharedstatedir = @sharedstatedir@ --supports_i8k_FALSE = @supports_i8k_FALSE@ --supports_i8k_TRUE = @supports_i8k_TRUE@ --sysconfdir = @sysconfdir@ --target = @target@ --target_alias = @target_alias@ --target_cpu = @target_cpu@ --target_os = @target_os@ --target_vendor = @target_vendor@ --unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ --unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ --x_includes = @x_includes@ --x_libraries = @x_libraries@ --xdg_appsdir = @xdg_appsdir@ --xdg_directorydir = @xdg_directorydir@ --xdg_menudir = @xdg_menudir@ --#>- METASOURCES = AUTO --kde_module_LTLIBRARIES = media_propsdlgplugin.la --media_propsdlgplugin_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) --media_propsdlgplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) --AM_CPPFLAGS = $(all_includes) --kde_services_DATA = media_propsdlgplugin.desktop --#>- media_propsdlgplugin_la_SOURCES = propertiespage.cpp propertiespagegui.ui propsdlgshareplugin.cpp --#>+ 1 --media_propsdlgplugin_la_SOURCES=propertiespage.cpp propsdlgshareplugin.cpp propertiespagegui.cpp --#>- all: all-am --#>+ 1 --all: docs-am all-am -- --.SUFFIXES: --.SUFFIXES: .cpp .lo .o .obj --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) --#>- @for dep in $?; do \ --#>- case '$(am__configure_deps)' in \ --#>- *$$dep*) \ --#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ --#>- && exit 0; \ --#>- exit 1;; \ --#>- esac; \ --#>- done; \ --#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ --#>- cd $(top_srcdir) && \ --#>- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile --#>+ 12 -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ -- cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile -- cd $(top_srcdir) && perl admin/am_edit kioslave/media/propsdlgplugin/Makefile.in --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) -- @$(NORMAL_INSTALL) -- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)" -- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ -- else :; fi; \ -- done -- --uninstall-kde_moduleLTLIBRARIES: -- @$(NORMAL_UNINSTALL) -- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ -- done -- --clean-kde_moduleLTLIBRARIES: -- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES) -- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --#>- media_propsdlgplugin.la: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) --#>+ 2 --@KDE_USE_CLOSURE_TRUE@media_propsdlgplugin.la: media_propsdlgplugin.la.closure $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) --@KDE_USE_CLOSURE_FALSE@media_propsdlgplugin.la: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(kde_moduledir) $(media_propsdlgplugin_la_LDFLAGS) $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_LIBADD) $(LIBS) -- --mostlyclean-compile: -- -rm -f *.$(OBJEXT) -- --distclean-compile: -- -rm -f *.tab.c -- --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/propertiespage.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/propsdlgshareplugin.Plo@am__quote@ -- --.cpp.o: --@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -- --.cpp.obj: --@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -- --.cpp.lo: --@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -- --mostlyclean-libtool: -- -rm -f *.lo -- --clean-libtool: -- -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: --install-kde_servicesDATA: $(kde_services_DATA) -- @$(NORMAL_INSTALL) -- test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)" -- @list='$(kde_services_DATA)'; for p in $$list; do \ -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \ -- $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \ -- done -- --uninstall-kde_servicesDATA: -- @$(NORMAL_UNINSTALL) -- @list='$(kde_services_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \ -- done -- --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- tags=; \ -- here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- tags=; \ -- here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(CTAGS_ARGS)$$tags$$unique" \ -- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -- $$tags $$unique -- --GTAGS: -- here=`$(am__cd) $(top_builddir) && pwd` \ -- && cd $(top_srcdir) \ -- && gtags -i $(GTAGS_ARGS) $$here -- --distclean-tags: -- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -- --distdir: $(DISTFILES) -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkdir_p) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ -- if test -d $$d/$$file; then \ -- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ -- fi; \ -- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ -- else \ -- test -f $(distdir)/$$file \ -- || cp -p $$d/$$file $(distdir)/$$file \ -- || exit 1; \ -- fi; \ -- done --check-am: all-am --check: check-am --all-am: Makefile $(LTLIBRARIES) $(DATA) --installdirs: -- for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \ -- test -z "$$dir" || $(mkdir_p) "$$dir"; \ -- done --install: install-am --install-exec: install-exec-am --install-data: install-data-am --uninstall: uninstall-am -- --install-am: all-am -- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -- --installcheck: installcheck-am --install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install --mostlyclean-generic: -- --clean-generic: -- --distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -- --maintainer-clean-generic: -- @echo "This command is intended for maintainers to use" -- @echo "it deletes files that may require special tools to rebuild." --#>- clean: clean-am --#>+ 1 --clean: kde-rpo-clean clean-am -- --#>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ --#>- mostlyclean-am --#>+ 2 --clean-am: clean-metasources clean-ui clean-closures clean-bcheck clean-final clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ -- mostlyclean-am -- --distclean: distclean-am -- -rm -rf ./$(DEPDIR) -- -rm -f Makefile --distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -- --dvi: dvi-am -- --dvi-am: -- --html: html-am -- --info: info-am -- --info-am: -- --#>- install-data-am: install-kde_moduleLTLIBRARIES \ --#>- install-kde_servicesDATA --#>+ 2 --install-data-am: \ -- install-kde_servicesDATA -- --#>- install-exec-am: --#>+ 1 --install-exec-am: install-kde_moduleLTLIBRARIES -- --install-info: install-info-am -- --install-man: -- --installcheck-am: -- --maintainer-clean: maintainer-clean-am -- -rm -rf ./$(DEPDIR) -- -rm -f Makefile --maintainer-clean-am: distclean-am maintainer-clean-generic -- --mostlyclean: mostlyclean-am -- --mostlyclean-am: mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool -- --pdf: pdf-am -- --pdf-am: -- --ps: ps-am -- --ps-am: -- --uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ -- uninstall-kde_servicesDATA -- --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-exec \ -- install-exec-am install-info install-info-am \ -- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \ -- install-man install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ -- uninstall-am uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ -- uninstall-kde_servicesDATA -- --# Tell versions [3.59,3.63) of GNU make to not export all variables. --# Otherwise a system limit (for SysV at least) may be exceeded. --.NOEXPORT: -- --#>+ 8 --media_propsdlgplugin.la.closure: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) -- @echo "int main() {return 0;}" > media_propsdlgplugin_la_closure.cpp -- @$(LTCXXCOMPILE) -c media_propsdlgplugin_la_closure.cpp -- $(CXXLINK) media_propsdlgplugin_la_closure.lo $(media_propsdlgplugin_la_LDFLAGS) $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_LIBADD) $(LIBS) -- @rm -f media_propsdlgplugin_la_closure.* media_propsdlgplugin.la.closure -- @echo "timestamp" > media_propsdlgplugin.la.closure -- -- --#>+ 3 --propsdlgshareplugin.moc: $(srcdir)/propsdlgshareplugin.h -- $(MOC) $(srcdir)/propsdlgshareplugin.h -o propsdlgshareplugin.moc -- --#>+ 2 --mocs: propsdlgshareplugin.moc -- --#>+ 3 --propertiespage.moc: $(srcdir)/propertiespage.h -- $(MOC) $(srcdir)/propertiespage.h -o propertiespage.moc -- --#>+ 2 --mocs: propertiespage.moc -- --#>+ 3 --clean-metasources: -- -rm -f propsdlgshareplugin.moc propertiespage.moc -- --#>+ 2 --KDE_DIST=propertiespagegui.ui Makefile.in propertiespage.h propsdlgshareplugin.h media_propsdlgplugin.desktop propertiespagegui.ui.h Makefile.am -- --#>+ 4 --clean-ui: -- -rm -f \ -- propertiespagegui.cpp propertiespagegui.h propertiespagegui.moc -- --#>+ 3 --clean-closures: -- -rm -f media_propsdlgplugin.la.closure -- --#>+ 2 --docs-am: -- --#>+ 15 --force-reedit: -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ -- cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile -- cd $(top_srcdir) && perl admin/am_edit kioslave/media/propsdlgplugin/Makefile.in -- -- --#>+ 21 --clean-bcheck: -- rm -f *.bchecktest.cc *.bchecktest.cc.class a.out -- --bcheck: bcheck-am -- --bcheck-am: -- @for i in ; do \ -- if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ -- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ -- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ -- echo "$$i"; \ -- if ! $(CXXCOMPILE) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ -- rm -f $$i.bchecktest.cc; exit 1; \ -- fi ; \ -- echo "" >> $$i.bchecktest.cc.class; \ -- perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ -- rm -f a.out; \ -- fi ; \ -- done -- -- --#>+ 11 --media_propsdlgplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/propertiespage.cpp $(srcdir)/propsdlgshareplugin.cpp propertiespagegui.cpp propsdlgshareplugin.moc propertiespagegui.moc propertiespage.moc -- @echo 'creating media_propsdlgplugin_la.all_cpp.cpp ...'; \ -- rm -f media_propsdlgplugin_la.all_cpp.files media_propsdlgplugin_la.all_cpp.final; \ -- echo "#define KDE_USE_FINAL 1" >> media_propsdlgplugin_la.all_cpp.final; \ -- for file in propertiespage.cpp propsdlgshareplugin.cpp propertiespagegui.cpp ; do \ -- echo "#include \"$$file\"" >> media_propsdlgplugin_la.all_cpp.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> media_propsdlgplugin_la.all_cpp.final; \ -- done; \ -- cat media_propsdlgplugin_la.all_cpp.final media_propsdlgplugin_la.all_cpp.files > media_propsdlgplugin_la.all_cpp.cpp; \ -- rm -f media_propsdlgplugin_la.all_cpp.final media_propsdlgplugin_la.all_cpp.files -- --#>+ 3 --clean-final: -- -rm -f media_propsdlgplugin_la.all_cpp.cpp -- --#>+ 3 --final: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_final_OBJECTS)" all-am -- --#>+ 3 --final-install: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_final_OBJECTS)" install-am -- --#>+ 3 --no-final: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_nofinal_OBJECTS)" all-am -- --#>+ 3 --no-final-install: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_nofinal_OBJECTS)" install-am -- --#>+ 3 --kde-rpo-clean: -- -rm -f *.rpo -- --#>+ 9 --nmcheck: --propsdlgshareplugin.o: propsdlgshareplugin.moc --nmcheck-am: nmcheck --propsdlgshareplugin.lo: propsdlgshareplugin.moc --propertiespage.lo: propertiespage.moc --$(srcdir)/propertiespage.cpp: propertiespagegui.h --$(srcdir)/propsdlgshareplugin.cpp: propertiespagegui.h --propertiespage.o: propertiespage.moc -- --#>+ 15 --propertiespagegui.cpp: $(srcdir)/propertiespagegui.ui propertiespagegui.h propertiespagegui.moc -- rm -f propertiespagegui.cpp -- echo '#include <kdialog.h>' > propertiespagegui.cpp -- echo '#include <klocale.h>' >> propertiespagegui.cpp -- $(UIC) -tr ${UIC_TR} -i propertiespagegui.h $(srcdir)/propertiespagegui.ui > propertiespagegui.cpp.temp ; ret=$$?; \ -- $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" propertiespagegui.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_propertiespagegui,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> propertiespagegui.cpp ;\ -- rm -f propertiespagegui.cpp.temp ;\ -- if test "$$ret" = 0; then echo '#include "propertiespagegui.moc"' >> propertiespagegui.cpp; else rm -f propertiespagegui.cpp ; exit $$ret ; fi -- --propertiespagegui.h: $(srcdir)/propertiespagegui.ui -- rm -rf propertiespagegui.h; -- $(UIC) $(srcdir)/propertiespagegui.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> propertiespagegui.h ; --propertiespagegui.moc: propertiespagegui.h -- $(MOC) propertiespagegui.h -o propertiespagegui.moc -diff -urN kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop ---- kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Thu Jan 1 01:00:00 1970 -@@ -1,73 +0,0 @@ --[Desktop Entry] --Encoding=UTF-8 --Type=Service --Name=Media Properties Page --Name[ca]=Pàgina de propietats de suport --Name[cs]=Stránka vlastností média --Name[da]=Medieegenskabsside --Name[de]=Eigenschaften von Medien --Name[el]=Σελίδα ιδιοτήτων μέσων --Name[es]=Página de propiedades de medios --Name[et]=Andmekandjate omadused --Name[fa]=صفحۀ ویژگیهای رسانه --Name[fi]=Mediaominaisuudet --Name[fr]=Page de propriétés du média --Name[he]=דף מאפייני מדיה --Name[hr]=Stranica svojstva medija --Name[hu]=Médiajellemzők lap --Name[is]=Eiginleikar miðils --Name[it]=Pagina delle proprietà dei dispositivi di archiviazione --Name[ja]=メディア属性ページ --Name[km]=ទំព័រលក្ខណៈសម្បត្តិមេឌៀ --Name[nb]=Side for medievarsling --Name[nds]=Medienegenschappen-Siet --Name[nl]=Pagina met media-eigenschappen --Name[nn]=Side for medieeigenskapar --Name[pl]=Strona właściwości nośnika --Name[pt]=Página de Propriedades de Suportes Físicos --Name[pt_BR]=Página de Propriedades de Suportes Físicos --Name[ru]=Свойства носителя --Name[sk]=Strana vlastností média --Name[sl]=Stran z lastnostmi nosilca --Name[sr]=Страна са својствима медијума --Name[sr@Latn]=Strana sa svojstvima medijuma --Name[sv]=Sida för mediaegenskaper --Name[uk]=Сторінка властивостей носіїв інформації --Name[vi]=Trang tài sản phương tiện --Name[zh_TW]=媒體內容頁 --Comment=Konqueror properties dialog plugin to configure mount behaviour --Comment[ca]=Diàleg de propietats de l'endollable Konqueror per a configurar el comportament de muntatge --Comment[cs]=Dialog nastavení chování připojení modulu pro Konqueror --Comment[da]=Konqueror plugin med egenskabsdialog til at indstille monteringsopførsel --Comment[de]=Konqueror-Modul zum Einstellen des Verhaltens beim Einbinden --Comment[el]=Πρόσθετο διαλόγου ιδιοτήτων του Konqueror για τη ρύθμιση της συμπεριφοράς προσάρτησης --Comment[es]=Plugin de diálogo de propiedades de Konqueror para configurar el comportamiento del montaje --Comment[et]=Konquerori seadistustedialoogi plugin andmekandjate ühendamise seadistamiseks --Comment[fa]=وصلۀ محاورۀ ویژگیهای Konqueror برای پیکربندی رفتار سوار کردن --Comment[fi]=Konquerorin ominaisuussovelma, joka tarkkailee liitospisteitä --Comment[fr]=Module de Konqueror pour configurer le comportement du montage --Comment[he]=תוסף חלון מאפיינים של Konqueror לקביעת אפשרויות חיבור --Comment[hr]=Konqueror dodatak dijaloga svojstava za konfiguriranje načina pristupanja --Comment[hu]=Konqueror beállítómodul a csatlakoztatási mód megadásához --Comment[is]=Konqueror eiginleikagluggi til að stilla tengihegðun --Comment[it]=Plugin della configurazione di Konqueror per configurare il montaggio --Comment[ja]=mountの挙動を設定する、Konqueror属性ダイアログ プラグイン --Comment[km]=កម្មវិធីជំនួយឲ្យមានប្រអប់លក្ខណៈសម្បត្តិ Konqueror ដើម្បីកំណត់រចនាសម្ព័ន្ធឥរិយាបថម៉ោន --Comment[nb]=Et programtillegg for å sette opp montering av enheter i Konqueror --Comment[nds]=Egenschappendialoog-Plugin för Konqueror för't Instellen vun't Inhangbedregen --Comment[nl]=Dialoogvenster voor Konqueror om het aankoppelgedrag in te stellen --Comment[nn]=Programtillegg for oppsett av montering i Konqueror --Comment[pl]=Wtyczka okna właściwości Konquerora do konfiguracji zachowania montowania --Comment[pt]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem --Comment[pt_BR]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem --Comment[ru]=Модуль свойств для Konqueror, отвечающий за поведение при подключении файловых систем --Comment[sk]=Modul Konqueror dialógu vlastností pre konfiguráciu správania pripojenia --Comment[sl]=Vstavek za Konqueror s katerim se nastavlja obnašanje priklopa medijev --Comment[sr]=Прикључак са својствима Konqueror-а за подешавање понашања при монтирању --Comment[sr@Latn]=Priključak sa svojstvima Konqueror-a za podešavanje ponašanja pri montiranju --Comment[sv]=Konqueror insticksprogram med egenskapsdialogruta för att anpassa monteringsbeteende --Comment[uk]=Втулок вікна властивостей Konqueror для налаштування поведінки монтування --Comment[vi]=bổ sung hộp thoại tài sản Konqueror để cấu hình ứng xử gắn kết --Comment[zh_TW]=Konqueror 內容對話框外掛程式，用於設定掛載的行為 --X-KDE-Library=media_propsdlgplugin --ServiceTypes=KPropsDlg/Plugin,media/audiocd,media/hdd_mounted,media/hdd_unmounted,media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/nfs_mounted,media/cdwriter_unmounted,media/nfs_unmounted,media/removable_mounted,media/dvd_mounted,media/removable_unmounted,media/dvd_unmounted,media/smb_mounted,media/dvdvideo,media/smb_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/floppy_mounted,media/zip_mounted,media/floppy_unmounted,media/zip_unmounted,media/camera_mounted,media/camera_unmounted -diff -urN kioslave/media/propsdlgplugin/propertiespage.cpp kioslave/media/propsdlgplugin/propertiespage.cpp ---- kioslave/media/propsdlgplugin/propertiespage.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespage.cpp Thu Jan 1 01:00:00 1970 -@@ -1,217 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program 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 General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ -- --#include <qcheckbox.h> --#include <qtooltip.h> --#include <qbuttongroup.h> --#include <qlineedit.h> --#include <qfileinfo.h> --#include <qlabel.h> --#include <qregexp.h> --#include <kpushbutton.h> --#include <kmessagebox.h> --#include <klocale.h> --#include <qcombobox.h> --#include <qtimer.h> --#include <kdebug.h> --#include "propertiespage.h" --#include <dcopref.h> -- --// keep in sync with .ui and kded module --const char *short_names[] = {"lower", "win95", "winnt", "mixed", 0 }; --const char *journales[] = {"data", "ordered", "writeback", 0 }; -- --PropertiesPage::PropertiesPage(QWidget* parent, const QString &_id) -- : PropertiesPageGUI(parent), id(_id) --{ -- kdDebug() << "props page " << id << endl; -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "mountoptions", id); -- -- QStringList list; -- -- if (reply.isValid()) -- list = reply; -- -- if (list.size()) { -- kdDebug() << "list " << list << endl; -- -- for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it) -- { -- QString key = (*it).left((*it).find('=')); -- QString value = (*it).mid((*it).find('=') + 1); -- kdDebug() << "key '" << key << "' value '" << value << "'\n"; -- options[key] = value; -- } -- -- if (!options.contains("ro")) -- option_ro->hide(); -- else -- option_ro->setChecked(options["ro"] == "true"); -- connect( option_ro, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("quiet")) -- option_quiet->hide(); -- else -- option_quiet->setChecked(options["quiet"] == "true"); -- connect( option_quiet, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("sync")) -- option_sync->hide(); -- else -- option_sync->setChecked(options["sync"] == "true"); -- connect( option_sync, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("atime")) -- option_atime->hide(); -- else -- option_atime->setChecked(options["atime"] == "true"); -- connect( option_atime, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("flush")) -- option_flush->hide(); -- else -- option_flush->setChecked(options["flush"] == "true"); -- connect( option_flush, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("utf8")) -- option_utf8->hide(); -- else -- option_utf8->setChecked(options["utf8"] == "true"); -- connect( option_utf8, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("uid")) -- option_uid->hide(); -- else -- option_uid->setChecked(options["uid"] == "true"); -- connect( option_uid, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("shortname")) -- { -- option_shortname->hide(); -- text_shortname->hide(); -- } -- else -- { -- for (int index = 0; short_names[index]; ++index) -- if (options["shortname"] == short_names[index]) -- { -- option_shortname->setCurrentItem(index); -- break; -- } -- connect( option_shortname, SIGNAL( activated(int) ), SIGNAL( changed() ) ); -- } -- -- if (!options.contains("journaling")) -- { -- text_journaling->hide(); -- option_journaling->hide(); -- } -- else -- { -- for (int index = 0; journales[index]; ++index) -- if (options["journaling"] == journales[index]) -- { -- option_journaling->setCurrentItem(index); -- break; -- } -- connect( option_journaling, SIGNAL( activated(int) ), SIGNAL( changed() ) ); -- } -- -- label_filesystem->setText(i18n("Filesystem: %1").arg(options["filesystem"])); -- option_mountpoint->setText(options["mountpoint"]); -- connect( option_mountpoint, SIGNAL( textChanged( const QString &) ), SIGNAL( changed() ) ); -- option_automount->setChecked(options["automount"] == "true"); -- connect( option_automount, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("journaling") && -- !options.contains("shortname") && -- !options.contains("uid") && -- !options.contains("utf8") && -- !options.contains("flush")) -- groupbox_specific->hide(); -- -- } else { -- -- groupbox_generic->setEnabled(false); -- groupbox_specific->setEnabled(false); -- label_filesystem->hide(); -- } --} -- --PropertiesPage::~PropertiesPage() --{ --} -- --bool PropertiesPage::save() --{ -- QStringList result; -- -- if (options.contains("ro")) -- result << QString("ro=%1").arg(option_ro->isChecked() ? "true" : "false"); -- -- if (options.contains("quiet")) -- result << QString("quiet=%1").arg(option_quiet->isChecked() ? "true" : "false"); -- -- if (options.contains("sync")) -- result << QString("sync=%1").arg(option_sync->isChecked() ? "true" : "false"); -- -- if (options.contains("atime")) -- result << QString("atime=%1").arg(option_atime->isChecked() ? "true" : "false"); -- -- if (options.contains("flush")) -- result << QString("flush=%1").arg(option_flush->isChecked() ? "true" : "false"); -- -- if (options.contains("utf8")) -- result << QString("utf8=%1").arg(option_utf8->isChecked() ? "true" : "false"); -- -- if (options.contains("uid")) -- result << QString("uid=%1").arg(option_uid->isChecked() ? "true" : "false"); -- -- if (options.contains("shortname")) -- result << QString("shortname=%1").arg(short_names[option_shortname->currentItem()]); -- -- if (options.contains("journaling")) -- result << QString("journaling=%1").arg(journales[option_journaling->currentItem()]); -- -- QString mp = option_mountpoint->text(); -- if (!mp.startsWith("/media/")) -- { -- KMessageBox::sorry(this, i18n("Mountpoint has to be below /media")); -- return false; -- } -- result << QString("mountpoint=%1").arg(mp); -- result << QString("automount=%1").arg(option_automount->isChecked() ? "true" : "false"); -- -- kdDebug() << result << endl; -- -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "setMountoptions", id, result); -- -- if (reply.isValid()) -- return (bool)reply; -- else { -- KMessageBox::sorry(this, -- i18n("Saving the changes failed")); -- -- return false; -- } --} -- --#include "propertiespage.moc" -diff -urN kioslave/media/propsdlgplugin/propertiespage.h kioslave/media/propsdlgplugin/propertiespage.h ---- kioslave/media/propsdlgplugin/propertiespage.h Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespage.h Thu Jan 1 01:00:00 1970 -@@ -1,46 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program 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 General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ -- --#ifndef PROPERTIESPAGE_H --#define PROPERTIESPAGE_H -- --#include "propertiespagegui.h" --#include <qmap.h> -- --class QCheckBox; --class Medium; -- --class PropertiesPage : public PropertiesPageGUI --{ -- Q_OBJECT -- --public: -- PropertiesPage(QWidget* parent, const QString &_id); -- virtual ~PropertiesPage(); -- -- bool save(); -- --protected: -- -- QMap<QString,QString> options; -- QString id; -- --}; -- --#endif -diff -urN kioslave/media/propsdlgplugin/propertiespagegui.ui kioslave/media/propsdlgplugin/propertiespagegui.ui ---- kioslave/media/propsdlgplugin/propertiespagegui.ui Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespagegui.ui Thu Jan 1 01:00:00 1970 -@@ -1,387 +0,0 @@ --<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> --<class>PropertiesPageGUI</class> --<widget class="QWidget"> -- <property name="name"> -- <cstring>PropertiesPageGUI</cstring> -- </property> -- <property name="geometry"> -- <rect> -- <x>0</x> -- <y>0</y> -- <width>527</width> -- <height>476</height> -- </rect> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <property name="margin"> -- <number>0</number> -- </property> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout17</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QGroupBox"> -- <property name="name"> -- <cstring>groupbox_generic</cstring> -- </property> -- <property name="title"> -- <string>Generic Mount Options</string> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout15</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_ro</cstring> -- </property> -- <property name="text"> -- <string>Read only</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Mount the file system read-only.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_quiet</cstring> -- </property> -- <property name="text"> -- <string>Quiet</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Attempts to chown or chmod files do not return errors, although they fail. Use with caution!</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_sync</cstring> -- </property> -- <property name="text"> -- <string>Synchronous</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>All I/O to the file system should be done synchronously.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_atime</cstring> -- </property> -- <property name="text"> -- <string>Access time updates</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Update inode access time for each access.</string> -- </property> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout14</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>textLabel3</cstring> -- </property> -- <property name="text"> -- <string>Mountpoint:</string> -- </property> -- <property name="buddy" stdset="0"> -- <cstring>option_mountpoint</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Under what directory this file system shall be mounted. Please note that there is no guarantee that the system will respect your wish. For one the directory has to be below /media - and it does not yet have to exist.</string> -- </property> -- </widget> -- <widget class="QLineEdit"> -- <property name="name"> -- <cstring>option_mountpoint</cstring> -- </property> -- <property name="text"> -- <string></string> -- </property> -- </widget> -- </hbox> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_automount</cstring> -- </property> -- <property name="text"> -- <string>Mount automatically</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Mount this file system automatically.</string> -- </property> -- </widget> -- </vbox> -- </widget> -- </vbox> -- </widget> -- <widget class="QGroupBox"> -- <property name="name"> -- <cstring>groupbox_specific</cstring> -- </property> -- <property name="title"> -- <string>Filesystem Specific Mount Options</string> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout11</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_flush</cstring> -- </property> -- <property name="text"> -- <string>Flushed IO</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Always flush all data to the hot plug devices immediately and don't cache it.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_utf8</cstring> -- </property> -- <property name="text"> -- <string>UTF-8 charset</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the console. It can be be enabled for the filesystem with this option.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_uid</cstring> -- </property> -- <property name="text"> -- <string>Mount as user</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Mount this file system as user.</string> -- </property> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout7</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>text_journaling</cstring> -- </property> -- <property name="text"> -- <string>Journaling:</string> -- </property> -- <property name="buddy" stdset="0"> -- <cstring>option_journaling</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> -- --<h3><b>All Data</b></h3> -- All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. -- --<h3><b>Ordered</b></h3> -- All data is forced directly out to the main file system prior to its metadata being committed to the journal. -- --<h3><b>Write Back</b></h3> -- Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery.</string> -- </property> -- </widget> -- <widget class="QComboBox"> -- <item> -- <property name="text"> -- <string>All Data</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Ordered</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Write Back</string> -- </property> -- </item> -- <property name="name"> -- <cstring>option_journaling</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> -- --<h3><b>All Data</b></h3> -- All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. -- --<h3><b>Ordered</b></h3> -- All data is forced directly out to the main file system prior to its metadata being committed to the journal. -- --<h3><b>Write Back</b></h3> -- Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery.</string> -- </property> -- </widget> -- </hbox> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout14</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>text_shortname</cstring> -- </property> -- <property name="text"> -- <string>Short names:</string> -- </property> -- <property name="buddy" stdset="0"> -- <cstring>option_shortname</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> -- --<h3><b>Lower</b></h3> --Force the short name to lower case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows 95</b></h3> --Force the short name to upper case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows NT</b></h3> --Display the shortname as is; store a long name when the short name is not all lower case or all upper case. -- --<h3><b>Mixed</b></h3> --Display the short name as is; store a long name when the short name is not all upper case.</string> -- </property> -- </widget> -- <widget class="QComboBox"> -- <item> -- <property name="text"> -- <string>Lower</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Windows 95</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Windows NT</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Mixed</string> -- </property> -- </item> -- <property name="name"> -- <cstring>option_shortname</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> -- --<h3><b>Lower</b></h3> --Force the short name to lower case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows 95</b></h3> --Force the short name to upper case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows NT</b></h3> --Display the shortname as is; store a long name when the short name is not all lower case or all upper case. -- --<h3><b>Mixed</b></h3> --Display the short name as is; store a long name when the short name is not all upper case.</string> -- </property> -- </widget> -- </hbox> -- </widget> -- </vbox> -- </widget> -- </vbox> -- </widget> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>label_filesystem</cstring> -- </property> -- <property name="text"> -- <string>Filesystem: iso9660</string> -- </property> -- </widget> -- <spacer> -- <property name="name"> -- <cstring>spacer1</cstring> -- </property> -- <property name="orientation"> -- <enum>Vertical</enum> -- </property> -- <property name="sizeType"> -- <enum>Expanding</enum> -- </property> -- <property name="sizeHint"> -- <size> -- <width>20</width> -- <height>20</height> -- </size> -- </property> -- </spacer> -- </vbox> -- </widget> -- </hbox> --</widget> --<connections> -- <connection> -- <sender>option_ro</sender> -- <signal>stateChanged(int)</signal> -- <receiver>PropertiesPageGUI</receiver> -- <slot>changedSlot()</slot> -- </connection> --</connections> --<variables> -- <variable>bool m_hasChanged;</variable> --</variables> --<signals> -- <signal>changed()</signal> --</signals> --<slots> -- <slot access="protected">changedSlot()</slot> --</slots> --<functions> -- <function returnType="bool">hasChanged()</function> --</functions> --<layoutdefaults spacing="6" margin="11"/> --</UI> -diff -urN kioslave/media/propsdlgplugin/propertiespagegui.ui.h kioslave/media/propsdlgplugin/propertiespagegui.ui.h ---- kioslave/media/propsdlgplugin/propertiespagegui.ui.h Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespagegui.ui.h Thu Jan 1 01:00:00 1970 -@@ -1,22 +0,0 @@ --/**************************************************************************** --** ui.h extension file, included from the uic-generated form implementation. --** --** If you wish to add, delete or rename functions or slots use --** Qt Designer which will update this file, preserving your code. Create an --** init() function in place of a constructor, and a destroy() function in --** place of a destructor. --*****************************************************************************/ -- -- --void PropertiesPageGUI::changedSlot() --{ -- m_hasChanged = true; -- emit changed(); --} -- --bool PropertiesPageGUI::hasChanged() --{ -- return m_hasChanged; --} -- -- -diff -urN kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp ---- kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp Thu Jan 1 01:00:00 1970 -@@ -1,100 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program 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 General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ --#include <qstring.h> --#include <qvbox.h> --#include <qlayout.h> --#include <qlabel.h> --#include <qtimer.h> -- --#include <kgenericfactory.h> --#include <kdebug.h> --#include <kpushbutton.h> --#include <kfileshare.h> --#include <kmessagebox.h> --#include <kprocess.h> --#include <kstandarddirs.h> --#include <kdialog.h> --#include <kglobal.h> --#include <dcopref.h> -- --#include "propertiespage.h" --#include "propsdlgshareplugin.h" --#include "../libmediacommon/medium.h" -- --typedef KGenericFactory<PropsDlgSharePlugin, KPropertiesDialog> PropsDlgSharePluginFactory; -- --K_EXPORT_COMPONENT_FACTORY( media_propsdlgplugin, -- PropsDlgSharePluginFactory("media_propsdlgplugin") ) -- --class PropsDlgSharePlugin::Private --{ -- public: -- PropertiesPage* page; --}; -- --PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg, -- const char *, const QStringList & ) -- : KPropsDlgPlugin(dlg), d(0) --{ -- if (properties->items().count() != 1) -- return; -- -- KFileItem *item = properties->items().first(); -- -- DCOPRef mediamanager("kded", "mediamanager"); -- kdDebug() << "properties " << item->url() << endl; -- DCOPReply reply = mediamanager.call( "properties", item->url().url() ); -- -- if ( !reply.isValid() ) -- return; -- -- QVBox* vbox = properties->addVBoxPage(i18n("&Mounting")); -- -- d = new Private(); -- -- d->page = new PropertiesPage(vbox, Medium::create(reply).id()); -- connect(d->page, SIGNAL(changed()), -- SLOT(slotChanged())); -- -- // QTimer::singleShot(100, this, SLOT(slotChanged())); -- --} -- --void PropsDlgSharePlugin::slotChanged() --{ -- kdDebug() << "slotChanged()\n"; -- setDirty(true); --} -- --PropsDlgSharePlugin::~PropsDlgSharePlugin() --{ -- delete d; --} -- --void PropsDlgSharePlugin::applyChanges() --{ -- kdDebug() << "applychanges\n"; -- if (!d->page->save()) { -- properties->abortApplying(); -- } --} -- -- --#include "propsdlgshareplugin.moc" -- -diff -urN kioslave/media/propsdlgplugin/propsdlgshareplugin.h kioslave/media/propsdlgplugin/propsdlgshareplugin.h ---- kioslave/media/propsdlgplugin/propsdlgshareplugin.h Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propsdlgshareplugin.h Thu Jan 1 01:00:00 1970 -@@ -1,44 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program 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 General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ -- --#ifndef KONQFILESHAREPLUGIN_H --#define KONQFILESHAREPLUGIN_H -- --#include <kpropertiesdialog.h> -- --class PropsDlgSharePlugin : public KPropsDlgPlugin --{ --Q_OBJECT --public: -- PropsDlgSharePlugin( KPropertiesDialog *dlg, const char *, const QStringList & ); -- virtual ~PropsDlgSharePlugin(); -- virtual void applyChanges(); -- --public slots: -- void slotChanged(); -- --private: -- class Private; -- Private *d; -- --}; -- --#endif -- -- -diff -urN kioslave/media/services/Makefile.in kioslave/media/services/Makefile.in ---- kioslave/media/services/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/services/Makefile.in Fri May 26 09:54:31 2006 -@@ -211,6 +211,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/services/media_eject.desktop kioslave/media/services/media_eject.desktop ---- kioslave/media/services/media_eject.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/services/media_eject.desktop Mon May 22 20:12:42 2006 -@@ -24,7 +24,7 @@ - Name[es]=Expulsar - Name[et]=Väljastamine - Name[eu]=Egotzi --Name[fa]=پس زدن -+Name[fa]=اخراج - Name[fi]=Poista - Name[fr]=Éjecter - Name[fy]=Utsmytknop -diff -urN kioslave/media/services/media_safelyremove.desktop kioslave/media/services/media_safelyremove.desktop ---- kioslave/media/services/media_safelyremove.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/services/media_safelyremove.desktop Tue May 23 13:33:34 2006 -@@ -18,10 +18,8 @@ - Name[es]=Extracción segura - Name[et]=Eemalda turvaliselt - Name[eu]=Atera arriskurik gabe --Name[fa]=حذف امن - Name[fi]=Poista turvallisesti - Name[fr]=Enlever en toute sécurité --Name[fy]=Feilich verwiderje - Name[ga]=Bain Amach go Sábháilte - Name[gl]=Eliminar de Maneira Segura - Name[he]=שליפה בבטחה -@@ -46,7 +44,6 @@ - Name[ru]=Безопасно извлечь - Name[rw]=Gukuramo Neza - Name[se]=Dorvvošlaš eretváldin --Name[sk]=Bezpečne odpojiť - Name[sl]=Varno odstrani - Name[sr]=Безбедно уклони - Name[sr@Latn]=Bezbedno ukloni diff --git a/x11/kde4-runtime/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kde4-runtime/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp deleted file mode 100644 index 5a6937d40f75..000000000000 --- a/x11/kde4-runtime/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- kioslave/media/mediamanager/fstabbackend.cpp.orig Mon May 22 20:12:42 2006 -+++ kioslave/media/mediamanager/fstabbackend.cpp Fri Jun 16 08:56:20 2006 -@@ -111,6 +111,7 @@ - if ( mount->mountType() == "swap" - || mount->mountType() == "tmpfs" - || mount->mountType() == "sysfs" -+ || mount->mountType() == "fdescfs" - || mount->mountType() == "kernfs" - || mount->mountType() == "usbfs" - || mount->mountType().contains( "proc" ) diff --git a/x11/kde4-runtime/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp b/x11/kde4-runtime/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp index 00685d0fd8a2..e2580f9277c0 100644 --- a/x11/kde4-runtime/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp +++ b/x11/kde4-runtime/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp @@ -1,5 +1,5 @@ ---- kioslave/media/mediamanager/halbackend.cpp.orig Sun Oct 1 21:31:54 2006 -+++ kioslave/media/mediamanager/halbackend.cpp Fri Feb 9 22:01:27 2007 +--- kioslave/media/mediamanager/halbackend.cpp.orig Mon Jan 15 12:31:32 2007 ++++ kioslave/media/mediamanager/halbackend.cpp Sat Mar 3 18:00:49 2007 @@ -17,9 +17,14 @@ */ @@ -14,9 +14,9 @@ +#include <langinfo.h> +#endif - #include <qfile.h> - #include <klocale.h> -@@ -66,6 +71,10 @@ + #include <kapplication.h> + #include <qeventloop.h> +@@ -71,6 +76,10 @@ /* Close HAL connection */ if (m_halContext) { @@ -27,7 +27,7 @@ const QPtrList<Medium> medlist = m_mediaList.list(); QPtrListIterator<Medium> it (medlist); for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) -@@ -185,6 +194,10 @@ +@@ -184,6 +193,10 @@ libhal_free_string_array( halDeviceList ); @@ -38,9 +38,9 @@ return true; } -@@ -242,11 +255,11 @@ - Medium* medium = new Medium(udi, ""); - +@@ -251,11 +264,11 @@ + } + } QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi)); - kdDebug() << "automount " << options["automount"] << endl; + kdDebug(1219) << "automount " << options["automount"] << endl; @@ -50,9 +50,9 @@ - kdDebug() << "error " << error << endl; + kdDebug(1219) << "error " << error << endl; } - setVolumeProperties(medium); m_mediaList.addMedium(medium, allowNotification); -@@ -264,6 +277,11 @@ + +@@ -272,6 +285,11 @@ Medium* medium = new Medium(udi, ""); setFloppyProperties(medium); m_mediaList.addMedium(medium, allowNotification); @@ -64,7 +64,7 @@ return; } -@@ -285,12 +303,23 @@ +@@ -293,12 +311,23 @@ void HALBackend::RemoveDevice(const char *udi) { @@ -89,7 +89,7 @@ const char* mediumUdi = findMediumUdiFromUdi(udi); if (!mediumUdi) return; -@@ -326,7 +355,7 @@ +@@ -334,7 +363,7 @@ } const char* mediumUdi = findMediumUdiFromUdi(udi); @@ -98,7 +98,7 @@ if (!mediumUdi) return; -@@ -384,7 +413,7 @@ +@@ -392,7 +421,7 @@ { Medium m( *cmedium ); if ( setFstabProperties( &m ) ) { @@ -107,7 +107,7 @@ m_mediaList.changeMediumState(m, false); } return; -@@ -399,6 +428,7 @@ +@@ -407,6 +436,7 @@ setFloppyProperties(m); if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) setCameraProperties(m); @@ -115,7 +115,7 @@ m_mediaList.changeMediumState(*m, false); -@@ -469,28 +499,23 @@ +@@ -479,28 +509,23 @@ else mimeType = "media/dvd" + MOUNT_SUFFIX; @@ -155,7 +155,7 @@ } else { -@@ -575,7 +600,7 @@ +@@ -584,7 +609,7 @@ } } @@ -164,7 +164,7 @@ QString fstype = medium->fsType(); if ( fstype.isNull() ) fstype = "auto"; -@@ -762,7 +787,7 @@ +@@ -794,7 +819,7 @@ if (t.endsWith("=")) t = t.left(t.length() - 1); valids[t] = true; @@ -173,7 +173,7 @@ } libhal_free_string_array(array); QStringList result; -@@ -882,12 +908,20 @@ +@@ -915,12 +940,20 @@ result << "journaling=ordered"; } @@ -195,7 +195,7 @@ KConfig config("mediamanagerrc"); config.setGroup(name); -@@ -927,7 +959,7 @@ +@@ -960,7 +993,7 @@ if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, "org.freedesktop.Hal.Device.Volume", "Mount"))) { @@ -204,7 +204,7 @@ return i18n("Internal Error"); } -@@ -935,7 +967,7 @@ +@@ -968,7 +1001,7 @@ DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &poptions, noptions, DBUS_TYPE_INVALID)) { @@ -213,7 +213,7 @@ dbus_message_unref (dmesg); return i18n("Internal Error"); } -@@ -963,7 +995,7 @@ +@@ -996,7 +1029,7 @@ return qerror; } @@ -222,18 +222,25 @@ dbus_message_unref (dmesg); dbus_message_unref (reply); -@@ -974,15 +1006,33 @@ +@@ -1044,7 +1077,7 @@ void HALBackend::slotResult(KIO::Job *job) { - kdDebug() << "slotResult " << mount_jobs[job] << endl; + kdDebug(1219) << "slotResult " << mount_jobs[job] << endl; - if (job->error()) - { - KMessageBox::error(0, job->errorText()); + + struct mount_job_data *data = mount_jobs[job]; + QString& qerror = data->errorMessage; +@@ -1071,7 +1104,6 @@ + qerror = job->errorText(); } -- ResetProperties( mount_jobs[job].latin1() ); + +- ResetProperties( medium->id().latin1() ); mount_jobs.remove(job); + + /* Job completed. Notify the caller */ +@@ -1080,6 +1112,25 @@ + kapp->eventLoop()->exitLoop(); } +#ifdef Q_OS_FREEBSD @@ -247,7 +254,7 @@ + { + bool mounted = false; + const char *dev = (*it)->deviceNode().ascii(); -+ for (int n = mntNum-1; n >= 0 && !mounted; n--) ++ for (int n = mntNum-1; n >= 0 && !mounted; n--) + mounted = !strcmp(dev, mntBuf[n].f_mntfromname); + if ((*it)->isMounted() != mounted) + ResetProperties((*it)->id().latin1()); @@ -258,31 +265,32 @@ QString HALBackend::isInFstab(const Medium *medium) { KMountPoint::List fstab = KMountPoint::possibleMountPoints(KMountPoint::NeedMountOptions|KMountPoint::NeedRealDeviceName); -@@ -992,11 +1042,13 @@ - - for (; it!=end; ++it) - { -- kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl; -+ kdDebug(1219) << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl; - if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && (*it)->realDeviceName() == medium->deviceNode() ) ) +@@ -1092,12 +1143,14 @@ + QString reald = (*it)->realDeviceName(); + if ( reald.endsWith( "/" ) ) + reald = reald.left( reald.length() - 1 ); +- kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << reald << "- -" << (*it)->mountedFrom() << "-" << endl; ++ kdDebug(1219) << "isInFstab -" << medium->deviceNode() << "- -" << reald << "- -" << (*it)->mountedFrom() << "-" << endl; + if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && reald == medium->deviceNode() ) ) { +#ifndef Q_OS_FREEBSD QStringList opts = (*it)->mountOptions(); if (opts.contains("user") || opts.contains("users")) -+#endif return (*it)->mountPoint(); ++#endif } } -@@ -1012,7 +1064,7 @@ - QString mountPoint = isInFstab(medium); - if (!mountPoint.isNull()) - { + +@@ -1116,7 +1169,7 @@ + data.completed = false; + data.medium = medium; + - kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; + kdDebug(1219) << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint ); connect(job, SIGNAL( result (KIO::Job *)), SLOT( slotResult( KIO::Job *))); -@@ -1023,7 +1075,7 @@ +@@ -1134,7 +1187,7 @@ QStringList soptions; @@ -291,7 +299,7 @@ QMap<QString,QString> valids = MediaManagerUtils::splitOptions(mountoptions(medium->id())); if (valids["flush"] == "true") -@@ -1036,10 +1088,10 @@ +@@ -1147,10 +1200,10 @@ if (valids["ro"] == "true") soptions << "ro"; @@ -304,7 +312,7 @@ if (valids["quiet"] == "true") soptions << "quiet"; -@@ -1069,6 +1121,13 @@ +@@ -1180,6 +1233,13 @@ soptions << QString("data=ordered"); } @@ -318,7 +326,7 @@ const char **options = new const char*[soptions.size() + 1]; uint noptions = 0; for (QStringList::ConstIterator it = soptions.begin(); it != soptions.end(); ++it, ++noptions) -@@ -1081,9 +1140,6 @@ +@@ -1192,9 +1252,6 @@ return qerror; } @@ -328,16 +336,7 @@ return QString(); } -@@ -1121,7 +1177,7 @@ - QString mountPoint = isInFstab(medium); - if (!mountPoint.isNull()) - { -- kdDebug() << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl; -+ kdDebug(1219) << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl; - KIO::Job *job = KIO::unmount( medium->mountPoint(), false ); - connect(job, SIGNAL( result (KIO::Job *)), - SLOT( slotResult( KIO::Job *))); -@@ -1134,7 +1190,7 @@ +@@ -1255,7 +1312,7 @@ const char *options[2]; const char *udi = medium->id().latin1(); @@ -346,7 +345,7 @@ dbus_error_init(&error); DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -@@ -1147,7 +1203,7 @@ +@@ -1268,7 +1325,7 @@ if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, "org.freedesktop.Hal.Device.Volume", "Unmount"))) { @@ -355,7 +354,7 @@ return i18n("Internal Error"); } -@@ -1157,7 +1213,7 @@ +@@ -1278,7 +1335,7 @@ if (!dbus_message_append_args (dmesg, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, 0, DBUS_TYPE_INVALID)) { @@ -364,16 +363,16 @@ dbus_message_unref (dmesg); return i18n("Internal Error"); } -@@ -1165,7 +1221,7 @@ - dbus_error_init (&error); - if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) +@@ -1288,7 +1345,7 @@ { + QString qerror, reason; + - kdDebug() << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl; + kdDebug(1219) << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl; - QString qerror = error.message; - if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.Busy")) { - qerror = QString("<qt>") + i18n("Device is Busy:"); -@@ -1201,13 +1257,10 @@ + qerror = "<qt>"; + qerror += i18n("Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and " + "currently mounted at <b>%4</b> could not be unmounted. ").arg( +@@ -1318,13 +1375,10 @@ return qerror; } diff --git a/x11/kde4-runtime/files/extrapatch-kioslave_media_mediamanager-halbackend.h b/x11/kde4-runtime/files/extrapatch-kioslave_media_mediamanager-halbackend.h index df548eb39905..21672b565977 100644 --- a/x11/kde4-runtime/files/extrapatch-kioslave_media_mediamanager-halbackend.h +++ b/x11/kde4-runtime/files/extrapatch-kioslave_media_mediamanager-halbackend.h @@ -1,5 +1,5 @@ ---- kioslave/media/mediamanager/halbackend.h.orig Sun Jan 28 23:58:13 2007 -+++ kioslave/media/mediamanager/halbackend.h Thu Feb 1 02:51:48 2007 +--- kioslave/media/mediamanager/halbackend.h.orig Mon Jan 15 12:31:32 2007 ++++ kioslave/media/mediamanager/halbackend.h Wed Feb 21 15:01:12 2007 @@ -34,6 +34,9 @@ #include <qobject.h> #include <qstringlist.h> @@ -10,7 +10,7 @@ #include <config.h> -@@ -154,6 +157,9 @@ +@@ -156,6 +159,9 @@ private slots: void slotResult(KIO::Job *job); @@ -20,10 +20,10 @@ /* Hal call-backs -- from gvm*/ public: -@@ -217,6 +223,10 @@ - DBusConnection *dbus_connection; +@@ -233,6 +239,10 @@ + }; - QMap<KIO::Job *, QString> mount_jobs; + QMap<KIO::Job *, struct mount_job_data*> mount_jobs; +#ifdef Q_OS_FREEBSD + QTimer m_pollTimer; + QPtrList<Medium> m_pollMediaList; diff --git a/x11/kde4-runtime/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp b/x11/kde4-runtime/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp index 508019a14f3c..7d0fbfa81767 100644 --- a/x11/kde4-runtime/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp +++ b/x11/kde4-runtime/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp @@ -1,6 +1,6 @@ ---- kioslave/media/mounthelper/kio_media_mounthelper.cpp.orig Sat Jan 27 01:58:24 2007 -+++ kioslave/media/mounthelper/kio_media_mounthelper.cpp Sat Jan 27 02:35:28 2007 -@@ -77,7 +77,9 @@ +--- kioslave/media/mounthelper/kio_media_mounthelper.cpp.orig Mon Jan 15 12:31:31 2007 ++++ kioslave/media/mounthelper/kio_media_mounthelper.cpp Wed Feb 21 15:17:23 2007 +@@ -89,7 +89,9 @@ m_isCdrom = medium.mimeType().find("dvd")!=-1 || medium.mimeType().find("cd")!=-1; @@ -11,7 +11,7 @@ { DCOPRef mediamanager("kded", "mediamanager"); DCOPReply reply = mediamanager.call( "unmount", medium.id()); -@@ -85,13 +87,14 @@ +@@ -97,30 +99,14 @@ reply.get(m_errorStr); kdDebug() << "medium unmount " << m_errorStr << endl; if (m_errorStr.isNull()) @@ -26,6 +26,23 @@ - } - else if (args->isSet("s") || args->isSet("e")) - { +- /* +- * We want to call mediamanager unmount before invoking eject. That's +- * because unmount would provide an informative error message in case of +- * failure. However, there are cases when unmount would fail +- * (supermount, slackware, see bug#116209) but eject would succeed. +- * Thus if unmount fails, save unmount error message and invokeEject() +- * anyway. Only if both unmount and eject fail, notify the user by +- * displaying the saved error message (see ejectFinished()). +- */ +- if (medium.isMounted()) +- { +- DCOPRef mediamanager("kded", "mediamanager"); +- DCOPReply reply = mediamanager.call( "unmount", medium.id()); +- if (reply.isValid()) +- reply.get(m_errorStr); +- m_device = device; +- } - invokeEject(device, true); } else diff --git a/x11/kde4-runtime/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kde4-runtime/files/patch-kdm-kfrontend-genkdmconf.c deleted file mode 100644 index e0179de4e074..000000000000 --- a/x11/kde4-runtime/files/patch-kdm-kfrontend-genkdmconf.c +++ /dev/null @@ -1,11 +0,0 @@ ---- kdm/kfrontend/genkdmconf.c.orig Mon Jun 5 14:34:06 2006 -+++ kdm/kfrontend/genkdmconf.c Mon Jun 5 14:35:52 2006 -@@ -1684,7 +1684,7 @@ - linkfile( ce ); - else { - tmpf = locate( "mktemp" ) ? -- "`mktemp`" : -+ "`mktemp /tmp/xsess-env-XXXXXX`" : - locate( "tempfile" ) ? - "`tempfile`" : - "$HOME/.xsession-env-$DISPLAY"; diff --git a/x11/kde4-runtime/files/patch-kwin-client.cpp b/x11/kde4-runtime/files/patch-kwin-client.cpp deleted file mode 100644 index d8e0f91db691..000000000000 --- a/x11/kde4-runtime/files/patch-kwin-client.cpp +++ /dev/null @@ -1,39 +0,0 @@ ---- kwin/client.cpp.orig Mon Oct 2 03:02:07 2006 -+++ kwin/client.cpp Mon Jan 8 10:54:19 2007 -@@ -477,17 +477,30 @@ - // calls it or when the decoration is created/destroyed - - if( Shape::version() >= 0x11 ) // 1.1, has input shape support -- { // there appears to be no way to find out if a window has input -- // shape set or not, so always set propagate the input shape -- // (it's the same like the bounding shape by default) -- XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, 0, 0, -+ { // There appears to be no way to find out if a window has input -+ // shape set or not, so always propagate the input shape -+ // (it's the same like the bounding shape by default). -+ // Also, build the shape using a helper window, not directly -+ // in the frame window, because the sequence set-shape-to-frame, -+ // remove-shape-of-client, add-input-shape-of-client has the problem -+ // that after the second step there's a hole in the input shape -+ // until the real shape of the client is added and that can make -+ // the window lose focus (which is a problem with mouse focus policies) -+ static Window helper_window = None; -+ if( helper_window == None ) -+ helper_window = XCreateSimpleWindow( qt_xdisplay(), qt_xrootwin(), -+ 0, 0, 1, 1, 0, 0, 0 ); -+ XResizeWindow( qt_xdisplay(), helper_window, width(), height()); -+ XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput, 0, 0, - frameId(), ShapeBounding, ShapeSet ); -- XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, -+ XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput, - clientPos().x(), clientPos().y(), - window(), ShapeBounding, ShapeSubtract ); -- XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, -+ XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput, - clientPos().x(), clientPos().y(), - window(), ShapeInput, ShapeUnion ); -+ XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, 0, 0, -+ helper_window, ShapeInput, ShapeSet ); - } - } - diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist index 46ca7f96cbe8..bd60a8fa6ce8 100644 --- a/x11/kde4-runtime/pkg-plist +++ b/x11/kde4-runtime/pkg-plist @@ -440,6 +440,9 @@ lib/kde3/kicker.so lib/kde3/kickermenu_find.a lib/kde3/kickermenu_find.la lib/kde3/kickermenu_find.so +lib/kde3/kickermenu_kate.a +lib/kde3/kickermenu_kate.la +lib/kde3/kickermenu_kate.so lib/kde3/kickermenu_kdeprint.a lib/kde3/kickermenu_kdeprint.la lib/kde3/kickermenu_kdeprint.so @@ -1158,6 +1161,7 @@ share/apps/kappfinder/apps/Internet/mozilla.desktop share/apps/kappfinder/apps/Internet/netscape.desktop share/apps/kappfinder/apps/Internet/netscape6.desktop share/apps/kappfinder/apps/Internet/opera.desktop +share/apps/kappfinder/apps/Internet/wireshark.desktop share/apps/kappfinder/apps/Internet/xbiff.desktop share/apps/kappfinder/apps/Internet/xchat.desktop share/apps/kappfinder/apps/Internet/xfmail.desktop @@ -1628,6 +1632,7 @@ share/apps/kicker/icons/locolor/16x16/actions/modified.png share/apps/kicker/menuext/find.desktop share/apps/kicker/menuext/find/kfind.desktop share/apps/kicker/menuext/find/websearch.desktop +share/apps/kicker/menuext/katesessionmenu.desktop share/apps/kicker/menuext/konquerormenu.desktop share/apps/kicker/menuext/konsolemenu.desktop share/apps/kicker/menuext/prefmenu.desktop @@ -2081,7 +2086,7 @@ share/desktop-directories/kde-edutainment.directory share/desktop-directories/kde-games-arcade.directory share/desktop-directories/kde-games-board.directory share/desktop-directories/kde-games-card.directory -share/desktop-directories/kde-games-kidsgames.directory +share/desktop-directories/kde-games-kids.directory share/desktop-directories/kde-games-roguelikes.directory share/desktop-directories/kde-games-strategy.directory share/desktop-directories/kde-games.directory @@ -2420,6 +2425,7 @@ share/doc/HTML/en/khelpcenter/userguide/common share/doc/HTML/en/khelpcenter/userguide/control-center.docbook share/doc/HTML/en/khelpcenter/userguide/creating-graphics.docbook share/doc/HTML/en/khelpcenter/userguide/credits-and-license.docbook +share/doc/HTML/en/khelpcenter/userguide/customizing-desktop.docbook share/doc/HTML/en/khelpcenter/userguide/desktop.png share/doc/HTML/en/khelpcenter/userguide/email.docbook share/doc/HTML/en/khelpcenter/userguide/extragear-applications.docbook @@ -2480,6 +2486,7 @@ share/doc/HTML/en/khelpcenter/userguide/ripsettings.png share/doc/HTML/en/khelpcenter/userguide/screen-captures.docbook share/doc/HTML/en/khelpcenter/userguide/services.png share/doc/HTML/en/khelpcenter/userguide/shared-sessions.docbook +share/doc/HTML/en/khelpcenter/userguide/splash-screen.png share/doc/HTML/en/khelpcenter/userguide/standard-menu-entries.docbook share/doc/HTML/en/khelpcenter/userguide/switching-sessions.docbook share/doc/HTML/en/khelpcenter/userguide/the-filemanager.docbook @@ -2492,7 +2499,6 @@ share/doc/HTML/en/khelpcenter/userguide/where-next.docbook share/doc/HTML/en/khelpcenter/userguide/windows-how-to.docbook share/doc/HTML/en/khelpcenter/userguide/your-kde-account.docbook share/doc/HTML/en/khelpcenter/visualdict/common -share/doc/HTML/en/khelpcenter/visualdict/contextmenu.png share/doc/HTML/en/khelpcenter/visualdict/index.cache.bz2 share/doc/HTML/en/khelpcenter/visualdict/index.docbook share/doc/HTML/en/khelpcenter/visualdict/pict1.png @@ -2508,6 +2514,9 @@ share/doc/HTML/en/khelpcenter/visualdict/pict18.png share/doc/HTML/en/khelpcenter/visualdict/pict19.png share/doc/HTML/en/khelpcenter/visualdict/pict2.png share/doc/HTML/en/khelpcenter/visualdict/pict20.png +share/doc/HTML/en/khelpcenter/visualdict/pict21.png +share/doc/HTML/en/khelpcenter/visualdict/pict22.png +share/doc/HTML/en/khelpcenter/visualdict/pict23.png share/doc/HTML/en/khelpcenter/visualdict/pict3.png share/doc/HTML/en/khelpcenter/visualdict/pict4.png share/doc/HTML/en/khelpcenter/visualdict/pict5.png @@ -2649,6 +2658,7 @@ share/doc/HTML/en/knetattach/common share/doc/HTML/en/knetattach/index.cache.bz2 share/doc/HTML/en/knetattach/index.docbook share/doc/HTML/en/knetattach/screenshot.png +share/doc/HTML/en/knetattach/screenshot1.png share/doc/HTML/en/knetattach/screenshot2.png share/doc/HTML/en/knetattach/screenshot3.png share/doc/HTML/en/knetattach/screenshot4.png @@ -2742,7 +2752,6 @@ share/icons/crystalsvg/128x128/apps/licq.png share/icons/crystalsvg/128x128/apps/linuxconf.png share/icons/crystalsvg/128x128/apps/locale.png share/icons/crystalsvg/128x128/apps/looknfeel.png -share/icons/crystalsvg/128x128/apps/mozilla.png share/icons/crystalsvg/128x128/apps/multimedia.png share/icons/crystalsvg/128x128/apps/netscape.png share/icons/crystalsvg/128x128/apps/package.png @@ -2808,7 +2817,6 @@ share/icons/crystalsvg/16x16/apps/enhanced_browsing.png share/icons/crystalsvg/16x16/apps/evolution.png share/icons/crystalsvg/16x16/apps/fifteenpieces.png share/icons/crystalsvg/16x16/apps/filetypes.png -share/icons/crystalsvg/16x16/apps/firefox.png share/icons/crystalsvg/16x16/apps/fonts.png share/icons/crystalsvg/16x16/apps/gabber.png share/icons/crystalsvg/16x16/apps/gaim.png @@ -2862,9 +2870,6 @@ share/icons/crystalsvg/16x16/apps/looknfeel.png share/icons/crystalsvg/16x16/apps/lyx.png share/icons/crystalsvg/16x16/apps/mac.png share/icons/crystalsvg/16x16/apps/mathematica.png -share/icons/crystalsvg/16x16/apps/mozilla.png -share/icons/crystalsvg/16x16/apps/mozilla_m.png -share/icons/crystalsvg/16x16/apps/mozilla_mail.png share/icons/crystalsvg/16x16/apps/multimedia.png share/icons/crystalsvg/16x16/apps/nedit.png share/icons/crystalsvg/16x16/apps/netscape.png @@ -2911,7 +2916,6 @@ share/icons/crystalsvg/16x16/apps/stylesheet.png share/icons/crystalsvg/16x16/apps/systemtray.png share/icons/crystalsvg/16x16/apps/taskbar.png share/icons/crystalsvg/16x16/apps/terminal.png -share/icons/crystalsvg/16x16/apps/thunderbird.png share/icons/crystalsvg/16x16/apps/tux.png share/icons/crystalsvg/16x16/apps/usb.png share/icons/crystalsvg/16x16/apps/vnc.png @@ -3016,7 +3020,6 @@ share/icons/crystalsvg/32x32/apps/error.png share/icons/crystalsvg/32x32/apps/evolution.png share/icons/crystalsvg/32x32/apps/fifteenpieces.png share/icons/crystalsvg/32x32/apps/filetypes.png -share/icons/crystalsvg/32x32/apps/firefox.png share/icons/crystalsvg/32x32/apps/fonts.png share/icons/crystalsvg/32x32/apps/gabber.png share/icons/crystalsvg/32x32/apps/gaim.png @@ -3071,9 +3074,6 @@ share/icons/crystalsvg/32x32/apps/looknfeel.png share/icons/crystalsvg/32x32/apps/lyx.png share/icons/crystalsvg/32x32/apps/mac.png share/icons/crystalsvg/32x32/apps/mathematica.png -share/icons/crystalsvg/32x32/apps/mozilla.png -share/icons/crystalsvg/32x32/apps/mozilla_m.png -share/icons/crystalsvg/32x32/apps/mozilla_mail.png share/icons/crystalsvg/32x32/apps/multimedia.png share/icons/crystalsvg/32x32/apps/nedit.png share/icons/crystalsvg/32x32/apps/netscape.png @@ -3118,7 +3118,6 @@ share/icons/crystalsvg/32x32/apps/stylesheet.png share/icons/crystalsvg/32x32/apps/systemtray.png share/icons/crystalsvg/32x32/apps/taskbar.png share/icons/crystalsvg/32x32/apps/terminal.png -share/icons/crystalsvg/32x32/apps/thunderbird.png share/icons/crystalsvg/32x32/apps/tux.png share/icons/crystalsvg/32x32/apps/usb.png share/icons/crystalsvg/32x32/apps/vnc.png @@ -3177,7 +3176,6 @@ share/icons/crystalsvg/48x48/apps/enhanced_browsing.png share/icons/crystalsvg/48x48/apps/evolution.png share/icons/crystalsvg/48x48/apps/fifteenpieces.png share/icons/crystalsvg/48x48/apps/filetypes.png -share/icons/crystalsvg/48x48/apps/firefox.png share/icons/crystalsvg/48x48/apps/fonts.png share/icons/crystalsvg/48x48/apps/gabber.png share/icons/crystalsvg/48x48/apps/gaim.png @@ -3226,9 +3224,6 @@ share/icons/crystalsvg/48x48/apps/licq.png share/icons/crystalsvg/48x48/apps/linuxconf.png share/icons/crystalsvg/48x48/apps/locale.png share/icons/crystalsvg/48x48/apps/looknfeel.png -share/icons/crystalsvg/48x48/apps/mozilla.png -share/icons/crystalsvg/48x48/apps/mozilla_m.png -share/icons/crystalsvg/48x48/apps/mozilla_mail.png share/icons/crystalsvg/48x48/apps/multimedia.png share/icons/crystalsvg/48x48/apps/nedit.png share/icons/crystalsvg/48x48/apps/netscape.png @@ -3330,7 +3325,6 @@ share/icons/crystalsvg/64x64/apps/licq.png share/icons/crystalsvg/64x64/apps/linuxconf.png share/icons/crystalsvg/64x64/apps/locale.png share/icons/crystalsvg/64x64/apps/looknfeel.png -share/icons/crystalsvg/64x64/apps/mozilla.png share/icons/crystalsvg/64x64/apps/multimedia.png share/icons/crystalsvg/64x64/apps/nedit.png share/icons/crystalsvg/64x64/apps/netscape.png diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 53cec9a18b5f..b4baad2d68d0 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 4 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -42,7 +41,7 @@ PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp @@ -52,7 +51,7 @@ CONFIGURE_ARGS+=--without-java \ --with-ssl-dir=${OPENSSLBASE} OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ - HAL "Use HAL backend for media:/ (FreeBSD 5+ only)" off \ + HAL "Use HAL backend for media:/ (FreeBSD 5+ only)" on \ HTDIG "Depend on htdig, used to build manual indices" off .include "${.CURDIR}/../../x11/kde3/Makefile.kde" @@ -70,7 +69,7 @@ RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper RUN_DEPENDS+= htdig:${PORTSDIR}/textproc/htdig .endif -.if defined(WITH_HAL) && ${OSVERSION} > 500035 +.if !defined(WITHOUT_HAL) && ${OSVERSION} > 500035 EXTRA_PATCHES= ${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.cpp \ ${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.h \ ${FILESDIR}/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp @@ -79,12 +78,9 @@ LIB_DEPENDS+= dbus-qt-1.1:${PORTSDIR}/devel/dbus-qt3 \ PLIST_SUB+= MEDIA="" .else CONFIGURE_ARGS+=--without-hal -EXTRA_PATCHES= ${FILESDIR}/extrapatch-kio_media \ - ${FILESDIR}/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp PLIST_SUB+= MEDIA="@comment " .endif - post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo index 6f53a73368ff..9051c799c5c2 100644 --- a/x11/kde4-workspace/distinfo +++ b/x11/kde4-workspace/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.5.tar.bz2) = 0c685af1cbca75f9c77b3ed231ba0468 -SHA256 (KDE/kdebase-3.5.5.tar.bz2) = f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0 -SIZE (KDE/kdebase-3.5.5.tar.bz2) = 23851886 +MD5 (KDE/kdebase-3.5.6.tar.bz2) = a53f589f58012e655a52220a6a151019 +SHA256 (KDE/kdebase-3.5.6.tar.bz2) = 245b35f8b2e1533f9ae92b3b07bee5339a716dfb8db363d0126d2e7409b7bd7e +SIZE (KDE/kdebase-3.5.6.tar.bz2) = 24155599 diff --git a/x11/kde4-workspace/files/extrapatch-kio_media b/x11/kde4-workspace/files/extrapatch-kio_media deleted file mode 100644 index ab1a03b094cb..000000000000 --- a/x11/kde4-workspace/files/extrapatch-kio_media +++ /dev/null @@ -1,5814 +0,0 @@ -diff -urN kioslave/media/Makefile.in kioslave/media/Makefile.in ---- kioslave/media/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/Makefile.in Fri May 26 09:54:31 2006 -@@ -122,8 +122,7 @@ - DATA = $(kde_services_DATA) - ETAGS = etags - CTAGS = ctags --DIST_SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ -- kfile-plugin kcmodule mimetypes services propsdlgplugin -+DIST_SUBDIRS = $(SUBDIRS) - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 1 - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -276,6 +275,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -@@ -611,9 +611,8 @@ - xdg_appsdir = @xdg_appsdir@ - xdg_directorydir = @xdg_directorydir@ - xdg_menudir = @xdg_menudir@ --@include_media_halbackend_TRUE@PROPSDLGPLUGINDIR = propsdlgplugin - SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ -- kfile-plugin kcmodule mimetypes services $(PROPSDLGPLUGINDIR) -+ kfile-plugin kcmodule mimetypes services - - INCLUDES = -I$(srcdir)/libmediacommon $(all_includes) - #>- METASOURCES = AUTO -@@ -1092,8 +1091,7 @@ - ./testmedia - - messages: rc.cpp -- $(EXTRACTRC) propsdlgplugin/propertiespagegui.ui >> rc.cpp -- $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp propsdlgplugin/*.cpp -o $(podir)/kio_media.pot -+ $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp -o $(podir)/kio_media.pot - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -diff -urN kioslave/media/kcmodule/Makefile.in kioslave/media/kcmodule/Makefile.in ---- kioslave/media/kcmodule/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/kcmodule/Makefile.in Fri May 26 09:54:31 2006 -@@ -253,6 +253,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/kcmodule/managermodule.cpp kioslave/media/kcmodule/managermodule.cpp ---- kioslave/media/kcmodule/managermodule.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/managermodule.cpp Sun Nov 20 20:14:21 2005 -@@ -39,15 +39,15 @@ - QString hal_text = view->kcfg_HalBackendEnabled->text(); - hal_text += " ("+i18n("No support for HAL on this system")+")"; - view->kcfg_HalBackendEnabled->setText( hal_text ); --#endif - view->kcfg_HalBackendEnabled->setEnabled( false ); -+#endif - - #ifndef COMPILE_LINUXCDPOLLING - QString poll_text = view->kcfg_CdPollingEnabled->text(); - poll_text += " ("+i18n("No support for CD polling on this system")+")"; - view->kcfg_CdPollingEnabled->setText( poll_text ); --#endif - view->kcfg_CdPollingEnabled->setEnabled( false ); -+#endif - - load(); - } -diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.desktop ---- kioslave/media/kcmodule/media.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/kcmodule/media.desktop Mon May 22 20:12:42 2006 -@@ -24,7 +24,6 @@ - Name[es]=Dispositivos de almacenamiento - Name[et]=Andmekandjad - Name[eu]=Biltegiratze-euskarria --Name[fa]=رسانه ذخیرهگاه - Name[fi]=Tallennusmedia - Name[fr]=Support de stockage - Name[fy]=Opslachapparaten -@@ -33,7 +32,7 @@ - Name[he]=התקנים - Name[hi]=भंडार मीडिया - Name[hr]=Mediji za pohranjivanje --Name[hu]=Tárolóeszközök -+Name[hu]=Tárolóeszköz - Name[is]=Geymslumiðlar - Name[it]=Dispositivi di archiviazione - Name[ja]=記憶メディア -@@ -43,7 +42,7 @@ - Name[mk]=Медиуми за податоци - Name[ms]=Media Storan - Name[nb]=Lagringsenheter --Name[nds]=Spiekermedien -+Name[nds]=Spiekerreedschappen - Name[nl]=Opslagapparaten - Name[nn]=Lagringsmedium - Name[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ -@@ -54,7 +53,6 @@ - Name[ru]=Устройства хранения данных - Name[rw]=Uburyo bwo Kubika - Name[se]=Vurkenmedia --Name[sk]=Zálohovacie médiá - Name[sl]=Nosilci za shranjevanje - Name[sr]=Складишни медијуми - Name[sr@Latn]=Skladišni medijumi -@@ -82,13 +80,11 @@ - Comment[es]=Configuración de las medios de almacenamiento - Comment[et]=Salvestusandmekandjate seadistused - Comment[eu]=Konfiguratu biltegiratze-euskarria --Comment[fa]=پیکربندی رسانه ذخیرهگاه - Comment[fi]=Aseta tallennusmedia - Comment[fr]=Configurer le média de stockage - Comment[fy]=Opslachmedia ynstelle - Comment[ga]=Cumraigh Meáin Stórála - Comment[gl]=Configurar Medios de Armacenaxe --Comment[he]=שינוי הגדרות מדיות אחסון - Comment[hr]=Konfiguriranje medija za pohranu - Comment[hu]=A tárolóeszközök beállítása - Comment[is]=Stillingar geymslumiðla -@@ -98,16 +94,15 @@ - Comment[lt]=Konfigūruoti saugojimo įrenginius - Comment[mk]=Конфигурирајте ги медиумите за податоци - Comment[nb]=Sett opp lagringsmedier --Comment[nds]=Spiekermedien instellen -+Comment[nds]=Spiekerreedschappen instellen - Comment[nl]=Opslagmedia instellen - Comment[nn]=Set opp lagringsmedium - Comment[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ ਸੰਰਚਨਾ - Comment[pl]=Konfiguracja nośników danych --Comment[pt]=Configurar os Suportes de Armazenamento -+Comment[pt]=Configurar os Meios de Armazenamento - Comment[pt_BR]=Configura as mídias de armazenamento - Comment[ru]=Настройка подключаемых устройств хранения - Comment[se]=Heivet vurkenmediaid --Comment[sk]=Nastavenie zálohovacích médií - Comment[sl]=Nastavitve nosilcev za shranjevanje - Comment[sr]=Подешавање медијума за складиштење - Comment[sr@Latn]=Podešavanje medijuma za skladištenje -@@ -132,13 +127,11 @@ - Keywords[es]=almacenamiento,medios,usb,cdrom,dispositivo - Keywords[et]=salvestamine,andmekandja,usb,cd,seade - Keywords[eu]=biltegiratzea,euskarriak,usb,cdrom,gailua --Keywords[fa]=ذخیره گاه، رسانه، گذرگاه سریال جهانی، دیسک فشرده، دستگاه - Keywords[fi]=varasto,media,usb,cdrom,laite - Keywords[fr]=stockage,media,medium,usb,cdrom,périphérique - Keywords[fy]=storage,opslach,media,usb,cd-rom,kompakt-skiif,device,apparaat,mp3-speler,usb-stick,geheugenkaart - Keywords[ga]=stóráil,stóras,meáin,meán,usb,cdrom,dlúthdhiosca,gléas - Keywords[gl]=armacenaxe,medios,usb,cdrom,dispositivo --Keywords[he]=storage,media,usb,cdrom,device,מדיה,התקן,סידירום,תקליטור - Keywords[hr]=storage,media,usb,cdrom,device,pohrana,snimanje,mediji,uređaj - Keywords[hu]=tároló,adathordozó,USB,CD-ROM,eszköz - Keywords[is]=geymsla,miðill,usb,cdrom,tæki -@@ -153,7 +146,7 @@ - Keywords[nn]=lagring,media,usb,CD-spiller,CD-ROM,einingar,minnepinnar,harddiskar,HD,eksterne harddiskar,zip-diskar - Keywords[pa]=ਸਟੋਰੇਜ਼,ਮੀਡਿਆ,ਜੰਤਰ,usb,cdrom - Keywords[pl]=dane,przechowywanie danych,nośnik danych,nośniki danych,usb,cdrom,urządzenie --Keywords[pt]=armazenamento,meio,suporte,usb,cdrom,dispositivo -+Keywords[pt]=armazenamento,meio,usb,cdrom,dispositivo - Keywords[pt_BR]=armazenamento,mídia,usb,cd-rom,device,dispositivo - Keywords[ru]=storage,media,usb,cdrom,device,устройство хранения - Keywords[sl]=shranjevanje,nosilec,usb,cdrom,naprava -diff -urN kioslave/media/kcmodule/notifiermodule.cpp kioslave/media/kcmodule/notifiermodule.cpp ---- kioslave/media/kcmodule/notifiermodule.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/notifiermodule.cpp Mon May 22 20:12:42 2006 -@@ -174,8 +174,8 @@ - ActionListBoxItem *action_item - = static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem()); - -- NotifierServiceAction * action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); -- if ( action ) -+ NotifierServiceAction * action; -+ if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() ) ) ) - { - ServiceConfigDialog dialog(action, m_settings.supportedMimetypes(), this); - -@@ -195,8 +195,7 @@ - = static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem()); - - NotifierServiceAction *action; -- action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); -- if ( action ) -+ if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() )) ) - { - m_settings.deleteAction( action ); - updateListBox(); -diff -urN kioslave/media/kfile-plugin/Makefile.in kioslave/media/kfile-plugin/Makefile.in ---- kioslave/media/kfile-plugin/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/kfile-plugin/Makefile.in Fri May 26 09:54:31 2006 -@@ -248,6 +248,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/kfile-plugin/kfile_media.desktop kioslave/media/kfile-plugin/kfile_media.desktop ---- kioslave/media/kfile-plugin/kfile_media.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/kfile-plugin/kfile_media.desktop Mon May 22 20:12:42 2006 -@@ -16,7 +16,6 @@ - Name[es]=Información de recursos - Name[et]=Andmekandja info - Name[eu]=Media informazioa --Name[fa]=اطلاعات رسانه - Name[fi]=Tallenteiden tiedot - Name[fr]=Informations sur le média - Name[fy]=Mediumynformaasje -@@ -47,7 +46,6 @@ - Name[ru]=Сведения о носителе - Name[rw]=Amakuru y'igitangazamakuru - Name[se]=Mediumdieđut --Name[sk]=Informácie o médiu - Name[sl]=Informacije o mediju - Name[sr]=Информације о медијуму - Name[sr@Latn]=Informacije o medijumu -@@ -63,4 +61,4 @@ - Name[zh_TW]=媒體資訊 - ServiceTypes=KFilePlugin - X-KDE-Library=kfile_media --MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera;media/camera_mounted;media/camera_unmounted -+MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera -diff -urN kioslave/media/kfile-plugin/kfilemediaplugin.cpp kioslave/media/kfile-plugin/kfilemediaplugin.cpp ---- kioslave/media/kfile-plugin/kfilemediaplugin.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/kfile-plugin/kfilemediaplugin.cpp Tue Nov 8 23:36:07 2005 -@@ -64,16 +64,12 @@ - addMimeType( "media/floppy_unmounted" ); - addMimeType( "media/zip_unmounted" ); - addMimeType( "media/gphoto2camera" ); -- addMimeType( "media/camera_mounted" ); -- addMimeType( "media/camera_unmounted" ); - } - - bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/) - { -- const Medium medium = askMedium(info); -+ const Medium medium = askMedium(info); - -- kdDebug() << "KFileMediaPlugin::readInfo " << medium.id() << endl; -- - if (medium.id().isNull()) return false; - - QString mount_point = medium.mountPoint(); -@@ -165,8 +161,7 @@ - const Medium KFileMediaPlugin::askMedium(KFileMetaInfo &info) - { - DCOPRef mediamanager("kded", "mediamanager"); -- kdDebug() << "properties " << info.url() << endl; -- DCOPReply reply = mediamanager.call( "properties", info.url().url() ); -+ DCOPReply reply = mediamanager.call( "properties", info.url().fileName() ); - - if ( !reply.isValid() ) - { -diff -urN kioslave/media/libmediacommon/Makefile.in kioslave/media/libmediacommon/Makefile.in ---- kioslave/media/libmediacommon/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/libmediacommon/Makefile.in Fri May 26 09:54:31 2006 -@@ -250,6 +250,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/libmediacommon/medium.cpp kioslave/media/libmediacommon/medium.cpp ---- kioslave/media/libmediacommon/medium.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/libmediacommon/medium.cpp Mon Oct 10 17:04:00 2005 -@@ -40,8 +40,6 @@ - m_properties+= QString::null; /* ICON_NAME */ - - loadUserLabel(); -- -- m_halmounted = false; - } - - Medium::Medium() -@@ -59,8 +57,6 @@ - m_properties+= QString::null; /* BASE_URL */ - m_properties+= QString::null; /* MIME_TYPE */ - m_properties+= QString::null; /* ICON_NAME */ -- -- m_halmounted = false; - } - - const Medium Medium::create(const QStringList &properties) -@@ -163,7 +159,7 @@ - bool Medium::mountableState(bool mounted) - { - if ( m_properties[DEVICE_NODE].isEmpty() -- || ( mounted && m_properties[MOUNT_POINT].isEmpty() ) ) -+ || m_properties[MOUNT_POINT].isEmpty() ) - { - return false; - } -@@ -208,10 +204,14 @@ - - KURL Medium::prettyBaseURL() const - { -- if ( !baseURL().isEmpty() ) -- return baseURL(); -- -+ if ( isMountable() ) -+ { - return KURL( mountPoint() ); -+ } -+ else -+ { -+ return KURL( baseURL() ); -+ } - } - - QString Medium::prettyLabel() const -diff -urN kioslave/media/libmediacommon/medium.h kioslave/media/libmediacommon/medium.h ---- kioslave/media/libmediacommon/medium.h Sat Jul 22 10:15:42 2006 -+++ kioslave/media/libmediacommon/medium.h Mon Oct 10 17:04:00 2005 -@@ -22,7 +22,6 @@ - #include <qstring.h> - #include <qstringlist.h> - #include <kurl.h> --#include <qmap.h> - - class Medium - { -@@ -79,32 +78,14 @@ - - void setMimeType(const QString &mimeType); - void setIconName(const QString &iconName); -- void setHalMounted(bool flag) const { m_halmounted = flag; } -- bool halMounted() const { return m_halmounted; } - - private: - Medium(); - void loadUserLabel(); - - QStringList m_properties; -- mutable bool m_halmounted; -- -+ - friend class QValueListNode<const Medium>; - }; -- --namespace MediaManagerUtils { -- static inline QMap<QString,QString> splitOptions(const QStringList & options) -- { -- QMap<QString,QString> valids; -- -- for (QStringList::ConstIterator it = options.begin(); it != options.end(); ++it) -- { -- QString key = (*it).left((*it).find('=')); -- QString value = (*it).mid((*it).find('=') + 1); -- valids[key] = value; -- } -- return valids; -- } --} - - #endif -diff -urN kioslave/media/mediaimpl.cpp kioslave/media/mediaimpl.cpp ---- kioslave/media/mediaimpl.cpp Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediaimpl.cpp Mon Oct 10 17:04:01 2005 -@@ -226,8 +226,6 @@ - - mp_mounting = &medium; - -- -- /* - KIO::Job* job = KIO::mount(false, 0, - medium.deviceNode(), - medium.mountPoint()); -@@ -236,7 +234,6 @@ - this, SLOT( slotMountResult( KIO::Job * ) ) ); - connect( job, SIGNAL( warning( KIO::Job *, const QString & ) ), - this, SLOT( slotWarning( KIO::Job *, const QString & ) ) ); -- */ - kapp->dcopClient() - ->connectDCOPSignal("kded", "mediamanager", - "mediumChanged(QString, bool)", -@@ -244,17 +241,7 @@ - "slotMediumChanged(QString)", - false); - -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "mount", medium.id()); -- if (reply.isValid()) -- reply.get(m_lastErrorMessage); -- else -- m_lastErrorMessage = i18n("Internal Error"); -- if (!m_lastErrorMessage.isEmpty()) -- m_lastErrorCode = KIO::ERR_SLAVE_DEFINED; -- else { -- qApp->eventLoop()->enterLoop(); -- } -+ qApp->eventLoop()->enterLoop(); - - mp_mounting = 0L; - -diff -urN kioslave/media/mediamanager/Makefile.in kioslave/media/mediamanager/Makefile.in ---- kioslave/media/mediamanager/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/mediamanager/Makefile.in Fri May 26 09:54:31 2006 -@@ -284,6 +284,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/mediamanager/fstabbackend.cpp kioslave/media/mediamanager/fstabbackend.cpp ---- kioslave/media/mediamanager/fstabbackend.cpp Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/fstabbackend.cpp Mon May 22 20:12:42 2006 -@@ -37,9 +37,6 @@ - #endif - - #include <klocale.h> --#include <kio/job.h> --#include <kio/netaccess.h> --#include <kdebug.h> - #include <kdirwatch.h> - #include <kurl.h> - #include <kmountpoint.h> -@@ -97,26 +94,6 @@ - KDirWatch::self()->removeFile(MTAB); - } - --QString FstabBackend::mount( const QString &_udi ) --{ -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- return i18n("No such medium: %1").arg(_udi); -- KIO::Job* job = KIO::mount( false, 0, medium->deviceNode(), medium->mountPoint()); -- KIO::NetAccess::synchronousRun( job, 0 ); -- return QString::null; --} -- --QString FstabBackend::unmount( const QString &_udi ) --{ -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- return i18n("No such medium: %1").arg(_udi); -- KIO::Job* job = KIO::unmount( medium->mountPoint(), false); -- KIO::NetAccess::synchronousRun( job, 0 ); -- return QString::null; --} -- - void FstabBackend::slotDirty(const QString &path) - { - if (path==MTAB) -@@ -134,7 +111,6 @@ - if ( mount->mountType() == "swap" - || mount->mountType() == "tmpfs" - || mount->mountType() == "sysfs" -- || mount->mountType() == "fdescfs" - || mount->mountType() == "kernfs" - || mount->mountType() == "usbfs" - || mount->mountType().contains( "proc" ) -@@ -147,7 +123,6 @@ - || mount->mountPoint() == "/dev/swap" - || mount->mountPoint() == "/dev/pts" - || mount->mountPoint().find("/proc") == 0 -- || mount->mountPoint().find("/sys") == 0 - - // We might want to display only network shares - // since HAL doesn't handle them -@@ -169,7 +144,7 @@ - - void FstabBackend::handleMtabChange(bool allowNotification) - { -- QStringList new_mtabIds; -+ QStringList new_mtabIds, new_mtabEntries; - KMountPoint::List mtab = KMountPoint::currentMountPoints(); - - KMountPoint::List::iterator it = mtab.begin(); -@@ -187,19 +162,18 @@ - nothing has changed, do not stat the mount point. Avoids - hang if network shares are stalling */ - QString mtabEntry = dev + "*" + mp + "*" + fs; -- if(m_mtabEntries.contains(mtabEntry)) { -- new_mtabIds += m_mtabEntries[mtabEntry]; -- continue; -- } -+ bool isOldEntry = m_mtabEntries.contains(mtabEntry); -+ new_mtabEntries+=mtabEntry; -+ if (isOldEntry) continue; - - QString id = generateId(dev, mp); - new_mtabIds+=id; -- m_mtabEntries[mtabEntry] = id; - - if ( !m_mtabIds.contains(id) && m_fstabIds.contains(id) ) - { - QString mime, icon, label; - guess(dev, mp, fs, true, mime, icon, label); -+ - m_mediaList.changeMediumState(id, true, false, - mime, icon, label); - } -@@ -237,10 +211,6 @@ - QString mp = medium->mountPoint(); - QString fs = medium->fsType(); - -- -- QString mtabEntry = dev + "*" + mp + "*" + fs; -- m_mtabEntries.remove(mtabEntry); -- - QString mime, icon, label; - guess(dev, mp, fs, false, mime, icon, label); - -@@ -256,6 +226,7 @@ - } - - m_mtabIds = new_mtabIds; -+ m_mtabEntries = new_mtabEntries; - } - - void FstabBackend::handleFstabChange(bool allowNotification) -diff -urN kioslave/media/mediamanager/fstabbackend.h kioslave/media/mediamanager/fstabbackend.h ---- kioslave/media/mediamanager/fstabbackend.h Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/fstabbackend.h Mon May 22 20:12:42 2006 -@@ -23,7 +23,6 @@ - - #include <qobject.h> - #include <qstringlist.h> --#include <qmap.h> - - #ifdef Q_OS_FREEBSD - #include <qtimer.h> -@@ -41,10 +40,6 @@ - const QString &fsType, bool mounted, - QString &mimeType, QString &iconName, - QString &label); -- -- QString mount(const QString &id); -- QString unmount(const QString &id); -- - private slots: - void slotDirty(const QString &path); - void handleFstabChange(bool allowNotification = true); -@@ -58,7 +53,7 @@ - - bool m_networkSharesOnly; - QStringList m_mtabIds; -- QMap<QString, QString> m_mtabEntries; -+ QStringList m_mtabEntries; - QStringList m_fstabIds; - #ifdef Q_OS_FREEBSD - QTimer m_mtabTimer; -diff -urN kioslave/media/mediamanager/halbackend.cpp kioslave/media/mediamanager/halbackend.cpp ---- kioslave/media/mediamanager/halbackend.cpp Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/halbackend.cpp Thu Jan 19 18:00:58 2006 -@@ -21,16 +21,9 @@ - - #include <stdlib.h> - --#include <qfile.h> - #include <klocale.h> - #include <kurl.h> - #include <kdebug.h> --#include <kprocess.h> --#include <kconfig.h> --#include <qstylesheet.h> --#include <kmountpoint.h> --#include <kmessagebox.h> --#include <kio/job.h> - - #define MOUNT_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mounted") : QString("_unmounted")) - #define MOUNT_ICON_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mount") : QString("_unmount")) -@@ -39,1177 +32,615 @@ - static HALBackend* s_HALBackend; - - /* A macro function to convert HAL string properties to QString */ --QString libhal_device_get_property_QString(LibHalContext *ctx, const char* udi, const char *key) -+QString hal_device_get_property_QString(LibHalContext *ctx, const char* udi, const char *key) - { -- char* _ppt_string; -- QString _ppt_QString; -- _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL); -- _ppt_QString = QString(_ppt_string ? _ppt_string : ""); -- libhal_free_string(_ppt_string); -- return _ppt_QString; -+ char* _ppt_string; -+ QString _ppt_QString; -+ _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL); -+ _ppt_QString = QString(_ppt_string ? _ppt_string : ""); -+ libhal_free_string(_ppt_string); -+ return _ppt_QString; - } - - /* Constructor */ - HALBackend::HALBackend(MediaList &list, QObject* parent) -- : QObject() -- , BackendBase(list) -- , m_halContext(NULL) -- , m_halStoragePolicy(NULL) -- , m_parent(parent) -+ : QObject() -+ , BackendBase(list) -+ , m_halContext(NULL) -+ , m_halStoragePolicy(NULL) -+ , m_parent(parent) - { -- s_HALBackend = this; -+ s_HALBackend = this; - } - - /* Destructor */ - HALBackend::~HALBackend() - { -- /* Close HAL connection */ -- if (m_halContext) -- { -- const QPtrList<Medium> medlist = m_mediaList.list(); -- QPtrListIterator<Medium> it (medlist); -- for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) -- unmount(current_medium->id()); -- -- -- /* Remove all the registered media first */ -- int numDevices; -- char** halDeviceList = libhal_get_all_devices( m_halContext, &numDevices, NULL ); -- -- if ( halDeviceList ) -- { -- for ( int i = 0; i < numDevices; i++ ) -- { -- m_mediaList.removeMedium( halDeviceList[i], false ); -- } -- } -- -- libhal_free_string_array( halDeviceList ); -- -- DBusError error; -- dbus_error_init(&error); -- libhal_ctx_shutdown(m_halContext, &error); -- libhal_ctx_free(m_halContext); -- } -- -- if (m_halStoragePolicy) -- libhal_storage_policy_free(m_halStoragePolicy); -+ /* Close HAL connection */ -+ if (m_halContext) -+ { -+ /* Remove all the registered media first */ -+ int numDevices; -+ char** halDeviceList = libhal_get_all_devices( m_halContext, &numDevices, NULL ); -+ -+ if ( halDeviceList ) -+ { -+ for ( int i = 0; i < numDevices; i++ ) -+ { -+ m_mediaList.removeMedium( halDeviceList[i], false ); -+ } -+ } -+ -+ #ifdef HAL_0_4 -+ hal_shutdown(m_halContext); -+ #else -+ libhal_ctx_shutdown(m_halContext, NULL); -+ libhal_ctx_free(m_halContext); -+ #endif -+ } -+ -+ if (m_halStoragePolicy) -+ libhal_storage_policy_free(m_halStoragePolicy); - } - - /* Connect to the HAL */ - bool HALBackend::InitHal() - { -- kdDebug(1219) << "Context new" << endl; -- m_halContext = libhal_ctx_new(); -- if (!m_halContext) -- { -- kdDebug(1219) << "Failed to initialize HAL!" << endl; -- return false; -- } -- -- // Main loop integration -- kdDebug(1219) << "Main loop integration" << endl; -- DBusError error; -- dbus_error_init(&error); -- dbus_connection = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error); -- -- if (!dbus_connection || dbus_error_is_set(&error)) { -- dbus_error_free(&error); -- libhal_ctx_free(m_halContext); -- m_halContext = NULL; -- return false; -- } -- -- dbus_bus_register(dbus_connection, &error); -- -- if (dbus_error_is_set(&error)) { -- dbus_error_free(&error); -- libhal_ctx_free(m_halContext); -- m_halContext = NULL; -- return false; -- } -- MainLoopIntegration(dbus_connection); -- libhal_ctx_set_dbus_connection(m_halContext, dbus_connection); -- -- // HAL callback functions -- kdDebug(1219) << "Callback functions" << endl; -- libhal_ctx_set_device_added(m_halContext, HALBackend::hal_device_added); -- libhal_ctx_set_device_removed(m_halContext, HALBackend::hal_device_removed); -- libhal_ctx_set_device_new_capability (m_halContext, NULL); -- libhal_ctx_set_device_lost_capability (m_halContext, NULL); -- libhal_ctx_set_device_property_modified (m_halContext, HALBackend::hal_device_property_modified); -- libhal_ctx_set_device_condition(m_halContext, HALBackend::hal_device_condition); -- -- kdDebug(1219) << "Context Init" << endl; -- if (!libhal_ctx_init(m_halContext, &error)) -- { -- if (dbus_error_is_set(&error)) -- dbus_error_free(&error); -- libhal_ctx_free(m_halContext); -- m_halContext = NULL; -- kdDebug(1219) << "Failed to init HAL context!" << endl; -- return false; -- } -- -- /** @todo customize watch policy */ -- kdDebug(1219) << "Watch properties" << endl; -- if (!libhal_device_property_watch_all(m_halContext, &error)) -- { -- kdDebug(1219) << "Failed to watch HAL properties!" << endl; -- return false; -- } -- -- /* libhal-storage initialization */ -- kdDebug(1219) << "Storage Policy" << endl; -- m_halStoragePolicy = libhal_storage_policy_new(); -- /** @todo define libhal-storage icon policy */ -+#ifdef HAL_0_4 /* HAL API 0.4 */ -+ /* libhal initialization */ -+ m_halFunctions.main_loop_integration = HALBackend::hal_main_loop_integration; -+ m_halFunctions.device_added = HALBackend::hal_device_added; -+ m_halFunctions.device_removed = HALBackend::hal_device_removed; -+ m_halFunctions.device_new_capability = NULL; -+ m_halFunctions.device_lost_capability = NULL; -+ m_halFunctions.device_property_modified = HALBackend::hal_device_property_modified; -+ m_halFunctions.device_condition = HALBackend::hal_device_condition; -+ -+ m_halContext = hal_initialize(&m_halFunctions, false); -+ if (!m_halContext) -+ { -+ kdDebug(1219) << "Failed to initialize HAL!" << endl; -+ return false; -+ } -+ -+ /** @todo customize watch policy */ -+ kdDebug(1219) << "Watch properties" << endl; -+ if (libhal_device_property_watch_all(m_halContext, NULL)) -+ { -+ kdDebug(1219) << "Failed to watch HAL properties!" << endl; -+ return false; -+ } -+#else /* HAL API >= 0.5 */ -+ kdDebug(1219) << "Context new" << endl; -+ m_halContext = libhal_ctx_new(); -+ if (!m_halContext) -+ { -+ kdDebug(1219) << "Failed to initialize HAL!" << endl; -+ return false; -+ } -+ -+ // Main loop integration -+ kdDebug(1219) << "Main loop integration" << endl; -+ DBusError error; -+ dbus_error_init(&error); -+ DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -+ if (dbus_error_is_set(&error)) { -+ dbus_error_free(&error); -+ libhal_ctx_free(m_halContext); -+ m_halContext = NULL; -+ return false; -+ } -+ MainLoopIntegration(dbus_connection); -+ libhal_ctx_set_dbus_connection(m_halContext, dbus_connection); -+ -+ // HAL callback functions -+ kdDebug(1219) << "Callback functions" << endl; -+ libhal_ctx_set_device_added(m_halContext, HALBackend::hal_device_added); -+ libhal_ctx_set_device_removed(m_halContext, HALBackend::hal_device_removed); -+ libhal_ctx_set_device_new_capability (m_halContext, NULL); -+ libhal_ctx_set_device_lost_capability (m_halContext, NULL); -+ libhal_ctx_set_device_property_modified (m_halContext, HALBackend::hal_device_property_modified); -+ libhal_ctx_set_device_condition(m_halContext, HALBackend::hal_device_condition); - -- /* List devices at startup */ -- return ListDevices(); -+ kdDebug(1219) << "Context Init" << endl; -+ if (!libhal_ctx_init(m_halContext, &error)) -+ { -+ if (dbus_error_is_set(&error)) -+ dbus_error_free(&error); -+ libhal_ctx_free(m_halContext); -+ m_halContext = NULL; -+ kdDebug(1219) << "Failed to init HAL context!" << endl; -+ return false; -+ } -+ -+ /** @todo customize watch policy */ -+ kdDebug(1219) << "Watch properties" << endl; -+ if (!libhal_device_property_watch_all(m_halContext, &error)) -+ { -+ kdDebug(1219) << "Failed to watch HAL properties!" << endl; -+ return false; -+ } -+#endif -+ -+ /* libhal-storage initialization */ -+ kdDebug(1219) << "Storage Policy" << endl; -+ m_halStoragePolicy = libhal_storage_policy_new(); -+ /** @todo define libhal-storage icon policy */ -+ -+ /* List devices at startup */ -+ return ListDevices(); - } - - /* List devices (at startup)*/ - bool HALBackend::ListDevices() - { -- kdDebug(1219) << "ListDevices" << endl; -+ kdDebug(1219) << "ListDevices" << endl; - -- int numDevices; -- char** halDeviceList = libhal_get_all_devices(m_halContext, &numDevices, NULL); -+ int numDevices; -+ char** halDeviceList = libhal_get_all_devices(m_halContext, &numDevices, NULL); - -- if (!halDeviceList) -- return false; -+ if (!halDeviceList) -+ return false; - -- kdDebug(1219) << "HALBackend::ListDevices : " << numDevices << " devices found" << endl; -- for (int i = 0; i < numDevices; i++) -- AddDevice(halDeviceList[i], false); -+ kdDebug(1219) << "HALBackend::ListDevices : " << numDevices << " devices found" << endl; -+ for (int i = 0; i < numDevices; i++) -+ AddDevice(halDeviceList[i], false); - -- libhal_free_string_array( halDeviceList ); -- -- return true; -+ return true; - } - - /* Create a media instance for the HAL device "udi". -- This functions checks whether the device is worth listing */ -+This functions checks whether the device is worth listing */ - void HALBackend::AddDevice(const char *udi, bool allowNotification) - { -- /* We don't deal with devices that do not expose their capabilities. -- If we don't check this, we will get a lot of warning messages from libhal */ -- if (!libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -- return; -- -- /* If the device is already listed, do not process. -- This should not happen, but who knows... */ -- /** @todo : refresh properties instead ? */ -- if (m_mediaList.findById(udi)) -- return; -- -- if (libhal_device_get_property_bool(m_halContext, "/org/freedesktop/Hal/devices/computer", "storage.disable_volume_handling", NULL)) -- allowNotification=false; -- -- /* Add volume block devices */ -- if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -- { -- /* We only list volume that have a filesystem or volume that have an audio track*/ -- if ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem" && -- !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio", NULL) && -- !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL) ) -- return; -- -- if ( ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") == "filesystem" && -- !libhal_device_get_property_bool(m_halContext, udi, "volume.is_mounted", NULL ) ) && -- ( libhal_device_get_property_bool(m_halContext, udi, "volume.ignore", NULL ) ) ) -- return; -- -- /* Query drive udi */ -- QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -- /* We don't list floppy volumes because we list floppy drives */ -- if ((libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "floppy") || -- (libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "zip") || -- (libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "jaz")) -- return; -- -- // if the device is locked do not act upon it -- if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "info.locked", NULL)) -- allowNotification=false; -- -- // if the device is locked do not act upon it -- if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "storage.partition_table_changed", NULL)) -- allowNotification=false; -- -- /** @todo check exclusion list **/ -- -- /* Create medium */ -- Medium* medium = new Medium(udi, ""); -- -- QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi)); -- kdDebug() << "automount " << options["automount"] << endl; -- if (options["automount"] == "true" && allowNotification ) { -- QString error = mount(medium); -- if (!error.isEmpty()) -- kdDebug() << "error " << error << endl; -- } -- setVolumeProperties(medium); -- m_mediaList.addMedium(medium, allowNotification); -- -- return; -- } -- -- /* Floppy & zip drives */ -- if (libhal_device_query_capability(m_halContext, udi, "storage", NULL)) -- if ((libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") || -- (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") || -- (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "jaz")) -- { -- /* Create medium */ -- Medium* medium = new Medium(udi, ""); -- setFloppyProperties(medium); -- m_mediaList.addMedium(medium, allowNotification); -- return; -- } -- -- /* Camera handled by gphoto2*/ -- if (libhal_device_query_capability(m_halContext, udi, "camera", NULL) && -- ((libhal_device_get_property_QString(m_halContext, udi, "camera.access_method")=="ptp") || -- -- (libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2.support", NULL) && -- libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2.support", NULL))) -- ) -- { -- /* Create medium */ -- Medium* medium = new Medium(udi, ""); -- setCameraProperties(medium); -- m_mediaList.addMedium(medium, allowNotification); -- return; -- } -+ /* We don't deal with devices that do not expose their capabilities. -+ If we don't check this, we will get a lot of warning messages from libhal */ -+ if (!libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -+ return; -+ -+ /* If the device is already listed, do not process. -+ This should not happen, but who knows... */ -+ /** @todo : refresh properties instead ? */ -+ if (m_mediaList.findById(udi)) -+ return; -+ -+ /* Add volume block devices */ -+ if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -+ { -+ /* We only list volume that have a filesystem or volume that have an audio track*/ -+ if ( (hal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem") && -+ (!libhal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio", NULL)) && -+ (!libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL)) ) -+ return; -+ /* Query drive udi */ -+ QString driveUdi = hal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -+ /* We don't list floppy volumes because we list floppy drives */ -+ if ((hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "floppy") || -+ (hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "zip") || -+ (hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "jaz")) -+ return; -+ -+ /** @todo check exclusion list **/ -+ -+ /* Create medium */ -+ Medium* medium = new Medium(udi, ""); -+ setVolumeProperties(medium); -+ m_mediaList.addMedium(medium, allowNotification); -+ -+ return; -+ } -+ -+ /* Floppy & zip drives */ -+ if (libhal_device_query_capability(m_halContext, udi, "storage", NULL)) -+ if ((hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") || -+ (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") || -+ (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "jaz")) -+ { -+ /* Create medium */ -+ Medium* medium = new Medium(udi, ""); -+ setFloppyProperties(medium); -+ m_mediaList.addMedium(medium, allowNotification); -+ return; -+ } -+ -+ /* Camera handled by gphoto2*/ -+ if (libhal_device_query_capability(m_halContext, udi, "camera", NULL) && -+#ifdef HAL_0_4 -+ libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2_support", NULL) && -+ libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2_support", NULL) -+#else -+ ((hal_device_get_property_QString(m_halContext, udi, "camera.access_method")=="ptp") || -+ -+ (libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2.support", NULL) && -+ libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2.support", NULL))) -+#endif -+ ) -+ { -+ /* Create medium */ -+ Medium* medium = new Medium(udi, ""); -+ setCameraProperties(medium); -+ m_mediaList.addMedium(medium, allowNotification); -+ return; -+ } - } - - void HALBackend::RemoveDevice(const char *udi) - { -- m_mediaList.removeMedium(udi, true); -+ m_mediaList.removeMedium(udi, true); - } - - void HALBackend::ModifyDevice(const char *udi, const char* key) - { -- Q_UNUSED(key); -- const char* mediumUdi = findMediumUdiFromUdi(udi); -- if (!mediumUdi) -- return; -- ResetProperties(mediumUdi); -+ Q_UNUSED(key); -+ const char* mediumUdi = findMediumUdiFromUdi(udi); -+ if (!mediumUdi) -+ return; -+ ResetProperties(mediumUdi); - } - - void HALBackend::DeviceCondition(const char* udi, const char* condition) - { -- QString conditionName = QString(condition); -- kdDebug(1219) << "Processing device condition " << conditionName << " for " << udi << endl; -- -- if (conditionName == "EjectPressed") { -- const Medium* medium = m_mediaList.findById(udi); -- if (!medium) { -- /* the ejectpressed appears on the drive and we need to find the volume */ -- const QPtrList<Medium> medlist = m_mediaList.list(); -- QPtrListIterator<Medium> it (medlist); -- for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) -- { -- QString driveUdi = libhal_device_get_property_QString(m_halContext, current_medium->id().latin1(), "block.storage_device"); -- if (driveUdi == udi) -- { -- medium = current_medium; -- break; -- } -- } -- } -- if (medium) { -- KProcess p; -- p << "kio_media_mounthelper" << "-e" << medium->name(); -- p.start(KProcess::DontCare); -- } -- } -- -- const char* mediumUdi = findMediumUdiFromUdi(udi); -- kdDebug() << "findMedumUdiFromUdi " << udi << " returned " << mediumUdi << endl; -- if (!mediumUdi) -- return; -- -- /* TODO: Warn the user that (s)he should unmount devices before unplugging */ -- if (conditionName == "VolumeUnmountForced") -- ResetProperties(mediumUdi); -- -- /* Reset properties after mounting */ -- if (conditionName == "VolumeMount") -- ResetProperties(mediumUdi); -- -- /* Reset properties after unmounting */ -- if (conditionName == "VolumeUnmount") -- ResetProperties(mediumUdi); -- -+ const char* mediumUdi = findMediumUdiFromUdi(udi); -+ if (!mediumUdi) -+ return; -+ -+ QString conditionName = QString(condition); -+ kdDebug(1219) << "Processing device condition " << conditionName << " for " << udi << endl; -+ -+ /* TODO: Warn the user that (s)he should unmount devices before unplugging */ -+ if (conditionName == "VolumeUnmountForced") -+ ResetProperties(mediumUdi); -+ -+ /* Reset properties after mounting */ -+ if (conditionName == "VolumeMount") -+ ResetProperties(mediumUdi); -+ -+ /* Reset properties after unmounting */ -+ if (conditionName == "VolumeUnmount") -+ ResetProperties(mediumUdi); - } - - void HALBackend::MainLoopIntegration(DBusConnection *dbusConnection) - { -- m_dBusQtConnection = new DBusQt::Connection(m_parent); -- m_dBusQtConnection->dbus_connection_setup_with_qt_main(dbusConnection); -+ m_dBusQtConnection = new DBusQt::Connection(m_parent); -+ m_dBusQtConnection->dbus_connection_setup_with_qt_main(dbusConnection); - } - - /****************************************** -- ** Properties attribution ** -- ******************************************/ -+** Properties attribution ** -+******************************************/ - - /* Return the medium udi that should be updated when recieving a call for -- device udi */ -+device udi */ - const char* HALBackend::findMediumUdiFromUdi(const char* udi) - { -- /* Easy part : this Udi is already registered as a device */ -- const Medium* medium = m_mediaList.findById(udi); -- if (medium) -- return medium->id().ascii(); -- -- /* Hard part : this is a volume whose drive is registered */ -- if (libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -- if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -- { -- QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -- return findMediumUdiFromUdi(driveUdi.ascii()); -- } -+ /* Easy part : this Udi is already registered as a device */ -+ const Medium* medium = m_mediaList.findById(udi); -+ if (medium) -+ return medium->id().ascii(); -+ -+ /* Hard part : this is a volume whose drive is registered */ -+ if (libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -+ if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -+ { -+ QString driveUdi = hal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -+ return findMediumUdiFromUdi(driveUdi.ascii()); -+ } - -- return NULL; -+ return NULL; - } - - void HALBackend::ResetProperties(const char* mediumUdi) - { -- kdDebug(1219) << "HALBackend::setProperties" << endl; -- if ( QString::fromLatin1( mediumUdi ).startsWith( "/org/kde/" ) ) -- { -- const Medium *cmedium = m_mediaList.findById(mediumUdi); -- if ( cmedium ) -- { -- Medium m( *cmedium ); -- if ( setFstabProperties( &m ) ) { -- kdDebug() << "setFstabProperties worked" << endl; -- m_mediaList.changeMediumState(m, false); -- } -- return; -- } -- } -- -- Medium* m = new Medium(mediumUdi, ""); -- -- if (libhal_device_query_capability(m_halContext, mediumUdi, "volume", NULL)) -- setVolumeProperties(m); -- if (libhal_device_query_capability(m_halContext, mediumUdi, "storage", NULL)) -- setFloppyProperties(m); -- if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) -- setCameraProperties(m); -+ kdDebug(1219) << "HALBackend::setProperties" << endl; - -- m_mediaList.changeMediumState(*m, false); -+ Medium* m = new Medium(mediumUdi, ""); -+ -+ if (libhal_device_query_capability(m_halContext, mediumUdi, "volume", NULL)) -+ setVolumeProperties(m); -+ if (libhal_device_query_capability(m_halContext, mediumUdi, "storage", NULL)) -+ setFloppyProperties(m); -+ if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) -+ setCameraProperties(m); - -- delete m; --} -+ m_mediaList.changeMediumState(*m, false); - --void HALBackend::setVolumeProperties(Medium* medium) --{ -- kdDebug(1219) << "HALBackend::setVolumeProperties for " << medium->id() << endl; -- -- const char* udi = medium->id().ascii(); -- /* Check if the device still exists */ -- if (!libhal_device_exists(m_halContext, udi, NULL)) -- return; -- -- /* Get device information from libhal-storage */ -- LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi); -- if (!halVolume) -- return; -- QString driveUdi = libhal_volume_get_storage_device_udi(halVolume); -- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, driveUdi.ascii()); -- if (!halDrive) { -- // at times HAL sends an UnmountForced event before the device is removed -- libhal_volume_free(halVolume); -- return; -- } -- -- medium->setName( -- generateName(libhal_volume_get_device_file(halVolume)) ); -- -- medium->mountableState( -- libhal_volume_get_device_file(halVolume), /* Device node */ -- libhal_volume_get_mount_point(halVolume), /* Mount point */ -- libhal_volume_get_fstype(halVolume), /* Filesystem type */ -- libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -- -- char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -- QString volume_name = QString::fromUtf8(name); -- QString media_name = volume_name; -- medium->setLabel(media_name); -- free(name); -- -- QString mimeType; -- if (libhal_volume_is_disc(halVolume)) -- { -- mimeType = "media/cdrom" + MOUNT_SUFFIX; -- -- LibHalVolumeDiscType discType = libhal_volume_get_disc_type(halVolume); -- if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_CDR) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_CDRW)) -- if (libhal_volume_disc_is_blank(halVolume)) -- { -- mimeType = "media/blankcd"; -- medium->unmountableState(""); -- } -- else -- mimeType = "media/cdwriter" + MOUNT_SUFFIX; -- -- if ((discType == LIBHAL_VOLUME_DISC_TYPE_DVDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRAM) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_DVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRW) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW) ) -- if (libhal_volume_disc_is_blank(halVolume)) -- { -- mimeType = "media/blankdvd"; -- medium->unmountableState(""); -- } -- else -- mimeType = "media/dvd" + MOUNT_SUFFIX; -- -- if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) -- { -- mimeType = "media/audiocd"; -- medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); -- } -- -- medium->setIconName(QString::null); -- -- /* check if the disc id a vcd or a video dvd */ -- DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); -- switch (type) -- { -- case DiscType::VCD: -- mimeType = "media/vcd"; -- break; -- case DiscType::SVCD: -- mimeType = "media/svcd"; -- break; -- case DiscType::DVD: -- mimeType = "media/dvdvideo"; -- break; -- } -- } -- else -- { -- mimeType = "media/hdd" + MOUNT_SUFFIX; -- if (libhal_drive_is_hotpluggable(halDrive)) -- { -- mimeType = "media/removable" + MOUNT_SUFFIX; -- medium->needMounting(); -- switch (libhal_drive_get_type(halDrive)) { -- case LIBHAL_DRIVE_TYPE_COMPACT_FLASH: -- medium->setIconName("compact_flash" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_MEMORY_STICK: -- medium->setIconName("memory_stick" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_SMART_MEDIA: -- medium->setIconName("smart_media" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_SD_MMC: -- medium->setIconName("sd_mmc" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER: -- { -- medium->setIconName("ipod" + MOUNT_ICON_SUFFIX); -- break; -- } -- case LIBHAL_DRIVE_TYPE_CAMERA: -- { -- mimeType = "media/camera" + MOUNT_SUFFIX; -- medium->setIconName("camera" + MOUNT_ICON_SUFFIX); -- const char *physdev = libhal_drive_get_physical_device_udi(halDrive); -- // get model from camera -- if (physdev && libhal_device_query_capability(m_halContext, physdev, "camera", NULL)) -- { -- if (libhal_device_property_exists(m_halContext, physdev, "usb_device.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, "usb_device.product")); -- else if (libhal_device_property_exists(m_halContext, physdev, "usb.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, "usb.product")); -- } -- break; -- } -- case LIBHAL_DRIVE_TYPE_TAPE: -- medium->setIconName(QString::null); //FIXME need icon -- break; -- default: -- medium->setIconName(QString::null); -- } -- -- if (medium->isMounted() && QFile::exists(medium->mountPoint() + "/dcim")) -- { -- mimeType = "media/camera" + MOUNT_SUFFIX; -- medium->setIconName("camera" + MOUNT_ICON_SUFFIX); -- } -- } -- } -- medium->setMimeType(mimeType); -- -- libhal_drive_free(halDrive); -- libhal_volume_free(halVolume); -+ delete m; - } - --bool HALBackend::setFstabProperties( Medium *medium ) -+void HALBackend::setVolumeProperties(Medium* medium) - { -- QString mp = isInFstab(medium); -+ kdDebug(1219) << "HALBackend::setVolumeProperties for " << medium->id() << endl; - -- if (!mp.isNull() && !medium->id().startsWith( "/org/kde" ) ) -- { -- // now that we know it's in fstab, we have to find out if it's mounted -- KMountPoint::List mtab = KMountPoint::currentMountPoints(); -- -- KMountPoint::List::iterator it = mtab.begin(); -- KMountPoint::List::iterator end = mtab.end(); -- -- bool mounted = false; -- -- for (; it!=end; ++it) -- { -- if ((*it)->mountedFrom() == medium->deviceNode() && (*it)->mountPoint() == mp ) -- { -- mounted = true; -- break; -- } -- } -- -- kdDebug() << mp << " " << mounted << " " << medium->deviceNode() << " " << endl; -- QString fstype = medium->fsType(); -- if ( fstype.isNull() ) -- fstype = "auto"; -- -- medium->mountableState( -- medium->deviceNode(), -- mp, /* Mount point */ -- fstype, /* Filesystem type */ -- mounted ); /* Mounted ? */ -+ const char* udi = medium->id().ascii(); -+ /* Check if the device still exists */ -+ if (!libhal_device_exists(m_halContext, udi, NULL)) -+ return; -+ -+ /* Get device information from libhal-storage */ -+ LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi); -+ if (!halVolume) -+ return; -+ QString driveUdi = libhal_volume_get_storage_device_udi(halVolume); -+ LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, driveUdi.ascii()); -+ -+ medium->setName( -+ generateName(libhal_volume_get_device_file(halVolume)) ); -+ -+ medium->mountableState( -+ libhal_volume_get_device_file(halVolume), /* Device node */ -+ libhal_volume_get_mount_point(halVolume), /* Mount point */ -+ libhal_volume_get_fstype(halVolume), /* Filesystem type */ -+ libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -+ -+ char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -+ QString volume_name = QString::fromUtf8(name); -+ QString media_name = volume_name; -+ medium->setLabel(media_name); -+ free(name); - -- return true; -- } -+ QString mimeType; -+ if (libhal_volume_is_disc(halVolume)) -+ { -+ mimeType = "media/cdrom" + MOUNT_SUFFIX; - -- return false; -+ LibHalVolumeDiscType discType = libhal_volume_get_disc_type(halVolume); -+ if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_CDR) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_CDRW)) -+ if (libhal_volume_disc_is_blank(halVolume)) -+ { -+ mimeType = "media/blankcd"; -+ medium->unmountableState(""); -+ } -+ else -+ mimeType = "media/cdwriter" + MOUNT_SUFFIX; -+ -+ if ((discType == LIBHAL_VOLUME_DISC_TYPE_DVDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRAM) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_DVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRW) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW) ) -+ if (libhal_volume_disc_is_blank(halVolume)) -+ { -+ mimeType = "media/blankdvd"; -+ medium->unmountableState(""); -+ } -+ else -+ mimeType = "media/dvd" + MOUNT_SUFFIX; -+ -+ if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) -+ { -+ mimeType = "media/audiocd"; -+ medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); -+ } -+ -+ medium->setIconName(QString::null); -+ -+ /* check if the disc id a vcd or a video dvd */ -+ DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); -+ switch (type) -+ { -+ case DiscType::VCD: -+ mimeType = "media/vcd"; -+ break; -+ case DiscType::SVCD: -+ mimeType = "media/svcd"; -+ break; -+ case DiscType::DVD: -+ mimeType = "media/dvdvideo"; -+ break; -+ } -+ } -+ else -+ { -+ mimeType = "media/hdd" + MOUNT_SUFFIX; -+ const char *physdev = libhal_drive_get_physical_device_udi(halDrive); -+ if (libhal_drive_is_hotpluggable(halDrive)) -+ { -+ mimeType = "media/removable" + MOUNT_SUFFIX; -+ medium->needMounting(); -+ switch (libhal_drive_get_type(halDrive)) { -+ case LIBHAL_DRIVE_TYPE_COMPACT_FLASH: -+ medium->setIconName("compact_flash" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_MEMORY_STICK: -+ medium->setIconName("memory_stick" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_SMART_MEDIA: -+ medium->setIconName("smart_media" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_SD_MMC: -+ medium->setIconName("sd_mmc" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER: -+ medium->setIconName("ipod" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_CAMERA: -+ mimeType = "media/camera" + MOUNT_SUFFIX; -+ medium->setIconName("camera" + MOUNT_ICON_SUFFIX); -+ // get model from camera -+ if (physdev && libhal_device_query_capability(m_halContext, physdev, "camera", NULL)) -+ { -+ if (libhal_device_property_exists(m_halContext, physdev, "usb_device.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, physdev, "usb_device.product")); -+ else if (libhal_device_property_exists(m_halContext, physdev, "usb.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, physdev, "usb.product")); -+ } -+ break; -+ case LIBHAL_DRIVE_TYPE_TAPE: -+ medium->setIconName(QString::null); //FIXME need icon -+ break; -+ default: -+ medium->setIconName(QString::null); -+ }; -+ }; -+ } -+ medium->setMimeType(mimeType); - -+ libhal_drive_free(halDrive); -+ libhal_volume_free(halVolume); - } - - // Handle floppies and zip drives - void HALBackend::setFloppyProperties(Medium* medium) - { -- kdDebug(1219) << "HALBackend::setFloppyProperties for " << medium->id() << endl; -+ kdDebug(1219) << "HALBackend::setFloppyProperties for " << medium->id() << endl; - -- const char* udi = medium->id().ascii(); -- /* Check if the device still exists */ -- if (!libhal_device_exists(m_halContext, udi, NULL)) -- return; -- -- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, udi); -- if (!halDrive) -- return; -- int numVolumes; -- char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); -- LibHalVolume* halVolume = NULL; -- kdDebug(1219) << " found " << numVolumes << " volumes" << endl; -- if (numVolumes) -- halVolume = libhal_volume_from_udi(m_halContext, volumes[0]); -- -- medium->setName( -- generateName(libhal_drive_get_device_file(halDrive)) ); -- -- if (halVolume) -- { -- medium->mountableState( -- libhal_volume_get_device_file(halVolume), /* Device node */ -- libhal_volume_get_mount_point(halVolume), /* Mount point */ -- libhal_volume_get_fstype(halVolume), /* Filesystem type */ -- libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -- } -- else -- { -- // HAL hates floppies - so we have to do it twice ;( -- medium->mountableState(libhal_drive_get_device_file(halDrive), QString::null, QString::null, false); -- setFstabProperties( medium ); -- } -- -- if (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") -- { -- if (medium->isMounted()) // don't use _SUFFIX here as it accesses the volume -- medium->setMimeType("media/floppy_mounted" ); -- else -- medium->setMimeType("media/floppy_unmounted"); -- } -- -- if (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") -- { -- if (medium->isMounted()) -- medium->setMimeType("media/zip_mounted" ); -- else -- medium->setMimeType("media/zip_unmounted"); -- } -- -- /** @todo And mimtype for JAZ drives ? */ -- -- medium->setIconName(QString::null); -- -- char *name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -- -- if (name) { -- medium->setLabel( QString::fromUtf8(name) ); -- free(name); -- } -- -- free(volumes); -- libhal_drive_free(halDrive); -- libhal_volume_free(halVolume); --} -+ const char* udi = medium->id().ascii(); -+ /* Check if the device still exists */ -+ if (!libhal_device_exists(m_halContext, udi, NULL)) -+ return; -+ -+ LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, udi); -+ if (!halDrive) -+ return; -+ int numVolumes; -+ char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); -+ LibHalVolume* halVolume = NULL; -+ kdDebug(1219) << " found " << numVolumes << " volumes" << endl; -+ if (numVolumes) -+ halVolume = libhal_volume_from_udi(m_halContext, volumes[0]); - --void HALBackend::setCameraProperties(Medium* medium) --{ -- kdDebug(1219) << "HALBackend::setCameraProperties for " << medium->id() << endl; -- -- const char* udi = medium->id().ascii(); -- /* Check if the device still exists */ -- if (!libhal_device_exists(m_halContext, udi, NULL)) -- return; -- -- /** @todo find name */ -- medium->setName("camera"); -- -- QString device = "camera:/"; -- -- char *cam = libhal_device_get_property_string(m_halContext, udi, "camera.libgphoto2.name", NULL); -- DBusError error; -- dbus_error_init(&error); -- if (cam && -- libhal_device_property_exists(m_halContext, udi, "usb.linux.device_number", NULL) && -- libhal_device_property_exists(m_halContext, udi, "usb.bus_number", NULL)) -- device.sprintf("camera://%s@[usb:%03d,%03d]/", cam, -- libhal_device_get_property_int(m_halContext, udi, "usb.bus_number", &error), -- libhal_device_get_property_int(m_halContext, udi, "usb.linux.device_number", &error)); -- -- libhal_free_string(cam); -- -- /** @todo find the rest of this URL */ -- medium->unmountableState(device); -- medium->setMimeType("media/gphoto2camera"); -- medium->setIconName(QString::null); -- if (libhal_device_property_exists(m_halContext, udi, "usb_device.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb_device.product")); -- else if (libhal_device_property_exists(m_halContext, udi, "usb.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb.product")); -- else -- medium->setLabel(i18n("Camera")); --} -+ medium->setName( -+ generateName(libhal_drive_get_device_file(halDrive)) ); - --QString HALBackend::generateName(const QString &devNode) --{ -- return KURL(devNode).fileName(); --} -+ if (halVolume) -+ { -+ medium->mountableState( -+ libhal_volume_get_device_file(halVolume), /* Device node */ -+ libhal_volume_get_mount_point(halVolume), /* Mount point */ -+ libhal_volume_get_fstype(halVolume), /* Filesystem type */ -+ libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -+ } -+ else -+ { -+ medium->mountableState( -+ libhal_drive_get_device_file(halDrive), /* Device node */ -+ "", /* Mount point */ -+ "", /* Filesystem type */ -+ false ); /* Mounted ? */ -+ } - --/****************************************** -- ** HAL CALL-BACKS ** -- ******************************************/ -+ if (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") -+ { -+ if (halVolume) -+ medium->setMimeType("media/floppy" + MOUNT_SUFFIX); -+ else -+ medium->setMimeType("media/floppy_unmounted"); -+ } - --void HALBackend::hal_device_added(LibHalContext *ctx, const char *udi) --{ -- kdDebug(1219) << "HALBackend::hal_device_added " << udi << endl; -- Q_UNUSED(ctx); -- s_HALBackend->AddDevice(udi); --} -+ if (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") -+ { -+ if (halVolume) -+ medium->setMimeType("media/zip" + MOUNT_SUFFIX); -+ else -+ medium->setMimeType("media/zip_unmounted"); -+ } - --void HALBackend::hal_device_removed(LibHalContext *ctx, const char *udi) --{ -- kdDebug(1219) << "HALBackend::hal_device_removed " << udi << endl; -- Q_UNUSED(ctx); -- s_HALBackend->RemoveDevice(udi); --} -+ /** @todo And mimtype for JAZ drives ? */ - --void HALBackend::hal_device_property_modified(LibHalContext *ctx, const char *udi, -- const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) --{ -- kdDebug(1219) << "HALBackend::hal_property_modified " << udi << " -- " << key << endl; -- Q_UNUSED(ctx); -- Q_UNUSED(is_removed); -- Q_UNUSED(is_added); -- s_HALBackend->ModifyDevice(udi, key); --} -+ medium->setIconName(QString::null); - --void HALBackend::hal_device_condition(LibHalContext *ctx, const char *udi, -- const char *condition_name, -- const char* message -- ) --{ -- kdDebug(1219) << "HALBackend::hal_device_condition " << udi << " -- " << condition_name << endl; -- Q_UNUSED(ctx); -- Q_UNUSED(message); -- s_HALBackend->DeviceCondition(udi, condition_name); -+ QString media_name; -+ if (halVolume) -+ { -+ char* name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -+ QString volume_name = QString::fromUtf8(name); -+ media_name = volume_name; -+ free(name); -+ } -+ else -+ { -+ char* name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -+ QString drive_name = QString::fromUtf8(name); -+ media_name = drive_name; -+ free(name); -+ } -+ medium->setLabel(media_name); -+ -+ free(volumes); -+ libhal_drive_free(halDrive); -+ libhal_volume_free(halVolume); - } - --QStringList HALBackend::mountoptions(const QString &name) -+void HALBackend::setCameraProperties(Medium* medium) - { -- const Medium* medium = m_mediaList.findById(name); -- if (medium && !isInFstab(medium).isNull()) -- return QStringList(); // not handled by HAL - fstab entry -- -- KConfig config("mediamanagerrc"); -- config.setGroup(name); -- -- char ** array = libhal_device_get_property_strlist(m_halContext, name.latin1(), "volume.mount.valid_options", NULL); -- QMap<QString,bool> valids; -- -- for (int index = 0; array && array[index]; ++index) { -- QString t = array[index]; -- if (t.endsWith("=")) -- t = t.left(t.length() - 1); -- valids[t] = true; -- kdDebug() << "valid " << t << endl; -- } -- libhal_free_string_array(array); -- QStringList result; -- QString tmp; -- -- QString fstype = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.fstype"); -- if (fstype.isNull()) -- fstype = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.policy.mount_filesystem"); -- -- -- QString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device"); -- -- bool removable = libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.removable", NULL) -- || libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.hotpluggable", NULL); -- -- config.setGroup(drive_udi); -- bool value = config.readBoolEntry("automount", false); -- config.setGroup(name); -- -- if (libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_blank", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_vcd", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_svcd", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_videodvd", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.has_audio", NULL)) -- value = false; -- -- result << QString("automount=%1").arg(value ? "true" : "false"); -- -- if (valids.contains("ro")) -- { -- value = config.readBoolEntry("ro", false); -- tmp = QString("ro=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- if (valids.contains("quiet")) -- { -- value = config.readBoolEntry("quiet", false); -- tmp = QString("quiet=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- if (valids.contains("flush")) -- { -- value = config.readBoolEntry("flush", fstype.endsWith("fat")); -- tmp = QString("flush=%1").arg(value ? "true" : "false"); -- result << tmp; -- } -- -- if (valids.contains("uid")) -- { -- value = config.readBoolEntry("uid", true); -- tmp = QString("uid=%1").arg(value ? "true" : "false"); -- result << tmp; -- } -- -- if (valids.contains("utf8")) -- { -- value = config.readBoolEntry("utf8", true); -- tmp = QString("utf8=%1").arg(value ? "true" : "false"); -- result << tmp; -- } -- -- if (valids.contains("shortname")) -- { -- QString svalue = config.readEntry("shortname", "lower").lower(); -- if (svalue == "winnt") -- result << "shortname=winnt"; -- else if (svalue == "win95") -- result << "shortname=win95"; -- else if (svalue == "mixed") -- result << "shortname=mixed"; -- else -- result << "shortname=lower"; -- } -- -- if (valids.contains("sync")) -- { -- value = config.readBoolEntry("sync", !fstype.endsWith("fat") && removable); -- tmp = QString("sync=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- if (valids.contains("noatime")) -- { -- value = config.readBoolEntry("atime", !fstype.endsWith("fat")); -- tmp = QString("atime=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- QString mount_point = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.mount_point"); -- if (mount_point.isEmpty()) -- mount_point = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.policy.desired_mount_point"); -- -- mount_point = config.readEntry("mountpoint", mount_point); -- -- if (!mount_point.startsWith("/")) -- mount_point = "/media/" + mount_point; -- -- result << QString("mountpoint=%1").arg(mount_point); -- result << QString("filesystem=%1").arg(fstype); -- -- if (valids.contains("data")) -- { -- QString svalue = config.readEntry("journaling").lower(); -- if (svalue == "ordered") -- result << "journaling=ordered"; -- else if (svalue == "writeback") -- result << "journaling=writeback"; -- else if (svalue == "data") -- result << "journaling=data"; -- else -- result << "journaling=ordered"; -- } -+ kdDebug(1219) << "HALBackend::setCameraProperties for " << medium->id() << endl; - -- return result; -+ const char* udi = medium->id().ascii(); -+ /* Check if the device still exists */ -+ if (!libhal_device_exists(m_halContext, udi, NULL)) -+ return; -+ -+ /** @todo find name */ -+ medium->setName("camera"); -+ /** @todo find the rest of this URL */ -+ medium->unmountableState("camera:/"); -+ medium->setMimeType("media/gphoto2camera"); -+ medium->setIconName(QString::null); -+ if (libhal_device_property_exists(m_halContext, udi, "usb_device.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, udi, "usb_device.product")); -+ else if (libhal_device_property_exists(m_halContext, udi, "usb.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, udi, "usb.product")); -+ else -+ medium->setLabel(i18n("Camera")); - } - --bool HALBackend::setMountoptions(const QString &name, const QStringList &options ) -+QString HALBackend::generateName(const QString &devNode) - { -- kdDebug() << "setMountoptions " << name << " " << options << endl; -- -- KConfig config("mediamanagerrc"); -- config.setGroup(name); -- -- QMap<QString,QString> valids = MediaManagerUtils::splitOptions(options); -- -- const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 }; -- for (int index = 0; names[index]; ++index) -- if (valids.contains(names[index])) -- config.writeEntry(names[index], valids[names[index]] == "true"); -- -- if (valids.contains("shortname")) -- config.writeEntry("shortname", valids["shortname"]); -- -- if (valids.contains("journaling")) -- config.writeEntry("journaling", valids["journaling"]); -- -- if (!mountoptions(name).contains(QString("mountpoint=%1").arg(valids["mountpoint"]))) -- config.writeEntry("mountpoint", valids["mountpoint"]); -- -- if (valids.contains("automount")) { -- QString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device"); -- config.setGroup(drive_udi); -- config.writeEntry("automount", valids["automount"]); -- } -- -- return true; -+ return KURL(devNode).fileName(); - } - --static QString mount_priv(const char *udi, const char *mount_point, const char **poptions, int noptions, -- DBusConnection *dbus_connection) --{ -- DBusMessage *dmesg, *reply; -- DBusError error; -- -- const char *fstype = ""; -- if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, -- "org.freedesktop.Hal.Device.Volume", -- "Mount"))) { -- kdDebug() << "mount failed for " << udi << ": could not create dbus message\n"; -- return i18n("Internal Error"); -- } -- -- if (!dbus_message_append_args (dmesg, DBUS_TYPE_STRING, &mount_point, DBUS_TYPE_STRING, &fstype, -- DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &poptions, noptions, -- DBUS_TYPE_INVALID)) -- { -- kdDebug() << "mount failed for " << udi << ": could not append args to dbus message\n"; -- dbus_message_unref (dmesg); -- return i18n("Internal Error"); -- } -- -- QString qerror; -- -- dbus_error_init (&error); -- if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) -- { -- QString qerror = error.message; -- kdError() << "mount failed for " << udi << ": " << error.name << " - " << qerror << endl; -- if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.UnknownFilesystemType")) -- qerror = i18n("Invalid filesystem type"); -- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.PermissionDenied")) -- qerror = i18n("Permissions denied"); -- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.AlreadyMounted")) -- qerror = i18n("Device is already mounted."); -- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.InvalidMountpoint") && strlen(mount_point)) { -- dbus_message_unref (dmesg); -- dbus_error_free (&error); -- return mount_priv(udi, "", poptions, noptions, dbus_connection); -- } -- dbus_message_unref (dmesg); -- dbus_error_free (&error); -- return qerror; -- } -- -- kdDebug() << "mount queued for " << udi << endl; -- -- dbus_message_unref (dmesg); -- dbus_message_unref (reply); -- -- return qerror; -+/****************************************** -+** HAL CALL-BACKS ** -+******************************************/ - -+#ifdef HAL_0_4 -+void HALBackend::hal_main_loop_integration(LibHalContext *ctx, -+ DBusConnection *dbus_connection) -+{ -+ kdDebug(1219) << "HALBackend::hal_main_loop_integration" << endl; -+ Q_UNUSED(ctx); -+ s_HALBackend->MainLoopIntegration(dbus_connection); - } -+#endif - --void HALBackend::slotResult(KIO::Job *job) -+void HALBackend::hal_device_added(LibHalContext *ctx, const char *udi) - { -- kdDebug() << "slotResult " << mount_jobs[job] << endl; -- if (job->error()) -- { -- KMessageBox::error(0, job->errorText()); -- } -- ResetProperties( mount_jobs[job].latin1() ); -- mount_jobs.remove(job); -+ kdDebug(1219) << "HALBackend::hal_device_added " << udi << endl; -+ Q_UNUSED(ctx); -+ s_HALBackend->AddDevice(udi); - } - --QString HALBackend::isInFstab(const Medium *medium) -+void HALBackend::hal_device_removed(LibHalContext *ctx, const char *udi) - { -- KMountPoint::List fstab = KMountPoint::possibleMountPoints(KMountPoint::NeedMountOptions|KMountPoint::NeedRealDeviceName); -- -- KMountPoint::List::iterator it = fstab.begin(); -- KMountPoint::List::iterator end = fstab.end(); -- -- for (; it!=end; ++it) -- { -- kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl; -- if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && (*it)->realDeviceName() == medium->deviceNode() ) ) -- { -- QStringList opts = (*it)->mountOptions(); -- if (opts.contains("user") || opts.contains("users")) -- return (*it)->mountPoint(); -- } -- } -- -- return QString::null; -+ kdDebug(1219) << "HALBackend::hal_device_removed " << udi << endl; -+ Q_UNUSED(ctx); -+ s_HALBackend->RemoveDevice(udi); - } - --QString HALBackend::mount(const Medium *medium) --{ -- if (medium->isMounted()) -- return QString(); // that was easy -- -- QString mountPoint = isInFstab(medium); -- if (!mountPoint.isNull()) -- { -- kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; -- KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint ); -- connect(job, SIGNAL( result (KIO::Job *)), -- SLOT( slotResult( KIO::Job *))); -- mount_jobs[job] = medium->id(); -- return QString(); // we won't report an error here -- } else if (medium->id().startsWith("/org/kde/") ) -- return i18n("Permissions denied"); -- -- QStringList soptions; -- -- kdDebug() << "mounting " << medium->id() << "..." << endl; -- -- QMap<QString,QString> valids = MediaManagerUtils::splitOptions(mountoptions(medium->id())); -- if (valids["flush"] == "true") -- soptions << "flush"; -- -- if (valids["uid"] == "true") -- { -- soptions << QString("uid=%1").arg(getuid()); -- } -- -- if (valids["ro"] == "true") -- soptions << "ro"; -- -- if (valids["atime"] != "true") -- soptions << "noatime"; -- -- if (valids["quiet"] == "true") -- soptions << "quiet"; -- -- if (valids["utf8"] == "true") -- soptions << "utf8"; -- -- if (valids["sync"] == "true") -- soptions << "sync"; -- -- QString mount_point = valids["mountpoint"]; -- if (mount_point.startsWith("/media/")) -- mount_point = mount_point.mid(7); -- -- if (valids.contains("shortname")) -- { -- soptions << QString("shortname=%1").arg(valids["shortname"]); -- } -- -- if (valids.contains("journaling")) -- { -- QString option = valids["journaling"]; -- if (option == "data") -- soptions << QString("data=journal"); -- else if (option == "writeback") -- soptions << QString("data=writeback"); -- else -- soptions << QString("data=ordered"); -- } -- -- const char **options = new const char*[soptions.size() + 1]; -- uint noptions = 0; -- for (QStringList::ConstIterator it = soptions.begin(); it != soptions.end(); ++it, ++noptions) -- options[noptions] = (*it).latin1(); -- options[noptions] = NULL; -- -- QString qerror = mount_priv(medium->id().latin1(), mount_point.utf8(), options, noptions, dbus_connection); -- if (!qerror.isEmpty()) { -- kdError() << "mounting " << medium->id() << " returned " << qerror << endl; -- return qerror; -- } -- -- medium->setHalMounted(true); -- ResetProperties(medium->id().latin1()); -- -- return QString(); --} -- --QString HALBackend::mount(const QString &_udi) -+void HALBackend::hal_device_property_modified(LibHalContext *ctx, const char *udi, -+ const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) - { -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- return i18n("No such medium: %1").arg(_udi); -- -- return mount(medium); -+ kdDebug(1219) << "HALBackend::hal_property_modified " << udi << " -- " << key << endl; -+ Q_UNUSED(ctx); -+ Q_UNUSED(is_removed); -+ Q_UNUSED(is_added); -+ s_HALBackend->ModifyDevice(udi, key); - } - --QString HALBackend::unmount(const QString &_udi) --{ -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- { // now we get fancy: if the udi is no volume, it _might_ be a device with only one -- // volume on it (think CDs) - so we're so nice to the caller to unmount that volume -- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, _udi.latin1()); -- if (halDrive) -- { -- int numVolumes; -- char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); -- if (numVolumes == 1) -- medium = m_mediaList.findById( volumes[0] ); -- } -- } -- -- if ( !medium ) -- return i18n("No such medium: %1").arg(_udi); -- -- if (!medium->isMounted()) -- return QString(); // that was easy -- -- QString mountPoint = isInFstab(medium); -- if (!mountPoint.isNull()) -- { -- kdDebug() << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl; -- KIO::Job *job = KIO::unmount( medium->mountPoint(), false ); -- connect(job, SIGNAL( result (KIO::Job *)), -- SLOT( slotResult( KIO::Job *))); -- mount_jobs[job] = medium->id(); -- return QString(); // we won't report an error here -- } -- -- DBusMessage *dmesg, *reply; -- DBusError error; -- const char *options[2]; -- -- const char *udi = medium->id().latin1(); -- kdDebug() << "unmounting " << udi << "..." << endl; -- -- dbus_error_init(&error); -- DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -- if (dbus_error_is_set(&error)) -- { -- dbus_error_free(&error); -- return false; -- } -- -- if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, -- "org.freedesktop.Hal.Device.Volume", -- "Unmount"))) { -- kdDebug() << "unmount failed for " << udi << ": could not create dbus message\n"; -- return i18n("Internal Error"); -- } -- -- options[0] = "force"; -- options[1] = 0; -- -- if (!dbus_message_append_args (dmesg, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, 0, -- DBUS_TYPE_INVALID)) -- { -- kdDebug() << "unmount failed for " << udi << ": could not append args to dbus message\n"; -- dbus_message_unref (dmesg); -- return i18n("Internal Error"); -- } -- -- dbus_error_init (&error); -- if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) -- { -- kdDebug() << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl; -- QString qerror = error.message; -- if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.Busy")) { -- qerror = QString("<qt>") + i18n("Device is Busy:"); -- QString cmdline = QString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint())); -- FILE *fuser = popen(cmdline.latin1(), "r"); -- uint counter = 0; -- if (fuser) { -- qerror += "<pre>"; -- QTextIStream is(fuser); -- QString tmp; -- while (!is.atEnd()) { -- tmp = is.readLine(); -- tmp = QStyleSheet::escape(tmp) + "\n"; -- -- qerror += tmp; -- if (counter++ > 20) -- { -- qerror += "..."; -- break; -- } -- } -- qerror += "</pre>"; -- (void)pclose( fuser ); -- } -- qerror += "</qt>"; -- } else if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.NotMounted")) { -- // this is faking. The error is that the device wasn't mounted by hal (but by the system) -- qerror = i18n("Permissions denied"); -- } -- -- dbus_message_unref (dmesg); -- dbus_error_free (&error); -- return qerror; -- } -- -- kdDebug() << "unmount queued for " << udi << endl; -- -- dbus_message_unref (dmesg); -- dbus_message_unref (reply); -- -- medium->setHalMounted(false); -- ResetProperties(udi); -- -- return QString(); -+void HALBackend::hal_device_condition(LibHalContext *ctx, const char *udi, -+ const char *condition_name, -+ #ifdef HAL_0_4 -+ DBusMessage *message -+ #else -+ const char* message -+ #endif -+ ) -+{ -+ kdDebug(1219) << "HALBackend::hal_device_condition " << udi << " -- " << condition_name << endl; -+ Q_UNUSED(ctx); -+ Q_UNUSED(message); -+ s_HALBackend->DeviceCondition(udi, condition_name); - } - - #include "halbackend.moc" -diff -urN kioslave/media/mediamanager/halbackend.h kioslave/media/mediamanager/halbackend.h ---- kioslave/media/mediamanager/halbackend.h Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/halbackend.h Mon Oct 10 17:04:01 2005 -@@ -45,9 +45,65 @@ - #include <libhal.h> - #include <libhal-storage.h> - --namespace KIO { -- class Job; --} -+/* The HAL API changed between 0.4 and 0.5 series. -+These defines enable backward compatibility */ -+#ifdef HAL_0_4 -+ // libhal-storage 0.4 API -+ #define LibHalStoragePolicy HalStoragePolicy -+ #define LibHalDrive HalDrive -+ #define LibHalVolume HalVolume -+ #define LibHalVolumeDiscType HalVolumeDiscType -+ #define libhal_storage_policy_free hal_storage_policy_free -+ #define libhal_storage_policy_new hal_storage_policy_new -+ #define libhal_drive_from_udi hal_drive_from_udi -+ #define libhal_drive_find_all_volumes hal_drive_find_all_volumes -+ #define libhal_drive_get_type hal_drive_get_type -+ #define libhal_drive_get_device_file hal_drive_get_device_file -+ #define libhal_drive_free hal_drive_free -+ #define libhal_drive_policy_compute_display_name hal_drive_policy_compute_display_name -+ #define libhal_drive_is_hotpluggable hal_drive_is_hotpluggable -+ #define libhal_drive_get_physical_device_udi hal_drive_get_physical_device_udi -+ #define libhal_volume_from_udi hal_volume_from_udi -+ #define libhal_volume_get_device_file hal_volume_get_device_file -+ #define libhal_volume_get_mount_point hal_volume_get_mount_point -+ #define libhal_volume_get_fstype hal_volume_get_fstype -+ #define libhal_volume_is_mounted hal_volume_is_mounted -+ #define libhal_volume_get_disc_type hal_volume_get_disc_type -+ #define libhal_volume_free hal_volume_free -+ #define libhal_volume_policy_compute_display_name hal_volume_policy_compute_display_name -+ #define libhal_volume_disc_has_data hal_volume_disc_has_data -+ #define libhal_volume_disc_has_audio hal_volume_disc_has_audio -+ #define libhal_volume_disc_is_blank hal_volume_disc_is_blank -+ #define libhal_volume_is_disc hal_volume_is_disc -+ #define libhal_volume_get_storage_device_udi hal_volume_get_storage_device_udi -+ #define LIBHAL_VOLUME_DISC_TYPE_CDROM HAL_VOLUME_DISC_TYPE_CDROM -+ #define LIBHAL_VOLUME_DISC_TYPE_CDR HAL_VOLUME_DISC_TYPE_CDR -+ #define LIBHAL_VOLUME_DISC_TYPE_CDRW HAL_VOLUME_DISC_TYPE_CDRW -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDROM HAL_VOLUME_DISC_TYPE_DVDROM -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDRAM HAL_VOLUME_DISC_TYPE_DVDRAM -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDR HAL_VOLUME_DISC_TYPE_DVDR -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDRW HAL_VOLUME_DISC_TYPE_DVDRW -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR HAL_VOLUME_DISC_TYPE_DVDPLUSR -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW HAL_VOLUME_DISC_TYPE_DVDPLUSRW -+ #define LIBHAL_DRIVE_TYPE_COMPACT_FLASH HAL_DRIVE_TYPE_COMPACT_FLASH -+ #define LIBHAL_DRIVE_TYPE_MEMORY_STICK HAL_DRIVE_TYPE_MEMORY_STICK -+ #define LIBHAL_DRIVE_TYPE_SMART_MEDIA HAL_DRIVE_TYPE_SMART_MEDIA -+ #define LIBHAL_DRIVE_TYPE_SD_MMC HAL_DRIVE_TYPE_SD_MMC -+ #define LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER HAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER -+ #define LIBHAL_DRIVE_TYPE_CAMERA HAL_DRIVE_TYPE_CAMERA -+ #define LIBHAL_DRIVE_TYPE_TAPE HAL_DRIVE_TYPE_TAPE -+ -+ // libhal 0.4 API -+ #define libhal_free_string hal_free_string -+ #define libhal_device_exists(ctx, udi, error) hal_device_exists(ctx, udi) -+ #define libhal_device_property_watch_all(ctx, error) hal_device_property_watch_all(ctx) -+ #define libhal_get_all_devices(ctx, num_devices, error) hal_get_all_devices(ctx, num_devices) -+ #define libhal_device_property_exists(ctx, udi, key, error) hal_device_property_exists(ctx, udi, key) -+ #define libhal_device_get_property_bool(ctx, udi, key, error) hal_device_get_property_bool(ctx, udi, key) -+ #define libhal_device_get_property_string(ctx, udi, key, error) hal_device_get_property_string(ctx, udi, key) -+ #define libhal_device_query_capability(ctx, udi, capability, error) hal_device_query_capability(ctx, udi, capability) -+#endif -+ - - /** - * A handy function to query a hal string -@@ -88,14 +144,6 @@ - */ - bool ListDevices(); - -- QStringList mountoptions(const QString &id); -- -- bool setMountoptions(const QString &id, const QStringList &options); -- -- QString mount(const QString &id); -- QString mount(const Medium *medium); -- QString unmount(const QString &id); -- - private: - /** - * Append a device in the media list. This function will check if the device -@@ -147,16 +195,20 @@ - - void setVolumeProperties(Medium* medium); - void setFloppyProperties(Medium* medium); -- bool setFstabProperties(Medium* medium); - void setCameraProperties(Medium* medium); - QString generateName(const QString &devNode); -- static QString isInFstab(const Medium *medium); -- --private slots: -- void slotResult(KIO::Job *job); - - /* Hal call-backs -- from gvm*/ - public: -+#ifdef HAL_0_4 -+ /** Invoked by libhal for integration with our mainloop. -+ * -+ * @param ctx LibHal context -+ * @param dbus_connection D-BUS connection to integrate -+ */ -+ static void hal_main_loop_integration(LibHalContext *ctx, DBusConnection *dbus_connection); -+#endif -+ - /** Invoked when a device is added to the Global Device List. - * - * @param ctx LibHal context -@@ -189,7 +241,11 @@ - */ - static void hal_device_condition(LibHalContext *ctx, const char *udi, - const char *condition_name, -+ #ifdef HAL_0_4 -+ DBusMessage *message -+ #else - const char* message -+ #endif - ); - - /* HAL and DBus structures */ -@@ -199,6 +255,13 @@ - */ - LibHalContext* m_halContext; - -+#ifdef HAL_0_4 -+ /** -+ * Structure defining the hal callback function for devices events -+ */ -+ LibHalFunctions m_halFunctions; -+#endif -+ - /** - * libhal-storage HAL policy, e.g. for icon names - */ -@@ -213,10 +276,6 @@ - * Object for the kded module - */ - QObject* m_parent; -- -- DBusConnection *dbus_connection; -- -- QMap<KIO::Job *, QString> mount_jobs; - }; - - #endif /* _HALBACKEND_H_ */ -diff -urN kioslave/media/mediamanager/linuxcdpolling.cpp kioslave/media/mediamanager/linuxcdpolling.cpp ---- kioslave/media/mediamanager/linuxcdpolling.cpp Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/linuxcdpolling.cpp Mon Oct 10 17:04:01 2005 -@@ -23,6 +23,7 @@ - - #include <qthread.h> - #include <qmutex.h> -+#include <qtimer.h> - #include <qfile.h> - - #include <kdebug.h> -@@ -188,7 +189,9 @@ - const QString &, bool, bool)), - this, SLOT(slotMediumStateChanged(const QString &)) ); - -- connect(&m_timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); -+ QTimer *timer = new QTimer(this); -+ connect(timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); -+ timer->start(500); - } - - LinuxCDPolling::~LinuxCDPolling() -@@ -226,7 +229,6 @@ - PollingThread *thread = new PollingThread(dev); - m_threads[id] = thread; - thread->start(); -- m_timer.start(500); - } - } - -@@ -266,7 +268,6 @@ - PollingThread *thread = new PollingThread(dev); - m_threads[id] = thread; - thread->start(); -- m_timer.start(500); - } - else if (m_threads.contains(id) && medium->isMounted()) - { -@@ -281,12 +282,6 @@ - void LinuxCDPolling::slotTimeout() - { - //kdDebug(1219) << "LinuxCDPolling::slotTimeout()" << endl; -- -- if (m_threads.isEmpty()) -- { -- m_timer.stop(); -- return; -- } - - QMap<QString, PollingThread*>::iterator it = m_threads.begin(); - QMap<QString, PollingThread*>::iterator end = m_threads.end(); -diff -urN kioslave/media/mediamanager/linuxcdpolling.h kioslave/media/mediamanager/linuxcdpolling.h ---- kioslave/media/mediamanager/linuxcdpolling.h Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/linuxcdpolling.h Mon Oct 10 17:04:01 2005 -@@ -24,7 +24,6 @@ - #include <qobject.h> - #include <qcstring.h> - #include <qmap.h> --#include <qtimer.h> - - class DiscType - { -@@ -80,7 +79,6 @@ - - QMap<QString, PollingThread*> m_threads; - QStringList m_excludeNotification; -- QTimer m_timer; - }; - - #endif -diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanager/mediamanager.cpp ---- kioslave/media/mediamanager/mediamanager.cpp Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/mediamanager.cpp Mon Oct 10 17:04:01 2005 -@@ -43,287 +43,201 @@ - MediaManager::MediaManager(const QCString &obj) - : KDEDModule(obj), m_dirNotify(m_mediaList) - { -- connect( &m_mediaList, SIGNAL(mediumAdded(const QString&, const QString&, bool)), -- SLOT(slotMediumAdded(const QString&, const QString&, bool)) ); -- connect( &m_mediaList, SIGNAL(mediumRemoved(const QString&, const QString&, bool)), -- SLOT(slotMediumRemoved(const QString&, const QString&, bool)) ); -- connect( &m_mediaList, -- SIGNAL(mediumStateChanged(const QString&, const QString&, bool, bool)), -- SLOT(slotMediumChanged(const QString&, const QString&, bool, bool)) ); -+ connect( &m_mediaList, SIGNAL(mediumAdded(const QString&, const QString&, bool)), -+ SLOT(slotMediumAdded(const QString&, const QString&, bool)) ); -+ connect( &m_mediaList, SIGNAL(mediumRemoved(const QString&, const QString&, bool)), -+ SLOT(slotMediumRemoved(const QString&, const QString&, bool)) ); -+ connect( &m_mediaList, -+ SIGNAL(mediumStateChanged(const QString&, const QString&, bool, bool)), -+ SLOT(slotMediumChanged(const QString&, const QString&, bool, bool)) ); - -- QTimer::singleShot( 10, this, SLOT( loadBackends() ) ); -+ QTimer::singleShot( 10, this, SLOT( loadBackends() ) ); - } - - MediaManager::~MediaManager() - { -- while ( !m_backends.isEmpty() ) -- { -- BackendBase *b = m_backends.first(); -- m_backends.remove( b ); -- delete b; -- } -+ while ( !m_backends.isEmpty() ) -+ { -+ BackendBase *b = m_backends.first(); -+ m_backends.remove( b ); -+ delete b; -+ } - } - - void MediaManager::loadBackends() - { - m_mediaList.blockSignals(true); - -- while ( !m_backends.isEmpty() ) -- { -- BackendBase *b = m_backends.first(); -- m_backends.remove( b ); -- delete b; -- } -- -- mp_removableBackend = 0L; -- m_halbackend = 0L; -- m_fstabbackend = 0L; -+ while ( !m_backends.isEmpty() ) -+ { -+ BackendBase *b = m_backends.first(); -+ m_backends.remove( b ); -+ delete b; -+ } -+ -+ mp_removableBackend = 0L; - - #ifdef COMPILE_HALBACKEND -- if ( MediaManagerSettings::self()->halBackendEnabled() ) -- { -- m_halbackend = new HALBackend(m_mediaList, this); -- if (m_halbackend->InitHal()) -- { -- m_backends.append( m_halbackend ); -- m_fstabbackend = new FstabBackend(m_mediaList, true); -- m_backends.append( m_fstabbackend ); -- // No need to load something else... -- m_mediaList.blockSignals(false); -- return; -- } -- else -- { -- delete m_halbackend; -- m_halbackend = 0; -- } -- } -+ if ( MediaManagerSettings::self()->halBackendEnabled() ) -+ { -+ HALBackend* hal_backend = new HALBackend(m_mediaList, this); -+ if (hal_backend->InitHal()) -+ { -+ m_backends.append( hal_backend ); -+ m_backends.append( new FstabBackend(m_mediaList, true) ); -+ // No need to load something else... -+ m_mediaList.blockSignals(false); -+ return; -+ } -+ else -+ { -+ delete hal_backend; -+ } -+ } - #endif // COMPILE_HALBACKEND - -- mp_removableBackend = new RemovableBackend(m_mediaList); -- m_backends.append( mp_removableBackend ); -+ mp_removableBackend = new RemovableBackend(m_mediaList); -+ m_backends.append( mp_removableBackend ); - - #ifdef COMPILE_LINUXCDPOLLING -- if ( MediaManagerSettings::self()->cdPollingEnabled() ) -- { -- m_backends.append( new LinuxCDPolling(m_mediaList) ); -- } -+ if ( MediaManagerSettings::self()->cdPollingEnabled() ) -+ { -+ m_backends.append( new LinuxCDPolling(m_mediaList) ); -+ } - #endif //COMPILE_LINUXCDPOLLING - -- m_fstabbackend = new FstabBackend(m_mediaList); -- m_backends.append( m_fstabbackend ); -- m_mediaList.blockSignals(false); -+ m_backends.append( new FstabBackend(m_mediaList) ); -+ m_mediaList.blockSignals(false); - } - - - QStringList MediaManager::fullList() - { -- QPtrList<Medium> list = m_mediaList.list(); -+ QPtrList<Medium> list = m_mediaList.list(); - -- QStringList result; -+ QStringList result; - -- QPtrList<Medium>::const_iterator it = list.begin(); -- QPtrList<Medium>::const_iterator end = list.end(); -- for (; it!=end; ++it) -- { -- result+= (*it)->properties(); -- result+= Medium::SEPARATOR; -- } -+ QPtrList<Medium>::const_iterator it = list.begin(); -+ QPtrList<Medium>::const_iterator end = list.end(); -+ for (; it!=end; ++it) -+ { -+ result+= (*it)->properties(); -+ result+= Medium::SEPARATOR; -+ } - -- return result; -+ return result; - } - - QStringList MediaManager::properties(const QString &name) - { -- const Medium *m = m_mediaList.findByName(name); -- -- if (!m) -- { -- KURL u(name); -- kdDebug() << "Media::prop " << name << " " << u.isValid() << endl; -- if (u.isValid()) -- { -- if (u.protocol() == "system") -- { -- QString path = u.path(); -- if (path.startsWith("/media/")) -- path = path.mid(strlen("/media/")); -- m = m_mediaList.findByName(path); -- kdDebug() << "findByName " << path << m << endl; -- } -- else if (u.protocol() == "media") -- { -- m = m_mediaList.findByName(u.filename()); -- kdDebug() << "findByName " << u.filename() << m << endl; -- } -- else if (u.protocol() == "file") -- { -- // look for the mount point -- QPtrList<Medium> list = m_mediaList.list(); -- QPtrList<Medium>::const_iterator it = list.begin(); -- QPtrList<Medium>::const_iterator end = list.end(); -- for (; it!=end; ++it) -- { -- kdDebug() << "comparing " << (*it)->mountPoint() << " " << u.path() << " " << (*it)->deviceNode() << endl; -- if ((*it)->mountPoint() == u.path() || (*it)->deviceNode() == u.path()) { -- m = *it; -- break; -- } -- } -- } -- } -- } -- -- if (m) -- return m->properties(); -- else -- return QStringList(); --} -+ const Medium *m = m_mediaList.findByName(name); - --QStringList MediaManager::mountoptions(const QString &name) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return QStringList(); -- return m_halbackend->mountoptions(name); --#else -- return QStringList(); --#endif --} -- --bool MediaManager::setMountoptions(const QString &name, const QStringList &options) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return false; -- return m_halbackend->setMountoptions(name, options); --#else -- return false; --#endif --} -- --QString MediaManager::mount(const QString &name) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return i18n("Feature only available with HAL"); -- return m_halbackend->mount(name); --#else -- if ( !m_fstabbackend ) // lying :) -- return i18n("Feature only available with HAL"); -- return m_fstabbackend->mount( name ); --#endif --} -- --QString MediaManager::unmount(const QString &name) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return i18n("Feature only available with HAL"); -- return m_halbackend->unmount(name); --#else -- if ( !m_fstabbackend ) // lying :) -- return i18n("Feature only available with HAL"); -- return m_fstabbackend->unmount( name ); --#endif -+ if (m!=0L) -+ { -+ return m->properties(); -+ } -+ else -+ { -+ return QStringList(); -+ } - } - - QString MediaManager::nameForLabel(const QString &label) - { -- const QPtrList<Medium> media = m_mediaList.list(); -+ const QPtrList<Medium> media = m_mediaList.list(); - -- QPtrList<Medium>::const_iterator it = media.begin(); -- QPtrList<Medium>::const_iterator end = media.end(); -- for (; it!=end; ++it) -- { -- const Medium *m = *it; -- -- if (m->prettyLabel()==label) -- { -- return m->name(); -- } -- } -+ QPtrList<Medium>::const_iterator it = media.begin(); -+ QPtrList<Medium>::const_iterator end = media.end(); -+ for (; it!=end; ++it) -+ { -+ const Medium *m = *it; -+ -+ if (m->prettyLabel()==label) -+ { -+ return m->name(); -+ } -+ } - -- return QString::null; -+ return QString::null; - } - - ASYNC MediaManager::setUserLabel(const QString &name, const QString &label) - { -- m_mediaList.setUserLabel(name, label); -+ m_mediaList.setUserLabel(name, label); - } - - ASYNC MediaManager::reloadBackends() - { -- MediaManagerSettings::self()->readConfig(); -- loadBackends(); -+ MediaManagerSettings::self()->readConfig(); -+ loadBackends(); - } - - bool MediaManager::removablePlug(const QString &devNode, const QString &label) - { -- if (mp_removableBackend) -- { -- return mp_removableBackend->plug(devNode, label); -- } -- return false; -+ if (mp_removableBackend) -+ { -+ return mp_removableBackend->plug(devNode, label); -+ } -+ return false; - } - - bool MediaManager::removableUnplug(const QString &devNode) - { -- if (mp_removableBackend) -- { -- return mp_removableBackend->unplug(devNode); -- } -- return false; -+ if (mp_removableBackend) -+ { -+ return mp_removableBackend->unplug(devNode); -+ } -+ return false; - } - - bool MediaManager::removableCamera(const QString &devNode) - { -- if (mp_removableBackend) -- { -- return mp_removableBackend->camera(devNode); -- } -- return false; -+ if (mp_removableBackend) -+ { -+ return mp_removableBackend->camera(devNode); -+ } -+ return false; - } - - - void MediaManager::slotMediumAdded(const QString &/*id*/, const QString &name, - bool allowNotification) - { -- kdDebug(1219) << "MediaManager::slotMediumAdded: " << name << endl; -+ kdDebug(1219) << "MediaManager::slotMediumAdded: " << name << endl; - -- KDirNotify_stub notifier("*", "*"); -- notifier.FilesAdded( KURL("media:/") ); -+ KDirNotify_stub notifier("*", "*"); -+ notifier.FilesAdded( KURL("media:/") ); - -- emit mediumAdded(name, allowNotification); -- emit mediumAdded(name); -+ emit mediumAdded(name, allowNotification); -+ emit mediumAdded(name); - } - - void MediaManager::slotMediumRemoved(const QString &/*id*/, const QString &name, - bool allowNotification) - { -- kdDebug(1219) << "MediaManager::slotMediumRemoved: " << name << endl; -+ kdDebug(1219) << "MediaManager::slotMediumRemoved: " << name << endl; - -- KDirNotify_stub notifier("*", "*"); -- notifier.FilesRemoved( KURL("media:/"+name) ); -+ KDirNotify_stub notifier("*", "*"); -+ notifier.FilesRemoved( KURL("media:/"+name) ); - -- emit mediumRemoved(name, allowNotification); -- emit mediumRemoved(name); -+ emit mediumRemoved(name, allowNotification); -+ emit mediumRemoved(name); - } - - void MediaManager::slotMediumChanged(const QString &/*id*/, const QString &name, - bool mounted, bool allowNotification) - { -- kdDebug(1219) << "MediaManager::slotMediumChanged: " << name << endl; -+ kdDebug(1219) << "MediaManager::slotMediumChanged: " << name << endl; - -- KDirNotify_stub notifier("*", "*"); -- if (!mounted) -- { -- notifier.FilesRemoved( KURL("media:/"+name) ); -- } -- notifier.FilesChanged( KURL("media:/"+name) ); -+ KDirNotify_stub notifier("*", "*"); -+ if (!mounted) -+ { -+ notifier.FilesRemoved( KURL("media:/"+name) ); -+ } -+ notifier.FilesChanged( KURL("media:/"+name) ); - -- emit mediumChanged(name, allowNotification); -- emit mediumChanged(name); -+ emit mediumChanged(name, allowNotification); -+ emit mediumChanged(name); - } - - -diff -urN kioslave/media/mediamanager/mediamanager.desktop kioslave/media/mediamanager/mediamanager.desktop ---- kioslave/media/mediamanager/mediamanager.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/mediamanager.desktop Tue May 23 13:33:34 2006 -@@ -16,13 +16,11 @@ - Name[es]=Administrador de recursos KDED - Name[et]=KDED andmekandjate haldur - Name[eu]=KDED media kudeatzailea --Name[fa]=مدیر رسانه KDED - Name[fi]=KDED-tallennusmedianhallinta - Name[fr]=Gestionnaire de médias KDED - Name[fy]=KDEDED-mediabehearder - Name[ga]=Bainisteoir Meán KDED - Name[gl]=Xestor de Meios de KDED --Name[he]=מנהל המדיה של KDED - Name[hi]=केडीईडी मीडिया प्रबंधक - Name[hr]=KDED upravitelj medija - Name[hu]=KDED médiakezelő -@@ -45,7 +43,6 @@ - Name[ru]=Управление подключаемыми устройствами - Name[rw]=Mugenga Igihuza KDED - Name[se]=KDED-mediagieđahalli --Name[sk]=KDED správca médií - Name[sl]=Upravitelj medijev KDED - Name[sr]=Менаџер медијума, KDED - Name[sr@Latn]=Menadžer medijuma, KDED -@@ -73,18 +70,16 @@ - Comment[es]=Monitoriza las actividades de los recursos y permite (des)montarlos (media:/) - Comment[et]=Hoiab silma peal andmekandjate aktiivsusel ja võimaldab neid ühendada/lahutada (media:/) - Comment[eu]=Montatzeak begiztatzen ditu (media:/) eta desmontatzen uzten du --Comment[fa]=حفظ رد فعالیتهای رسانه و اجازه سو ار(پیاده) کردن (media:/) - Comment[fi]=Pidä kirjaa tallennustapahtumista ja salli tallennusvälineen liittäminen/irrotus (devices:/) - Comment[fr]=Gardez une trace des montages et permettre le (dé)montage (media:/) - Comment[fy]=Hâld de media-aktiviteiten by en stien ta om media oan- en ôf te keppelje (media:/) - Comment[gl]=Seguimento das actividades dos meios e permite-lle (des)montar (media:/) --Comment[he]=מנטר אחר פעילויות מדיה, ומאפשר לחבר או לנתק התקנים (media:/) - Comment[hi]=मीडिया क्रियाओं की जानकारी रखे तथा (अन)माउन्ट करने दे (मीडिया:/) - Comment[hr]=Praćenje aktivnosti medija i omogućavanje pristupanja i napuštanja - Comment[hu]=Az adathordozók követése, csatlakoztatása és leválasztása (media:/) - Comment[is]=Fylgjast með breytingum á tækjum og bjóða upp á (af)tengingu (media:/) - Comment[it]=Tiene traccia delle attività dei supporti e permette di montarli o smontarli (device:/) --Comment[ja]=メディアの活動を追跡し、(media:/) をマウントしたりアンマウントします -+Comment[ja]=メディアの活動を捕捉し、マウントしたりアンマウントします。(media:/) - Comment[km]=តាមដានសកម្មភាពព័ត៌មាន និងអនុញ្ញាតឲ្យរៀបចំ (មិនរៀបចំ) (media:/) - Comment[lt]=Stebi laikmenose vykdomus veiksmus ir leidžia (iš)montuoti (media:/) - Comment[lv]=Seko datu nesēju aktivitātēm un ļauj montēt/nomontēt tos (media:/) -@@ -103,7 +98,6 @@ - Comment[ru]=Автоматическое подключение устройств (media:/) - Comment[rw]=Kugumana inzira y'ibikorwa by'ibitangazamakuru no kwemerera gushyiramo(gukuramo) (ibitangazamakuru:/) - Comment[se]=Gozit mii dáhpáhuvvá median ja diktá du gálgat ja čadnat daid (media:/) --Comment[sk]=Sledovanie pripojenia/odpojenia medií (media:/) - Comment[sl]=Nadzoruj dejanja medija in dovilo priklop/odklop (media:/) - Comment[sr]=Прати активност медијума и омогућава (де)монтирање (media:/) - Comment[sr@Latn]=Prati aktivnost medijuma i omogućava (de)montiranje (media:/) -@@ -122,4 +116,3 @@ - X-KDE-FactoryName=mediamanager - X-KDE-Kded-autoload=true - X-KDE-Kded-load-on-demand=true --X-KDE-Kded-phase=1 -diff -urN kioslave/media/mediamanager/mediamanager.h kioslave/media/mediamanager/mediamanager.h ---- kioslave/media/mediamanager/mediamanager.h Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/mediamanager.h Mon Oct 10 17:04:01 2005 -@@ -28,8 +28,6 @@ - #include "removablebackend.h" - #include "mediadirnotify.h" - --class HALBackend; --class FstabBackend; - - class MediaManager : public KDEDModule - { -@@ -42,12 +40,6 @@ - k_dcop: - QStringList fullList(); - QStringList properties(const QString &name); -- QStringList mountoptions(const QString &name); -- bool setMountoptions(const QString &name, const QStringList &options); -- -- QString mount(const QString &uid); -- QString unmount(const QString &uid); -- - QString nameForLabel(const QString &label); - ASYNC setUserLabel(const QString &name, const QString &label); - -@@ -82,9 +74,7 @@ - MediaList m_mediaList; - QValueList<BackendBase*> m_backends; - RemovableBackend *mp_removableBackend; -- HALBackend *m_halbackend; - MediaDirNotify m_dirNotify; -- FstabBackend *m_fstabbackend; - }; - - #endif -diff -urN kioslave/media/medianotifier/Makefile.in kioslave/media/medianotifier/Makefile.in ---- kioslave/media/medianotifier/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/medianotifier/Makefile.in Fri May 26 09:54:31 2006 -@@ -254,6 +254,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/medianotifier/medianotifier.cpp kioslave/media/medianotifier/medianotifier.cpp ---- kioslave/media/medianotifier/medianotifier.cpp Sun Oct 1 19:31:53 2006 -+++ kioslave/media/medianotifier/medianotifier.cpp Fri Mar 17 11:17:33 2006 -@@ -48,21 +48,13 @@ - - MediaNotifier::~MediaNotifier() - { -- disconnectDCOPSignal( "kded", "mediamanager", "mediumAdded(QString, bool)", -- "onMediumChange(QString, bool)" ); -- -- disconnectDCOPSignal( "kded", "mediamanager", "mediumChanged(QString, bool)", -- "onMediumChange(QString, bool)" ); - } - - void MediaNotifier::onMediumChange( const QString &name, bool allowNotification ) - { - kdDebug() << "MediaNotifier::onMediumChange( " << name << ", " - << allowNotification << ")" << endl; -- -- if ( !allowNotification ) -- return; -- -+ - // Update user activity timestamp, otherwise the notification dialog will be shown - // in the background due to focus stealing prevention. Entering a new media can - // be seen as a kind of user activity after all. It'd be better to update the timestamp -@@ -103,11 +95,11 @@ - { - QString mimetype = medium.mimetype(); - -- bool is_cdrom = mimetype.startsWith( "cd" ) || mimetype.startsWith( "dvd" ); -+ bool is_cdrom = mimetype.contains( "cd" ) || mimetype.contains( "dvd" ); - bool is_mounted = mimetype.endsWith( "_mounted" ); - - // We autorun only on CD/DVD or removable disks (USB, Firewire) -- if ( !( is_cdrom || is_mounted ) -+ if ( !( is_cdrom && is_mounted ) - && mimetype!="media/removable_mounted" ) - { - return false; -diff -urN kioslave/media/medianotifier/medianotifier.desktop kioslave/media/medianotifier/medianotifier.desktop ---- kioslave/media/medianotifier/medianotifier.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/medianotifier/medianotifier.desktop Mon May 22 20:12:42 2006 -@@ -18,12 +18,10 @@ - Name[es]=Demonio de notificaciones de medios - Name[et]=Andmekandjate märguannete deemon - Name[eu]=Euskarrien jakinarazpen daemon-a --Name[fa]=شبح اخطاردهنده رسانه - Name[fi]=Mediahuomautin - Name[fr]=Démon de notifications des média - Name[fy]=Medianotifikaasje-daemon - Name[gl]=Daemon Notificador de Medios --Name[he]=שירות הודעות מערכת - Name[hr]=Demon obavijesti o medijima - Name[hu]=Lemezfigyelő szolgáltatás - Name[is]=Miðils tilkynningarpúki -@@ -34,12 +32,10 @@ - Name[nb]=Medievarslingsnisse - Name[nds]=Medien-Narichtendämoon - Name[nl]=Medianotificatie-daemon --Name[nn]=Mediepåminningsnisse - Name[pl]=Usługa powiadamiania o nośnikach - Name[pt]=Servidor de Notificação de Dispositivos - Name[pt_BR]=Servidor de Notificação de Dispositivos - Name[ru]=Демон уведомлений от подключаемых устройств --Name[sk]=Notifikátor medií - Name[sl]=Demon za obveščanje o nosilcih - Name[sr]=Демон за обавештења о медијумима - Name[sr@Latn]=Demon za obaveštenja o medijumima -@@ -47,7 +43,6 @@ - Name[uk]=Даемон сповіщення про носії інформації - Name[vi]=Trình nền Thông báo Ổ lưu trữ - Name[zh_CN]=介质通知守护程序 --Name[zh_TW]=媒體通知伺服程式 - Comment=A media plugged notifier - Comment[af]='n Inpropbare media inkennissteller - Comment[bg]=Мултимедиен демон за уведомяване при поставяне/включване на ново мултимедийно устройство -@@ -61,7 +56,6 @@ - Comment[es]=Un notificador de medios empotrable - Comment[et]=Andmekandja ühendamisest märkuandev deemon - Comment[eu]=Euskarri konektatze jakinarazlea --Comment[fa]=یک اخطاردهنده وصلشده رسانه - Comment[fi]=Liitetyn median huomautin - Comment[fr]=Notification de connexion de média - Comment[fy]=Meidieling fan oankeppele media -@@ -70,7 +64,7 @@ - Comment[hu]=Lemezérzékelő - Comment[is]=Tilkynnari um tengda miðla - Comment[it]=Notifiche dei dispositivi attaccati --Comment[ja]=メディアの接続を通知します -+Comment[ja]=メディアの接続を通知する - Comment[lt]=Perspėjimo apie media prijungimą priedas - Comment[mk]=Известување за приклучен медиум - Comment[nb]=En medievarsler som programtillegg -@@ -82,7 +76,6 @@ - Comment[pt]=Um notificador ligado aos dispositivos - Comment[pt_BR]=um notificador para mídia que é espetada (plug) - Comment[ru]=Система обработки уведомлений от подключаемых устройств --Comment[sk]=Notifikátor pripojených médií - Comment[sl]=Obveščanje o vstavljenih/priklopljenih nosilcih - Comment[sr]=Обавештавач о укљученим медијима - Comment[sr@Latn]=Obaveštavač o uključenim medijima -diff -urN kioslave/media/medianotifier/notificationdialog.cpp kioslave/media/medianotifier/notificationdialog.cpp ---- kioslave/media/medianotifier/notificationdialog.cpp Sat Oct 7 16:23:12 2006 -+++ kioslave/media/medianotifier/notificationdialog.cpp Mon Oct 10 17:04:00 2005 -@@ -26,7 +26,6 @@ - #include <klistbox.h> - #include <qlabel.h> - #include <qcheckbox.h> --#include <qpushbutton.h> - - #include "actionlistboxitem.h" - #include "notificationdialogview.h" -@@ -71,8 +70,6 @@ - this, SLOT( delayedDestruct() ) ); - - m_actionWatcher->startScan(); -- QPushButton * btn = actionButton( Ok ); -- btn->setFocus(); - } - - NotificationDialog::~NotificationDialog() -diff -urN kioslave/media/mimetypes/Makefile.in kioslave/media/mimetypes/Makefile.in ---- kioslave/media/mimetypes/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/mimetypes/Makefile.in Fri May 26 09:54:31 2006 -@@ -211,6 +211,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/mimetypes/audiocd.desktop kioslave/media/mimetypes/audiocd.desktop ---- kioslave/media/mimetypes/audiocd.desktop Mon Oct 2 12:44:33 2006 -+++ kioslave/media/mimetypes/audiocd.desktop Mon May 22 20:12:42 2006 -@@ -11,7 +11,6 @@ - Comment[cs]=Zvukové CD - Comment[da]=Lyd-cd - Comment[el]=CD ήχου --Comment[fa]=دیسک فشرده صوتی - Comment[fi]=CD-äänilevy - Comment[fr]=CD audio - Comment[fy]=Audio-Kompaktskiif -@@ -25,7 +24,6 @@ - Comment[it]=CD audio - Comment[ja]=オーディオ CD - Comment[km]=ស៊ីឌីអូឌីយ៉ូ --Comment[mk]=Аудио ЦД - Comment[ms]=CD Audio - Comment[nb]=Lyd-CD - Comment[nds]=Audio-CD -@@ -33,7 +31,7 @@ - Comment[nn]=Lyd-CD - Comment[pa]=ਆਡੀਓ CD - Comment[pl]=Płyta CD Audio --Comment[pt]=CD de áudio -+Comment[pt]=CD áudio - Comment[pt_BR]=CD de Áudio - Comment[ro]=CD Audio - Comment[ru]=Аудио CD -diff -urN kioslave/media/mimetypes/blankcd.desktop kioslave/media/mimetypes/blankcd.desktop ---- kioslave/media/mimetypes/blankcd.desktop Mon Oct 2 12:44:33 2006 -+++ kioslave/media/mimetypes/blankcd.desktop Mon May 22 20:12:43 2006 -@@ -16,7 +16,6 @@ - Comment[es]=CD vacío - Comment[et]=Tühi CD - Comment[eu]=CD hutsik --Comment[fa]=دیسک فشرده خام - Comment[fi]=Tyhjä CD - Comment[fr]=CD vierge - Comment[fy]=Blanke Kompaktskiif -@@ -32,7 +31,6 @@ - Comment[km]=ស៊ីឌីទទេ - Comment[lt]=Tuščias CD - Comment[lv]=Tukšs CD --Comment[mk]=Празно ЦД - Comment[ms]=CD Kosong - Comment[nb]=Tom CD - Comment[nds]=Leddige CD -@@ -46,7 +44,6 @@ - Comment[ru]=Чистый CD - Comment[rw]=CD Itanditseho - Comment[se]=Guorus CD --Comment[sk]=Čisté CD - Comment[sl]=Prazen CD - Comment[sr]=Празан CD - Comment[sr@Latn]=Prazan CD -diff -urN kioslave/media/mimetypes/blankdvd.desktop kioslave/media/mimetypes/blankdvd.desktop ---- kioslave/media/mimetypes/blankdvd.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/blankdvd.desktop Mon May 22 20:12:42 2006 -@@ -16,7 +16,6 @@ - Comment[es]=DVD vacío - Comment[et]=Tühi DVD - Comment[eu]=DVD hutsik --Comment[fa]=DVD خام - Comment[fi]=Tyhjä DVD-levy - Comment[fr]=DVD vierge - Comment[fy]=Blanke Dûbelskiif -@@ -32,7 +31,6 @@ - Comment[km]=ឌីវីឌីទទេ - Comment[lt]=Tuščias DVD - Comment[lv]=Tukšs DVD --Comment[mk]=Празно DVD - Comment[ms]=DVD Kosong - Comment[nb]=Tom DVD - Comment[nds]=Leddige DVD -@@ -46,7 +44,6 @@ - Comment[ru]=Чистый DVD - Comment[rw]=DVD Itanditseho - Comment[se]=Guorus DVD --Comment[sk]=Čisté DVD - Comment[sl]=Prazen DVD - Comment[sr]=Празан DVD - Comment[sr@Latn]=Prazan DVD -diff -urN kioslave/media/mimetypes/camera_mounted.desktop kioslave/media/mimetypes/camera_mounted.desktop ---- kioslave/media/mimetypes/camera_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/camera_mounted.desktop Mon May 22 20:12:42 2006 -@@ -16,7 +16,6 @@ - Comment[es]=Cámara montada - Comment[et]=Ühendatud kaamera - Comment[eu]=Kamara muntatuta --Comment[fa]=دوربین سوارشده - Comment[fi]=Liitetty kamera - Comment[fr]=Appareil photo monté - Comment[fy]=Oankeppele kamera -@@ -41,7 +40,6 @@ - Comment[pt_BR]=Câmera montada - Comment[ru]=Подключённая камера - Comment[se]=Čatnon govvenapperáhtta --Comment[sk]=Pripojený digitálny fotoaparát - Comment[sl]=Priklopljen fotoaparat - Comment[sr]=Монтирана камера - Comment[sr@Latn]=Montirana kamera -diff -urN kioslave/media/mimetypes/camera_unmounted.desktop kioslave/media/mimetypes/camera_unmounted.desktop ---- kioslave/media/mimetypes/camera_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/camera_unmounted.desktop Mon May 22 20:12:42 2006 -@@ -16,7 +16,6 @@ - Comment[es]=Cámara desmontada - Comment[et]=Lahutatud kaamera - Comment[eu]=Kamara desmuntatua --Comment[fa]=دوربین پیادهشده - Comment[fi]=Irrotettu kamera - Comment[fr]=Appareil photo non monté - Comment[fy]=Ofkeppele kamera -@@ -41,7 +40,6 @@ - Comment[pt_BR]=Câmera desmontada - Comment[ru]=Неподключённая камера - Comment[se]=Gálgajuvvon govvenapperáhtta --Comment[sk]=Odpojený digitálny fotoaparát - Comment[sl]=Odklopljen fotoaparat - Comment[sr]=Демонтирана камера - Comment[sr@Latn]=Demontirana kamera -diff -urN kioslave/media/mimetypes/cdrom_mounted.desktop kioslave/media/mimetypes/cdrom_mounted.desktop ---- kioslave/media/mimetypes/cdrom_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/cdrom_mounted.desktop Mon May 22 20:12:43 2006 -@@ -21,7 +21,7 @@ - Comment[es]=CD-ROM montado - Comment[et]=Ühendatud CD-ROM - Comment[eu]=CD-ROM muntatua --Comment[fa]=CD-ROM سوارشده -+Comment[fa]=CD سوار شده - Comment[fi]=Liitetty CD-ROM - Comment[fr]=CD-ROM monté - Comment[fy]=Oankeppele Kompaktskiif -diff -urN kioslave/media/mimetypes/cdrom_unmounted.desktop kioslave/media/mimetypes/cdrom_unmounted.desktop ---- kioslave/media/mimetypes/cdrom_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/cdrom_unmounted.desktop Mon May 22 20:12:43 2006 -@@ -21,7 +21,7 @@ - Comment[es]=CD-ROM desmontado - Comment[et]=Lahutatud CD-ROM - Comment[eu]=CD-ROM desmuntatua --Comment[fa]=CD-ROM پیادهشده -+Comment[fa]= CD پیاده شده - Comment[fi]=Irrotettu CD-ROM - Comment[fr]=CD-ROM non monté - Comment[fy]=Ofkeppele Kompaktskiif -diff -urN kioslave/media/mimetypes/cdwriter_mounted.desktop kioslave/media/mimetypes/cdwriter_mounted.desktop ---- kioslave/media/mimetypes/cdwriter_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/cdwriter_mounted.desktop Mon May 22 20:12:42 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Escritor de CDs montado - Comment[et]=Ühendatud CD kirjutaja - Comment[eu]=CD erretzaile muntatua --Comment[fa]=CD Writer سوارشده -+Comment[fa]=CD Writer سوار شده - Comment[fi]=Liitetty CD-kirjoitin - Comment[fr]=Graveur de CD monté - Comment[fy]=Oankeppele Kompaktskiif -diff -urN kioslave/media/mimetypes/cdwriter_unmounted.desktop kioslave/media/mimetypes/cdwriter_unmounted.desktop ---- kioslave/media/mimetypes/cdwriter_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/cdwriter_unmounted.desktop Mon May 22 20:12:42 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Escritor de CDs desmontado - Comment[et]=Lahutatud CD kirjutaja - Comment[eu]=CD erretzaile desmuntatua --Comment[fa]=CD Writer پیادهشده -+Comment[fa]=CD Writer پیاده شده - Comment[fi]=Irrotettu CD-kirjoitin - Comment[fr]=Graveur de CD non monté - Comment[fy]=Ofkeppele Kompaktskiif -diff -urN kioslave/media/mimetypes/dvd_mounted.desktop kioslave/media/mimetypes/dvd_mounted.desktop ---- kioslave/media/mimetypes/dvd_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/dvd_mounted.desktop Mon May 22 20:12:42 2006 -@@ -21,7 +21,7 @@ - Comment[es]=DVD montado - Comment[et]=Ühendatud DVD - Comment[eu]=DVD muntatua --Comment[fa]=DVD سوارشده -+Comment[fa]=DVD سوار شده - Comment[fi]=Liitetty DVD-levy - Comment[fr]=DVD-ROM monté(s) - Comment[fy]=Oankeppele Dûbelskiif -diff -urN kioslave/media/mimetypes/dvd_unmounted.desktop kioslave/media/mimetypes/dvd_unmounted.desktop ---- kioslave/media/mimetypes/dvd_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/dvd_unmounted.desktop Tue May 23 13:33:34 2006 -@@ -21,7 +21,7 @@ - Comment[es]=DVD desmontado - Comment[et]=Lahutatud DVD - Comment[eu]=DVD desmuntatua --Comment[fa]=DVD پیادهشده -+Comment[fa]=DVD پیاده شده - Comment[fi]=Irrotettu DVD-levy - Comment[fr]=DVD-ROM non monté(s) - Comment[fy]=Ofkeppele Dûbelskiif -diff -urN kioslave/media/mimetypes/dvdvideo.desktop kioslave/media/mimetypes/dvdvideo.desktop ---- kioslave/media/mimetypes/dvdvideo.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/dvdvideo.desktop Mon May 22 20:12:43 2006 -@@ -16,7 +16,6 @@ - Comment[es]=Disco de video DVD - Comment[et]=DVD videoplaat - Comment[eu]=DVD bideo diska --Comment[fa]=دیسک ویدئویی DVD - Comment[fi]=DVD-videolevy - Comment[fr]=DVD vidéo - Comment[fy]=Dûbelskiif Fideoskiif -@@ -32,7 +31,6 @@ - Comment[km]=ថាសវីដេអូ ឌីវីឌី - Comment[lt]=DVD video diskas - Comment[lv]=DVD Video Disks --Comment[mk]=DVD Видеодиск - Comment[ms]=Cakera Video DVD - Comment[nb]=DVD-videoplate - Comment[nds]=DVD-Videodisk -@@ -40,13 +38,12 @@ - Comment[nn]=DVD-videoplate - Comment[pa]=DVD ਵੀਡਿਓ ਡਿਸਕ - Comment[pl]=Płyta DVD Video --Comment[pt]=Disco DVD de Vídeo -+Comment[pt]=Disco DVD Vídeo - Comment[pt_BR]=DVD de vídeo - Comment[ro]=Disc video DVD - Comment[ru]=DVD с видео - Comment[rw]=Disiki Videwo DVD - Comment[se]=DVD-videoskearru --Comment[sk]=DVD Video disk - Comment[sl]=DVD Video disk - Comment[sr]=DVD видео диск - Comment[sr@Latn]=DVD video disk -diff -urN kioslave/media/mimetypes/floppy5_mounted.desktop kioslave/media/mimetypes/floppy5_mounted.desktop ---- kioslave/media/mimetypes/floppy5_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/floppy5_mounted.desktop Mon May 22 20:12:42 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disquete 5¼" montado - Comment[et]=Ühendatud 5¼" flopi - Comment[eu]=5¼"ko diskete muntatua --Comment[fa]=فلاپی 5¼" سوارشده -+Comment[fa]=فلاپی 5¼"سوار شده - Comment[fi]=Liitetty 5¼"-levyke - Comment[fr]=Disquette 5¼" montée - Comment[fy]=Oankeppele 5¼" Skiif -diff -urN kioslave/media/mimetypes/floppy5_unmounted.desktop kioslave/media/mimetypes/floppy5_unmounted.desktop ---- kioslave/media/mimetypes/floppy5_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/floppy5_unmounted.desktop Tue May 23 13:33:35 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disquete 5¼" desmontado - Comment[et]=Lahutatud 5¼" flopi - Comment[eu]=5¼"ko diskete desmuntatua --Comment[fa]=فلاپی 5¼" پیادهشده -+Comment[fa]=فلاپی 5¼" پیاده شده - Comment[fi]=Irrotettu 5¼"-levyke - Comment[fr]=Disquette 5¼" non montée - Comment[fy]=Ofkeppele 5¼" Skiif -diff -urN kioslave/media/mimetypes/floppy_mounted.desktop kioslave/media/mimetypes/floppy_mounted.desktop ---- kioslave/media/mimetypes/floppy_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/floppy_mounted.desktop Mon May 22 20:12:43 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disquete montado - Comment[et]=Ühendatud flopi - Comment[eu]=Diskete muntatua --Comment[fa]=فلاپی سوارشده -+Comment[fa]=فلاپی سوار شده - Comment[fi]=Liitetty levyke - Comment[fr]=Disquette montée - Comment[fy]=Oankeppele Skiif -diff -urN kioslave/media/mimetypes/floppy_unmounted.desktop kioslave/media/mimetypes/floppy_unmounted.desktop ---- kioslave/media/mimetypes/floppy_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/floppy_unmounted.desktop Tue May 23 13:33:34 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disquete desmontado - Comment[et]=Lahutatud flopi - Comment[eu]=Diskete desmuntatua --Comment[fa]=فلاپی پیادهشده -+Comment[fa]=فلاپی پیاده شده - Comment[fi]=Irrotettu levyke - Comment[fr]=Disquette non montée - Comment[fy]=Ofkeppele Skiif -diff -urN kioslave/media/mimetypes/gphoto2camera.desktop kioslave/media/mimetypes/gphoto2camera.desktop ---- kioslave/media/mimetypes/gphoto2camera.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/gphoto2camera.desktop Mon May 22 20:12:43 2006 -@@ -18,7 +18,6 @@ - Comment[es]=Cámara - Comment[et]=Kaamera - Comment[eu]=Kamara --Comment[fa]=دوربین - Comment[fi]=Kamera - Comment[fr]=Nouvel appareil photo - Comment[fy]=Kamera -@@ -41,13 +40,12 @@ - Comment[nn]=Kamera - Comment[pa]=ਕੈਮਰਾ - Comment[pl]=Aparat fotograficzny --Comment[pt]=Máquina fotográfica -+Comment[pt]=Máquina Fotográfica - Comment[pt_BR]=Câmera - Comment[ro]=Aparat foto - Comment[ru]=Камера - Comment[rw]=Kamera - Comment[se]=Govvanaperáhtta --Comment[sk]=Digitálny fotoaparát - Comment[sl]=Fotoaparat - Comment[sr]=Камера - Comment[sr@Latn]=Kamera -diff -urN kioslave/media/mimetypes/hdd_mounted.desktop kioslave/media/mimetypes/hdd_mounted.desktop ---- kioslave/media/mimetypes/hdd_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/hdd_mounted.desktop Mon May 22 20:12:43 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Volumen de disco duro montado - Comment[et]=Ühendatud kõvaketta partitsioon - Comment[eu]=Diska gogorraren zatiketa muntatua --Comment[fa]=حجم دیسک سخت سوارشده - Comment[fi]=Liitetty kiintoleyosio - Comment[fr]=Partition de disque dur montée - Comment[fy]=Oankeppele Fêsteskiif folume -@@ -44,13 +43,12 @@ - Comment[nn]=Montert harddiskvolum - Comment[pa]=ਮਾਊਟ ਕੀਤਾ ਹਾਰਡ ਡਿਸਕ ਭਾਗ - Comment[pl]=Zamontowana partycja dysku twardego --Comment[pt]=Volume de disco rígido montado -+Comment[pt]=Volume de Disco Rígido Montado - Comment[pt_BR]=Volume do HD Montado - Comment[ro]=Volum de hard disc montat - Comment[ru]=Смонтированный раздел жёсткого диска - Comment[rw]=Ububiko Disiki Bwashyizwemo - Comment[se]=Čatnon garraskearrooassi --Comment[sk]=Pripojený oddiel pevného disku - Comment[sl]=Priklopljen pogon trdega diska - Comment[sr]=Монтирана партиција хард диска - Comment[sr@Latn]=Montirana particija hard diska -diff -urN kioslave/media/mimetypes/hdd_unmounted.desktop kioslave/media/mimetypes/hdd_unmounted.desktop ---- kioslave/media/mimetypes/hdd_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/hdd_unmounted.desktop Mon May 22 20:12:43 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Volumen de disco duro desmontado - Comment[et]=Lahutatud kõvaketta partitsioon - Comment[eu]=Diska gogorraren zatiketa desmuntatua --Comment[fa]=حجم دیسک سخت پیاده شده - Comment[fi]=Irrotettu kiintolevyosio - Comment[fr]=Partition de disque dur non montée - Comment[fy]=Ofkeppele Fêsteskiif folume -@@ -44,13 +43,12 @@ - Comment[nn]=Umontert harddiskvolum - Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ ਹਾਰਡ ਡਿਸਕ ਭਾਗ - Comment[pl]=Odmontowana partycja dysku twardego --Comment[pt]=Volume de disco rígido desmontado -+Comment[pt]=Volume de Disco Rígido Desmontado - Comment[pt_BR]=Volume do HD Desmontado - Comment[ro]=Volum de hard disc nemontat - Comment[ru]=Отмонтированный раздел жёсткого диска - Comment[rw]=Ububiko Disiki Bwakuwemo - Comment[se]=Gálgajuvvon garraskearrooassi --Comment[sk]=Odpojený oddiel pevného disku - Comment[sl]=Odklopljen pogon trdega diska - Comment[sr]=Демонтирана партиција хард диска - Comment[sr@Latn]=Demontirana particija hard diska -diff -urN kioslave/media/mimetypes/nfs_mounted.desktop kioslave/media/mimetypes/nfs_mounted.desktop ---- kioslave/media/mimetypes/nfs_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/nfs_mounted.desktop Tue May 23 13:33:34 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Recurso NFS montado - Comment[et]=Ühendatud NFS ressurss - Comment[eu]=NFS baliabide muntatua --Comment[fa]=مشترک NFS سوارشده - Comment[fi]=Liitetty NFS-jako - Comment[fr]=Ressource NFS montée - Comment[fy]=Oankeppele NFS-boarne -@@ -44,13 +43,12 @@ - Comment[nn]=Montert delt NFS-ressurs - Comment[pa]=ਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਝ - Comment[pl]=Zamontowany system plików NFS --Comment[pt]=Partilha de NFS montada -+Comment[pt]=Partilha de NFS Montada - Comment[pt_BR]=Volume NFS Montado - Comment[ro]=Partajare NFS montată - Comment[ru]=Смонтированный ресурс NFS - Comment[rw]=Umugabane NFS Washyizwemo - Comment[se]=Čatnon NFS-resursa --Comment[sk]=Pripojený zdroj NFS - Comment[sl]=Priklopljen vir NFS - Comment[sr]=Монтирано NFS дељење - Comment[sr@Latn]=Montirano NFS deljenje -diff -urN kioslave/media/mimetypes/nfs_unmounted.desktop kioslave/media/mimetypes/nfs_unmounted.desktop ---- kioslave/media/mimetypes/nfs_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/nfs_unmounted.desktop Tue May 23 13:33:35 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Recurso NFS desmontado - Comment[et]=Lahutatud NFS ressurss - Comment[eu]=NFS baliabide desmuntatua --Comment[fa]=مشترک NFS پیاده شده - Comment[fi]=Irrotettu NFS-jako - Comment[fr]=Ressource NFS non montée - Comment[fy]=Oankeppele NFS-boarne -@@ -44,13 +43,12 @@ - Comment[nn]=Umontert delt NFS-ressurs - Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਝ - Comment[pl]=Odmontowany system plików NFS --Comment[pt]=Partilha de NFS desmontada -+Comment[pt]=Partilha de NFS Desmontada - Comment[pt_BR]=Volume NFS Desmontado - Comment[ro]=Partajare NFS nemontată - Comment[ru]=Отмонтированный ресурс NFS - Comment[rw]=Umugabane NFS Wakuwemo - Comment[se]=Gálgajuvvon NFS-resursa --Comment[sk]=Odpojený zdroj NFS - Comment[sl]=Odklopljen vir NFS - Comment[sr]=Демонтирано NFS дељење - Comment[sr@Latn]=Demontirano NFS deljenje -diff -urN kioslave/media/mimetypes/removable_mounted.desktop kioslave/media/mimetypes/removable_mounted.desktop ---- kioslave/media/mimetypes/removable_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/removable_mounted.desktop Mon May 22 20:12:42 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Recurso extraíble montado - Comment[et]=Ühendatud eemaldatav andmekandja - Comment[eu]=Euskarri aldagarria muntatua --Comment[fa]=رسانه برداشتنی سوارشده - Comment[fi]=Liitetty irrotettava resurssi - Comment[fr]=Média amovible monté - Comment[fy]=Oankeppele ferwiderber medium -@@ -44,13 +43,12 @@ - Comment[nn]=Montert flyttbart medium - Comment[pa]=ਮਾਊਟ ਕੀਤੇ ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ - Comment[pl]=Zamontowany nośnik wymienny --Comment[pt]=Dispositivo amovível montado -+Comment[pt]=Dispositivo Amovível Montado - Comment[pt_BR]=Mídia Removível Montada - Comment[ro]=Mediu amovibil montat - Comment[ru]=Смонтированный внешний диск - Comment[rw]=Igitangazamakuru Kivanwamo Cyashyizwemo - Comment[se]=Čátnon sirdehahtti medium --Comment[sk]=Pripojené vyberateľné médium - Comment[sl]=Priklopljen odstranljiv medij - Comment[sr]=Монтиран уклоњиви медијум - Comment[sr@Latn]=Montiran uklonjivi medijum -diff -urN kioslave/media/mimetypes/removable_unmounted.desktop kioslave/media/mimetypes/removable_unmounted.desktop ---- kioslave/media/mimetypes/removable_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/removable_unmounted.desktop Mon May 22 20:12:42 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Recurso extraíble desmontado - Comment[et]=Lahutatud eemaldatav andmekandja - Comment[eu]=Euskarri aldagarria desmuntatua --Comment[fa]=رسانه برداشتنی پیاده شده - Comment[fi]=Irrotettu irrotettava resurssi - Comment[fr]=Média amovible non monté - Comment[fy]=Ofkeppele ferwiderber medium -@@ -44,13 +43,12 @@ - Comment[nn]=Umontert flyttbart medium - Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ - Comment[pl]=Odmontowany nośnik wymienny --Comment[pt]=Dispositivo amovível desmontado -+Comment[pt]=Dispositivo Amovível Desmontado - Comment[pt_BR]=Mídia Removível Desmontada - Comment[ro]=Mediu amovibil nemontat - Comment[ru]=Отмонтированный внешний диск - Comment[rw]=Igitangazamakuru Kivanwamo Cyavanwemo - Comment[se]=Gálgaduvvon sirdehahtti medium --Comment[sk]=Odpojené vyberateľné médium - Comment[sl]=Odklopljen odstranljiv medij - Comment[sr]=Демонтиран уклоњиви медијум - Comment[sr@Latn]=Demontiran uklonjivi medijum -diff -urN kioslave/media/mimetypes/smb_mounted.desktop kioslave/media/mimetypes/smb_mounted.desktop ---- kioslave/media/mimetypes/smb_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/smb_mounted.desktop Tue May 23 13:33:34 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Recurso de Samba montado (Red de Microsoft) - Comment[et]=Ühendatud Samba (Microsoft Network) ressurss - Comment[eu]=Samba (Microsoft sarea) partekaketa muntatua --Comment[fa]=مشترک Samba (Microsoft Network) سوار شده -+Comment[fa]=اشتراک سامبای ویندوز سوار شده - Comment[fi]=Liitetty Samba-jako (Microsoft-verkko) - Comment[fr]=Partage Samba (réseau Microsoft) monté - Comment[fy]=Oankeppele Samba-netwurkboarne (Microsoft-netwurken) -diff -urN kioslave/media/mimetypes/smb_unmounted.desktop kioslave/media/mimetypes/smb_unmounted.desktop ---- kioslave/media/mimetypes/smb_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/smb_unmounted.desktop Tue May 23 13:33:34 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Recurso de Samba desmontado (Red de Microsoft) - Comment[et]=Lahutatud Samba (Microsoft Network) ressurss - Comment[eu]=Samba (Microsoft sarea) partekaketa desmuntatua --Comment[fa]=مشترک Samba (Microsoft Network) پیاده شده -+Comment[fa]=اشتراک سامبای ویندوز پیاده شده - Comment[fi]=Irrotettu Samba-jako (Microsoft-verkko) - Comment[fr]=Partage Samba (réseau Microsoft) non monté - Comment[fy]=Ofkeppele Samba-netwurkboarne (Microsoft-netwurken) -diff -urN kioslave/media/mimetypes/svcd.desktop kioslave/media/mimetypes/svcd.desktop ---- kioslave/media/mimetypes/svcd.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/svcd.desktop Mon May 22 20:12:43 2006 -@@ -7,7 +7,6 @@ - Comment[bn]=সুপার ভিডিও সিডি - Comment[ca]=CD Súper Vídeo - Comment[da]=Super Video-cd --Comment[fa]=دیسک فشرده ابرویدئو - Comment[fr]=Super CD vidéo - Comment[fy]=Super Fideo-kompaktskiif - Comment[gl]=Super Vídeo CD -@@ -17,7 +16,6 @@ - Comment[it]=Super video CD - Comment[ja]=スーパービデオ CD - Comment[km]=ស៊ីឌីវីដេអូគុណភាពខ្ពស់ --Comment[mk]=Супер видео ЦД - Comment[ms]=CD Supervideo - Comment[nb]=Super video CD - Comment[nds]=Super-Video-CD -diff -urN kioslave/media/mimetypes/vcd.desktop kioslave/media/mimetypes/vcd.desktop ---- kioslave/media/mimetypes/vcd.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/vcd.desktop Mon May 22 20:12:42 2006 -@@ -9,7 +9,6 @@ - Comment[ca]=CD Vídeo - Comment[da]=Video-cd - Comment[el]=Βίντεο CD --Comment[fa]=دیسک فشرده ویدئویی - Comment[fr]=CD vidéo - Comment[fy]=Fideo-kompaktskiif - Comment[ga]=Dlúthdhiosca Físe -@@ -19,7 +18,6 @@ - Comment[is]=Vídeó CD - Comment[ja]=ビデオ CD - Comment[km]=ស៊ីឌីវីដេអូ --Comment[mk]=Видео ЦД - Comment[ms]=CD Video - Comment[nds]=Video-CD - Comment[nl]=Video-cd -diff -urN kioslave/media/mimetypes/zip_mounted.desktop kioslave/media/mimetypes/zip_mounted.desktop ---- kioslave/media/mimetypes/zip_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/zip_mounted.desktop Tue May 23 13:33:35 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disco Zip montado - Comment[et]=Ühendatud Zip-ketas - Comment[eu]=Zip diska muntatua --Comment[fa]=دیسک فشرده سوارشده -+Comment[fa]=دیسک زیپ سوار شده - Comment[fi]=Liitetty Zip-levy - Comment[fr]=Disque Zip monté - Comment[fy]=Oankeppelee Zip-skiif -diff -urN kioslave/media/mimetypes/zip_unmounted.desktop kioslave/media/mimetypes/zip_unmounted.desktop ---- kioslave/media/mimetypes/zip_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/zip_unmounted.desktop Tue May 23 13:33:35 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disco Zip desmontado - Comment[et]=Lahutatud Zip-ketas - Comment[eu]=Zip diska desmuntatua --Comment[fa]=دیسک فشرده پیاده شده -+Comment[fa]= دیسک زیپ پیاده شده - Comment[fi]=Irrotettu Zip-levy - Comment[fr]=Disque Zip non monté - Comment[fy]=Ofkeppele Zip-skiif -@@ -33,7 +33,7 @@ - Comment[hu]=Leválasztott Zip-lemez - Comment[is]=Aftengdur Zip diskur - Comment[it]=Disco Zip non montato --Comment[ja]=マウントされていない Zip ディスク -+Comment[ja]=マウントされていないZipディスク - Comment[km]=ថាស Zip មិនបានរៀបចំ - Comment[lo]= ຫັງກາລີ - Comment[lt]=Išmontuotas Zip diskas -diff -urN kioslave/media/mounthelper/Makefile.in kioslave/media/mounthelper/Makefile.in ---- kioslave/media/mounthelper/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/mounthelper/Makefile.in Fri May 26 09:54:31 2006 -@@ -57,8 +57,8 @@ - #>+ 1 - kio_media_mounthelper_OBJECTS = kio_media_mounthelper.$(OBJEXT) - am__DEPENDENCIES_1 = --kio_media_mounthelper_DEPENDENCIES = \ -- ../libmediacommon/libmediacommon.la $(am__DEPENDENCIES_1) -+kio_media_mounthelper_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -+ ../libmediacommon/libmediacommon.la - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - am__depfiles_maybe = depfiles -@@ -236,6 +236,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -@@ -575,7 +576,7 @@ - AM_LDFLAGS = $(all_libraries) - kio_media_mounthelper_SOURCES = kio_media_mounthelper.cpp - kio_media_mounthelper_LDFLAGS = $(KDE_RPATH) $(all_libraries) --kio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) -+kio_media_mounthelper_LDADD = $(LIB_KIO) ../libmediacommon/libmediacommon.la - #>- METASOURCES = AUTO - #>- all: all-am - #>+ 1 -diff -urN kioslave/media/mounthelper/kio_media_mounthelper.cpp kioslave/media/mounthelper/kio_media_mounthelper.cpp ---- kioslave/media/mounthelper/kio_media_mounthelper.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/mounthelper/kio_media_mounthelper.cpp Fri Mar 17 11:17:33 2006 -@@ -27,7 +27,6 @@ - #include <dcopclient.h> - #include <dcopref.h> - #include <qtimer.h> --#include <stdlib.h> - #include <kdebug.h> - #include <kglobal.h> - #include <kprocess.h> -@@ -79,30 +78,31 @@ - - if (args->isSet("u")) - { -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "unmount", medium.id()); -- if (reply.isValid()) -- reply.get(m_errorStr); -- kdDebug() << "medium unmount " << m_errorStr << endl; -- if (m_errorStr.isNull()) -- ::exit(0); -- else -- error(); -+ KIO::Job * job = KIO::unmount( mount_point ); -+ -+ connect( job, SIGNAL( result( KIO::Job * ) ), -+ this, SLOT( slotResult( KIO::Job * ) ) ); - } - else if (args->isSet("s") || args->isSet("e")) - { -- invokeEject(device, true); -+ if (medium.isMounted()) -+ { -+ KIO::Job * job = KIO::unmount( mount_point ); -+ -+ m_device = device; -+ connect( job, SIGNAL( result( KIO::Job * ) ), -+ this, SLOT( slotResultSafe( KIO::Job * ) ) ); -+ } -+ else -+ { -+ invokeEject(device, true); -+ } - } - else - { -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "mount", medium.id()); -- if (reply.isValid()) -- reply.get(m_errorStr); -- if (m_errorStr.isNull()) -- ::exit(0); -- else -- error(); -+ KIO::Job* job = KIO::mount( false, 0, device, mount_point); -+ connect( job, SIGNAL( result( KIO::Job * ) ), -+ this, SLOT( slotResult( KIO::Job * ) ) ); - } - } - -@@ -173,12 +173,12 @@ - void MountHelper::error() - { - KMessageBox::error(0, m_errorStr); -- ::exit(1); -+ kapp->exit(1); - } - - void MountHelper::finished() - { -- ::exit(0); -+ kapp->quit(); - } - - static KCmdLineOptions options[] = -@@ -207,7 +207,7 @@ - - KStartupInfo::appStarted(); - app->dcopClient()->attach(); -- return app->exec(); -+ app->exec(); - } - - #include "kio_media_mounthelper.moc" -diff -urN kioslave/media/propsdlgplugin/Makefile.in kioslave/media/propsdlgplugin/Makefile.in ---- kioslave/media/propsdlgplugin/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/propsdlgplugin/Makefile.in Thu Jan 1 01:00:00 1970 -@@ -1,1063 +0,0 @@ --# Makefile.in generated by automake 1.9.6 from Makefile.am. --# KDE tags expanded automatically by am_edit - $Revision: 483858 $ --# @configure_input@ -- --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005 Free Software Foundation, Inc. --# This Makefile.in is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY, to the extent permitted by law; without --# even the implied warranty of MERCHANTABILITY or FITNESS FOR A --# PARTICULAR PURPOSE. -- --@SET_MAKE@ -- -- --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ --VPATH = @srcdir@ --pkgdatadir = $(datadir)/@PACKAGE@ --pkglibdir = $(libdir)/@PACKAGE@ --pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../../.. --am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ --install_sh_DATA = $(install_sh) -c -m 644 --install_sh_PROGRAM = $(install_sh) -c --install_sh_SCRIPT = $(install_sh) -c --INSTALL_HEADER = $(INSTALL_DATA) --transform = $(program_transform_name) --NORMAL_INSTALL = : --PRE_INSTALL = : --POST_INSTALL = : --NORMAL_UNINSTALL = : --PRE_UNINSTALL = : --POST_UNINSTALL = : --build_triplet = @build@ --host_triplet = @host@ --target_triplet = @target@ --subdir = kioslave/media/propsdlgplugin --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(kde_moduledir)" \ -- "$(DESTDIR)$(kde_servicesdir)" --kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(kde_module_LTLIBRARIES) --am__DEPENDENCIES_1 = --media_propsdlgplugin_la_DEPENDENCIES = \ -- ../libmediacommon/libmediacommon.la $(am__DEPENDENCIES_1) --am_media_propsdlgplugin_la_OBJECTS = propertiespage.lo \ -- propsdlgshareplugin.lo --#>- media_propsdlgplugin_la_OBJECTS = \ --#>- $(am_media_propsdlgplugin_la_OBJECTS) --#>+ 5 --media_propsdlgplugin_la_final_OBJECTS = media_propsdlgplugin_la.all_cpp.lo --media_propsdlgplugin_la_nofinal_OBJECTS = propertiespage.lo \ -- propsdlgshareplugin.lo propertiespagegui.lo --@KDE_USE_FINAL_FALSE@media_propsdlgplugin_la_OBJECTS = $(media_propsdlgplugin_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@media_propsdlgplugin_la_OBJECTS = $(media_propsdlgplugin_la_final_OBJECTS) --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --am__depfiles_maybe = depfiles --#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ --#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --#>+ 2 --CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ --#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ --#>- $(AM_CXXFLAGS) $(CXXFLAGS) --#>+ 3 --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --CXXLD = $(CXX) --#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ --#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --#>+ 2 --CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --SOURCES = $(media_propsdlgplugin_la_SOURCES) --DIST_SOURCES = $(media_propsdlgplugin_la_SOURCES) --kde_servicesDATA_INSTALL = $(INSTALL_DATA) --DATA = $(kde_services_DATA) --ETAGS = etags --CTAGS = ctags --#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) --#>+ 1 --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) --ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ --AMTAR = @AMTAR@ --AR = @AR@ --ARTSCCONFIG = @ARTSCCONFIG@ --ARTS_CFLAGS = @ARTS_CFLAGS@ --AUTOCONF = @AUTOCONF@ --AUTODIRS = @AUTODIRS@ --AUTOHEADER = @AUTOHEADER@ --AUTOMAKE = @AUTOMAKE@ --AWK = @AWK@ --CC = @CC@ --CCDEPMODE = @CCDEPMODE@ --CFLAGS = @CFLAGS@ --COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@ --COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@ --CONF_FILES = @CONF_FILES@ --CPP = @CPP@ --CPPFLAGS = @CPPFLAGS@ --CXX = @CXX@ --CXXCPP = @CXXCPP@ --CXXDEPMODE = @CXXDEPMODE@ --CXXFLAGS = @CXXFLAGS@ --CYGPATH_W = @CYGPATH_W@ --DBUSQT_INCS = @DBUSQT_INCS@ --DBUSQT_LIBS = @DBUSQT_LIBS@ --DBUS_CFLAGS = @DBUS_CFLAGS@ --DBUS_INCS = @DBUS_INCS@ --DBUS_LIBS = @DBUS_LIBS@ --DCOPIDL = @DCOPIDL@ --DCOPIDL2CPP = @DCOPIDL2CPP@ --DCOPIDLNG = @DCOPIDLNG@ --DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ --DEFS = @DEFS@ --DEPDIR = @DEPDIR@ --DOXYGEN = @DOXYGEN@ --DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ --DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ --DPMSINC = @DPMSINC@ --DPMSLIB = @DPMSLIB@ --ECHO = @ECHO@ --ECHO_C = @ECHO_C@ --ECHO_N = @ECHO_N@ --ECHO_T = @ECHO_T@ --EGREP = @EGREP@ --ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ --EXEEXT = @EXEEXT@ --EXR_FLAGS = @EXR_FLAGS@ --F77 = @F77@ --FFLAGS = @FFLAGS@ --FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ --GLINC = @GLINC@ --GLLIB = @GLLIB@ --GMSGFMT = @GMSGFMT@ --HALBACKEND = @HALBACKEND@ --HAL_CFLAGS = @HAL_CFLAGS@ --HAL_INCS = @HAL_INCS@ --HAL_LIBS = @HAL_LIBS@ --HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@ --HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@ --HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ --INSTALL_DATA = @INSTALL_DATA@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_SCRIPT = @INSTALL_SCRIPT@ --INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ --JAR = @JAR@ --JAVAC = @JAVAC@ --JAVAH = @JAVAH@ --JVMLIBS = @JVMLIBS@ --KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ --KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@ --KCONFIG_COMPILER = @KCONFIG_COMPILER@ --KDECONFIG = @KDECONFIG@ --KDE_BINDIR = @KDE_BINDIR@ --KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@ --KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ --KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ --KDE_HAVE_DOT = @KDE_HAVE_DOT@ --KDE_INCLUDES = @KDE_INCLUDES@ --KDE_LDFLAGS = @KDE_LDFLAGS@ --KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ --KDE_MT_LIBS = @KDE_MT_LIBS@ --KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ --KDE_PLUGIN = @KDE_PLUGIN@ --KDE_RPATH = @KDE_RPATH@ --KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ --KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ --KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ --KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ --KDE_USE_FPIE = @KDE_USE_FPIE@ --KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ --KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ --KDE_USE_PIE = @KDE_USE_PIE@ --KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ --KDM_PAM_SERVICE = @KDM_PAM_SERVICE@ --KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@ --KRB4_INCS = @KRB4_INCS@ --KRB4_LIBS = @KRB4_LIBS@ --KRB4_RPATH = @KRB4_RPATH@ --KRB5_INCS = @KRB5_INCS@ --KRB5_LIBS = @KRB5_LIBS@ --KRB5_RPATH = @KRB5_RPATH@ --KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@ --LDAP_INCS = @LDAP_INCS@ --LDAP_LIBS = @LDAP_LIBS@ --LDAP_RPATH = @LDAP_RPATH@ --LDFLAGS = @LDFLAGS@ --LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ --LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ --LIBALIB = @LIBALIB@ --LIBART_CFLAGS = @LIBART_CFLAGS@ --LIBART_LIBS = @LIBART_LIBS@ --LIBART_RPATH = @LIBART_RPATH@ --LIBBZ2 = @LIBBZ2@ --LIBCFG = @LIBCFG@ --LIBCOMPAT = @LIBCOMPAT@ --LIBCRYPT = @LIBCRYPT@ --LIBCURSES = @LIBCURSES@ --LIBDEVINFO = @LIBDEVINFO@ --LIBDL = @LIBDL@ --LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@ --LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@ --LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@ --LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@ --LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@ --LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@ --LIBGEN = @LIBGEN@ --LIBHOSTS = @LIBHOSTS@ --LIBJPEG = @LIBJPEG@ --LIBKSTAT = @LIBKSTAT@ --LIBMALLOC = @LIBMALLOC@ --LIBOBJS = @LIBOBJS@ --LIBODM = @LIBODM@ --LIBOSSAUDIO = @LIBOSSAUDIO@ --LIBPNG = @LIBPNG@ --LIBPOSIX4 = @LIBPOSIX4@ --LIBPTHREAD = @LIBPTHREAD@ --LIBRESOLV = @LIBRESOLV@ --LIBRPC = @LIBRPC@ --LIBS = @LIBS@ --LIBSENSORS = @LIBSENSORS@ --LIBSHADOW = @LIBSHADOW@ --LIBSM = @LIBSM@ --LIBSOCKET = @LIBSOCKET@ --LIBSSL = @LIBSSL@ --LIBTOOL = @LIBTOOL@ --LIBUCB = @LIBUCB@ --LIBUSBCONFIG = @LIBUSBCONFIG@ --LIBUTIL = @LIBUTIL@ --LIBXDMCP = @LIBXDMCP@ --LIBXFT_LIB = @LIBXFT_LIB@ --LIBZ = @LIBZ@ --LIB_ARTS = @LIB_ARTS@ --LIB_DNSSD = @LIB_DNSSD@ --LIB_EXR = @LIB_EXR@ --LIB_FONT_ENC = @LIB_FONT_ENC@ --LIB_KAB = @LIB_KAB@ --LIB_KABC = @LIB_KABC@ --LIB_KDECORE = @LIB_KDECORE@ --LIB_KDED = @LIB_KDED@ --LIB_KDEPIM = @LIB_KDEPIM@ --LIB_KDEPRINT = @LIB_KDEPRINT@ --LIB_KDEUI = @LIB_KDEUI@ --LIB_KDNSSD = @LIB_KDNSSD@ --LIB_KFILE = @LIB_KFILE@ --LIB_KFM = @LIB_KFM@ --LIB_KHTML = @LIB_KHTML@ --LIB_KIMPROXY = @LIB_KIMPROXY@ --LIB_KIO = @LIB_KIO@ --LIB_KJS = @LIB_KJS@ --LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ --LIB_KPARTS = @LIB_KPARTS@ --LIB_KSPELL = @LIB_KSPELL@ --LIB_KSYCOCA = @LIB_KSYCOCA@ --LIB_KUNITTEST = @LIB_KUNITTEST@ --LIB_KUTILS = @LIB_KUTILS@ --LIB_KVM = @LIB_KVM@ --LIB_LBER = @LIB_LBER@ --LIB_LIBS = @LIB_LIBS@ --LIB_POLL = @LIB_POLL@ --LIB_QPE = @LIB_QPE@ --LIB_QT = @LIB_QT@ --LIB_SMB = @LIB_SMB@ --LIB_TRU64_MACH = @LIB_TRU64_MACH@ --LIB_X11 = @LIB_X11@ --LIB_XCOMPOSITE = @LIB_XCOMPOSITE@ --LIB_XCURSOR = @LIB_XCURSOR@ --LIB_XEXT = @LIB_XEXT@ --LIB_XF86MISC = @LIB_XF86MISC@ --LIB_XFIXES = @LIB_XFIXES@ --LIB_XINERAMA = @LIB_XINERAMA@ --LIB_XRANDR = @LIB_XRANDR@ --LIB_XRENDER = @LIB_XRENDER@ --LIB_XSS = @LIB_XSS@ --LINUXCDPOLLING = @LINUXCDPOLLING@ --LN_S = @LN_S@ --LTLIBOBJS = @LTLIBOBJS@ --MAKEINFO = @MAKEINFO@ --MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ --MCOPIDL = @MCOPIDL@ --MD5SUM = @MD5SUM@ --MD5SUM_CUT = @MD5SUM_CUT@ --MEINPROC = @MEINPROC@ --MOC = @MOC@ --MSGFMT = @MSGFMT@ --NOOPT_CFLAGS = @NOOPT_CFLAGS@ --NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ --OBJEXT = @OBJEXT@ --PACKAGE = @PACKAGE@ --PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ --PACKAGE_NAME = @PACKAGE_NAME@ --PACKAGE_STRING = @PACKAGE_STRING@ --PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_VERSION = @PACKAGE_VERSION@ --PAMLIBS = @PAMLIBS@ --PASSWDLIBS = @PASSWDLIBS@ --PATH_SEPARATOR = @PATH_SEPARATOR@ --PERL = @PERL@ --PKG_CONFIG = @PKG_CONFIG@ --QTDOCDIR = @QTDOCDIR@ --QTE_NORTTI = @QTE_NORTTI@ --QT_INCLUDES = @QT_INCLUDES@ --QT_LDFLAGS = @QT_LDFLAGS@ --RANLIB = @RANLIB@ --RUN_KAPPFINDER = @RUN_KAPPFINDER@ --SASL2_LIBS = @SASL2_LIBS@ --SETUIDFLAGS = @SETUIDFLAGS@ --SET_MAKE = @SET_MAKE@ --SHELL = @SHELL@ --SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@ --SSL_INCLUDES = @SSL_INCLUDES@ --SSL_LDFLAGS = @SSL_LDFLAGS@ --STRIP = @STRIP@ --TOPSUBDIRS = @TOPSUBDIRS@ --UIC = @UIC@ --UIC_TR = @UIC_TR@ --UNAME = @UNAME@ --USB_CFLAGS = @USB_CFLAGS@ --USB_LIBS = @USB_LIBS@ --USER_INCLUDES = @USER_INCLUDES@ --USER_LDFLAGS = @USER_LDFLAGS@ --USE_EXCEPTIONS = @USE_EXCEPTIONS@ --USE_RTTI = @USE_RTTI@ --USE_THREADS = @USE_THREADS@ --VERSION = @VERSION@ --WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ --XGETTEXT = @XGETTEXT@ --XMLLINT = @XMLLINT@ --XTESTLIB = @XTESTLIB@ --X_EXTRA_LIBS = @X_EXTRA_LIBS@ --X_INCLUDES = @X_INCLUDES@ --X_LDFLAGS = @X_LDFLAGS@ --X_PRE_LIBS = @X_PRE_LIBS@ --X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ --ac_ct_CC = @ac_ct_CC@ --ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ --all_includes = @all_includes@ --all_libraries = @all_libraries@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ --am__include = @am__include@ --am__leading_dot = @am__leading_dot@ --am__quote = @am__quote@ --am__tar = @am__tar@ --am__untar = @am__untar@ --applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@ --applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@ --bindir = @bindir@ --build = @build@ --build_alias = @build_alias@ --build_cpu = @build_cpu@ --build_os = @build_os@ --build_vendor = @build_vendor@ --datadir = @datadir@ --doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ --doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ --drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ --drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ --exec_prefix = @exec_prefix@ --have_xcursor_FALSE = @have_xcursor_FALSE@ --have_xcursor_TRUE = @have_xcursor_TRUE@ --host = @host@ --host_alias = @host_alias@ --host_cpu = @host_cpu@ --host_os = @host_os@ --host_vendor = @host_vendor@ --include_ARTS_FALSE = @include_ARTS_FALSE@ --include_ARTS_TRUE = @include_ARTS_TRUE@ --include_BZIP2_FALSE = @include_BZIP2_FALSE@ --include_BZIP2_TRUE = @include_BZIP2_TRUE@ --include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@ --include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@ --include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@ --include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@ --include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@ --include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@ --include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@ --include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@ --include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@ --include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@ --include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@ --include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@ --include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@ --include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@ --include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@ --include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@ --include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@ --include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@ --include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@ --include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@ --include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@ --include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@ --include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@ --include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@ --include_kompmgr_FALSE = @include_kompmgr_FALSE@ --include_kompmgr_TRUE = @include_kompmgr_TRUE@ --include_ksysguardd_FALSE = @include_ksysguardd_FALSE@ --include_ksysguardd_TRUE = @include_ksysguardd_TRUE@ --include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@ --include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@ --include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@ --include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@ --include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@ --include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@ --include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@ --include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@ --include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@ --include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@ --include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@ --include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@ --include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@ --include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@ --include_media_halbackend_FALSE = @include_media_halbackend_FALSE@ --include_media_halbackend_TRUE = @include_media_halbackend_TRUE@ --include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@ --include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@ --include_x11_FALSE = @include_x11_FALSE@ --include_x11_TRUE = @include_x11_TRUE@ --includedir = @includedir@ --infodir = @infodir@ --install_sh = @install_sh@ --install_usbids_FALSE = @install_usbids_FALSE@ --install_usbids_TRUE = @install_usbids_TRUE@ --jni_includes = @jni_includes@ --kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@ --kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@ --kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@ --kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@ --kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@ --kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@ --kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@ --kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@ --kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@ --kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@ --kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@ --kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@ --kde_appsdir = @kde_appsdir@ --kde_bindir = @kde_bindir@ --kde_confdir = @kde_confdir@ --kde_datadir = @kde_datadir@ --kde_htmldir = @kde_htmldir@ --kde_icondir = @kde_icondir@ --kde_includes = @kde_includes@ --kde_kcfgdir = @kde_kcfgdir@ --kde_libraries = @kde_libraries@ --kde_libs_htmldir = @kde_libs_htmldir@ --kde_libs_prefix = @kde_libs_prefix@ --kde_locale = @kde_locale@ --kde_mimedir = @kde_mimedir@ --kde_moduledir = @kde_moduledir@ --kde_qtver = @kde_qtver@ --kde_servicesdir = @kde_servicesdir@ --kde_servicetypesdir = @kde_servicetypesdir@ --kde_sounddir = @kde_sounddir@ --kde_styledir = @kde_styledir@ --kde_templatesdir = @kde_templatesdir@ --kde_wallpaperdir = @kde_wallpaperdir@ --kde_widgetdir = @kde_widgetdir@ --kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@ --kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@ --kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@ --kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@ --kdeinitdir = @kdeinitdir@ --kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@ --kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@ --kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@ --kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@ --kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@ --kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@ --kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@ --kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@ --kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@ --kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@ --kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@ --kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@ --kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@ --kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@ --kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@ --kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@ --khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@ --khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@ --khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@ --khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@ --kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@ --kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@ --kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@ --kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@ --klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@ --klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@ --kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@ --kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@ --knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@ --knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@ --konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@ --konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@ --konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@ --konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@ --kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@ --kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@ --kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@ --kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@ --kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@ --kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@ --kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@ --kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@ --ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@ --ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@ --ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@ --ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@ --kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@ --kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@ --ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@ --ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@ --ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@ --ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@ --ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@ --ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@ --kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@ --kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@ --kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@ --kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@ --l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@ --l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@ --libdir = @libdir@ --libexecdir = @libexecdir@ --libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ --libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ --localstatedir = @localstatedir@ --mandir = @mandir@ --mkdir_p = @mkdir_p@ --nogroup = @nogroup@ --nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ --nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ --oldincludedir = @oldincludedir@ --pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ --pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ --prefix = @prefix@ --program_transform_name = @program_transform_name@ --qt_includes = @qt_includes@ --qt_libraries = @qt_libraries@ --sbindir = @sbindir@ --sharedstatedir = @sharedstatedir@ --supports_i8k_FALSE = @supports_i8k_FALSE@ --supports_i8k_TRUE = @supports_i8k_TRUE@ --sysconfdir = @sysconfdir@ --target = @target@ --target_alias = @target_alias@ --target_cpu = @target_cpu@ --target_os = @target_os@ --target_vendor = @target_vendor@ --unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ --unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ --x_includes = @x_includes@ --x_libraries = @x_libraries@ --xdg_appsdir = @xdg_appsdir@ --xdg_directorydir = @xdg_directorydir@ --xdg_menudir = @xdg_menudir@ --#>- METASOURCES = AUTO --kde_module_LTLIBRARIES = media_propsdlgplugin.la --media_propsdlgplugin_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) --media_propsdlgplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) --AM_CPPFLAGS = $(all_includes) --kde_services_DATA = media_propsdlgplugin.desktop --#>- media_propsdlgplugin_la_SOURCES = propertiespage.cpp propertiespagegui.ui propsdlgshareplugin.cpp --#>+ 1 --media_propsdlgplugin_la_SOURCES=propertiespage.cpp propsdlgshareplugin.cpp propertiespagegui.cpp --#>- all: all-am --#>+ 1 --all: docs-am all-am -- --.SUFFIXES: --.SUFFIXES: .cpp .lo .o .obj --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) --#>- @for dep in $?; do \ --#>- case '$(am__configure_deps)' in \ --#>- *$$dep*) \ --#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ --#>- && exit 0; \ --#>- exit 1;; \ --#>- esac; \ --#>- done; \ --#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ --#>- cd $(top_srcdir) && \ --#>- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile --#>+ 12 -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ -- cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile -- cd $(top_srcdir) && perl admin/am_edit kioslave/media/propsdlgplugin/Makefile.in --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) -- @$(NORMAL_INSTALL) -- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)" -- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ -- else :; fi; \ -- done -- --uninstall-kde_moduleLTLIBRARIES: -- @$(NORMAL_UNINSTALL) -- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ -- done -- --clean-kde_moduleLTLIBRARIES: -- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES) -- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --#>- media_propsdlgplugin.la: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) --#>+ 2 --@KDE_USE_CLOSURE_TRUE@media_propsdlgplugin.la: media_propsdlgplugin.la.closure $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) --@KDE_USE_CLOSURE_FALSE@media_propsdlgplugin.la: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(kde_moduledir) $(media_propsdlgplugin_la_LDFLAGS) $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_LIBADD) $(LIBS) -- --mostlyclean-compile: -- -rm -f *.$(OBJEXT) -- --distclean-compile: -- -rm -f *.tab.c -- --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/propertiespage.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/propsdlgshareplugin.Plo@am__quote@ -- --.cpp.o: --@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -- --.cpp.obj: --@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -- --.cpp.lo: --@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -- --mostlyclean-libtool: -- -rm -f *.lo -- --clean-libtool: -- -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: --install-kde_servicesDATA: $(kde_services_DATA) -- @$(NORMAL_INSTALL) -- test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)" -- @list='$(kde_services_DATA)'; for p in $$list; do \ -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \ -- $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \ -- done -- --uninstall-kde_servicesDATA: -- @$(NORMAL_UNINSTALL) -- @list='$(kde_services_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \ -- done -- --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- tags=; \ -- here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- tags=; \ -- here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(CTAGS_ARGS)$$tags$$unique" \ -- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -- $$tags $$unique -- --GTAGS: -- here=`$(am__cd) $(top_builddir) && pwd` \ -- && cd $(top_srcdir) \ -- && gtags -i $(GTAGS_ARGS) $$here -- --distclean-tags: -- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -- --distdir: $(DISTFILES) -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkdir_p) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ -- if test -d $$d/$$file; then \ -- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ -- fi; \ -- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ -- else \ -- test -f $(distdir)/$$file \ -- || cp -p $$d/$$file $(distdir)/$$file \ -- || exit 1; \ -- fi; \ -- done --check-am: all-am --check: check-am --all-am: Makefile $(LTLIBRARIES) $(DATA) --installdirs: -- for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \ -- test -z "$$dir" || $(mkdir_p) "$$dir"; \ -- done --install: install-am --install-exec: install-exec-am --install-data: install-data-am --uninstall: uninstall-am -- --install-am: all-am -- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -- --installcheck: installcheck-am --install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install --mostlyclean-generic: -- --clean-generic: -- --distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -- --maintainer-clean-generic: -- @echo "This command is intended for maintainers to use" -- @echo "it deletes files that may require special tools to rebuild." --#>- clean: clean-am --#>+ 1 --clean: kde-rpo-clean clean-am -- --#>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ --#>- mostlyclean-am --#>+ 2 --clean-am: clean-metasources clean-ui clean-closures clean-bcheck clean-final clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ -- mostlyclean-am -- --distclean: distclean-am -- -rm -rf ./$(DEPDIR) -- -rm -f Makefile --distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -- --dvi: dvi-am -- --dvi-am: -- --html: html-am -- --info: info-am -- --info-am: -- --#>- install-data-am: install-kde_moduleLTLIBRARIES \ --#>- install-kde_servicesDATA --#>+ 2 --install-data-am: \ -- install-kde_servicesDATA -- --#>- install-exec-am: --#>+ 1 --install-exec-am: install-kde_moduleLTLIBRARIES -- --install-info: install-info-am -- --install-man: -- --installcheck-am: -- --maintainer-clean: maintainer-clean-am -- -rm -rf ./$(DEPDIR) -- -rm -f Makefile --maintainer-clean-am: distclean-am maintainer-clean-generic -- --mostlyclean: mostlyclean-am -- --mostlyclean-am: mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool -- --pdf: pdf-am -- --pdf-am: -- --ps: ps-am -- --ps-am: -- --uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ -- uninstall-kde_servicesDATA -- --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-exec \ -- install-exec-am install-info install-info-am \ -- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \ -- install-man install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ -- uninstall-am uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ -- uninstall-kde_servicesDATA -- --# Tell versions [3.59,3.63) of GNU make to not export all variables. --# Otherwise a system limit (for SysV at least) may be exceeded. --.NOEXPORT: -- --#>+ 8 --media_propsdlgplugin.la.closure: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) -- @echo "int main() {return 0;}" > media_propsdlgplugin_la_closure.cpp -- @$(LTCXXCOMPILE) -c media_propsdlgplugin_la_closure.cpp -- $(CXXLINK) media_propsdlgplugin_la_closure.lo $(media_propsdlgplugin_la_LDFLAGS) $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_LIBADD) $(LIBS) -- @rm -f media_propsdlgplugin_la_closure.* media_propsdlgplugin.la.closure -- @echo "timestamp" > media_propsdlgplugin.la.closure -- -- --#>+ 3 --propsdlgshareplugin.moc: $(srcdir)/propsdlgshareplugin.h -- $(MOC) $(srcdir)/propsdlgshareplugin.h -o propsdlgshareplugin.moc -- --#>+ 2 --mocs: propsdlgshareplugin.moc -- --#>+ 3 --propertiespage.moc: $(srcdir)/propertiespage.h -- $(MOC) $(srcdir)/propertiespage.h -o propertiespage.moc -- --#>+ 2 --mocs: propertiespage.moc -- --#>+ 3 --clean-metasources: -- -rm -f propsdlgshareplugin.moc propertiespage.moc -- --#>+ 2 --KDE_DIST=propertiespagegui.ui Makefile.in propertiespage.h propsdlgshareplugin.h media_propsdlgplugin.desktop propertiespagegui.ui.h Makefile.am -- --#>+ 4 --clean-ui: -- -rm -f \ -- propertiespagegui.cpp propertiespagegui.h propertiespagegui.moc -- --#>+ 3 --clean-closures: -- -rm -f media_propsdlgplugin.la.closure -- --#>+ 2 --docs-am: -- --#>+ 15 --force-reedit: -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ -- cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile -- cd $(top_srcdir) && perl admin/am_edit kioslave/media/propsdlgplugin/Makefile.in -- -- --#>+ 21 --clean-bcheck: -- rm -f *.bchecktest.cc *.bchecktest.cc.class a.out -- --bcheck: bcheck-am -- --bcheck-am: -- @for i in ; do \ -- if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ -- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ -- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ -- echo "$$i"; \ -- if ! $(CXXCOMPILE) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ -- rm -f $$i.bchecktest.cc; exit 1; \ -- fi ; \ -- echo "" >> $$i.bchecktest.cc.class; \ -- perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ -- rm -f a.out; \ -- fi ; \ -- done -- -- --#>+ 11 --media_propsdlgplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/propertiespage.cpp $(srcdir)/propsdlgshareplugin.cpp propertiespagegui.cpp propsdlgshareplugin.moc propertiespagegui.moc propertiespage.moc -- @echo 'creating media_propsdlgplugin_la.all_cpp.cpp ...'; \ -- rm -f media_propsdlgplugin_la.all_cpp.files media_propsdlgplugin_la.all_cpp.final; \ -- echo "#define KDE_USE_FINAL 1" >> media_propsdlgplugin_la.all_cpp.final; \ -- for file in propertiespage.cpp propsdlgshareplugin.cpp propertiespagegui.cpp ; do \ -- echo "#include \"$$file\"" >> media_propsdlgplugin_la.all_cpp.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> media_propsdlgplugin_la.all_cpp.final; \ -- done; \ -- cat media_propsdlgplugin_la.all_cpp.final media_propsdlgplugin_la.all_cpp.files > media_propsdlgplugin_la.all_cpp.cpp; \ -- rm -f media_propsdlgplugin_la.all_cpp.final media_propsdlgplugin_la.all_cpp.files -- --#>+ 3 --clean-final: -- -rm -f media_propsdlgplugin_la.all_cpp.cpp -- --#>+ 3 --final: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_final_OBJECTS)" all-am -- --#>+ 3 --final-install: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_final_OBJECTS)" install-am -- --#>+ 3 --no-final: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_nofinal_OBJECTS)" all-am -- --#>+ 3 --no-final-install: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_nofinal_OBJECTS)" install-am -- --#>+ 3 --kde-rpo-clean: -- -rm -f *.rpo -- --#>+ 9 --nmcheck: --propsdlgshareplugin.o: propsdlgshareplugin.moc --nmcheck-am: nmcheck --propsdlgshareplugin.lo: propsdlgshareplugin.moc --propertiespage.lo: propertiespage.moc --$(srcdir)/propertiespage.cpp: propertiespagegui.h --$(srcdir)/propsdlgshareplugin.cpp: propertiespagegui.h --propertiespage.o: propertiespage.moc -- --#>+ 15 --propertiespagegui.cpp: $(srcdir)/propertiespagegui.ui propertiespagegui.h propertiespagegui.moc -- rm -f propertiespagegui.cpp -- echo '#include <kdialog.h>' > propertiespagegui.cpp -- echo '#include <klocale.h>' >> propertiespagegui.cpp -- $(UIC) -tr ${UIC_TR} -i propertiespagegui.h $(srcdir)/propertiespagegui.ui > propertiespagegui.cpp.temp ; ret=$$?; \ -- $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" propertiespagegui.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_propertiespagegui,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> propertiespagegui.cpp ;\ -- rm -f propertiespagegui.cpp.temp ;\ -- if test "$$ret" = 0; then echo '#include "propertiespagegui.moc"' >> propertiespagegui.cpp; else rm -f propertiespagegui.cpp ; exit $$ret ; fi -- --propertiespagegui.h: $(srcdir)/propertiespagegui.ui -- rm -rf propertiespagegui.h; -- $(UIC) $(srcdir)/propertiespagegui.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> propertiespagegui.h ; --propertiespagegui.moc: propertiespagegui.h -- $(MOC) propertiespagegui.h -o propertiespagegui.moc -diff -urN kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop ---- kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Thu Jan 1 01:00:00 1970 -@@ -1,73 +0,0 @@ --[Desktop Entry] --Encoding=UTF-8 --Type=Service --Name=Media Properties Page --Name[ca]=Pàgina de propietats de suport --Name[cs]=Stránka vlastností média --Name[da]=Medieegenskabsside --Name[de]=Eigenschaften von Medien --Name[el]=Σελίδα ιδιοτήτων μέσων --Name[es]=Página de propiedades de medios --Name[et]=Andmekandjate omadused --Name[fa]=صفحۀ ویژگیهای رسانه --Name[fi]=Mediaominaisuudet --Name[fr]=Page de propriétés du média --Name[he]=דף מאפייני מדיה --Name[hr]=Stranica svojstva medija --Name[hu]=Médiajellemzők lap --Name[is]=Eiginleikar miðils --Name[it]=Pagina delle proprietà dei dispositivi di archiviazione --Name[ja]=メディア属性ページ --Name[km]=ទំព័រលក្ខណៈសម្បត្តិមេឌៀ --Name[nb]=Side for medievarsling --Name[nds]=Medienegenschappen-Siet --Name[nl]=Pagina met media-eigenschappen --Name[nn]=Side for medieeigenskapar --Name[pl]=Strona właściwości nośnika --Name[pt]=Página de Propriedades de Suportes Físicos --Name[pt_BR]=Página de Propriedades de Suportes Físicos --Name[ru]=Свойства носителя --Name[sk]=Strana vlastností média --Name[sl]=Stran z lastnostmi nosilca --Name[sr]=Страна са својствима медијума --Name[sr@Latn]=Strana sa svojstvima medijuma --Name[sv]=Sida för mediaegenskaper --Name[uk]=Сторінка властивостей носіїв інформації --Name[vi]=Trang tài sản phương tiện --Name[zh_TW]=媒體內容頁 --Comment=Konqueror properties dialog plugin to configure mount behaviour --Comment[ca]=Diàleg de propietats de l'endollable Konqueror per a configurar el comportament de muntatge --Comment[cs]=Dialog nastavení chování připojení modulu pro Konqueror --Comment[da]=Konqueror plugin med egenskabsdialog til at indstille monteringsopførsel --Comment[de]=Konqueror-Modul zum Einstellen des Verhaltens beim Einbinden --Comment[el]=Πρόσθετο διαλόγου ιδιοτήτων του Konqueror για τη ρύθμιση της συμπεριφοράς προσάρτησης --Comment[es]=Plugin de diálogo de propiedades de Konqueror para configurar el comportamiento del montaje --Comment[et]=Konquerori seadistustedialoogi plugin andmekandjate ühendamise seadistamiseks --Comment[fa]=وصلۀ محاورۀ ویژگیهای Konqueror برای پیکربندی رفتار سوار کردن --Comment[fi]=Konquerorin ominaisuussovelma, joka tarkkailee liitospisteitä --Comment[fr]=Module de Konqueror pour configurer le comportement du montage --Comment[he]=תוסף חלון מאפיינים של Konqueror לקביעת אפשרויות חיבור --Comment[hr]=Konqueror dodatak dijaloga svojstava za konfiguriranje načina pristupanja --Comment[hu]=Konqueror beállítómodul a csatlakoztatási mód megadásához --Comment[is]=Konqueror eiginleikagluggi til að stilla tengihegðun --Comment[it]=Plugin della configurazione di Konqueror per configurare il montaggio --Comment[ja]=mountの挙動を設定する、Konqueror属性ダイアログ プラグイン --Comment[km]=កម្មវិធីជំនួយឲ្យមានប្រអប់លក្ខណៈសម្បត្តិ Konqueror ដើម្បីកំណត់រចនាសម្ព័ន្ធឥរិយាបថម៉ោន --Comment[nb]=Et programtillegg for å sette opp montering av enheter i Konqueror --Comment[nds]=Egenschappendialoog-Plugin för Konqueror för't Instellen vun't Inhangbedregen --Comment[nl]=Dialoogvenster voor Konqueror om het aankoppelgedrag in te stellen --Comment[nn]=Programtillegg for oppsett av montering i Konqueror --Comment[pl]=Wtyczka okna właściwości Konquerora do konfiguracji zachowania montowania --Comment[pt]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem --Comment[pt_BR]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem --Comment[ru]=Модуль свойств для Konqueror, отвечающий за поведение при подключении файловых систем --Comment[sk]=Modul Konqueror dialógu vlastností pre konfiguráciu správania pripojenia --Comment[sl]=Vstavek za Konqueror s katerim se nastavlja obnašanje priklopa medijev --Comment[sr]=Прикључак са својствима Konqueror-а за подешавање понашања при монтирању --Comment[sr@Latn]=Priključak sa svojstvima Konqueror-a za podešavanje ponašanja pri montiranju --Comment[sv]=Konqueror insticksprogram med egenskapsdialogruta för att anpassa monteringsbeteende --Comment[uk]=Втулок вікна властивостей Konqueror для налаштування поведінки монтування --Comment[vi]=bổ sung hộp thoại tài sản Konqueror để cấu hình ứng xử gắn kết --Comment[zh_TW]=Konqueror 內容對話框外掛程式，用於設定掛載的行為 --X-KDE-Library=media_propsdlgplugin --ServiceTypes=KPropsDlg/Plugin,media/audiocd,media/hdd_mounted,media/hdd_unmounted,media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/nfs_mounted,media/cdwriter_unmounted,media/nfs_unmounted,media/removable_mounted,media/dvd_mounted,media/removable_unmounted,media/dvd_unmounted,media/smb_mounted,media/dvdvideo,media/smb_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/floppy_mounted,media/zip_mounted,media/floppy_unmounted,media/zip_unmounted,media/camera_mounted,media/camera_unmounted -diff -urN kioslave/media/propsdlgplugin/propertiespage.cpp kioslave/media/propsdlgplugin/propertiespage.cpp ---- kioslave/media/propsdlgplugin/propertiespage.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespage.cpp Thu Jan 1 01:00:00 1970 -@@ -1,217 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program 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 General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ -- --#include <qcheckbox.h> --#include <qtooltip.h> --#include <qbuttongroup.h> --#include <qlineedit.h> --#include <qfileinfo.h> --#include <qlabel.h> --#include <qregexp.h> --#include <kpushbutton.h> --#include <kmessagebox.h> --#include <klocale.h> --#include <qcombobox.h> --#include <qtimer.h> --#include <kdebug.h> --#include "propertiespage.h" --#include <dcopref.h> -- --// keep in sync with .ui and kded module --const char *short_names[] = {"lower", "win95", "winnt", "mixed", 0 }; --const char *journales[] = {"data", "ordered", "writeback", 0 }; -- --PropertiesPage::PropertiesPage(QWidget* parent, const QString &_id) -- : PropertiesPageGUI(parent), id(_id) --{ -- kdDebug() << "props page " << id << endl; -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "mountoptions", id); -- -- QStringList list; -- -- if (reply.isValid()) -- list = reply; -- -- if (list.size()) { -- kdDebug() << "list " << list << endl; -- -- for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it) -- { -- QString key = (*it).left((*it).find('=')); -- QString value = (*it).mid((*it).find('=') + 1); -- kdDebug() << "key '" << key << "' value '" << value << "'\n"; -- options[key] = value; -- } -- -- if (!options.contains("ro")) -- option_ro->hide(); -- else -- option_ro->setChecked(options["ro"] == "true"); -- connect( option_ro, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("quiet")) -- option_quiet->hide(); -- else -- option_quiet->setChecked(options["quiet"] == "true"); -- connect( option_quiet, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("sync")) -- option_sync->hide(); -- else -- option_sync->setChecked(options["sync"] == "true"); -- connect( option_sync, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("atime")) -- option_atime->hide(); -- else -- option_atime->setChecked(options["atime"] == "true"); -- connect( option_atime, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("flush")) -- option_flush->hide(); -- else -- option_flush->setChecked(options["flush"] == "true"); -- connect( option_flush, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("utf8")) -- option_utf8->hide(); -- else -- option_utf8->setChecked(options["utf8"] == "true"); -- connect( option_utf8, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("uid")) -- option_uid->hide(); -- else -- option_uid->setChecked(options["uid"] == "true"); -- connect( option_uid, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("shortname")) -- { -- option_shortname->hide(); -- text_shortname->hide(); -- } -- else -- { -- for (int index = 0; short_names[index]; ++index) -- if (options["shortname"] == short_names[index]) -- { -- option_shortname->setCurrentItem(index); -- break; -- } -- connect( option_shortname, SIGNAL( activated(int) ), SIGNAL( changed() ) ); -- } -- -- if (!options.contains("journaling")) -- { -- text_journaling->hide(); -- option_journaling->hide(); -- } -- else -- { -- for (int index = 0; journales[index]; ++index) -- if (options["journaling"] == journales[index]) -- { -- option_journaling->setCurrentItem(index); -- break; -- } -- connect( option_journaling, SIGNAL( activated(int) ), SIGNAL( changed() ) ); -- } -- -- label_filesystem->setText(i18n("Filesystem: %1").arg(options["filesystem"])); -- option_mountpoint->setText(options["mountpoint"]); -- connect( option_mountpoint, SIGNAL( textChanged( const QString &) ), SIGNAL( changed() ) ); -- option_automount->setChecked(options["automount"] == "true"); -- connect( option_automount, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("journaling") && -- !options.contains("shortname") && -- !options.contains("uid") && -- !options.contains("utf8") && -- !options.contains("flush")) -- groupbox_specific->hide(); -- -- } else { -- -- groupbox_generic->setEnabled(false); -- groupbox_specific->setEnabled(false); -- label_filesystem->hide(); -- } --} -- --PropertiesPage::~PropertiesPage() --{ --} -- --bool PropertiesPage::save() --{ -- QStringList result; -- -- if (options.contains("ro")) -- result << QString("ro=%1").arg(option_ro->isChecked() ? "true" : "false"); -- -- if (options.contains("quiet")) -- result << QString("quiet=%1").arg(option_quiet->isChecked() ? "true" : "false"); -- -- if (options.contains("sync")) -- result << QString("sync=%1").arg(option_sync->isChecked() ? "true" : "false"); -- -- if (options.contains("atime")) -- result << QString("atime=%1").arg(option_atime->isChecked() ? "true" : "false"); -- -- if (options.contains("flush")) -- result << QString("flush=%1").arg(option_flush->isChecked() ? "true" : "false"); -- -- if (options.contains("utf8")) -- result << QString("utf8=%1").arg(option_utf8->isChecked() ? "true" : "false"); -- -- if (options.contains("uid")) -- result << QString("uid=%1").arg(option_uid->isChecked() ? "true" : "false"); -- -- if (options.contains("shortname")) -- result << QString("shortname=%1").arg(short_names[option_shortname->currentItem()]); -- -- if (options.contains("journaling")) -- result << QString("journaling=%1").arg(journales[option_journaling->currentItem()]); -- -- QString mp = option_mountpoint->text(); -- if (!mp.startsWith("/media/")) -- { -- KMessageBox::sorry(this, i18n("Mountpoint has to be below /media")); -- return false; -- } -- result << QString("mountpoint=%1").arg(mp); -- result << QString("automount=%1").arg(option_automount->isChecked() ? "true" : "false"); -- -- kdDebug() << result << endl; -- -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "setMountoptions", id, result); -- -- if (reply.isValid()) -- return (bool)reply; -- else { -- KMessageBox::sorry(this, -- i18n("Saving the changes failed")); -- -- return false; -- } --} -- --#include "propertiespage.moc" -diff -urN kioslave/media/propsdlgplugin/propertiespage.h kioslave/media/propsdlgplugin/propertiespage.h ---- kioslave/media/propsdlgplugin/propertiespage.h Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespage.h Thu Jan 1 01:00:00 1970 -@@ -1,46 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program 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 General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ -- --#ifndef PROPERTIESPAGE_H --#define PROPERTIESPAGE_H -- --#include "propertiespagegui.h" --#include <qmap.h> -- --class QCheckBox; --class Medium; -- --class PropertiesPage : public PropertiesPageGUI --{ -- Q_OBJECT -- --public: -- PropertiesPage(QWidget* parent, const QString &_id); -- virtual ~PropertiesPage(); -- -- bool save(); -- --protected: -- -- QMap<QString,QString> options; -- QString id; -- --}; -- --#endif -diff -urN kioslave/media/propsdlgplugin/propertiespagegui.ui kioslave/media/propsdlgplugin/propertiespagegui.ui ---- kioslave/media/propsdlgplugin/propertiespagegui.ui Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespagegui.ui Thu Jan 1 01:00:00 1970 -@@ -1,387 +0,0 @@ --<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> --<class>PropertiesPageGUI</class> --<widget class="QWidget"> -- <property name="name"> -- <cstring>PropertiesPageGUI</cstring> -- </property> -- <property name="geometry"> -- <rect> -- <x>0</x> -- <y>0</y> -- <width>527</width> -- <height>476</height> -- </rect> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <property name="margin"> -- <number>0</number> -- </property> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout17</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QGroupBox"> -- <property name="name"> -- <cstring>groupbox_generic</cstring> -- </property> -- <property name="title"> -- <string>Generic Mount Options</string> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout15</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_ro</cstring> -- </property> -- <property name="text"> -- <string>Read only</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Mount the file system read-only.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_quiet</cstring> -- </property> -- <property name="text"> -- <string>Quiet</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Attempts to chown or chmod files do not return errors, although they fail. Use with caution!</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_sync</cstring> -- </property> -- <property name="text"> -- <string>Synchronous</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>All I/O to the file system should be done synchronously.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_atime</cstring> -- </property> -- <property name="text"> -- <string>Access time updates</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Update inode access time for each access.</string> -- </property> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout14</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>textLabel3</cstring> -- </property> -- <property name="text"> -- <string>Mountpoint:</string> -- </property> -- <property name="buddy" stdset="0"> -- <cstring>option_mountpoint</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Under what directory this file system shall be mounted. Please note that there is no guarantee that the system will respect your wish. For one the directory has to be below /media - and it does not yet have to exist.</string> -- </property> -- </widget> -- <widget class="QLineEdit"> -- <property name="name"> -- <cstring>option_mountpoint</cstring> -- </property> -- <property name="text"> -- <string></string> -- </property> -- </widget> -- </hbox> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_automount</cstring> -- </property> -- <property name="text"> -- <string>Mount automatically</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Mount this file system automatically.</string> -- </property> -- </widget> -- </vbox> -- </widget> -- </vbox> -- </widget> -- <widget class="QGroupBox"> -- <property name="name"> -- <cstring>groupbox_specific</cstring> -- </property> -- <property name="title"> -- <string>Filesystem Specific Mount Options</string> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout11</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_flush</cstring> -- </property> -- <property name="text"> -- <string>Flushed IO</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Always flush all data to the hot plug devices immediately and don't cache it.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_utf8</cstring> -- </property> -- <property name="text"> -- <string>UTF-8 charset</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the console. It can be be enabled for the filesystem with this option.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_uid</cstring> -- </property> -- <property name="text"> -- <string>Mount as user</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Mount this file system as user.</string> -- </property> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout7</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>text_journaling</cstring> -- </property> -- <property name="text"> -- <string>Journaling:</string> -- </property> -- <property name="buddy" stdset="0"> -- <cstring>option_journaling</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> -- --<h3><b>All Data</b></h3> -- All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. -- --<h3><b>Ordered</b></h3> -- All data is forced directly out to the main file system prior to its metadata being committed to the journal. -- --<h3><b>Write Back</b></h3> -- Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery.</string> -- </property> -- </widget> -- <widget class="QComboBox"> -- <item> -- <property name="text"> -- <string>All Data</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Ordered</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Write Back</string> -- </property> -- </item> -- <property name="name"> -- <cstring>option_journaling</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> -- --<h3><b>All Data</b></h3> -- All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. -- --<h3><b>Ordered</b></h3> -- All data is forced directly out to the main file system prior to its metadata being committed to the journal. -- --<h3><b>Write Back</b></h3> -- Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery.</string> -- </property> -- </widget> -- </hbox> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout14</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>text_shortname</cstring> -- </property> -- <property name="text"> -- <string>Short names:</string> -- </property> -- <property name="buddy" stdset="0"> -- <cstring>option_shortname</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> -- --<h3><b>Lower</b></h3> --Force the short name to lower case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows 95</b></h3> --Force the short name to upper case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows NT</b></h3> --Display the shortname as is; store a long name when the short name is not all lower case or all upper case. -- --<h3><b>Mixed</b></h3> --Display the short name as is; store a long name when the short name is not all upper case.</string> -- </property> -- </widget> -- <widget class="QComboBox"> -- <item> -- <property name="text"> -- <string>Lower</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Windows 95</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Windows NT</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Mixed</string> -- </property> -- </item> -- <property name="name"> -- <cstring>option_shortname</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> -- --<h3><b>Lower</b></h3> --Force the short name to lower case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows 95</b></h3> --Force the short name to upper case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows NT</b></h3> --Display the shortname as is; store a long name when the short name is not all lower case or all upper case. -- --<h3><b>Mixed</b></h3> --Display the short name as is; store a long name when the short name is not all upper case.</string> -- </property> -- </widget> -- </hbox> -- </widget> -- </vbox> -- </widget> -- </vbox> -- </widget> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>label_filesystem</cstring> -- </property> -- <property name="text"> -- <string>Filesystem: iso9660</string> -- </property> -- </widget> -- <spacer> -- <property name="name"> -- <cstring>spacer1</cstring> -- </property> -- <property name="orientation"> -- <enum>Vertical</enum> -- </property> -- <property name="sizeType"> -- <enum>Expanding</enum> -- </property> -- <property name="sizeHint"> -- <size> -- <width>20</width> -- <height>20</height> -- </size> -- </property> -- </spacer> -- </vbox> -- </widget> -- </hbox> --</widget> --<connections> -- <connection> -- <sender>option_ro</sender> -- <signal>stateChanged(int)</signal> -- <receiver>PropertiesPageGUI</receiver> -- <slot>changedSlot()</slot> -- </connection> --</connections> --<variables> -- <variable>bool m_hasChanged;</variable> --</variables> --<signals> -- <signal>changed()</signal> --</signals> --<slots> -- <slot access="protected">changedSlot()</slot> --</slots> --<functions> -- <function returnType="bool">hasChanged()</function> --</functions> --<layoutdefaults spacing="6" margin="11"/> --</UI> -diff -urN kioslave/media/propsdlgplugin/propertiespagegui.ui.h kioslave/media/propsdlgplugin/propertiespagegui.ui.h ---- kioslave/media/propsdlgplugin/propertiespagegui.ui.h Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespagegui.ui.h Thu Jan 1 01:00:00 1970 -@@ -1,22 +0,0 @@ --/**************************************************************************** --** ui.h extension file, included from the uic-generated form implementation. --** --** If you wish to add, delete or rename functions or slots use --** Qt Designer which will update this file, preserving your code. Create an --** init() function in place of a constructor, and a destroy() function in --** place of a destructor. --*****************************************************************************/ -- -- --void PropertiesPageGUI::changedSlot() --{ -- m_hasChanged = true; -- emit changed(); --} -- --bool PropertiesPageGUI::hasChanged() --{ -- return m_hasChanged; --} -- -- -diff -urN kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp ---- kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp Thu Jan 1 01:00:00 1970 -@@ -1,100 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program 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 General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ --#include <qstring.h> --#include <qvbox.h> --#include <qlayout.h> --#include <qlabel.h> --#include <qtimer.h> -- --#include <kgenericfactory.h> --#include <kdebug.h> --#include <kpushbutton.h> --#include <kfileshare.h> --#include <kmessagebox.h> --#include <kprocess.h> --#include <kstandarddirs.h> --#include <kdialog.h> --#include <kglobal.h> --#include <dcopref.h> -- --#include "propertiespage.h" --#include "propsdlgshareplugin.h" --#include "../libmediacommon/medium.h" -- --typedef KGenericFactory<PropsDlgSharePlugin, KPropertiesDialog> PropsDlgSharePluginFactory; -- --K_EXPORT_COMPONENT_FACTORY( media_propsdlgplugin, -- PropsDlgSharePluginFactory("media_propsdlgplugin") ) -- --class PropsDlgSharePlugin::Private --{ -- public: -- PropertiesPage* page; --}; -- --PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg, -- const char *, const QStringList & ) -- : KPropsDlgPlugin(dlg), d(0) --{ -- if (properties->items().count() != 1) -- return; -- -- KFileItem *item = properties->items().first(); -- -- DCOPRef mediamanager("kded", "mediamanager"); -- kdDebug() << "properties " << item->url() << endl; -- DCOPReply reply = mediamanager.call( "properties", item->url().url() ); -- -- if ( !reply.isValid() ) -- return; -- -- QVBox* vbox = properties->addVBoxPage(i18n("&Mounting")); -- -- d = new Private(); -- -- d->page = new PropertiesPage(vbox, Medium::create(reply).id()); -- connect(d->page, SIGNAL(changed()), -- SLOT(slotChanged())); -- -- // QTimer::singleShot(100, this, SLOT(slotChanged())); -- --} -- --void PropsDlgSharePlugin::slotChanged() --{ -- kdDebug() << "slotChanged()\n"; -- setDirty(true); --} -- --PropsDlgSharePlugin::~PropsDlgSharePlugin() --{ -- delete d; --} -- --void PropsDlgSharePlugin::applyChanges() --{ -- kdDebug() << "applychanges\n"; -- if (!d->page->save()) { -- properties->abortApplying(); -- } --} -- -- --#include "propsdlgshareplugin.moc" -- -diff -urN kioslave/media/propsdlgplugin/propsdlgshareplugin.h kioslave/media/propsdlgplugin/propsdlgshareplugin.h ---- kioslave/media/propsdlgplugin/propsdlgshareplugin.h Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propsdlgshareplugin.h Thu Jan 1 01:00:00 1970 -@@ -1,44 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program 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 General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ -- --#ifndef KONQFILESHAREPLUGIN_H --#define KONQFILESHAREPLUGIN_H -- --#include <kpropertiesdialog.h> -- --class PropsDlgSharePlugin : public KPropsDlgPlugin --{ --Q_OBJECT --public: -- PropsDlgSharePlugin( KPropertiesDialog *dlg, const char *, const QStringList & ); -- virtual ~PropsDlgSharePlugin(); -- virtual void applyChanges(); -- --public slots: -- void slotChanged(); -- --private: -- class Private; -- Private *d; -- --}; -- --#endif -- -- -diff -urN kioslave/media/services/Makefile.in kioslave/media/services/Makefile.in ---- kioslave/media/services/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/services/Makefile.in Fri May 26 09:54:31 2006 -@@ -211,6 +211,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/services/media_eject.desktop kioslave/media/services/media_eject.desktop ---- kioslave/media/services/media_eject.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/services/media_eject.desktop Mon May 22 20:12:42 2006 -@@ -24,7 +24,7 @@ - Name[es]=Expulsar - Name[et]=Väljastamine - Name[eu]=Egotzi --Name[fa]=پس زدن -+Name[fa]=اخراج - Name[fi]=Poista - Name[fr]=Éjecter - Name[fy]=Utsmytknop -diff -urN kioslave/media/services/media_safelyremove.desktop kioslave/media/services/media_safelyremove.desktop ---- kioslave/media/services/media_safelyremove.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/services/media_safelyremove.desktop Tue May 23 13:33:34 2006 -@@ -18,10 +18,8 @@ - Name[es]=Extracción segura - Name[et]=Eemalda turvaliselt - Name[eu]=Atera arriskurik gabe --Name[fa]=حذف امن - Name[fi]=Poista turvallisesti - Name[fr]=Enlever en toute sécurité --Name[fy]=Feilich verwiderje - Name[ga]=Bain Amach go Sábháilte - Name[gl]=Eliminar de Maneira Segura - Name[he]=שליפה בבטחה -@@ -46,7 +44,6 @@ - Name[ru]=Безопасно извлечь - Name[rw]=Gukuramo Neza - Name[se]=Dorvvošlaš eretváldin --Name[sk]=Bezpečne odpojiť - Name[sl]=Varno odstrani - Name[sr]=Безбедно уклони - Name[sr@Latn]=Bezbedno ukloni diff --git a/x11/kde4-workspace/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kde4-workspace/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp deleted file mode 100644 index 5a6937d40f75..000000000000 --- a/x11/kde4-workspace/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- kioslave/media/mediamanager/fstabbackend.cpp.orig Mon May 22 20:12:42 2006 -+++ kioslave/media/mediamanager/fstabbackend.cpp Fri Jun 16 08:56:20 2006 -@@ -111,6 +111,7 @@ - if ( mount->mountType() == "swap" - || mount->mountType() == "tmpfs" - || mount->mountType() == "sysfs" -+ || mount->mountType() == "fdescfs" - || mount->mountType() == "kernfs" - || mount->mountType() == "usbfs" - || mount->mountType().contains( "proc" ) diff --git a/x11/kde4-workspace/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp b/x11/kde4-workspace/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp index 00685d0fd8a2..e2580f9277c0 100644 --- a/x11/kde4-workspace/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp +++ b/x11/kde4-workspace/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp @@ -1,5 +1,5 @@ ---- kioslave/media/mediamanager/halbackend.cpp.orig Sun Oct 1 21:31:54 2006 -+++ kioslave/media/mediamanager/halbackend.cpp Fri Feb 9 22:01:27 2007 +--- kioslave/media/mediamanager/halbackend.cpp.orig Mon Jan 15 12:31:32 2007 ++++ kioslave/media/mediamanager/halbackend.cpp Sat Mar 3 18:00:49 2007 @@ -17,9 +17,14 @@ */ @@ -14,9 +14,9 @@ +#include <langinfo.h> +#endif - #include <qfile.h> - #include <klocale.h> -@@ -66,6 +71,10 @@ + #include <kapplication.h> + #include <qeventloop.h> +@@ -71,6 +76,10 @@ /* Close HAL connection */ if (m_halContext) { @@ -27,7 +27,7 @@ const QPtrList<Medium> medlist = m_mediaList.list(); QPtrListIterator<Medium> it (medlist); for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) -@@ -185,6 +194,10 @@ +@@ -184,6 +193,10 @@ libhal_free_string_array( halDeviceList ); @@ -38,9 +38,9 @@ return true; } -@@ -242,11 +255,11 @@ - Medium* medium = new Medium(udi, ""); - +@@ -251,11 +264,11 @@ + } + } QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi)); - kdDebug() << "automount " << options["automount"] << endl; + kdDebug(1219) << "automount " << options["automount"] << endl; @@ -50,9 +50,9 @@ - kdDebug() << "error " << error << endl; + kdDebug(1219) << "error " << error << endl; } - setVolumeProperties(medium); m_mediaList.addMedium(medium, allowNotification); -@@ -264,6 +277,11 @@ + +@@ -272,6 +285,11 @@ Medium* medium = new Medium(udi, ""); setFloppyProperties(medium); m_mediaList.addMedium(medium, allowNotification); @@ -64,7 +64,7 @@ return; } -@@ -285,12 +303,23 @@ +@@ -293,12 +311,23 @@ void HALBackend::RemoveDevice(const char *udi) { @@ -89,7 +89,7 @@ const char* mediumUdi = findMediumUdiFromUdi(udi); if (!mediumUdi) return; -@@ -326,7 +355,7 @@ +@@ -334,7 +363,7 @@ } const char* mediumUdi = findMediumUdiFromUdi(udi); @@ -98,7 +98,7 @@ if (!mediumUdi) return; -@@ -384,7 +413,7 @@ +@@ -392,7 +421,7 @@ { Medium m( *cmedium ); if ( setFstabProperties( &m ) ) { @@ -107,7 +107,7 @@ m_mediaList.changeMediumState(m, false); } return; -@@ -399,6 +428,7 @@ +@@ -407,6 +436,7 @@ setFloppyProperties(m); if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) setCameraProperties(m); @@ -115,7 +115,7 @@ m_mediaList.changeMediumState(*m, false); -@@ -469,28 +499,23 @@ +@@ -479,28 +509,23 @@ else mimeType = "media/dvd" + MOUNT_SUFFIX; @@ -155,7 +155,7 @@ } else { -@@ -575,7 +600,7 @@ +@@ -584,7 +609,7 @@ } } @@ -164,7 +164,7 @@ QString fstype = medium->fsType(); if ( fstype.isNull() ) fstype = "auto"; -@@ -762,7 +787,7 @@ +@@ -794,7 +819,7 @@ if (t.endsWith("=")) t = t.left(t.length() - 1); valids[t] = true; @@ -173,7 +173,7 @@ } libhal_free_string_array(array); QStringList result; -@@ -882,12 +908,20 @@ +@@ -915,12 +940,20 @@ result << "journaling=ordered"; } @@ -195,7 +195,7 @@ KConfig config("mediamanagerrc"); config.setGroup(name); -@@ -927,7 +959,7 @@ +@@ -960,7 +993,7 @@ if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, "org.freedesktop.Hal.Device.Volume", "Mount"))) { @@ -204,7 +204,7 @@ return i18n("Internal Error"); } -@@ -935,7 +967,7 @@ +@@ -968,7 +1001,7 @@ DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &poptions, noptions, DBUS_TYPE_INVALID)) { @@ -213,7 +213,7 @@ dbus_message_unref (dmesg); return i18n("Internal Error"); } -@@ -963,7 +995,7 @@ +@@ -996,7 +1029,7 @@ return qerror; } @@ -222,18 +222,25 @@ dbus_message_unref (dmesg); dbus_message_unref (reply); -@@ -974,15 +1006,33 @@ +@@ -1044,7 +1077,7 @@ void HALBackend::slotResult(KIO::Job *job) { - kdDebug() << "slotResult " << mount_jobs[job] << endl; + kdDebug(1219) << "slotResult " << mount_jobs[job] << endl; - if (job->error()) - { - KMessageBox::error(0, job->errorText()); + + struct mount_job_data *data = mount_jobs[job]; + QString& qerror = data->errorMessage; +@@ -1071,7 +1104,6 @@ + qerror = job->errorText(); } -- ResetProperties( mount_jobs[job].latin1() ); + +- ResetProperties( medium->id().latin1() ); mount_jobs.remove(job); + + /* Job completed. Notify the caller */ +@@ -1080,6 +1112,25 @@ + kapp->eventLoop()->exitLoop(); } +#ifdef Q_OS_FREEBSD @@ -247,7 +254,7 @@ + { + bool mounted = false; + const char *dev = (*it)->deviceNode().ascii(); -+ for (int n = mntNum-1; n >= 0 && !mounted; n--) ++ for (int n = mntNum-1; n >= 0 && !mounted; n--) + mounted = !strcmp(dev, mntBuf[n].f_mntfromname); + if ((*it)->isMounted() != mounted) + ResetProperties((*it)->id().latin1()); @@ -258,31 +265,32 @@ QString HALBackend::isInFstab(const Medium *medium) { KMountPoint::List fstab = KMountPoint::possibleMountPoints(KMountPoint::NeedMountOptions|KMountPoint::NeedRealDeviceName); -@@ -992,11 +1042,13 @@ - - for (; it!=end; ++it) - { -- kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl; -+ kdDebug(1219) << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl; - if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && (*it)->realDeviceName() == medium->deviceNode() ) ) +@@ -1092,12 +1143,14 @@ + QString reald = (*it)->realDeviceName(); + if ( reald.endsWith( "/" ) ) + reald = reald.left( reald.length() - 1 ); +- kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << reald << "- -" << (*it)->mountedFrom() << "-" << endl; ++ kdDebug(1219) << "isInFstab -" << medium->deviceNode() << "- -" << reald << "- -" << (*it)->mountedFrom() << "-" << endl; + if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && reald == medium->deviceNode() ) ) { +#ifndef Q_OS_FREEBSD QStringList opts = (*it)->mountOptions(); if (opts.contains("user") || opts.contains("users")) -+#endif return (*it)->mountPoint(); ++#endif } } -@@ -1012,7 +1064,7 @@ - QString mountPoint = isInFstab(medium); - if (!mountPoint.isNull()) - { + +@@ -1116,7 +1169,7 @@ + data.completed = false; + data.medium = medium; + - kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; + kdDebug(1219) << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint ); connect(job, SIGNAL( result (KIO::Job *)), SLOT( slotResult( KIO::Job *))); -@@ -1023,7 +1075,7 @@ +@@ -1134,7 +1187,7 @@ QStringList soptions; @@ -291,7 +299,7 @@ QMap<QString,QString> valids = MediaManagerUtils::splitOptions(mountoptions(medium->id())); if (valids["flush"] == "true") -@@ -1036,10 +1088,10 @@ +@@ -1147,10 +1200,10 @@ if (valids["ro"] == "true") soptions << "ro"; @@ -304,7 +312,7 @@ if (valids["quiet"] == "true") soptions << "quiet"; -@@ -1069,6 +1121,13 @@ +@@ -1180,6 +1233,13 @@ soptions << QString("data=ordered"); } @@ -318,7 +326,7 @@ const char **options = new const char*[soptions.size() + 1]; uint noptions = 0; for (QStringList::ConstIterator it = soptions.begin(); it != soptions.end(); ++it, ++noptions) -@@ -1081,9 +1140,6 @@ +@@ -1192,9 +1252,6 @@ return qerror; } @@ -328,16 +336,7 @@ return QString(); } -@@ -1121,7 +1177,7 @@ - QString mountPoint = isInFstab(medium); - if (!mountPoint.isNull()) - { -- kdDebug() << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl; -+ kdDebug(1219) << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl; - KIO::Job *job = KIO::unmount( medium->mountPoint(), false ); - connect(job, SIGNAL( result (KIO::Job *)), - SLOT( slotResult( KIO::Job *))); -@@ -1134,7 +1190,7 @@ +@@ -1255,7 +1312,7 @@ const char *options[2]; const char *udi = medium->id().latin1(); @@ -346,7 +345,7 @@ dbus_error_init(&error); DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -@@ -1147,7 +1203,7 @@ +@@ -1268,7 +1325,7 @@ if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, "org.freedesktop.Hal.Device.Volume", "Unmount"))) { @@ -355,7 +354,7 @@ return i18n("Internal Error"); } -@@ -1157,7 +1213,7 @@ +@@ -1278,7 +1335,7 @@ if (!dbus_message_append_args (dmesg, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, 0, DBUS_TYPE_INVALID)) { @@ -364,16 +363,16 @@ dbus_message_unref (dmesg); return i18n("Internal Error"); } -@@ -1165,7 +1221,7 @@ - dbus_error_init (&error); - if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) +@@ -1288,7 +1345,7 @@ { + QString qerror, reason; + - kdDebug() << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl; + kdDebug(1219) << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl; - QString qerror = error.message; - if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.Busy")) { - qerror = QString("<qt>") + i18n("Device is Busy:"); -@@ -1201,13 +1257,10 @@ + qerror = "<qt>"; + qerror += i18n("Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and " + "currently mounted at <b>%4</b> could not be unmounted. ").arg( +@@ -1318,13 +1375,10 @@ return qerror; } diff --git a/x11/kde4-workspace/files/extrapatch-kioslave_media_mediamanager-halbackend.h b/x11/kde4-workspace/files/extrapatch-kioslave_media_mediamanager-halbackend.h index df548eb39905..21672b565977 100644 --- a/x11/kde4-workspace/files/extrapatch-kioslave_media_mediamanager-halbackend.h +++ b/x11/kde4-workspace/files/extrapatch-kioslave_media_mediamanager-halbackend.h @@ -1,5 +1,5 @@ ---- kioslave/media/mediamanager/halbackend.h.orig Sun Jan 28 23:58:13 2007 -+++ kioslave/media/mediamanager/halbackend.h Thu Feb 1 02:51:48 2007 +--- kioslave/media/mediamanager/halbackend.h.orig Mon Jan 15 12:31:32 2007 ++++ kioslave/media/mediamanager/halbackend.h Wed Feb 21 15:01:12 2007 @@ -34,6 +34,9 @@ #include <qobject.h> #include <qstringlist.h> @@ -10,7 +10,7 @@ #include <config.h> -@@ -154,6 +157,9 @@ +@@ -156,6 +159,9 @@ private slots: void slotResult(KIO::Job *job); @@ -20,10 +20,10 @@ /* Hal call-backs -- from gvm*/ public: -@@ -217,6 +223,10 @@ - DBusConnection *dbus_connection; +@@ -233,6 +239,10 @@ + }; - QMap<KIO::Job *, QString> mount_jobs; + QMap<KIO::Job *, struct mount_job_data*> mount_jobs; +#ifdef Q_OS_FREEBSD + QTimer m_pollTimer; + QPtrList<Medium> m_pollMediaList; diff --git a/x11/kde4-workspace/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp b/x11/kde4-workspace/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp index 508019a14f3c..7d0fbfa81767 100644 --- a/x11/kde4-workspace/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp +++ b/x11/kde4-workspace/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp @@ -1,6 +1,6 @@ ---- kioslave/media/mounthelper/kio_media_mounthelper.cpp.orig Sat Jan 27 01:58:24 2007 -+++ kioslave/media/mounthelper/kio_media_mounthelper.cpp Sat Jan 27 02:35:28 2007 -@@ -77,7 +77,9 @@ +--- kioslave/media/mounthelper/kio_media_mounthelper.cpp.orig Mon Jan 15 12:31:31 2007 ++++ kioslave/media/mounthelper/kio_media_mounthelper.cpp Wed Feb 21 15:17:23 2007 +@@ -89,7 +89,9 @@ m_isCdrom = medium.mimeType().find("dvd")!=-1 || medium.mimeType().find("cd")!=-1; @@ -11,7 +11,7 @@ { DCOPRef mediamanager("kded", "mediamanager"); DCOPReply reply = mediamanager.call( "unmount", medium.id()); -@@ -85,13 +87,14 @@ +@@ -97,30 +99,14 @@ reply.get(m_errorStr); kdDebug() << "medium unmount " << m_errorStr << endl; if (m_errorStr.isNull()) @@ -26,6 +26,23 @@ - } - else if (args->isSet("s") || args->isSet("e")) - { +- /* +- * We want to call mediamanager unmount before invoking eject. That's +- * because unmount would provide an informative error message in case of +- * failure. However, there are cases when unmount would fail +- * (supermount, slackware, see bug#116209) but eject would succeed. +- * Thus if unmount fails, save unmount error message and invokeEject() +- * anyway. Only if both unmount and eject fail, notify the user by +- * displaying the saved error message (see ejectFinished()). +- */ +- if (medium.isMounted()) +- { +- DCOPRef mediamanager("kded", "mediamanager"); +- DCOPReply reply = mediamanager.call( "unmount", medium.id()); +- if (reply.isValid()) +- reply.get(m_errorStr); +- m_device = device; +- } - invokeEject(device, true); } else diff --git a/x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c deleted file mode 100644 index e0179de4e074..000000000000 --- a/x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c +++ /dev/null @@ -1,11 +0,0 @@ ---- kdm/kfrontend/genkdmconf.c.orig Mon Jun 5 14:34:06 2006 -+++ kdm/kfrontend/genkdmconf.c Mon Jun 5 14:35:52 2006 -@@ -1684,7 +1684,7 @@ - linkfile( ce ); - else { - tmpf = locate( "mktemp" ) ? -- "`mktemp`" : -+ "`mktemp /tmp/xsess-env-XXXXXX`" : - locate( "tempfile" ) ? - "`tempfile`" : - "$HOME/.xsession-env-$DISPLAY"; diff --git a/x11/kde4-workspace/files/patch-kwin-client.cpp b/x11/kde4-workspace/files/patch-kwin-client.cpp deleted file mode 100644 index d8e0f91db691..000000000000 --- a/x11/kde4-workspace/files/patch-kwin-client.cpp +++ /dev/null @@ -1,39 +0,0 @@ ---- kwin/client.cpp.orig Mon Oct 2 03:02:07 2006 -+++ kwin/client.cpp Mon Jan 8 10:54:19 2007 -@@ -477,17 +477,30 @@ - // calls it or when the decoration is created/destroyed - - if( Shape::version() >= 0x11 ) // 1.1, has input shape support -- { // there appears to be no way to find out if a window has input -- // shape set or not, so always set propagate the input shape -- // (it's the same like the bounding shape by default) -- XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, 0, 0, -+ { // There appears to be no way to find out if a window has input -+ // shape set or not, so always propagate the input shape -+ // (it's the same like the bounding shape by default). -+ // Also, build the shape using a helper window, not directly -+ // in the frame window, because the sequence set-shape-to-frame, -+ // remove-shape-of-client, add-input-shape-of-client has the problem -+ // that after the second step there's a hole in the input shape -+ // until the real shape of the client is added and that can make -+ // the window lose focus (which is a problem with mouse focus policies) -+ static Window helper_window = None; -+ if( helper_window == None ) -+ helper_window = XCreateSimpleWindow( qt_xdisplay(), qt_xrootwin(), -+ 0, 0, 1, 1, 0, 0, 0 ); -+ XResizeWindow( qt_xdisplay(), helper_window, width(), height()); -+ XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput, 0, 0, - frameId(), ShapeBounding, ShapeSet ); -- XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, -+ XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput, - clientPos().x(), clientPos().y(), - window(), ShapeBounding, ShapeSubtract ); -- XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, -+ XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput, - clientPos().x(), clientPos().y(), - window(), ShapeInput, ShapeUnion ); -+ XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, 0, 0, -+ helper_window, ShapeInput, ShapeSet ); - } - } - diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist index 46ca7f96cbe8..bd60a8fa6ce8 100644 --- a/x11/kde4-workspace/pkg-plist +++ b/x11/kde4-workspace/pkg-plist @@ -440,6 +440,9 @@ lib/kde3/kicker.so lib/kde3/kickermenu_find.a lib/kde3/kickermenu_find.la lib/kde3/kickermenu_find.so +lib/kde3/kickermenu_kate.a +lib/kde3/kickermenu_kate.la +lib/kde3/kickermenu_kate.so lib/kde3/kickermenu_kdeprint.a lib/kde3/kickermenu_kdeprint.la lib/kde3/kickermenu_kdeprint.so @@ -1158,6 +1161,7 @@ share/apps/kappfinder/apps/Internet/mozilla.desktop share/apps/kappfinder/apps/Internet/netscape.desktop share/apps/kappfinder/apps/Internet/netscape6.desktop share/apps/kappfinder/apps/Internet/opera.desktop +share/apps/kappfinder/apps/Internet/wireshark.desktop share/apps/kappfinder/apps/Internet/xbiff.desktop share/apps/kappfinder/apps/Internet/xchat.desktop share/apps/kappfinder/apps/Internet/xfmail.desktop @@ -1628,6 +1632,7 @@ share/apps/kicker/icons/locolor/16x16/actions/modified.png share/apps/kicker/menuext/find.desktop share/apps/kicker/menuext/find/kfind.desktop share/apps/kicker/menuext/find/websearch.desktop +share/apps/kicker/menuext/katesessionmenu.desktop share/apps/kicker/menuext/konquerormenu.desktop share/apps/kicker/menuext/konsolemenu.desktop share/apps/kicker/menuext/prefmenu.desktop @@ -2081,7 +2086,7 @@ share/desktop-directories/kde-edutainment.directory share/desktop-directories/kde-games-arcade.directory share/desktop-directories/kde-games-board.directory share/desktop-directories/kde-games-card.directory -share/desktop-directories/kde-games-kidsgames.directory +share/desktop-directories/kde-games-kids.directory share/desktop-directories/kde-games-roguelikes.directory share/desktop-directories/kde-games-strategy.directory share/desktop-directories/kde-games.directory @@ -2420,6 +2425,7 @@ share/doc/HTML/en/khelpcenter/userguide/common share/doc/HTML/en/khelpcenter/userguide/control-center.docbook share/doc/HTML/en/khelpcenter/userguide/creating-graphics.docbook share/doc/HTML/en/khelpcenter/userguide/credits-and-license.docbook +share/doc/HTML/en/khelpcenter/userguide/customizing-desktop.docbook share/doc/HTML/en/khelpcenter/userguide/desktop.png share/doc/HTML/en/khelpcenter/userguide/email.docbook share/doc/HTML/en/khelpcenter/userguide/extragear-applications.docbook @@ -2480,6 +2486,7 @@ share/doc/HTML/en/khelpcenter/userguide/ripsettings.png share/doc/HTML/en/khelpcenter/userguide/screen-captures.docbook share/doc/HTML/en/khelpcenter/userguide/services.png share/doc/HTML/en/khelpcenter/userguide/shared-sessions.docbook +share/doc/HTML/en/khelpcenter/userguide/splash-screen.png share/doc/HTML/en/khelpcenter/userguide/standard-menu-entries.docbook share/doc/HTML/en/khelpcenter/userguide/switching-sessions.docbook share/doc/HTML/en/khelpcenter/userguide/the-filemanager.docbook @@ -2492,7 +2499,6 @@ share/doc/HTML/en/khelpcenter/userguide/where-next.docbook share/doc/HTML/en/khelpcenter/userguide/windows-how-to.docbook share/doc/HTML/en/khelpcenter/userguide/your-kde-account.docbook share/doc/HTML/en/khelpcenter/visualdict/common -share/doc/HTML/en/khelpcenter/visualdict/contextmenu.png share/doc/HTML/en/khelpcenter/visualdict/index.cache.bz2 share/doc/HTML/en/khelpcenter/visualdict/index.docbook share/doc/HTML/en/khelpcenter/visualdict/pict1.png @@ -2508,6 +2514,9 @@ share/doc/HTML/en/khelpcenter/visualdict/pict18.png share/doc/HTML/en/khelpcenter/visualdict/pict19.png share/doc/HTML/en/khelpcenter/visualdict/pict2.png share/doc/HTML/en/khelpcenter/visualdict/pict20.png +share/doc/HTML/en/khelpcenter/visualdict/pict21.png +share/doc/HTML/en/khelpcenter/visualdict/pict22.png +share/doc/HTML/en/khelpcenter/visualdict/pict23.png share/doc/HTML/en/khelpcenter/visualdict/pict3.png share/doc/HTML/en/khelpcenter/visualdict/pict4.png share/doc/HTML/en/khelpcenter/visualdict/pict5.png @@ -2649,6 +2658,7 @@ share/doc/HTML/en/knetattach/common share/doc/HTML/en/knetattach/index.cache.bz2 share/doc/HTML/en/knetattach/index.docbook share/doc/HTML/en/knetattach/screenshot.png +share/doc/HTML/en/knetattach/screenshot1.png share/doc/HTML/en/knetattach/screenshot2.png share/doc/HTML/en/knetattach/screenshot3.png share/doc/HTML/en/knetattach/screenshot4.png @@ -2742,7 +2752,6 @@ share/icons/crystalsvg/128x128/apps/licq.png share/icons/crystalsvg/128x128/apps/linuxconf.png share/icons/crystalsvg/128x128/apps/locale.png share/icons/crystalsvg/128x128/apps/looknfeel.png -share/icons/crystalsvg/128x128/apps/mozilla.png share/icons/crystalsvg/128x128/apps/multimedia.png share/icons/crystalsvg/128x128/apps/netscape.png share/icons/crystalsvg/128x128/apps/package.png @@ -2808,7 +2817,6 @@ share/icons/crystalsvg/16x16/apps/enhanced_browsing.png share/icons/crystalsvg/16x16/apps/evolution.png share/icons/crystalsvg/16x16/apps/fifteenpieces.png share/icons/crystalsvg/16x16/apps/filetypes.png -share/icons/crystalsvg/16x16/apps/firefox.png share/icons/crystalsvg/16x16/apps/fonts.png share/icons/crystalsvg/16x16/apps/gabber.png share/icons/crystalsvg/16x16/apps/gaim.png @@ -2862,9 +2870,6 @@ share/icons/crystalsvg/16x16/apps/looknfeel.png share/icons/crystalsvg/16x16/apps/lyx.png share/icons/crystalsvg/16x16/apps/mac.png share/icons/crystalsvg/16x16/apps/mathematica.png -share/icons/crystalsvg/16x16/apps/mozilla.png -share/icons/crystalsvg/16x16/apps/mozilla_m.png -share/icons/crystalsvg/16x16/apps/mozilla_mail.png share/icons/crystalsvg/16x16/apps/multimedia.png share/icons/crystalsvg/16x16/apps/nedit.png share/icons/crystalsvg/16x16/apps/netscape.png @@ -2911,7 +2916,6 @@ share/icons/crystalsvg/16x16/apps/stylesheet.png share/icons/crystalsvg/16x16/apps/systemtray.png share/icons/crystalsvg/16x16/apps/taskbar.png share/icons/crystalsvg/16x16/apps/terminal.png -share/icons/crystalsvg/16x16/apps/thunderbird.png share/icons/crystalsvg/16x16/apps/tux.png share/icons/crystalsvg/16x16/apps/usb.png share/icons/crystalsvg/16x16/apps/vnc.png @@ -3016,7 +3020,6 @@ share/icons/crystalsvg/32x32/apps/error.png share/icons/crystalsvg/32x32/apps/evolution.png share/icons/crystalsvg/32x32/apps/fifteenpieces.png share/icons/crystalsvg/32x32/apps/filetypes.png -share/icons/crystalsvg/32x32/apps/firefox.png share/icons/crystalsvg/32x32/apps/fonts.png share/icons/crystalsvg/32x32/apps/gabber.png share/icons/crystalsvg/32x32/apps/gaim.png @@ -3071,9 +3074,6 @@ share/icons/crystalsvg/32x32/apps/looknfeel.png share/icons/crystalsvg/32x32/apps/lyx.png share/icons/crystalsvg/32x32/apps/mac.png share/icons/crystalsvg/32x32/apps/mathematica.png -share/icons/crystalsvg/32x32/apps/mozilla.png -share/icons/crystalsvg/32x32/apps/mozilla_m.png -share/icons/crystalsvg/32x32/apps/mozilla_mail.png share/icons/crystalsvg/32x32/apps/multimedia.png share/icons/crystalsvg/32x32/apps/nedit.png share/icons/crystalsvg/32x32/apps/netscape.png @@ -3118,7 +3118,6 @@ share/icons/crystalsvg/32x32/apps/stylesheet.png share/icons/crystalsvg/32x32/apps/systemtray.png share/icons/crystalsvg/32x32/apps/taskbar.png share/icons/crystalsvg/32x32/apps/terminal.png -share/icons/crystalsvg/32x32/apps/thunderbird.png share/icons/crystalsvg/32x32/apps/tux.png share/icons/crystalsvg/32x32/apps/usb.png share/icons/crystalsvg/32x32/apps/vnc.png @@ -3177,7 +3176,6 @@ share/icons/crystalsvg/48x48/apps/enhanced_browsing.png share/icons/crystalsvg/48x48/apps/evolution.png share/icons/crystalsvg/48x48/apps/fifteenpieces.png share/icons/crystalsvg/48x48/apps/filetypes.png -share/icons/crystalsvg/48x48/apps/firefox.png share/icons/crystalsvg/48x48/apps/fonts.png share/icons/crystalsvg/48x48/apps/gabber.png share/icons/crystalsvg/48x48/apps/gaim.png @@ -3226,9 +3224,6 @@ share/icons/crystalsvg/48x48/apps/licq.png share/icons/crystalsvg/48x48/apps/linuxconf.png share/icons/crystalsvg/48x48/apps/locale.png share/icons/crystalsvg/48x48/apps/looknfeel.png -share/icons/crystalsvg/48x48/apps/mozilla.png -share/icons/crystalsvg/48x48/apps/mozilla_m.png -share/icons/crystalsvg/48x48/apps/mozilla_mail.png share/icons/crystalsvg/48x48/apps/multimedia.png share/icons/crystalsvg/48x48/apps/nedit.png share/icons/crystalsvg/48x48/apps/netscape.png @@ -3330,7 +3325,6 @@ share/icons/crystalsvg/64x64/apps/licq.png share/icons/crystalsvg/64x64/apps/linuxconf.png share/icons/crystalsvg/64x64/apps/locale.png share/icons/crystalsvg/64x64/apps/looknfeel.png -share/icons/crystalsvg/64x64/apps/mozilla.png share/icons/crystalsvg/64x64/apps/multimedia.png share/icons/crystalsvg/64x64/apps/nedit.png share/icons/crystalsvg/64x64/apps/netscape.png diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 53cec9a18b5f..b4baad2d68d0 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 4 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -42,7 +41,7 @@ PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp @@ -52,7 +51,7 @@ CONFIGURE_ARGS+=--without-java \ --with-ssl-dir=${OPENSSLBASE} OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ - HAL "Use HAL backend for media:/ (FreeBSD 5+ only)" off \ + HAL "Use HAL backend for media:/ (FreeBSD 5+ only)" on \ HTDIG "Depend on htdig, used to build manual indices" off .include "${.CURDIR}/../../x11/kde3/Makefile.kde" @@ -70,7 +69,7 @@ RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper RUN_DEPENDS+= htdig:${PORTSDIR}/textproc/htdig .endif -.if defined(WITH_HAL) && ${OSVERSION} > 500035 +.if !defined(WITHOUT_HAL) && ${OSVERSION} > 500035 EXTRA_PATCHES= ${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.cpp \ ${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.h \ ${FILESDIR}/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp @@ -79,12 +78,9 @@ LIB_DEPENDS+= dbus-qt-1.1:${PORTSDIR}/devel/dbus-qt3 \ PLIST_SUB+= MEDIA="" .else CONFIGURE_ARGS+=--without-hal -EXTRA_PATCHES= ${FILESDIR}/extrapatch-kio_media \ - ${FILESDIR}/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp PLIST_SUB+= MEDIA="@comment " .endif - post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo index 6f53a73368ff..9051c799c5c2 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.5.tar.bz2) = 0c685af1cbca75f9c77b3ed231ba0468 -SHA256 (KDE/kdebase-3.5.5.tar.bz2) = f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0 -SIZE (KDE/kdebase-3.5.5.tar.bz2) = 23851886 +MD5 (KDE/kdebase-3.5.6.tar.bz2) = a53f589f58012e655a52220a6a151019 +SHA256 (KDE/kdebase-3.5.6.tar.bz2) = 245b35f8b2e1533f9ae92b3b07bee5339a716dfb8db363d0126d2e7409b7bd7e +SIZE (KDE/kdebase-3.5.6.tar.bz2) = 24155599 diff --git a/x11/kdebase3/files/extrapatch-kio_media b/x11/kdebase3/files/extrapatch-kio_media deleted file mode 100644 index ab1a03b094cb..000000000000 --- a/x11/kdebase3/files/extrapatch-kio_media +++ /dev/null @@ -1,5814 +0,0 @@ -diff -urN kioslave/media/Makefile.in kioslave/media/Makefile.in ---- kioslave/media/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/Makefile.in Fri May 26 09:54:31 2006 -@@ -122,8 +122,7 @@ - DATA = $(kde_services_DATA) - ETAGS = etags - CTAGS = ctags --DIST_SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ -- kfile-plugin kcmodule mimetypes services propsdlgplugin -+DIST_SUBDIRS = $(SUBDIRS) - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 1 - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -276,6 +275,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -@@ -611,9 +611,8 @@ - xdg_appsdir = @xdg_appsdir@ - xdg_directorydir = @xdg_directorydir@ - xdg_menudir = @xdg_menudir@ --@include_media_halbackend_TRUE@PROPSDLGPLUGINDIR = propsdlgplugin - SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ -- kfile-plugin kcmodule mimetypes services $(PROPSDLGPLUGINDIR) -+ kfile-plugin kcmodule mimetypes services - - INCLUDES = -I$(srcdir)/libmediacommon $(all_includes) - #>- METASOURCES = AUTO -@@ -1092,8 +1091,7 @@ - ./testmedia - - messages: rc.cpp -- $(EXTRACTRC) propsdlgplugin/propertiespagegui.ui >> rc.cpp -- $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp propsdlgplugin/*.cpp -o $(podir)/kio_media.pot -+ $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp -o $(podir)/kio_media.pot - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -diff -urN kioslave/media/kcmodule/Makefile.in kioslave/media/kcmodule/Makefile.in ---- kioslave/media/kcmodule/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/kcmodule/Makefile.in Fri May 26 09:54:31 2006 -@@ -253,6 +253,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/kcmodule/managermodule.cpp kioslave/media/kcmodule/managermodule.cpp ---- kioslave/media/kcmodule/managermodule.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/managermodule.cpp Sun Nov 20 20:14:21 2005 -@@ -39,15 +39,15 @@ - QString hal_text = view->kcfg_HalBackendEnabled->text(); - hal_text += " ("+i18n("No support for HAL on this system")+")"; - view->kcfg_HalBackendEnabled->setText( hal_text ); --#endif - view->kcfg_HalBackendEnabled->setEnabled( false ); -+#endif - - #ifndef COMPILE_LINUXCDPOLLING - QString poll_text = view->kcfg_CdPollingEnabled->text(); - poll_text += " ("+i18n("No support for CD polling on this system")+")"; - view->kcfg_CdPollingEnabled->setText( poll_text ); --#endif - view->kcfg_CdPollingEnabled->setEnabled( false ); -+#endif - - load(); - } -diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.desktop ---- kioslave/media/kcmodule/media.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/kcmodule/media.desktop Mon May 22 20:12:42 2006 -@@ -24,7 +24,6 @@ - Name[es]=Dispositivos de almacenamiento - Name[et]=Andmekandjad - Name[eu]=Biltegiratze-euskarria --Name[fa]=رسانه ذخیرهگاه - Name[fi]=Tallennusmedia - Name[fr]=Support de stockage - Name[fy]=Opslachapparaten -@@ -33,7 +32,7 @@ - Name[he]=התקנים - Name[hi]=भंडार मीडिया - Name[hr]=Mediji za pohranjivanje --Name[hu]=Tárolóeszközök -+Name[hu]=Tárolóeszköz - Name[is]=Geymslumiðlar - Name[it]=Dispositivi di archiviazione - Name[ja]=記憶メディア -@@ -43,7 +42,7 @@ - Name[mk]=Медиуми за податоци - Name[ms]=Media Storan - Name[nb]=Lagringsenheter --Name[nds]=Spiekermedien -+Name[nds]=Spiekerreedschappen - Name[nl]=Opslagapparaten - Name[nn]=Lagringsmedium - Name[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ -@@ -54,7 +53,6 @@ - Name[ru]=Устройства хранения данных - Name[rw]=Uburyo bwo Kubika - Name[se]=Vurkenmedia --Name[sk]=Zálohovacie médiá - Name[sl]=Nosilci za shranjevanje - Name[sr]=Складишни медијуми - Name[sr@Latn]=Skladišni medijumi -@@ -82,13 +80,11 @@ - Comment[es]=Configuración de las medios de almacenamiento - Comment[et]=Salvestusandmekandjate seadistused - Comment[eu]=Konfiguratu biltegiratze-euskarria --Comment[fa]=پیکربندی رسانه ذخیرهگاه - Comment[fi]=Aseta tallennusmedia - Comment[fr]=Configurer le média de stockage - Comment[fy]=Opslachmedia ynstelle - Comment[ga]=Cumraigh Meáin Stórála - Comment[gl]=Configurar Medios de Armacenaxe --Comment[he]=שינוי הגדרות מדיות אחסון - Comment[hr]=Konfiguriranje medija za pohranu - Comment[hu]=A tárolóeszközök beállítása - Comment[is]=Stillingar geymslumiðla -@@ -98,16 +94,15 @@ - Comment[lt]=Konfigūruoti saugojimo įrenginius - Comment[mk]=Конфигурирајте ги медиумите за податоци - Comment[nb]=Sett opp lagringsmedier --Comment[nds]=Spiekermedien instellen -+Comment[nds]=Spiekerreedschappen instellen - Comment[nl]=Opslagmedia instellen - Comment[nn]=Set opp lagringsmedium - Comment[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ ਸੰਰਚਨਾ - Comment[pl]=Konfiguracja nośników danych --Comment[pt]=Configurar os Suportes de Armazenamento -+Comment[pt]=Configurar os Meios de Armazenamento - Comment[pt_BR]=Configura as mídias de armazenamento - Comment[ru]=Настройка подключаемых устройств хранения - Comment[se]=Heivet vurkenmediaid --Comment[sk]=Nastavenie zálohovacích médií - Comment[sl]=Nastavitve nosilcev za shranjevanje - Comment[sr]=Подешавање медијума за складиштење - Comment[sr@Latn]=Podešavanje medijuma za skladištenje -@@ -132,13 +127,11 @@ - Keywords[es]=almacenamiento,medios,usb,cdrom,dispositivo - Keywords[et]=salvestamine,andmekandja,usb,cd,seade - Keywords[eu]=biltegiratzea,euskarriak,usb,cdrom,gailua --Keywords[fa]=ذخیره گاه، رسانه، گذرگاه سریال جهانی، دیسک فشرده، دستگاه - Keywords[fi]=varasto,media,usb,cdrom,laite - Keywords[fr]=stockage,media,medium,usb,cdrom,périphérique - Keywords[fy]=storage,opslach,media,usb,cd-rom,kompakt-skiif,device,apparaat,mp3-speler,usb-stick,geheugenkaart - Keywords[ga]=stóráil,stóras,meáin,meán,usb,cdrom,dlúthdhiosca,gléas - Keywords[gl]=armacenaxe,medios,usb,cdrom,dispositivo --Keywords[he]=storage,media,usb,cdrom,device,מדיה,התקן,סידירום,תקליטור - Keywords[hr]=storage,media,usb,cdrom,device,pohrana,snimanje,mediji,uređaj - Keywords[hu]=tároló,adathordozó,USB,CD-ROM,eszköz - Keywords[is]=geymsla,miðill,usb,cdrom,tæki -@@ -153,7 +146,7 @@ - Keywords[nn]=lagring,media,usb,CD-spiller,CD-ROM,einingar,minnepinnar,harddiskar,HD,eksterne harddiskar,zip-diskar - Keywords[pa]=ਸਟੋਰੇਜ਼,ਮੀਡਿਆ,ਜੰਤਰ,usb,cdrom - Keywords[pl]=dane,przechowywanie danych,nośnik danych,nośniki danych,usb,cdrom,urządzenie --Keywords[pt]=armazenamento,meio,suporte,usb,cdrom,dispositivo -+Keywords[pt]=armazenamento,meio,usb,cdrom,dispositivo - Keywords[pt_BR]=armazenamento,mídia,usb,cd-rom,device,dispositivo - Keywords[ru]=storage,media,usb,cdrom,device,устройство хранения - Keywords[sl]=shranjevanje,nosilec,usb,cdrom,naprava -diff -urN kioslave/media/kcmodule/notifiermodule.cpp kioslave/media/kcmodule/notifiermodule.cpp ---- kioslave/media/kcmodule/notifiermodule.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/notifiermodule.cpp Mon May 22 20:12:42 2006 -@@ -174,8 +174,8 @@ - ActionListBoxItem *action_item - = static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem()); - -- NotifierServiceAction * action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); -- if ( action ) -+ NotifierServiceAction * action; -+ if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() ) ) ) - { - ServiceConfigDialog dialog(action, m_settings.supportedMimetypes(), this); - -@@ -195,8 +195,7 @@ - = static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem()); - - NotifierServiceAction *action; -- action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); -- if ( action ) -+ if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() )) ) - { - m_settings.deleteAction( action ); - updateListBox(); -diff -urN kioslave/media/kfile-plugin/Makefile.in kioslave/media/kfile-plugin/Makefile.in ---- kioslave/media/kfile-plugin/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/kfile-plugin/Makefile.in Fri May 26 09:54:31 2006 -@@ -248,6 +248,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/kfile-plugin/kfile_media.desktop kioslave/media/kfile-plugin/kfile_media.desktop ---- kioslave/media/kfile-plugin/kfile_media.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/kfile-plugin/kfile_media.desktop Mon May 22 20:12:42 2006 -@@ -16,7 +16,6 @@ - Name[es]=Información de recursos - Name[et]=Andmekandja info - Name[eu]=Media informazioa --Name[fa]=اطلاعات رسانه - Name[fi]=Tallenteiden tiedot - Name[fr]=Informations sur le média - Name[fy]=Mediumynformaasje -@@ -47,7 +46,6 @@ - Name[ru]=Сведения о носителе - Name[rw]=Amakuru y'igitangazamakuru - Name[se]=Mediumdieđut --Name[sk]=Informácie o médiu - Name[sl]=Informacije o mediju - Name[sr]=Информације о медијуму - Name[sr@Latn]=Informacije o medijumu -@@ -63,4 +61,4 @@ - Name[zh_TW]=媒體資訊 - ServiceTypes=KFilePlugin - X-KDE-Library=kfile_media --MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera;media/camera_mounted;media/camera_unmounted -+MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera -diff -urN kioslave/media/kfile-plugin/kfilemediaplugin.cpp kioslave/media/kfile-plugin/kfilemediaplugin.cpp ---- kioslave/media/kfile-plugin/kfilemediaplugin.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/kfile-plugin/kfilemediaplugin.cpp Tue Nov 8 23:36:07 2005 -@@ -64,16 +64,12 @@ - addMimeType( "media/floppy_unmounted" ); - addMimeType( "media/zip_unmounted" ); - addMimeType( "media/gphoto2camera" ); -- addMimeType( "media/camera_mounted" ); -- addMimeType( "media/camera_unmounted" ); - } - - bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/) - { -- const Medium medium = askMedium(info); -+ const Medium medium = askMedium(info); - -- kdDebug() << "KFileMediaPlugin::readInfo " << medium.id() << endl; -- - if (medium.id().isNull()) return false; - - QString mount_point = medium.mountPoint(); -@@ -165,8 +161,7 @@ - const Medium KFileMediaPlugin::askMedium(KFileMetaInfo &info) - { - DCOPRef mediamanager("kded", "mediamanager"); -- kdDebug() << "properties " << info.url() << endl; -- DCOPReply reply = mediamanager.call( "properties", info.url().url() ); -+ DCOPReply reply = mediamanager.call( "properties", info.url().fileName() ); - - if ( !reply.isValid() ) - { -diff -urN kioslave/media/libmediacommon/Makefile.in kioslave/media/libmediacommon/Makefile.in ---- kioslave/media/libmediacommon/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/libmediacommon/Makefile.in Fri May 26 09:54:31 2006 -@@ -250,6 +250,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/libmediacommon/medium.cpp kioslave/media/libmediacommon/medium.cpp ---- kioslave/media/libmediacommon/medium.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/libmediacommon/medium.cpp Mon Oct 10 17:04:00 2005 -@@ -40,8 +40,6 @@ - m_properties+= QString::null; /* ICON_NAME */ - - loadUserLabel(); -- -- m_halmounted = false; - } - - Medium::Medium() -@@ -59,8 +57,6 @@ - m_properties+= QString::null; /* BASE_URL */ - m_properties+= QString::null; /* MIME_TYPE */ - m_properties+= QString::null; /* ICON_NAME */ -- -- m_halmounted = false; - } - - const Medium Medium::create(const QStringList &properties) -@@ -163,7 +159,7 @@ - bool Medium::mountableState(bool mounted) - { - if ( m_properties[DEVICE_NODE].isEmpty() -- || ( mounted && m_properties[MOUNT_POINT].isEmpty() ) ) -+ || m_properties[MOUNT_POINT].isEmpty() ) - { - return false; - } -@@ -208,10 +204,14 @@ - - KURL Medium::prettyBaseURL() const - { -- if ( !baseURL().isEmpty() ) -- return baseURL(); -- -+ if ( isMountable() ) -+ { - return KURL( mountPoint() ); -+ } -+ else -+ { -+ return KURL( baseURL() ); -+ } - } - - QString Medium::prettyLabel() const -diff -urN kioslave/media/libmediacommon/medium.h kioslave/media/libmediacommon/medium.h ---- kioslave/media/libmediacommon/medium.h Sat Jul 22 10:15:42 2006 -+++ kioslave/media/libmediacommon/medium.h Mon Oct 10 17:04:00 2005 -@@ -22,7 +22,6 @@ - #include <qstring.h> - #include <qstringlist.h> - #include <kurl.h> --#include <qmap.h> - - class Medium - { -@@ -79,32 +78,14 @@ - - void setMimeType(const QString &mimeType); - void setIconName(const QString &iconName); -- void setHalMounted(bool flag) const { m_halmounted = flag; } -- bool halMounted() const { return m_halmounted; } - - private: - Medium(); - void loadUserLabel(); - - QStringList m_properties; -- mutable bool m_halmounted; -- -+ - friend class QValueListNode<const Medium>; - }; -- --namespace MediaManagerUtils { -- static inline QMap<QString,QString> splitOptions(const QStringList & options) -- { -- QMap<QString,QString> valids; -- -- for (QStringList::ConstIterator it = options.begin(); it != options.end(); ++it) -- { -- QString key = (*it).left((*it).find('=')); -- QString value = (*it).mid((*it).find('=') + 1); -- valids[key] = value; -- } -- return valids; -- } --} - - #endif -diff -urN kioslave/media/mediaimpl.cpp kioslave/media/mediaimpl.cpp ---- kioslave/media/mediaimpl.cpp Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediaimpl.cpp Mon Oct 10 17:04:01 2005 -@@ -226,8 +226,6 @@ - - mp_mounting = &medium; - -- -- /* - KIO::Job* job = KIO::mount(false, 0, - medium.deviceNode(), - medium.mountPoint()); -@@ -236,7 +234,6 @@ - this, SLOT( slotMountResult( KIO::Job * ) ) ); - connect( job, SIGNAL( warning( KIO::Job *, const QString & ) ), - this, SLOT( slotWarning( KIO::Job *, const QString & ) ) ); -- */ - kapp->dcopClient() - ->connectDCOPSignal("kded", "mediamanager", - "mediumChanged(QString, bool)", -@@ -244,17 +241,7 @@ - "slotMediumChanged(QString)", - false); - -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "mount", medium.id()); -- if (reply.isValid()) -- reply.get(m_lastErrorMessage); -- else -- m_lastErrorMessage = i18n("Internal Error"); -- if (!m_lastErrorMessage.isEmpty()) -- m_lastErrorCode = KIO::ERR_SLAVE_DEFINED; -- else { -- qApp->eventLoop()->enterLoop(); -- } -+ qApp->eventLoop()->enterLoop(); - - mp_mounting = 0L; - -diff -urN kioslave/media/mediamanager/Makefile.in kioslave/media/mediamanager/Makefile.in ---- kioslave/media/mediamanager/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/mediamanager/Makefile.in Fri May 26 09:54:31 2006 -@@ -284,6 +284,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/mediamanager/fstabbackend.cpp kioslave/media/mediamanager/fstabbackend.cpp ---- kioslave/media/mediamanager/fstabbackend.cpp Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/fstabbackend.cpp Mon May 22 20:12:42 2006 -@@ -37,9 +37,6 @@ - #endif - - #include <klocale.h> --#include <kio/job.h> --#include <kio/netaccess.h> --#include <kdebug.h> - #include <kdirwatch.h> - #include <kurl.h> - #include <kmountpoint.h> -@@ -97,26 +94,6 @@ - KDirWatch::self()->removeFile(MTAB); - } - --QString FstabBackend::mount( const QString &_udi ) --{ -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- return i18n("No such medium: %1").arg(_udi); -- KIO::Job* job = KIO::mount( false, 0, medium->deviceNode(), medium->mountPoint()); -- KIO::NetAccess::synchronousRun( job, 0 ); -- return QString::null; --} -- --QString FstabBackend::unmount( const QString &_udi ) --{ -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- return i18n("No such medium: %1").arg(_udi); -- KIO::Job* job = KIO::unmount( medium->mountPoint(), false); -- KIO::NetAccess::synchronousRun( job, 0 ); -- return QString::null; --} -- - void FstabBackend::slotDirty(const QString &path) - { - if (path==MTAB) -@@ -134,7 +111,6 @@ - if ( mount->mountType() == "swap" - || mount->mountType() == "tmpfs" - || mount->mountType() == "sysfs" -- || mount->mountType() == "fdescfs" - || mount->mountType() == "kernfs" - || mount->mountType() == "usbfs" - || mount->mountType().contains( "proc" ) -@@ -147,7 +123,6 @@ - || mount->mountPoint() == "/dev/swap" - || mount->mountPoint() == "/dev/pts" - || mount->mountPoint().find("/proc") == 0 -- || mount->mountPoint().find("/sys") == 0 - - // We might want to display only network shares - // since HAL doesn't handle them -@@ -169,7 +144,7 @@ - - void FstabBackend::handleMtabChange(bool allowNotification) - { -- QStringList new_mtabIds; -+ QStringList new_mtabIds, new_mtabEntries; - KMountPoint::List mtab = KMountPoint::currentMountPoints(); - - KMountPoint::List::iterator it = mtab.begin(); -@@ -187,19 +162,18 @@ - nothing has changed, do not stat the mount point. Avoids - hang if network shares are stalling */ - QString mtabEntry = dev + "*" + mp + "*" + fs; -- if(m_mtabEntries.contains(mtabEntry)) { -- new_mtabIds += m_mtabEntries[mtabEntry]; -- continue; -- } -+ bool isOldEntry = m_mtabEntries.contains(mtabEntry); -+ new_mtabEntries+=mtabEntry; -+ if (isOldEntry) continue; - - QString id = generateId(dev, mp); - new_mtabIds+=id; -- m_mtabEntries[mtabEntry] = id; - - if ( !m_mtabIds.contains(id) && m_fstabIds.contains(id) ) - { - QString mime, icon, label; - guess(dev, mp, fs, true, mime, icon, label); -+ - m_mediaList.changeMediumState(id, true, false, - mime, icon, label); - } -@@ -237,10 +211,6 @@ - QString mp = medium->mountPoint(); - QString fs = medium->fsType(); - -- -- QString mtabEntry = dev + "*" + mp + "*" + fs; -- m_mtabEntries.remove(mtabEntry); -- - QString mime, icon, label; - guess(dev, mp, fs, false, mime, icon, label); - -@@ -256,6 +226,7 @@ - } - - m_mtabIds = new_mtabIds; -+ m_mtabEntries = new_mtabEntries; - } - - void FstabBackend::handleFstabChange(bool allowNotification) -diff -urN kioslave/media/mediamanager/fstabbackend.h kioslave/media/mediamanager/fstabbackend.h ---- kioslave/media/mediamanager/fstabbackend.h Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/fstabbackend.h Mon May 22 20:12:42 2006 -@@ -23,7 +23,6 @@ - - #include <qobject.h> - #include <qstringlist.h> --#include <qmap.h> - - #ifdef Q_OS_FREEBSD - #include <qtimer.h> -@@ -41,10 +40,6 @@ - const QString &fsType, bool mounted, - QString &mimeType, QString &iconName, - QString &label); -- -- QString mount(const QString &id); -- QString unmount(const QString &id); -- - private slots: - void slotDirty(const QString &path); - void handleFstabChange(bool allowNotification = true); -@@ -58,7 +53,7 @@ - - bool m_networkSharesOnly; - QStringList m_mtabIds; -- QMap<QString, QString> m_mtabEntries; -+ QStringList m_mtabEntries; - QStringList m_fstabIds; - #ifdef Q_OS_FREEBSD - QTimer m_mtabTimer; -diff -urN kioslave/media/mediamanager/halbackend.cpp kioslave/media/mediamanager/halbackend.cpp ---- kioslave/media/mediamanager/halbackend.cpp Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/halbackend.cpp Thu Jan 19 18:00:58 2006 -@@ -21,16 +21,9 @@ - - #include <stdlib.h> - --#include <qfile.h> - #include <klocale.h> - #include <kurl.h> - #include <kdebug.h> --#include <kprocess.h> --#include <kconfig.h> --#include <qstylesheet.h> --#include <kmountpoint.h> --#include <kmessagebox.h> --#include <kio/job.h> - - #define MOUNT_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mounted") : QString("_unmounted")) - #define MOUNT_ICON_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mount") : QString("_unmount")) -@@ -39,1177 +32,615 @@ - static HALBackend* s_HALBackend; - - /* A macro function to convert HAL string properties to QString */ --QString libhal_device_get_property_QString(LibHalContext *ctx, const char* udi, const char *key) -+QString hal_device_get_property_QString(LibHalContext *ctx, const char* udi, const char *key) - { -- char* _ppt_string; -- QString _ppt_QString; -- _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL); -- _ppt_QString = QString(_ppt_string ? _ppt_string : ""); -- libhal_free_string(_ppt_string); -- return _ppt_QString; -+ char* _ppt_string; -+ QString _ppt_QString; -+ _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL); -+ _ppt_QString = QString(_ppt_string ? _ppt_string : ""); -+ libhal_free_string(_ppt_string); -+ return _ppt_QString; - } - - /* Constructor */ - HALBackend::HALBackend(MediaList &list, QObject* parent) -- : QObject() -- , BackendBase(list) -- , m_halContext(NULL) -- , m_halStoragePolicy(NULL) -- , m_parent(parent) -+ : QObject() -+ , BackendBase(list) -+ , m_halContext(NULL) -+ , m_halStoragePolicy(NULL) -+ , m_parent(parent) - { -- s_HALBackend = this; -+ s_HALBackend = this; - } - - /* Destructor */ - HALBackend::~HALBackend() - { -- /* Close HAL connection */ -- if (m_halContext) -- { -- const QPtrList<Medium> medlist = m_mediaList.list(); -- QPtrListIterator<Medium> it (medlist); -- for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) -- unmount(current_medium->id()); -- -- -- /* Remove all the registered media first */ -- int numDevices; -- char** halDeviceList = libhal_get_all_devices( m_halContext, &numDevices, NULL ); -- -- if ( halDeviceList ) -- { -- for ( int i = 0; i < numDevices; i++ ) -- { -- m_mediaList.removeMedium( halDeviceList[i], false ); -- } -- } -- -- libhal_free_string_array( halDeviceList ); -- -- DBusError error; -- dbus_error_init(&error); -- libhal_ctx_shutdown(m_halContext, &error); -- libhal_ctx_free(m_halContext); -- } -- -- if (m_halStoragePolicy) -- libhal_storage_policy_free(m_halStoragePolicy); -+ /* Close HAL connection */ -+ if (m_halContext) -+ { -+ /* Remove all the registered media first */ -+ int numDevices; -+ char** halDeviceList = libhal_get_all_devices( m_halContext, &numDevices, NULL ); -+ -+ if ( halDeviceList ) -+ { -+ for ( int i = 0; i < numDevices; i++ ) -+ { -+ m_mediaList.removeMedium( halDeviceList[i], false ); -+ } -+ } -+ -+ #ifdef HAL_0_4 -+ hal_shutdown(m_halContext); -+ #else -+ libhal_ctx_shutdown(m_halContext, NULL); -+ libhal_ctx_free(m_halContext); -+ #endif -+ } -+ -+ if (m_halStoragePolicy) -+ libhal_storage_policy_free(m_halStoragePolicy); - } - - /* Connect to the HAL */ - bool HALBackend::InitHal() - { -- kdDebug(1219) << "Context new" << endl; -- m_halContext = libhal_ctx_new(); -- if (!m_halContext) -- { -- kdDebug(1219) << "Failed to initialize HAL!" << endl; -- return false; -- } -- -- // Main loop integration -- kdDebug(1219) << "Main loop integration" << endl; -- DBusError error; -- dbus_error_init(&error); -- dbus_connection = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error); -- -- if (!dbus_connection || dbus_error_is_set(&error)) { -- dbus_error_free(&error); -- libhal_ctx_free(m_halContext); -- m_halContext = NULL; -- return false; -- } -- -- dbus_bus_register(dbus_connection, &error); -- -- if (dbus_error_is_set(&error)) { -- dbus_error_free(&error); -- libhal_ctx_free(m_halContext); -- m_halContext = NULL; -- return false; -- } -- MainLoopIntegration(dbus_connection); -- libhal_ctx_set_dbus_connection(m_halContext, dbus_connection); -- -- // HAL callback functions -- kdDebug(1219) << "Callback functions" << endl; -- libhal_ctx_set_device_added(m_halContext, HALBackend::hal_device_added); -- libhal_ctx_set_device_removed(m_halContext, HALBackend::hal_device_removed); -- libhal_ctx_set_device_new_capability (m_halContext, NULL); -- libhal_ctx_set_device_lost_capability (m_halContext, NULL); -- libhal_ctx_set_device_property_modified (m_halContext, HALBackend::hal_device_property_modified); -- libhal_ctx_set_device_condition(m_halContext, HALBackend::hal_device_condition); -- -- kdDebug(1219) << "Context Init" << endl; -- if (!libhal_ctx_init(m_halContext, &error)) -- { -- if (dbus_error_is_set(&error)) -- dbus_error_free(&error); -- libhal_ctx_free(m_halContext); -- m_halContext = NULL; -- kdDebug(1219) << "Failed to init HAL context!" << endl; -- return false; -- } -- -- /** @todo customize watch policy */ -- kdDebug(1219) << "Watch properties" << endl; -- if (!libhal_device_property_watch_all(m_halContext, &error)) -- { -- kdDebug(1219) << "Failed to watch HAL properties!" << endl; -- return false; -- } -- -- /* libhal-storage initialization */ -- kdDebug(1219) << "Storage Policy" << endl; -- m_halStoragePolicy = libhal_storage_policy_new(); -- /** @todo define libhal-storage icon policy */ -+#ifdef HAL_0_4 /* HAL API 0.4 */ -+ /* libhal initialization */ -+ m_halFunctions.main_loop_integration = HALBackend::hal_main_loop_integration; -+ m_halFunctions.device_added = HALBackend::hal_device_added; -+ m_halFunctions.device_removed = HALBackend::hal_device_removed; -+ m_halFunctions.device_new_capability = NULL; -+ m_halFunctions.device_lost_capability = NULL; -+ m_halFunctions.device_property_modified = HALBackend::hal_device_property_modified; -+ m_halFunctions.device_condition = HALBackend::hal_device_condition; -+ -+ m_halContext = hal_initialize(&m_halFunctions, false); -+ if (!m_halContext) -+ { -+ kdDebug(1219) << "Failed to initialize HAL!" << endl; -+ return false; -+ } -+ -+ /** @todo customize watch policy */ -+ kdDebug(1219) << "Watch properties" << endl; -+ if (libhal_device_property_watch_all(m_halContext, NULL)) -+ { -+ kdDebug(1219) << "Failed to watch HAL properties!" << endl; -+ return false; -+ } -+#else /* HAL API >= 0.5 */ -+ kdDebug(1219) << "Context new" << endl; -+ m_halContext = libhal_ctx_new(); -+ if (!m_halContext) -+ { -+ kdDebug(1219) << "Failed to initialize HAL!" << endl; -+ return false; -+ } -+ -+ // Main loop integration -+ kdDebug(1219) << "Main loop integration" << endl; -+ DBusError error; -+ dbus_error_init(&error); -+ DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -+ if (dbus_error_is_set(&error)) { -+ dbus_error_free(&error); -+ libhal_ctx_free(m_halContext); -+ m_halContext = NULL; -+ return false; -+ } -+ MainLoopIntegration(dbus_connection); -+ libhal_ctx_set_dbus_connection(m_halContext, dbus_connection); -+ -+ // HAL callback functions -+ kdDebug(1219) << "Callback functions" << endl; -+ libhal_ctx_set_device_added(m_halContext, HALBackend::hal_device_added); -+ libhal_ctx_set_device_removed(m_halContext, HALBackend::hal_device_removed); -+ libhal_ctx_set_device_new_capability (m_halContext, NULL); -+ libhal_ctx_set_device_lost_capability (m_halContext, NULL); -+ libhal_ctx_set_device_property_modified (m_halContext, HALBackend::hal_device_property_modified); -+ libhal_ctx_set_device_condition(m_halContext, HALBackend::hal_device_condition); - -- /* List devices at startup */ -- return ListDevices(); -+ kdDebug(1219) << "Context Init" << endl; -+ if (!libhal_ctx_init(m_halContext, &error)) -+ { -+ if (dbus_error_is_set(&error)) -+ dbus_error_free(&error); -+ libhal_ctx_free(m_halContext); -+ m_halContext = NULL; -+ kdDebug(1219) << "Failed to init HAL context!" << endl; -+ return false; -+ } -+ -+ /** @todo customize watch policy */ -+ kdDebug(1219) << "Watch properties" << endl; -+ if (!libhal_device_property_watch_all(m_halContext, &error)) -+ { -+ kdDebug(1219) << "Failed to watch HAL properties!" << endl; -+ return false; -+ } -+#endif -+ -+ /* libhal-storage initialization */ -+ kdDebug(1219) << "Storage Policy" << endl; -+ m_halStoragePolicy = libhal_storage_policy_new(); -+ /** @todo define libhal-storage icon policy */ -+ -+ /* List devices at startup */ -+ return ListDevices(); - } - - /* List devices (at startup)*/ - bool HALBackend::ListDevices() - { -- kdDebug(1219) << "ListDevices" << endl; -+ kdDebug(1219) << "ListDevices" << endl; - -- int numDevices; -- char** halDeviceList = libhal_get_all_devices(m_halContext, &numDevices, NULL); -+ int numDevices; -+ char** halDeviceList = libhal_get_all_devices(m_halContext, &numDevices, NULL); - -- if (!halDeviceList) -- return false; -+ if (!halDeviceList) -+ return false; - -- kdDebug(1219) << "HALBackend::ListDevices : " << numDevices << " devices found" << endl; -- for (int i = 0; i < numDevices; i++) -- AddDevice(halDeviceList[i], false); -+ kdDebug(1219) << "HALBackend::ListDevices : " << numDevices << " devices found" << endl; -+ for (int i = 0; i < numDevices; i++) -+ AddDevice(halDeviceList[i], false); - -- libhal_free_string_array( halDeviceList ); -- -- return true; -+ return true; - } - - /* Create a media instance for the HAL device "udi". -- This functions checks whether the device is worth listing */ -+This functions checks whether the device is worth listing */ - void HALBackend::AddDevice(const char *udi, bool allowNotification) - { -- /* We don't deal with devices that do not expose their capabilities. -- If we don't check this, we will get a lot of warning messages from libhal */ -- if (!libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -- return; -- -- /* If the device is already listed, do not process. -- This should not happen, but who knows... */ -- /** @todo : refresh properties instead ? */ -- if (m_mediaList.findById(udi)) -- return; -- -- if (libhal_device_get_property_bool(m_halContext, "/org/freedesktop/Hal/devices/computer", "storage.disable_volume_handling", NULL)) -- allowNotification=false; -- -- /* Add volume block devices */ -- if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -- { -- /* We only list volume that have a filesystem or volume that have an audio track*/ -- if ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem" && -- !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio", NULL) && -- !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL) ) -- return; -- -- if ( ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") == "filesystem" && -- !libhal_device_get_property_bool(m_halContext, udi, "volume.is_mounted", NULL ) ) && -- ( libhal_device_get_property_bool(m_halContext, udi, "volume.ignore", NULL ) ) ) -- return; -- -- /* Query drive udi */ -- QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -- /* We don't list floppy volumes because we list floppy drives */ -- if ((libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "floppy") || -- (libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "zip") || -- (libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "jaz")) -- return; -- -- // if the device is locked do not act upon it -- if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "info.locked", NULL)) -- allowNotification=false; -- -- // if the device is locked do not act upon it -- if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "storage.partition_table_changed", NULL)) -- allowNotification=false; -- -- /** @todo check exclusion list **/ -- -- /* Create medium */ -- Medium* medium = new Medium(udi, ""); -- -- QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi)); -- kdDebug() << "automount " << options["automount"] << endl; -- if (options["automount"] == "true" && allowNotification ) { -- QString error = mount(medium); -- if (!error.isEmpty()) -- kdDebug() << "error " << error << endl; -- } -- setVolumeProperties(medium); -- m_mediaList.addMedium(medium, allowNotification); -- -- return; -- } -- -- /* Floppy & zip drives */ -- if (libhal_device_query_capability(m_halContext, udi, "storage", NULL)) -- if ((libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") || -- (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") || -- (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "jaz")) -- { -- /* Create medium */ -- Medium* medium = new Medium(udi, ""); -- setFloppyProperties(medium); -- m_mediaList.addMedium(medium, allowNotification); -- return; -- } -- -- /* Camera handled by gphoto2*/ -- if (libhal_device_query_capability(m_halContext, udi, "camera", NULL) && -- ((libhal_device_get_property_QString(m_halContext, udi, "camera.access_method")=="ptp") || -- -- (libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2.support", NULL) && -- libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2.support", NULL))) -- ) -- { -- /* Create medium */ -- Medium* medium = new Medium(udi, ""); -- setCameraProperties(medium); -- m_mediaList.addMedium(medium, allowNotification); -- return; -- } -+ /* We don't deal with devices that do not expose their capabilities. -+ If we don't check this, we will get a lot of warning messages from libhal */ -+ if (!libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -+ return; -+ -+ /* If the device is already listed, do not process. -+ This should not happen, but who knows... */ -+ /** @todo : refresh properties instead ? */ -+ if (m_mediaList.findById(udi)) -+ return; -+ -+ /* Add volume block devices */ -+ if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -+ { -+ /* We only list volume that have a filesystem or volume that have an audio track*/ -+ if ( (hal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem") && -+ (!libhal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio", NULL)) && -+ (!libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL)) ) -+ return; -+ /* Query drive udi */ -+ QString driveUdi = hal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -+ /* We don't list floppy volumes because we list floppy drives */ -+ if ((hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "floppy") || -+ (hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "zip") || -+ (hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "jaz")) -+ return; -+ -+ /** @todo check exclusion list **/ -+ -+ /* Create medium */ -+ Medium* medium = new Medium(udi, ""); -+ setVolumeProperties(medium); -+ m_mediaList.addMedium(medium, allowNotification); -+ -+ return; -+ } -+ -+ /* Floppy & zip drives */ -+ if (libhal_device_query_capability(m_halContext, udi, "storage", NULL)) -+ if ((hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") || -+ (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") || -+ (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "jaz")) -+ { -+ /* Create medium */ -+ Medium* medium = new Medium(udi, ""); -+ setFloppyProperties(medium); -+ m_mediaList.addMedium(medium, allowNotification); -+ return; -+ } -+ -+ /* Camera handled by gphoto2*/ -+ if (libhal_device_query_capability(m_halContext, udi, "camera", NULL) && -+#ifdef HAL_0_4 -+ libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2_support", NULL) && -+ libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2_support", NULL) -+#else -+ ((hal_device_get_property_QString(m_halContext, udi, "camera.access_method")=="ptp") || -+ -+ (libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2.support", NULL) && -+ libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2.support", NULL))) -+#endif -+ ) -+ { -+ /* Create medium */ -+ Medium* medium = new Medium(udi, ""); -+ setCameraProperties(medium); -+ m_mediaList.addMedium(medium, allowNotification); -+ return; -+ } - } - - void HALBackend::RemoveDevice(const char *udi) - { -- m_mediaList.removeMedium(udi, true); -+ m_mediaList.removeMedium(udi, true); - } - - void HALBackend::ModifyDevice(const char *udi, const char* key) - { -- Q_UNUSED(key); -- const char* mediumUdi = findMediumUdiFromUdi(udi); -- if (!mediumUdi) -- return; -- ResetProperties(mediumUdi); -+ Q_UNUSED(key); -+ const char* mediumUdi = findMediumUdiFromUdi(udi); -+ if (!mediumUdi) -+ return; -+ ResetProperties(mediumUdi); - } - - void HALBackend::DeviceCondition(const char* udi, const char* condition) - { -- QString conditionName = QString(condition); -- kdDebug(1219) << "Processing device condition " << conditionName << " for " << udi << endl; -- -- if (conditionName == "EjectPressed") { -- const Medium* medium = m_mediaList.findById(udi); -- if (!medium) { -- /* the ejectpressed appears on the drive and we need to find the volume */ -- const QPtrList<Medium> medlist = m_mediaList.list(); -- QPtrListIterator<Medium> it (medlist); -- for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) -- { -- QString driveUdi = libhal_device_get_property_QString(m_halContext, current_medium->id().latin1(), "block.storage_device"); -- if (driveUdi == udi) -- { -- medium = current_medium; -- break; -- } -- } -- } -- if (medium) { -- KProcess p; -- p << "kio_media_mounthelper" << "-e" << medium->name(); -- p.start(KProcess::DontCare); -- } -- } -- -- const char* mediumUdi = findMediumUdiFromUdi(udi); -- kdDebug() << "findMedumUdiFromUdi " << udi << " returned " << mediumUdi << endl; -- if (!mediumUdi) -- return; -- -- /* TODO: Warn the user that (s)he should unmount devices before unplugging */ -- if (conditionName == "VolumeUnmountForced") -- ResetProperties(mediumUdi); -- -- /* Reset properties after mounting */ -- if (conditionName == "VolumeMount") -- ResetProperties(mediumUdi); -- -- /* Reset properties after unmounting */ -- if (conditionName == "VolumeUnmount") -- ResetProperties(mediumUdi); -- -+ const char* mediumUdi = findMediumUdiFromUdi(udi); -+ if (!mediumUdi) -+ return; -+ -+ QString conditionName = QString(condition); -+ kdDebug(1219) << "Processing device condition " << conditionName << " for " << udi << endl; -+ -+ /* TODO: Warn the user that (s)he should unmount devices before unplugging */ -+ if (conditionName == "VolumeUnmountForced") -+ ResetProperties(mediumUdi); -+ -+ /* Reset properties after mounting */ -+ if (conditionName == "VolumeMount") -+ ResetProperties(mediumUdi); -+ -+ /* Reset properties after unmounting */ -+ if (conditionName == "VolumeUnmount") -+ ResetProperties(mediumUdi); - } - - void HALBackend::MainLoopIntegration(DBusConnection *dbusConnection) - { -- m_dBusQtConnection = new DBusQt::Connection(m_parent); -- m_dBusQtConnection->dbus_connection_setup_with_qt_main(dbusConnection); -+ m_dBusQtConnection = new DBusQt::Connection(m_parent); -+ m_dBusQtConnection->dbus_connection_setup_with_qt_main(dbusConnection); - } - - /****************************************** -- ** Properties attribution ** -- ******************************************/ -+** Properties attribution ** -+******************************************/ - - /* Return the medium udi that should be updated when recieving a call for -- device udi */ -+device udi */ - const char* HALBackend::findMediumUdiFromUdi(const char* udi) - { -- /* Easy part : this Udi is already registered as a device */ -- const Medium* medium = m_mediaList.findById(udi); -- if (medium) -- return medium->id().ascii(); -- -- /* Hard part : this is a volume whose drive is registered */ -- if (libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -- if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -- { -- QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -- return findMediumUdiFromUdi(driveUdi.ascii()); -- } -+ /* Easy part : this Udi is already registered as a device */ -+ const Medium* medium = m_mediaList.findById(udi); -+ if (medium) -+ return medium->id().ascii(); -+ -+ /* Hard part : this is a volume whose drive is registered */ -+ if (libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -+ if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -+ { -+ QString driveUdi = hal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -+ return findMediumUdiFromUdi(driveUdi.ascii()); -+ } - -- return NULL; -+ return NULL; - } - - void HALBackend::ResetProperties(const char* mediumUdi) - { -- kdDebug(1219) << "HALBackend::setProperties" << endl; -- if ( QString::fromLatin1( mediumUdi ).startsWith( "/org/kde/" ) ) -- { -- const Medium *cmedium = m_mediaList.findById(mediumUdi); -- if ( cmedium ) -- { -- Medium m( *cmedium ); -- if ( setFstabProperties( &m ) ) { -- kdDebug() << "setFstabProperties worked" << endl; -- m_mediaList.changeMediumState(m, false); -- } -- return; -- } -- } -- -- Medium* m = new Medium(mediumUdi, ""); -- -- if (libhal_device_query_capability(m_halContext, mediumUdi, "volume", NULL)) -- setVolumeProperties(m); -- if (libhal_device_query_capability(m_halContext, mediumUdi, "storage", NULL)) -- setFloppyProperties(m); -- if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) -- setCameraProperties(m); -+ kdDebug(1219) << "HALBackend::setProperties" << endl; - -- m_mediaList.changeMediumState(*m, false); -+ Medium* m = new Medium(mediumUdi, ""); -+ -+ if (libhal_device_query_capability(m_halContext, mediumUdi, "volume", NULL)) -+ setVolumeProperties(m); -+ if (libhal_device_query_capability(m_halContext, mediumUdi, "storage", NULL)) -+ setFloppyProperties(m); -+ if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) -+ setCameraProperties(m); - -- delete m; --} -+ m_mediaList.changeMediumState(*m, false); - --void HALBackend::setVolumeProperties(Medium* medium) --{ -- kdDebug(1219) << "HALBackend::setVolumeProperties for " << medium->id() << endl; -- -- const char* udi = medium->id().ascii(); -- /* Check if the device still exists */ -- if (!libhal_device_exists(m_halContext, udi, NULL)) -- return; -- -- /* Get device information from libhal-storage */ -- LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi); -- if (!halVolume) -- return; -- QString driveUdi = libhal_volume_get_storage_device_udi(halVolume); -- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, driveUdi.ascii()); -- if (!halDrive) { -- // at times HAL sends an UnmountForced event before the device is removed -- libhal_volume_free(halVolume); -- return; -- } -- -- medium->setName( -- generateName(libhal_volume_get_device_file(halVolume)) ); -- -- medium->mountableState( -- libhal_volume_get_device_file(halVolume), /* Device node */ -- libhal_volume_get_mount_point(halVolume), /* Mount point */ -- libhal_volume_get_fstype(halVolume), /* Filesystem type */ -- libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -- -- char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -- QString volume_name = QString::fromUtf8(name); -- QString media_name = volume_name; -- medium->setLabel(media_name); -- free(name); -- -- QString mimeType; -- if (libhal_volume_is_disc(halVolume)) -- { -- mimeType = "media/cdrom" + MOUNT_SUFFIX; -- -- LibHalVolumeDiscType discType = libhal_volume_get_disc_type(halVolume); -- if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_CDR) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_CDRW)) -- if (libhal_volume_disc_is_blank(halVolume)) -- { -- mimeType = "media/blankcd"; -- medium->unmountableState(""); -- } -- else -- mimeType = "media/cdwriter" + MOUNT_SUFFIX; -- -- if ((discType == LIBHAL_VOLUME_DISC_TYPE_DVDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRAM) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_DVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRW) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW) ) -- if (libhal_volume_disc_is_blank(halVolume)) -- { -- mimeType = "media/blankdvd"; -- medium->unmountableState(""); -- } -- else -- mimeType = "media/dvd" + MOUNT_SUFFIX; -- -- if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) -- { -- mimeType = "media/audiocd"; -- medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); -- } -- -- medium->setIconName(QString::null); -- -- /* check if the disc id a vcd or a video dvd */ -- DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); -- switch (type) -- { -- case DiscType::VCD: -- mimeType = "media/vcd"; -- break; -- case DiscType::SVCD: -- mimeType = "media/svcd"; -- break; -- case DiscType::DVD: -- mimeType = "media/dvdvideo"; -- break; -- } -- } -- else -- { -- mimeType = "media/hdd" + MOUNT_SUFFIX; -- if (libhal_drive_is_hotpluggable(halDrive)) -- { -- mimeType = "media/removable" + MOUNT_SUFFIX; -- medium->needMounting(); -- switch (libhal_drive_get_type(halDrive)) { -- case LIBHAL_DRIVE_TYPE_COMPACT_FLASH: -- medium->setIconName("compact_flash" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_MEMORY_STICK: -- medium->setIconName("memory_stick" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_SMART_MEDIA: -- medium->setIconName("smart_media" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_SD_MMC: -- medium->setIconName("sd_mmc" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER: -- { -- medium->setIconName("ipod" + MOUNT_ICON_SUFFIX); -- break; -- } -- case LIBHAL_DRIVE_TYPE_CAMERA: -- { -- mimeType = "media/camera" + MOUNT_SUFFIX; -- medium->setIconName("camera" + MOUNT_ICON_SUFFIX); -- const char *physdev = libhal_drive_get_physical_device_udi(halDrive); -- // get model from camera -- if (physdev && libhal_device_query_capability(m_halContext, physdev, "camera", NULL)) -- { -- if (libhal_device_property_exists(m_halContext, physdev, "usb_device.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, "usb_device.product")); -- else if (libhal_device_property_exists(m_halContext, physdev, "usb.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, "usb.product")); -- } -- break; -- } -- case LIBHAL_DRIVE_TYPE_TAPE: -- medium->setIconName(QString::null); //FIXME need icon -- break; -- default: -- medium->setIconName(QString::null); -- } -- -- if (medium->isMounted() && QFile::exists(medium->mountPoint() + "/dcim")) -- { -- mimeType = "media/camera" + MOUNT_SUFFIX; -- medium->setIconName("camera" + MOUNT_ICON_SUFFIX); -- } -- } -- } -- medium->setMimeType(mimeType); -- -- libhal_drive_free(halDrive); -- libhal_volume_free(halVolume); -+ delete m; - } - --bool HALBackend::setFstabProperties( Medium *medium ) -+void HALBackend::setVolumeProperties(Medium* medium) - { -- QString mp = isInFstab(medium); -+ kdDebug(1219) << "HALBackend::setVolumeProperties for " << medium->id() << endl; - -- if (!mp.isNull() && !medium->id().startsWith( "/org/kde" ) ) -- { -- // now that we know it's in fstab, we have to find out if it's mounted -- KMountPoint::List mtab = KMountPoint::currentMountPoints(); -- -- KMountPoint::List::iterator it = mtab.begin(); -- KMountPoint::List::iterator end = mtab.end(); -- -- bool mounted = false; -- -- for (; it!=end; ++it) -- { -- if ((*it)->mountedFrom() == medium->deviceNode() && (*it)->mountPoint() == mp ) -- { -- mounted = true; -- break; -- } -- } -- -- kdDebug() << mp << " " << mounted << " " << medium->deviceNode() << " " << endl; -- QString fstype = medium->fsType(); -- if ( fstype.isNull() ) -- fstype = "auto"; -- -- medium->mountableState( -- medium->deviceNode(), -- mp, /* Mount point */ -- fstype, /* Filesystem type */ -- mounted ); /* Mounted ? */ -+ const char* udi = medium->id().ascii(); -+ /* Check if the device still exists */ -+ if (!libhal_device_exists(m_halContext, udi, NULL)) -+ return; -+ -+ /* Get device information from libhal-storage */ -+ LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi); -+ if (!halVolume) -+ return; -+ QString driveUdi = libhal_volume_get_storage_device_udi(halVolume); -+ LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, driveUdi.ascii()); -+ -+ medium->setName( -+ generateName(libhal_volume_get_device_file(halVolume)) ); -+ -+ medium->mountableState( -+ libhal_volume_get_device_file(halVolume), /* Device node */ -+ libhal_volume_get_mount_point(halVolume), /* Mount point */ -+ libhal_volume_get_fstype(halVolume), /* Filesystem type */ -+ libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -+ -+ char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -+ QString volume_name = QString::fromUtf8(name); -+ QString media_name = volume_name; -+ medium->setLabel(media_name); -+ free(name); - -- return true; -- } -+ QString mimeType; -+ if (libhal_volume_is_disc(halVolume)) -+ { -+ mimeType = "media/cdrom" + MOUNT_SUFFIX; - -- return false; -+ LibHalVolumeDiscType discType = libhal_volume_get_disc_type(halVolume); -+ if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_CDR) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_CDRW)) -+ if (libhal_volume_disc_is_blank(halVolume)) -+ { -+ mimeType = "media/blankcd"; -+ medium->unmountableState(""); -+ } -+ else -+ mimeType = "media/cdwriter" + MOUNT_SUFFIX; -+ -+ if ((discType == LIBHAL_VOLUME_DISC_TYPE_DVDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRAM) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_DVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRW) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW) ) -+ if (libhal_volume_disc_is_blank(halVolume)) -+ { -+ mimeType = "media/blankdvd"; -+ medium->unmountableState(""); -+ } -+ else -+ mimeType = "media/dvd" + MOUNT_SUFFIX; -+ -+ if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) -+ { -+ mimeType = "media/audiocd"; -+ medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); -+ } -+ -+ medium->setIconName(QString::null); -+ -+ /* check if the disc id a vcd or a video dvd */ -+ DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); -+ switch (type) -+ { -+ case DiscType::VCD: -+ mimeType = "media/vcd"; -+ break; -+ case DiscType::SVCD: -+ mimeType = "media/svcd"; -+ break; -+ case DiscType::DVD: -+ mimeType = "media/dvdvideo"; -+ break; -+ } -+ } -+ else -+ { -+ mimeType = "media/hdd" + MOUNT_SUFFIX; -+ const char *physdev = libhal_drive_get_physical_device_udi(halDrive); -+ if (libhal_drive_is_hotpluggable(halDrive)) -+ { -+ mimeType = "media/removable" + MOUNT_SUFFIX; -+ medium->needMounting(); -+ switch (libhal_drive_get_type(halDrive)) { -+ case LIBHAL_DRIVE_TYPE_COMPACT_FLASH: -+ medium->setIconName("compact_flash" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_MEMORY_STICK: -+ medium->setIconName("memory_stick" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_SMART_MEDIA: -+ medium->setIconName("smart_media" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_SD_MMC: -+ medium->setIconName("sd_mmc" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER: -+ medium->setIconName("ipod" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_CAMERA: -+ mimeType = "media/camera" + MOUNT_SUFFIX; -+ medium->setIconName("camera" + MOUNT_ICON_SUFFIX); -+ // get model from camera -+ if (physdev && libhal_device_query_capability(m_halContext, physdev, "camera", NULL)) -+ { -+ if (libhal_device_property_exists(m_halContext, physdev, "usb_device.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, physdev, "usb_device.product")); -+ else if (libhal_device_property_exists(m_halContext, physdev, "usb.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, physdev, "usb.product")); -+ } -+ break; -+ case LIBHAL_DRIVE_TYPE_TAPE: -+ medium->setIconName(QString::null); //FIXME need icon -+ break; -+ default: -+ medium->setIconName(QString::null); -+ }; -+ }; -+ } -+ medium->setMimeType(mimeType); - -+ libhal_drive_free(halDrive); -+ libhal_volume_free(halVolume); - } - - // Handle floppies and zip drives - void HALBackend::setFloppyProperties(Medium* medium) - { -- kdDebug(1219) << "HALBackend::setFloppyProperties for " << medium->id() << endl; -+ kdDebug(1219) << "HALBackend::setFloppyProperties for " << medium->id() << endl; - -- const char* udi = medium->id().ascii(); -- /* Check if the device still exists */ -- if (!libhal_device_exists(m_halContext, udi, NULL)) -- return; -- -- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, udi); -- if (!halDrive) -- return; -- int numVolumes; -- char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); -- LibHalVolume* halVolume = NULL; -- kdDebug(1219) << " found " << numVolumes << " volumes" << endl; -- if (numVolumes) -- halVolume = libhal_volume_from_udi(m_halContext, volumes[0]); -- -- medium->setName( -- generateName(libhal_drive_get_device_file(halDrive)) ); -- -- if (halVolume) -- { -- medium->mountableState( -- libhal_volume_get_device_file(halVolume), /* Device node */ -- libhal_volume_get_mount_point(halVolume), /* Mount point */ -- libhal_volume_get_fstype(halVolume), /* Filesystem type */ -- libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -- } -- else -- { -- // HAL hates floppies - so we have to do it twice ;( -- medium->mountableState(libhal_drive_get_device_file(halDrive), QString::null, QString::null, false); -- setFstabProperties( medium ); -- } -- -- if (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") -- { -- if (medium->isMounted()) // don't use _SUFFIX here as it accesses the volume -- medium->setMimeType("media/floppy_mounted" ); -- else -- medium->setMimeType("media/floppy_unmounted"); -- } -- -- if (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") -- { -- if (medium->isMounted()) -- medium->setMimeType("media/zip_mounted" ); -- else -- medium->setMimeType("media/zip_unmounted"); -- } -- -- /** @todo And mimtype for JAZ drives ? */ -- -- medium->setIconName(QString::null); -- -- char *name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -- -- if (name) { -- medium->setLabel( QString::fromUtf8(name) ); -- free(name); -- } -- -- free(volumes); -- libhal_drive_free(halDrive); -- libhal_volume_free(halVolume); --} -+ const char* udi = medium->id().ascii(); -+ /* Check if the device still exists */ -+ if (!libhal_device_exists(m_halContext, udi, NULL)) -+ return; -+ -+ LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, udi); -+ if (!halDrive) -+ return; -+ int numVolumes; -+ char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); -+ LibHalVolume* halVolume = NULL; -+ kdDebug(1219) << " found " << numVolumes << " volumes" << endl; -+ if (numVolumes) -+ halVolume = libhal_volume_from_udi(m_halContext, volumes[0]); - --void HALBackend::setCameraProperties(Medium* medium) --{ -- kdDebug(1219) << "HALBackend::setCameraProperties for " << medium->id() << endl; -- -- const char* udi = medium->id().ascii(); -- /* Check if the device still exists */ -- if (!libhal_device_exists(m_halContext, udi, NULL)) -- return; -- -- /** @todo find name */ -- medium->setName("camera"); -- -- QString device = "camera:/"; -- -- char *cam = libhal_device_get_property_string(m_halContext, udi, "camera.libgphoto2.name", NULL); -- DBusError error; -- dbus_error_init(&error); -- if (cam && -- libhal_device_property_exists(m_halContext, udi, "usb.linux.device_number", NULL) && -- libhal_device_property_exists(m_halContext, udi, "usb.bus_number", NULL)) -- device.sprintf("camera://%s@[usb:%03d,%03d]/", cam, -- libhal_device_get_property_int(m_halContext, udi, "usb.bus_number", &error), -- libhal_device_get_property_int(m_halContext, udi, "usb.linux.device_number", &error)); -- -- libhal_free_string(cam); -- -- /** @todo find the rest of this URL */ -- medium->unmountableState(device); -- medium->setMimeType("media/gphoto2camera"); -- medium->setIconName(QString::null); -- if (libhal_device_property_exists(m_halContext, udi, "usb_device.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb_device.product")); -- else if (libhal_device_property_exists(m_halContext, udi, "usb.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb.product")); -- else -- medium->setLabel(i18n("Camera")); --} -+ medium->setName( -+ generateName(libhal_drive_get_device_file(halDrive)) ); - --QString HALBackend::generateName(const QString &devNode) --{ -- return KURL(devNode).fileName(); --} -+ if (halVolume) -+ { -+ medium->mountableState( -+ libhal_volume_get_device_file(halVolume), /* Device node */ -+ libhal_volume_get_mount_point(halVolume), /* Mount point */ -+ libhal_volume_get_fstype(halVolume), /* Filesystem type */ -+ libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -+ } -+ else -+ { -+ medium->mountableState( -+ libhal_drive_get_device_file(halDrive), /* Device node */ -+ "", /* Mount point */ -+ "", /* Filesystem type */ -+ false ); /* Mounted ? */ -+ } - --/****************************************** -- ** HAL CALL-BACKS ** -- ******************************************/ -+ if (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") -+ { -+ if (halVolume) -+ medium->setMimeType("media/floppy" + MOUNT_SUFFIX); -+ else -+ medium->setMimeType("media/floppy_unmounted"); -+ } - --void HALBackend::hal_device_added(LibHalContext *ctx, const char *udi) --{ -- kdDebug(1219) << "HALBackend::hal_device_added " << udi << endl; -- Q_UNUSED(ctx); -- s_HALBackend->AddDevice(udi); --} -+ if (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") -+ { -+ if (halVolume) -+ medium->setMimeType("media/zip" + MOUNT_SUFFIX); -+ else -+ medium->setMimeType("media/zip_unmounted"); -+ } - --void HALBackend::hal_device_removed(LibHalContext *ctx, const char *udi) --{ -- kdDebug(1219) << "HALBackend::hal_device_removed " << udi << endl; -- Q_UNUSED(ctx); -- s_HALBackend->RemoveDevice(udi); --} -+ /** @todo And mimtype for JAZ drives ? */ - --void HALBackend::hal_device_property_modified(LibHalContext *ctx, const char *udi, -- const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) --{ -- kdDebug(1219) << "HALBackend::hal_property_modified " << udi << " -- " << key << endl; -- Q_UNUSED(ctx); -- Q_UNUSED(is_removed); -- Q_UNUSED(is_added); -- s_HALBackend->ModifyDevice(udi, key); --} -+ medium->setIconName(QString::null); - --void HALBackend::hal_device_condition(LibHalContext *ctx, const char *udi, -- const char *condition_name, -- const char* message -- ) --{ -- kdDebug(1219) << "HALBackend::hal_device_condition " << udi << " -- " << condition_name << endl; -- Q_UNUSED(ctx); -- Q_UNUSED(message); -- s_HALBackend->DeviceCondition(udi, condition_name); -+ QString media_name; -+ if (halVolume) -+ { -+ char* name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -+ QString volume_name = QString::fromUtf8(name); -+ media_name = volume_name; -+ free(name); -+ } -+ else -+ { -+ char* name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -+ QString drive_name = QString::fromUtf8(name); -+ media_name = drive_name; -+ free(name); -+ } -+ medium->setLabel(media_name); -+ -+ free(volumes); -+ libhal_drive_free(halDrive); -+ libhal_volume_free(halVolume); - } - --QStringList HALBackend::mountoptions(const QString &name) -+void HALBackend::setCameraProperties(Medium* medium) - { -- const Medium* medium = m_mediaList.findById(name); -- if (medium && !isInFstab(medium).isNull()) -- return QStringList(); // not handled by HAL - fstab entry -- -- KConfig config("mediamanagerrc"); -- config.setGroup(name); -- -- char ** array = libhal_device_get_property_strlist(m_halContext, name.latin1(), "volume.mount.valid_options", NULL); -- QMap<QString,bool> valids; -- -- for (int index = 0; array && array[index]; ++index) { -- QString t = array[index]; -- if (t.endsWith("=")) -- t = t.left(t.length() - 1); -- valids[t] = true; -- kdDebug() << "valid " << t << endl; -- } -- libhal_free_string_array(array); -- QStringList result; -- QString tmp; -- -- QString fstype = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.fstype"); -- if (fstype.isNull()) -- fstype = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.policy.mount_filesystem"); -- -- -- QString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device"); -- -- bool removable = libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.removable", NULL) -- || libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.hotpluggable", NULL); -- -- config.setGroup(drive_udi); -- bool value = config.readBoolEntry("automount", false); -- config.setGroup(name); -- -- if (libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_blank", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_vcd", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_svcd", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_videodvd", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.has_audio", NULL)) -- value = false; -- -- result << QString("automount=%1").arg(value ? "true" : "false"); -- -- if (valids.contains("ro")) -- { -- value = config.readBoolEntry("ro", false); -- tmp = QString("ro=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- if (valids.contains("quiet")) -- { -- value = config.readBoolEntry("quiet", false); -- tmp = QString("quiet=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- if (valids.contains("flush")) -- { -- value = config.readBoolEntry("flush", fstype.endsWith("fat")); -- tmp = QString("flush=%1").arg(value ? "true" : "false"); -- result << tmp; -- } -- -- if (valids.contains("uid")) -- { -- value = config.readBoolEntry("uid", true); -- tmp = QString("uid=%1").arg(value ? "true" : "false"); -- result << tmp; -- } -- -- if (valids.contains("utf8")) -- { -- value = config.readBoolEntry("utf8", true); -- tmp = QString("utf8=%1").arg(value ? "true" : "false"); -- result << tmp; -- } -- -- if (valids.contains("shortname")) -- { -- QString svalue = config.readEntry("shortname", "lower").lower(); -- if (svalue == "winnt") -- result << "shortname=winnt"; -- else if (svalue == "win95") -- result << "shortname=win95"; -- else if (svalue == "mixed") -- result << "shortname=mixed"; -- else -- result << "shortname=lower"; -- } -- -- if (valids.contains("sync")) -- { -- value = config.readBoolEntry("sync", !fstype.endsWith("fat") && removable); -- tmp = QString("sync=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- if (valids.contains("noatime")) -- { -- value = config.readBoolEntry("atime", !fstype.endsWith("fat")); -- tmp = QString("atime=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- QString mount_point = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.mount_point"); -- if (mount_point.isEmpty()) -- mount_point = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.policy.desired_mount_point"); -- -- mount_point = config.readEntry("mountpoint", mount_point); -- -- if (!mount_point.startsWith("/")) -- mount_point = "/media/" + mount_point; -- -- result << QString("mountpoint=%1").arg(mount_point); -- result << QString("filesystem=%1").arg(fstype); -- -- if (valids.contains("data")) -- { -- QString svalue = config.readEntry("journaling").lower(); -- if (svalue == "ordered") -- result << "journaling=ordered"; -- else if (svalue == "writeback") -- result << "journaling=writeback"; -- else if (svalue == "data") -- result << "journaling=data"; -- else -- result << "journaling=ordered"; -- } -+ kdDebug(1219) << "HALBackend::setCameraProperties for " << medium->id() << endl; - -- return result; -+ const char* udi = medium->id().ascii(); -+ /* Check if the device still exists */ -+ if (!libhal_device_exists(m_halContext, udi, NULL)) -+ return; -+ -+ /** @todo find name */ -+ medium->setName("camera"); -+ /** @todo find the rest of this URL */ -+ medium->unmountableState("camera:/"); -+ medium->setMimeType("media/gphoto2camera"); -+ medium->setIconName(QString::null); -+ if (libhal_device_property_exists(m_halContext, udi, "usb_device.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, udi, "usb_device.product")); -+ else if (libhal_device_property_exists(m_halContext, udi, "usb.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, udi, "usb.product")); -+ else -+ medium->setLabel(i18n("Camera")); - } - --bool HALBackend::setMountoptions(const QString &name, const QStringList &options ) -+QString HALBackend::generateName(const QString &devNode) - { -- kdDebug() << "setMountoptions " << name << " " << options << endl; -- -- KConfig config("mediamanagerrc"); -- config.setGroup(name); -- -- QMap<QString,QString> valids = MediaManagerUtils::splitOptions(options); -- -- const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 }; -- for (int index = 0; names[index]; ++index) -- if (valids.contains(names[index])) -- config.writeEntry(names[index], valids[names[index]] == "true"); -- -- if (valids.contains("shortname")) -- config.writeEntry("shortname", valids["shortname"]); -- -- if (valids.contains("journaling")) -- config.writeEntry("journaling", valids["journaling"]); -- -- if (!mountoptions(name).contains(QString("mountpoint=%1").arg(valids["mountpoint"]))) -- config.writeEntry("mountpoint", valids["mountpoint"]); -- -- if (valids.contains("automount")) { -- QString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device"); -- config.setGroup(drive_udi); -- config.writeEntry("automount", valids["automount"]); -- } -- -- return true; -+ return KURL(devNode).fileName(); - } - --static QString mount_priv(const char *udi, const char *mount_point, const char **poptions, int noptions, -- DBusConnection *dbus_connection) --{ -- DBusMessage *dmesg, *reply; -- DBusError error; -- -- const char *fstype = ""; -- if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, -- "org.freedesktop.Hal.Device.Volume", -- "Mount"))) { -- kdDebug() << "mount failed for " << udi << ": could not create dbus message\n"; -- return i18n("Internal Error"); -- } -- -- if (!dbus_message_append_args (dmesg, DBUS_TYPE_STRING, &mount_point, DBUS_TYPE_STRING, &fstype, -- DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &poptions, noptions, -- DBUS_TYPE_INVALID)) -- { -- kdDebug() << "mount failed for " << udi << ": could not append args to dbus message\n"; -- dbus_message_unref (dmesg); -- return i18n("Internal Error"); -- } -- -- QString qerror; -- -- dbus_error_init (&error); -- if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) -- { -- QString qerror = error.message; -- kdError() << "mount failed for " << udi << ": " << error.name << " - " << qerror << endl; -- if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.UnknownFilesystemType")) -- qerror = i18n("Invalid filesystem type"); -- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.PermissionDenied")) -- qerror = i18n("Permissions denied"); -- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.AlreadyMounted")) -- qerror = i18n("Device is already mounted."); -- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.InvalidMountpoint") && strlen(mount_point)) { -- dbus_message_unref (dmesg); -- dbus_error_free (&error); -- return mount_priv(udi, "", poptions, noptions, dbus_connection); -- } -- dbus_message_unref (dmesg); -- dbus_error_free (&error); -- return qerror; -- } -- -- kdDebug() << "mount queued for " << udi << endl; -- -- dbus_message_unref (dmesg); -- dbus_message_unref (reply); -- -- return qerror; -+/****************************************** -+** HAL CALL-BACKS ** -+******************************************/ - -+#ifdef HAL_0_4 -+void HALBackend::hal_main_loop_integration(LibHalContext *ctx, -+ DBusConnection *dbus_connection) -+{ -+ kdDebug(1219) << "HALBackend::hal_main_loop_integration" << endl; -+ Q_UNUSED(ctx); -+ s_HALBackend->MainLoopIntegration(dbus_connection); - } -+#endif - --void HALBackend::slotResult(KIO::Job *job) -+void HALBackend::hal_device_added(LibHalContext *ctx, const char *udi) - { -- kdDebug() << "slotResult " << mount_jobs[job] << endl; -- if (job->error()) -- { -- KMessageBox::error(0, job->errorText()); -- } -- ResetProperties( mount_jobs[job].latin1() ); -- mount_jobs.remove(job); -+ kdDebug(1219) << "HALBackend::hal_device_added " << udi << endl; -+ Q_UNUSED(ctx); -+ s_HALBackend->AddDevice(udi); - } - --QString HALBackend::isInFstab(const Medium *medium) -+void HALBackend::hal_device_removed(LibHalContext *ctx, const char *udi) - { -- KMountPoint::List fstab = KMountPoint::possibleMountPoints(KMountPoint::NeedMountOptions|KMountPoint::NeedRealDeviceName); -- -- KMountPoint::List::iterator it = fstab.begin(); -- KMountPoint::List::iterator end = fstab.end(); -- -- for (; it!=end; ++it) -- { -- kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl; -- if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && (*it)->realDeviceName() == medium->deviceNode() ) ) -- { -- QStringList opts = (*it)->mountOptions(); -- if (opts.contains("user") || opts.contains("users")) -- return (*it)->mountPoint(); -- } -- } -- -- return QString::null; -+ kdDebug(1219) << "HALBackend::hal_device_removed " << udi << endl; -+ Q_UNUSED(ctx); -+ s_HALBackend->RemoveDevice(udi); - } - --QString HALBackend::mount(const Medium *medium) --{ -- if (medium->isMounted()) -- return QString(); // that was easy -- -- QString mountPoint = isInFstab(medium); -- if (!mountPoint.isNull()) -- { -- kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; -- KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint ); -- connect(job, SIGNAL( result (KIO::Job *)), -- SLOT( slotResult( KIO::Job *))); -- mount_jobs[job] = medium->id(); -- return QString(); // we won't report an error here -- } else if (medium->id().startsWith("/org/kde/") ) -- return i18n("Permissions denied"); -- -- QStringList soptions; -- -- kdDebug() << "mounting " << medium->id() << "..." << endl; -- -- QMap<QString,QString> valids = MediaManagerUtils::splitOptions(mountoptions(medium->id())); -- if (valids["flush"] == "true") -- soptions << "flush"; -- -- if (valids["uid"] == "true") -- { -- soptions << QString("uid=%1").arg(getuid()); -- } -- -- if (valids["ro"] == "true") -- soptions << "ro"; -- -- if (valids["atime"] != "true") -- soptions << "noatime"; -- -- if (valids["quiet"] == "true") -- soptions << "quiet"; -- -- if (valids["utf8"] == "true") -- soptions << "utf8"; -- -- if (valids["sync"] == "true") -- soptions << "sync"; -- -- QString mount_point = valids["mountpoint"]; -- if (mount_point.startsWith("/media/")) -- mount_point = mount_point.mid(7); -- -- if (valids.contains("shortname")) -- { -- soptions << QString("shortname=%1").arg(valids["shortname"]); -- } -- -- if (valids.contains("journaling")) -- { -- QString option = valids["journaling"]; -- if (option == "data") -- soptions << QString("data=journal"); -- else if (option == "writeback") -- soptions << QString("data=writeback"); -- else -- soptions << QString("data=ordered"); -- } -- -- const char **options = new const char*[soptions.size() + 1]; -- uint noptions = 0; -- for (QStringList::ConstIterator it = soptions.begin(); it != soptions.end(); ++it, ++noptions) -- options[noptions] = (*it).latin1(); -- options[noptions] = NULL; -- -- QString qerror = mount_priv(medium->id().latin1(), mount_point.utf8(), options, noptions, dbus_connection); -- if (!qerror.isEmpty()) { -- kdError() << "mounting " << medium->id() << " returned " << qerror << endl; -- return qerror; -- } -- -- medium->setHalMounted(true); -- ResetProperties(medium->id().latin1()); -- -- return QString(); --} -- --QString HALBackend::mount(const QString &_udi) -+void HALBackend::hal_device_property_modified(LibHalContext *ctx, const char *udi, -+ const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) - { -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- return i18n("No such medium: %1").arg(_udi); -- -- return mount(medium); -+ kdDebug(1219) << "HALBackend::hal_property_modified " << udi << " -- " << key << endl; -+ Q_UNUSED(ctx); -+ Q_UNUSED(is_removed); -+ Q_UNUSED(is_added); -+ s_HALBackend->ModifyDevice(udi, key); - } - --QString HALBackend::unmount(const QString &_udi) --{ -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- { // now we get fancy: if the udi is no volume, it _might_ be a device with only one -- // volume on it (think CDs) - so we're so nice to the caller to unmount that volume -- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, _udi.latin1()); -- if (halDrive) -- { -- int numVolumes; -- char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); -- if (numVolumes == 1) -- medium = m_mediaList.findById( volumes[0] ); -- } -- } -- -- if ( !medium ) -- return i18n("No such medium: %1").arg(_udi); -- -- if (!medium->isMounted()) -- return QString(); // that was easy -- -- QString mountPoint = isInFstab(medium); -- if (!mountPoint.isNull()) -- { -- kdDebug() << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl; -- KIO::Job *job = KIO::unmount( medium->mountPoint(), false ); -- connect(job, SIGNAL( result (KIO::Job *)), -- SLOT( slotResult( KIO::Job *))); -- mount_jobs[job] = medium->id(); -- return QString(); // we won't report an error here -- } -- -- DBusMessage *dmesg, *reply; -- DBusError error; -- const char *options[2]; -- -- const char *udi = medium->id().latin1(); -- kdDebug() << "unmounting " << udi << "..." << endl; -- -- dbus_error_init(&error); -- DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -- if (dbus_error_is_set(&error)) -- { -- dbus_error_free(&error); -- return false; -- } -- -- if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, -- "org.freedesktop.Hal.Device.Volume", -- "Unmount"))) { -- kdDebug() << "unmount failed for " << udi << ": could not create dbus message\n"; -- return i18n("Internal Error"); -- } -- -- options[0] = "force"; -- options[1] = 0; -- -- if (!dbus_message_append_args (dmesg, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, 0, -- DBUS_TYPE_INVALID)) -- { -- kdDebug() << "unmount failed for " << udi << ": could not append args to dbus message\n"; -- dbus_message_unref (dmesg); -- return i18n("Internal Error"); -- } -- -- dbus_error_init (&error); -- if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) -- { -- kdDebug() << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl; -- QString qerror = error.message; -- if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.Busy")) { -- qerror = QString("<qt>") + i18n("Device is Busy:"); -- QString cmdline = QString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint())); -- FILE *fuser = popen(cmdline.latin1(), "r"); -- uint counter = 0; -- if (fuser) { -- qerror += "<pre>"; -- QTextIStream is(fuser); -- QString tmp; -- while (!is.atEnd()) { -- tmp = is.readLine(); -- tmp = QStyleSheet::escape(tmp) + "\n"; -- -- qerror += tmp; -- if (counter++ > 20) -- { -- qerror += "..."; -- break; -- } -- } -- qerror += "</pre>"; -- (void)pclose( fuser ); -- } -- qerror += "</qt>"; -- } else if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.NotMounted")) { -- // this is faking. The error is that the device wasn't mounted by hal (but by the system) -- qerror = i18n("Permissions denied"); -- } -- -- dbus_message_unref (dmesg); -- dbus_error_free (&error); -- return qerror; -- } -- -- kdDebug() << "unmount queued for " << udi << endl; -- -- dbus_message_unref (dmesg); -- dbus_message_unref (reply); -- -- medium->setHalMounted(false); -- ResetProperties(udi); -- -- return QString(); -+void HALBackend::hal_device_condition(LibHalContext *ctx, const char *udi, -+ const char *condition_name, -+ #ifdef HAL_0_4 -+ DBusMessage *message -+ #else -+ const char* message -+ #endif -+ ) -+{ -+ kdDebug(1219) << "HALBackend::hal_device_condition " << udi << " -- " << condition_name << endl; -+ Q_UNUSED(ctx); -+ Q_UNUSED(message); -+ s_HALBackend->DeviceCondition(udi, condition_name); - } - - #include "halbackend.moc" -diff -urN kioslave/media/mediamanager/halbackend.h kioslave/media/mediamanager/halbackend.h ---- kioslave/media/mediamanager/halbackend.h Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/halbackend.h Mon Oct 10 17:04:01 2005 -@@ -45,9 +45,65 @@ - #include <libhal.h> - #include <libhal-storage.h> - --namespace KIO { -- class Job; --} -+/* The HAL API changed between 0.4 and 0.5 series. -+These defines enable backward compatibility */ -+#ifdef HAL_0_4 -+ // libhal-storage 0.4 API -+ #define LibHalStoragePolicy HalStoragePolicy -+ #define LibHalDrive HalDrive -+ #define LibHalVolume HalVolume -+ #define LibHalVolumeDiscType HalVolumeDiscType -+ #define libhal_storage_policy_free hal_storage_policy_free -+ #define libhal_storage_policy_new hal_storage_policy_new -+ #define libhal_drive_from_udi hal_drive_from_udi -+ #define libhal_drive_find_all_volumes hal_drive_find_all_volumes -+ #define libhal_drive_get_type hal_drive_get_type -+ #define libhal_drive_get_device_file hal_drive_get_device_file -+ #define libhal_drive_free hal_drive_free -+ #define libhal_drive_policy_compute_display_name hal_drive_policy_compute_display_name -+ #define libhal_drive_is_hotpluggable hal_drive_is_hotpluggable -+ #define libhal_drive_get_physical_device_udi hal_drive_get_physical_device_udi -+ #define libhal_volume_from_udi hal_volume_from_udi -+ #define libhal_volume_get_device_file hal_volume_get_device_file -+ #define libhal_volume_get_mount_point hal_volume_get_mount_point -+ #define libhal_volume_get_fstype hal_volume_get_fstype -+ #define libhal_volume_is_mounted hal_volume_is_mounted -+ #define libhal_volume_get_disc_type hal_volume_get_disc_type -+ #define libhal_volume_free hal_volume_free -+ #define libhal_volume_policy_compute_display_name hal_volume_policy_compute_display_name -+ #define libhal_volume_disc_has_data hal_volume_disc_has_data -+ #define libhal_volume_disc_has_audio hal_volume_disc_has_audio -+ #define libhal_volume_disc_is_blank hal_volume_disc_is_blank -+ #define libhal_volume_is_disc hal_volume_is_disc -+ #define libhal_volume_get_storage_device_udi hal_volume_get_storage_device_udi -+ #define LIBHAL_VOLUME_DISC_TYPE_CDROM HAL_VOLUME_DISC_TYPE_CDROM -+ #define LIBHAL_VOLUME_DISC_TYPE_CDR HAL_VOLUME_DISC_TYPE_CDR -+ #define LIBHAL_VOLUME_DISC_TYPE_CDRW HAL_VOLUME_DISC_TYPE_CDRW -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDROM HAL_VOLUME_DISC_TYPE_DVDROM -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDRAM HAL_VOLUME_DISC_TYPE_DVDRAM -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDR HAL_VOLUME_DISC_TYPE_DVDR -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDRW HAL_VOLUME_DISC_TYPE_DVDRW -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR HAL_VOLUME_DISC_TYPE_DVDPLUSR -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW HAL_VOLUME_DISC_TYPE_DVDPLUSRW -+ #define LIBHAL_DRIVE_TYPE_COMPACT_FLASH HAL_DRIVE_TYPE_COMPACT_FLASH -+ #define LIBHAL_DRIVE_TYPE_MEMORY_STICK HAL_DRIVE_TYPE_MEMORY_STICK -+ #define LIBHAL_DRIVE_TYPE_SMART_MEDIA HAL_DRIVE_TYPE_SMART_MEDIA -+ #define LIBHAL_DRIVE_TYPE_SD_MMC HAL_DRIVE_TYPE_SD_MMC -+ #define LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER HAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER -+ #define LIBHAL_DRIVE_TYPE_CAMERA HAL_DRIVE_TYPE_CAMERA -+ #define LIBHAL_DRIVE_TYPE_TAPE HAL_DRIVE_TYPE_TAPE -+ -+ // libhal 0.4 API -+ #define libhal_free_string hal_free_string -+ #define libhal_device_exists(ctx, udi, error) hal_device_exists(ctx, udi) -+ #define libhal_device_property_watch_all(ctx, error) hal_device_property_watch_all(ctx) -+ #define libhal_get_all_devices(ctx, num_devices, error) hal_get_all_devices(ctx, num_devices) -+ #define libhal_device_property_exists(ctx, udi, key, error) hal_device_property_exists(ctx, udi, key) -+ #define libhal_device_get_property_bool(ctx, udi, key, error) hal_device_get_property_bool(ctx, udi, key) -+ #define libhal_device_get_property_string(ctx, udi, key, error) hal_device_get_property_string(ctx, udi, key) -+ #define libhal_device_query_capability(ctx, udi, capability, error) hal_device_query_capability(ctx, udi, capability) -+#endif -+ - - /** - * A handy function to query a hal string -@@ -88,14 +144,6 @@ - */ - bool ListDevices(); - -- QStringList mountoptions(const QString &id); -- -- bool setMountoptions(const QString &id, const QStringList &options); -- -- QString mount(const QString &id); -- QString mount(const Medium *medium); -- QString unmount(const QString &id); -- - private: - /** - * Append a device in the media list. This function will check if the device -@@ -147,16 +195,20 @@ - - void setVolumeProperties(Medium* medium); - void setFloppyProperties(Medium* medium); -- bool setFstabProperties(Medium* medium); - void setCameraProperties(Medium* medium); - QString generateName(const QString &devNode); -- static QString isInFstab(const Medium *medium); -- --private slots: -- void slotResult(KIO::Job *job); - - /* Hal call-backs -- from gvm*/ - public: -+#ifdef HAL_0_4 -+ /** Invoked by libhal for integration with our mainloop. -+ * -+ * @param ctx LibHal context -+ * @param dbus_connection D-BUS connection to integrate -+ */ -+ static void hal_main_loop_integration(LibHalContext *ctx, DBusConnection *dbus_connection); -+#endif -+ - /** Invoked when a device is added to the Global Device List. - * - * @param ctx LibHal context -@@ -189,7 +241,11 @@ - */ - static void hal_device_condition(LibHalContext *ctx, const char *udi, - const char *condition_name, -+ #ifdef HAL_0_4 -+ DBusMessage *message -+ #else - const char* message -+ #endif - ); - - /* HAL and DBus structures */ -@@ -199,6 +255,13 @@ - */ - LibHalContext* m_halContext; - -+#ifdef HAL_0_4 -+ /** -+ * Structure defining the hal callback function for devices events -+ */ -+ LibHalFunctions m_halFunctions; -+#endif -+ - /** - * libhal-storage HAL policy, e.g. for icon names - */ -@@ -213,10 +276,6 @@ - * Object for the kded module - */ - QObject* m_parent; -- -- DBusConnection *dbus_connection; -- -- QMap<KIO::Job *, QString> mount_jobs; - }; - - #endif /* _HALBACKEND_H_ */ -diff -urN kioslave/media/mediamanager/linuxcdpolling.cpp kioslave/media/mediamanager/linuxcdpolling.cpp ---- kioslave/media/mediamanager/linuxcdpolling.cpp Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/linuxcdpolling.cpp Mon Oct 10 17:04:01 2005 -@@ -23,6 +23,7 @@ - - #include <qthread.h> - #include <qmutex.h> -+#include <qtimer.h> - #include <qfile.h> - - #include <kdebug.h> -@@ -188,7 +189,9 @@ - const QString &, bool, bool)), - this, SLOT(slotMediumStateChanged(const QString &)) ); - -- connect(&m_timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); -+ QTimer *timer = new QTimer(this); -+ connect(timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); -+ timer->start(500); - } - - LinuxCDPolling::~LinuxCDPolling() -@@ -226,7 +229,6 @@ - PollingThread *thread = new PollingThread(dev); - m_threads[id] = thread; - thread->start(); -- m_timer.start(500); - } - } - -@@ -266,7 +268,6 @@ - PollingThread *thread = new PollingThread(dev); - m_threads[id] = thread; - thread->start(); -- m_timer.start(500); - } - else if (m_threads.contains(id) && medium->isMounted()) - { -@@ -281,12 +282,6 @@ - void LinuxCDPolling::slotTimeout() - { - //kdDebug(1219) << "LinuxCDPolling::slotTimeout()" << endl; -- -- if (m_threads.isEmpty()) -- { -- m_timer.stop(); -- return; -- } - - QMap<QString, PollingThread*>::iterator it = m_threads.begin(); - QMap<QString, PollingThread*>::iterator end = m_threads.end(); -diff -urN kioslave/media/mediamanager/linuxcdpolling.h kioslave/media/mediamanager/linuxcdpolling.h ---- kioslave/media/mediamanager/linuxcdpolling.h Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/linuxcdpolling.h Mon Oct 10 17:04:01 2005 -@@ -24,7 +24,6 @@ - #include <qobject.h> - #include <qcstring.h> - #include <qmap.h> --#include <qtimer.h> - - class DiscType - { -@@ -80,7 +79,6 @@ - - QMap<QString, PollingThread*> m_threads; - QStringList m_excludeNotification; -- QTimer m_timer; - }; - - #endif -diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanager/mediamanager.cpp ---- kioslave/media/mediamanager/mediamanager.cpp Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/mediamanager.cpp Mon Oct 10 17:04:01 2005 -@@ -43,287 +43,201 @@ - MediaManager::MediaManager(const QCString &obj) - : KDEDModule(obj), m_dirNotify(m_mediaList) - { -- connect( &m_mediaList, SIGNAL(mediumAdded(const QString&, const QString&, bool)), -- SLOT(slotMediumAdded(const QString&, const QString&, bool)) ); -- connect( &m_mediaList, SIGNAL(mediumRemoved(const QString&, const QString&, bool)), -- SLOT(slotMediumRemoved(const QString&, const QString&, bool)) ); -- connect( &m_mediaList, -- SIGNAL(mediumStateChanged(const QString&, const QString&, bool, bool)), -- SLOT(slotMediumChanged(const QString&, const QString&, bool, bool)) ); -+ connect( &m_mediaList, SIGNAL(mediumAdded(const QString&, const QString&, bool)), -+ SLOT(slotMediumAdded(const QString&, const QString&, bool)) ); -+ connect( &m_mediaList, SIGNAL(mediumRemoved(const QString&, const QString&, bool)), -+ SLOT(slotMediumRemoved(const QString&, const QString&, bool)) ); -+ connect( &m_mediaList, -+ SIGNAL(mediumStateChanged(const QString&, const QString&, bool, bool)), -+ SLOT(slotMediumChanged(const QString&, const QString&, bool, bool)) ); - -- QTimer::singleShot( 10, this, SLOT( loadBackends() ) ); -+ QTimer::singleShot( 10, this, SLOT( loadBackends() ) ); - } - - MediaManager::~MediaManager() - { -- while ( !m_backends.isEmpty() ) -- { -- BackendBase *b = m_backends.first(); -- m_backends.remove( b ); -- delete b; -- } -+ while ( !m_backends.isEmpty() ) -+ { -+ BackendBase *b = m_backends.first(); -+ m_backends.remove( b ); -+ delete b; -+ } - } - - void MediaManager::loadBackends() - { - m_mediaList.blockSignals(true); - -- while ( !m_backends.isEmpty() ) -- { -- BackendBase *b = m_backends.first(); -- m_backends.remove( b ); -- delete b; -- } -- -- mp_removableBackend = 0L; -- m_halbackend = 0L; -- m_fstabbackend = 0L; -+ while ( !m_backends.isEmpty() ) -+ { -+ BackendBase *b = m_backends.first(); -+ m_backends.remove( b ); -+ delete b; -+ } -+ -+ mp_removableBackend = 0L; - - #ifdef COMPILE_HALBACKEND -- if ( MediaManagerSettings::self()->halBackendEnabled() ) -- { -- m_halbackend = new HALBackend(m_mediaList, this); -- if (m_halbackend->InitHal()) -- { -- m_backends.append( m_halbackend ); -- m_fstabbackend = new FstabBackend(m_mediaList, true); -- m_backends.append( m_fstabbackend ); -- // No need to load something else... -- m_mediaList.blockSignals(false); -- return; -- } -- else -- { -- delete m_halbackend; -- m_halbackend = 0; -- } -- } -+ if ( MediaManagerSettings::self()->halBackendEnabled() ) -+ { -+ HALBackend* hal_backend = new HALBackend(m_mediaList, this); -+ if (hal_backend->InitHal()) -+ { -+ m_backends.append( hal_backend ); -+ m_backends.append( new FstabBackend(m_mediaList, true) ); -+ // No need to load something else... -+ m_mediaList.blockSignals(false); -+ return; -+ } -+ else -+ { -+ delete hal_backend; -+ } -+ } - #endif // COMPILE_HALBACKEND - -- mp_removableBackend = new RemovableBackend(m_mediaList); -- m_backends.append( mp_removableBackend ); -+ mp_removableBackend = new RemovableBackend(m_mediaList); -+ m_backends.append( mp_removableBackend ); - - #ifdef COMPILE_LINUXCDPOLLING -- if ( MediaManagerSettings::self()->cdPollingEnabled() ) -- { -- m_backends.append( new LinuxCDPolling(m_mediaList) ); -- } -+ if ( MediaManagerSettings::self()->cdPollingEnabled() ) -+ { -+ m_backends.append( new LinuxCDPolling(m_mediaList) ); -+ } - #endif //COMPILE_LINUXCDPOLLING - -- m_fstabbackend = new FstabBackend(m_mediaList); -- m_backends.append( m_fstabbackend ); -- m_mediaList.blockSignals(false); -+ m_backends.append( new FstabBackend(m_mediaList) ); -+ m_mediaList.blockSignals(false); - } - - - QStringList MediaManager::fullList() - { -- QPtrList<Medium> list = m_mediaList.list(); -+ QPtrList<Medium> list = m_mediaList.list(); - -- QStringList result; -+ QStringList result; - -- QPtrList<Medium>::const_iterator it = list.begin(); -- QPtrList<Medium>::const_iterator end = list.end(); -- for (; it!=end; ++it) -- { -- result+= (*it)->properties(); -- result+= Medium::SEPARATOR; -- } -+ QPtrList<Medium>::const_iterator it = list.begin(); -+ QPtrList<Medium>::const_iterator end = list.end(); -+ for (; it!=end; ++it) -+ { -+ result+= (*it)->properties(); -+ result+= Medium::SEPARATOR; -+ } - -- return result; -+ return result; - } - - QStringList MediaManager::properties(const QString &name) - { -- const Medium *m = m_mediaList.findByName(name); -- -- if (!m) -- { -- KURL u(name); -- kdDebug() << "Media::prop " << name << " " << u.isValid() << endl; -- if (u.isValid()) -- { -- if (u.protocol() == "system") -- { -- QString path = u.path(); -- if (path.startsWith("/media/")) -- path = path.mid(strlen("/media/")); -- m = m_mediaList.findByName(path); -- kdDebug() << "findByName " << path << m << endl; -- } -- else if (u.protocol() == "media") -- { -- m = m_mediaList.findByName(u.filename()); -- kdDebug() << "findByName " << u.filename() << m << endl; -- } -- else if (u.protocol() == "file") -- { -- // look for the mount point -- QPtrList<Medium> list = m_mediaList.list(); -- QPtrList<Medium>::const_iterator it = list.begin(); -- QPtrList<Medium>::const_iterator end = list.end(); -- for (; it!=end; ++it) -- { -- kdDebug() << "comparing " << (*it)->mountPoint() << " " << u.path() << " " << (*it)->deviceNode() << endl; -- if ((*it)->mountPoint() == u.path() || (*it)->deviceNode() == u.path()) { -- m = *it; -- break; -- } -- } -- } -- } -- } -- -- if (m) -- return m->properties(); -- else -- return QStringList(); --} -+ const Medium *m = m_mediaList.findByName(name); - --QStringList MediaManager::mountoptions(const QString &name) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return QStringList(); -- return m_halbackend->mountoptions(name); --#else -- return QStringList(); --#endif --} -- --bool MediaManager::setMountoptions(const QString &name, const QStringList &options) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return false; -- return m_halbackend->setMountoptions(name, options); --#else -- return false; --#endif --} -- --QString MediaManager::mount(const QString &name) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return i18n("Feature only available with HAL"); -- return m_halbackend->mount(name); --#else -- if ( !m_fstabbackend ) // lying :) -- return i18n("Feature only available with HAL"); -- return m_fstabbackend->mount( name ); --#endif --} -- --QString MediaManager::unmount(const QString &name) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return i18n("Feature only available with HAL"); -- return m_halbackend->unmount(name); --#else -- if ( !m_fstabbackend ) // lying :) -- return i18n("Feature only available with HAL"); -- return m_fstabbackend->unmount( name ); --#endif -+ if (m!=0L) -+ { -+ return m->properties(); -+ } -+ else -+ { -+ return QStringList(); -+ } - } - - QString MediaManager::nameForLabel(const QString &label) - { -- const QPtrList<Medium> media = m_mediaList.list(); -+ const QPtrList<Medium> media = m_mediaList.list(); - -- QPtrList<Medium>::const_iterator it = media.begin(); -- QPtrList<Medium>::const_iterator end = media.end(); -- for (; it!=end; ++it) -- { -- const Medium *m = *it; -- -- if (m->prettyLabel()==label) -- { -- return m->name(); -- } -- } -+ QPtrList<Medium>::const_iterator it = media.begin(); -+ QPtrList<Medium>::const_iterator end = media.end(); -+ for (; it!=end; ++it) -+ { -+ const Medium *m = *it; -+ -+ if (m->prettyLabel()==label) -+ { -+ return m->name(); -+ } -+ } - -- return QString::null; -+ return QString::null; - } - - ASYNC MediaManager::setUserLabel(const QString &name, const QString &label) - { -- m_mediaList.setUserLabel(name, label); -+ m_mediaList.setUserLabel(name, label); - } - - ASYNC MediaManager::reloadBackends() - { -- MediaManagerSettings::self()->readConfig(); -- loadBackends(); -+ MediaManagerSettings::self()->readConfig(); -+ loadBackends(); - } - - bool MediaManager::removablePlug(const QString &devNode, const QString &label) - { -- if (mp_removableBackend) -- { -- return mp_removableBackend->plug(devNode, label); -- } -- return false; -+ if (mp_removableBackend) -+ { -+ return mp_removableBackend->plug(devNode, label); -+ } -+ return false; - } - - bool MediaManager::removableUnplug(const QString &devNode) - { -- if (mp_removableBackend) -- { -- return mp_removableBackend->unplug(devNode); -- } -- return false; -+ if (mp_removableBackend) -+ { -+ return mp_removableBackend->unplug(devNode); -+ } -+ return false; - } - - bool MediaManager::removableCamera(const QString &devNode) - { -- if (mp_removableBackend) -- { -- return mp_removableBackend->camera(devNode); -- } -- return false; -+ if (mp_removableBackend) -+ { -+ return mp_removableBackend->camera(devNode); -+ } -+ return false; - } - - - void MediaManager::slotMediumAdded(const QString &/*id*/, const QString &name, - bool allowNotification) - { -- kdDebug(1219) << "MediaManager::slotMediumAdded: " << name << endl; -+ kdDebug(1219) << "MediaManager::slotMediumAdded: " << name << endl; - -- KDirNotify_stub notifier("*", "*"); -- notifier.FilesAdded( KURL("media:/") ); -+ KDirNotify_stub notifier("*", "*"); -+ notifier.FilesAdded( KURL("media:/") ); - -- emit mediumAdded(name, allowNotification); -- emit mediumAdded(name); -+ emit mediumAdded(name, allowNotification); -+ emit mediumAdded(name); - } - - void MediaManager::slotMediumRemoved(const QString &/*id*/, const QString &name, - bool allowNotification) - { -- kdDebug(1219) << "MediaManager::slotMediumRemoved: " << name << endl; -+ kdDebug(1219) << "MediaManager::slotMediumRemoved: " << name << endl; - -- KDirNotify_stub notifier("*", "*"); -- notifier.FilesRemoved( KURL("media:/"+name) ); -+ KDirNotify_stub notifier("*", "*"); -+ notifier.FilesRemoved( KURL("media:/"+name) ); - -- emit mediumRemoved(name, allowNotification); -- emit mediumRemoved(name); -+ emit mediumRemoved(name, allowNotification); -+ emit mediumRemoved(name); - } - - void MediaManager::slotMediumChanged(const QString &/*id*/, const QString &name, - bool mounted, bool allowNotification) - { -- kdDebug(1219) << "MediaManager::slotMediumChanged: " << name << endl; -+ kdDebug(1219) << "MediaManager::slotMediumChanged: " << name << endl; - -- KDirNotify_stub notifier("*", "*"); -- if (!mounted) -- { -- notifier.FilesRemoved( KURL("media:/"+name) ); -- } -- notifier.FilesChanged( KURL("media:/"+name) ); -+ KDirNotify_stub notifier("*", "*"); -+ if (!mounted) -+ { -+ notifier.FilesRemoved( KURL("media:/"+name) ); -+ } -+ notifier.FilesChanged( KURL("media:/"+name) ); - -- emit mediumChanged(name, allowNotification); -- emit mediumChanged(name); -+ emit mediumChanged(name, allowNotification); -+ emit mediumChanged(name); - } - - -diff -urN kioslave/media/mediamanager/mediamanager.desktop kioslave/media/mediamanager/mediamanager.desktop ---- kioslave/media/mediamanager/mediamanager.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/mediamanager.desktop Tue May 23 13:33:34 2006 -@@ -16,13 +16,11 @@ - Name[es]=Administrador de recursos KDED - Name[et]=KDED andmekandjate haldur - Name[eu]=KDED media kudeatzailea --Name[fa]=مدیر رسانه KDED - Name[fi]=KDED-tallennusmedianhallinta - Name[fr]=Gestionnaire de médias KDED - Name[fy]=KDEDED-mediabehearder - Name[ga]=Bainisteoir Meán KDED - Name[gl]=Xestor de Meios de KDED --Name[he]=מנהל המדיה של KDED - Name[hi]=केडीईडी मीडिया प्रबंधक - Name[hr]=KDED upravitelj medija - Name[hu]=KDED médiakezelő -@@ -45,7 +43,6 @@ - Name[ru]=Управление подключаемыми устройствами - Name[rw]=Mugenga Igihuza KDED - Name[se]=KDED-mediagieđahalli --Name[sk]=KDED správca médií - Name[sl]=Upravitelj medijev KDED - Name[sr]=Менаџер медијума, KDED - Name[sr@Latn]=Menadžer medijuma, KDED -@@ -73,18 +70,16 @@ - Comment[es]=Monitoriza las actividades de los recursos y permite (des)montarlos (media:/) - Comment[et]=Hoiab silma peal andmekandjate aktiivsusel ja võimaldab neid ühendada/lahutada (media:/) - Comment[eu]=Montatzeak begiztatzen ditu (media:/) eta desmontatzen uzten du --Comment[fa]=حفظ رد فعالیتهای رسانه و اجازه سو ار(پیاده) کردن (media:/) - Comment[fi]=Pidä kirjaa tallennustapahtumista ja salli tallennusvälineen liittäminen/irrotus (devices:/) - Comment[fr]=Gardez une trace des montages et permettre le (dé)montage (media:/) - Comment[fy]=Hâld de media-aktiviteiten by en stien ta om media oan- en ôf te keppelje (media:/) - Comment[gl]=Seguimento das actividades dos meios e permite-lle (des)montar (media:/) --Comment[he]=מנטר אחר פעילויות מדיה, ומאפשר לחבר או לנתק התקנים (media:/) - Comment[hi]=मीडिया क्रियाओं की जानकारी रखे तथा (अन)माउन्ट करने दे (मीडिया:/) - Comment[hr]=Praćenje aktivnosti medija i omogućavanje pristupanja i napuštanja - Comment[hu]=Az adathordozók követése, csatlakoztatása és leválasztása (media:/) - Comment[is]=Fylgjast með breytingum á tækjum og bjóða upp á (af)tengingu (media:/) - Comment[it]=Tiene traccia delle attività dei supporti e permette di montarli o smontarli (device:/) --Comment[ja]=メディアの活動を追跡し、(media:/) をマウントしたりアンマウントします -+Comment[ja]=メディアの活動を捕捉し、マウントしたりアンマウントします。(media:/) - Comment[km]=តាមដានសកម្មភាពព័ត៌មាន និងអនុញ្ញាតឲ្យរៀបចំ (មិនរៀបចំ) (media:/) - Comment[lt]=Stebi laikmenose vykdomus veiksmus ir leidžia (iš)montuoti (media:/) - Comment[lv]=Seko datu nesēju aktivitātēm un ļauj montēt/nomontēt tos (media:/) -@@ -103,7 +98,6 @@ - Comment[ru]=Автоматическое подключение устройств (media:/) - Comment[rw]=Kugumana inzira y'ibikorwa by'ibitangazamakuru no kwemerera gushyiramo(gukuramo) (ibitangazamakuru:/) - Comment[se]=Gozit mii dáhpáhuvvá median ja diktá du gálgat ja čadnat daid (media:/) --Comment[sk]=Sledovanie pripojenia/odpojenia medií (media:/) - Comment[sl]=Nadzoruj dejanja medija in dovilo priklop/odklop (media:/) - Comment[sr]=Прати активност медијума и омогућава (де)монтирање (media:/) - Comment[sr@Latn]=Prati aktivnost medijuma i omogućava (de)montiranje (media:/) -@@ -122,4 +116,3 @@ - X-KDE-FactoryName=mediamanager - X-KDE-Kded-autoload=true - X-KDE-Kded-load-on-demand=true --X-KDE-Kded-phase=1 -diff -urN kioslave/media/mediamanager/mediamanager.h kioslave/media/mediamanager/mediamanager.h ---- kioslave/media/mediamanager/mediamanager.h Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/mediamanager.h Mon Oct 10 17:04:01 2005 -@@ -28,8 +28,6 @@ - #include "removablebackend.h" - #include "mediadirnotify.h" - --class HALBackend; --class FstabBackend; - - class MediaManager : public KDEDModule - { -@@ -42,12 +40,6 @@ - k_dcop: - QStringList fullList(); - QStringList properties(const QString &name); -- QStringList mountoptions(const QString &name); -- bool setMountoptions(const QString &name, const QStringList &options); -- -- QString mount(const QString &uid); -- QString unmount(const QString &uid); -- - QString nameForLabel(const QString &label); - ASYNC setUserLabel(const QString &name, const QString &label); - -@@ -82,9 +74,7 @@ - MediaList m_mediaList; - QValueList<BackendBase*> m_backends; - RemovableBackend *mp_removableBackend; -- HALBackend *m_halbackend; - MediaDirNotify m_dirNotify; -- FstabBackend *m_fstabbackend; - }; - - #endif -diff -urN kioslave/media/medianotifier/Makefile.in kioslave/media/medianotifier/Makefile.in ---- kioslave/media/medianotifier/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/medianotifier/Makefile.in Fri May 26 09:54:31 2006 -@@ -254,6 +254,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/medianotifier/medianotifier.cpp kioslave/media/medianotifier/medianotifier.cpp ---- kioslave/media/medianotifier/medianotifier.cpp Sun Oct 1 19:31:53 2006 -+++ kioslave/media/medianotifier/medianotifier.cpp Fri Mar 17 11:17:33 2006 -@@ -48,21 +48,13 @@ - - MediaNotifier::~MediaNotifier() - { -- disconnectDCOPSignal( "kded", "mediamanager", "mediumAdded(QString, bool)", -- "onMediumChange(QString, bool)" ); -- -- disconnectDCOPSignal( "kded", "mediamanager", "mediumChanged(QString, bool)", -- "onMediumChange(QString, bool)" ); - } - - void MediaNotifier::onMediumChange( const QString &name, bool allowNotification ) - { - kdDebug() << "MediaNotifier::onMediumChange( " << name << ", " - << allowNotification << ")" << endl; -- -- if ( !allowNotification ) -- return; -- -+ - // Update user activity timestamp, otherwise the notification dialog will be shown - // in the background due to focus stealing prevention. Entering a new media can - // be seen as a kind of user activity after all. It'd be better to update the timestamp -@@ -103,11 +95,11 @@ - { - QString mimetype = medium.mimetype(); - -- bool is_cdrom = mimetype.startsWith( "cd" ) || mimetype.startsWith( "dvd" ); -+ bool is_cdrom = mimetype.contains( "cd" ) || mimetype.contains( "dvd" ); - bool is_mounted = mimetype.endsWith( "_mounted" ); - - // We autorun only on CD/DVD or removable disks (USB, Firewire) -- if ( !( is_cdrom || is_mounted ) -+ if ( !( is_cdrom && is_mounted ) - && mimetype!="media/removable_mounted" ) - { - return false; -diff -urN kioslave/media/medianotifier/medianotifier.desktop kioslave/media/medianotifier/medianotifier.desktop ---- kioslave/media/medianotifier/medianotifier.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/medianotifier/medianotifier.desktop Mon May 22 20:12:42 2006 -@@ -18,12 +18,10 @@ - Name[es]=Demonio de notificaciones de medios - Name[et]=Andmekandjate märguannete deemon - Name[eu]=Euskarrien jakinarazpen daemon-a --Name[fa]=شبح اخطاردهنده رسانه - Name[fi]=Mediahuomautin - Name[fr]=Démon de notifications des média - Name[fy]=Medianotifikaasje-daemon - Name[gl]=Daemon Notificador de Medios --Name[he]=שירות הודעות מערכת - Name[hr]=Demon obavijesti o medijima - Name[hu]=Lemezfigyelő szolgáltatás - Name[is]=Miðils tilkynningarpúki -@@ -34,12 +32,10 @@ - Name[nb]=Medievarslingsnisse - Name[nds]=Medien-Narichtendämoon - Name[nl]=Medianotificatie-daemon --Name[nn]=Mediepåminningsnisse - Name[pl]=Usługa powiadamiania o nośnikach - Name[pt]=Servidor de Notificação de Dispositivos - Name[pt_BR]=Servidor de Notificação de Dispositivos - Name[ru]=Демон уведомлений от подключаемых устройств --Name[sk]=Notifikátor medií - Name[sl]=Demon za obveščanje o nosilcih - Name[sr]=Демон за обавештења о медијумима - Name[sr@Latn]=Demon za obaveštenja o medijumima -@@ -47,7 +43,6 @@ - Name[uk]=Даемон сповіщення про носії інформації - Name[vi]=Trình nền Thông báo Ổ lưu trữ - Name[zh_CN]=介质通知守护程序 --Name[zh_TW]=媒體通知伺服程式 - Comment=A media plugged notifier - Comment[af]='n Inpropbare media inkennissteller - Comment[bg]=Мултимедиен демон за уведомяване при поставяне/включване на ново мултимедийно устройство -@@ -61,7 +56,6 @@ - Comment[es]=Un notificador de medios empotrable - Comment[et]=Andmekandja ühendamisest märkuandev deemon - Comment[eu]=Euskarri konektatze jakinarazlea --Comment[fa]=یک اخطاردهنده وصلشده رسانه - Comment[fi]=Liitetyn median huomautin - Comment[fr]=Notification de connexion de média - Comment[fy]=Meidieling fan oankeppele media -@@ -70,7 +64,7 @@ - Comment[hu]=Lemezérzékelő - Comment[is]=Tilkynnari um tengda miðla - Comment[it]=Notifiche dei dispositivi attaccati --Comment[ja]=メディアの接続を通知します -+Comment[ja]=メディアの接続を通知する - Comment[lt]=Perspėjimo apie media prijungimą priedas - Comment[mk]=Известување за приклучен медиум - Comment[nb]=En medievarsler som programtillegg -@@ -82,7 +76,6 @@ - Comment[pt]=Um notificador ligado aos dispositivos - Comment[pt_BR]=um notificador para mídia que é espetada (plug) - Comment[ru]=Система обработки уведомлений от подключаемых устройств --Comment[sk]=Notifikátor pripojených médií - Comment[sl]=Obveščanje o vstavljenih/priklopljenih nosilcih - Comment[sr]=Обавештавач о укљученим медијима - Comment[sr@Latn]=Obaveštavač o uključenim medijima -diff -urN kioslave/media/medianotifier/notificationdialog.cpp kioslave/media/medianotifier/notificationdialog.cpp ---- kioslave/media/medianotifier/notificationdialog.cpp Sat Oct 7 16:23:12 2006 -+++ kioslave/media/medianotifier/notificationdialog.cpp Mon Oct 10 17:04:00 2005 -@@ -26,7 +26,6 @@ - #include <klistbox.h> - #include <qlabel.h> - #include <qcheckbox.h> --#include <qpushbutton.h> - - #include "actionlistboxitem.h" - #include "notificationdialogview.h" -@@ -71,8 +70,6 @@ - this, SLOT( delayedDestruct() ) ); - - m_actionWatcher->startScan(); -- QPushButton * btn = actionButton( Ok ); -- btn->setFocus(); - } - - NotificationDialog::~NotificationDialog() -diff -urN kioslave/media/mimetypes/Makefile.in kioslave/media/mimetypes/Makefile.in ---- kioslave/media/mimetypes/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/mimetypes/Makefile.in Fri May 26 09:54:31 2006 -@@ -211,6 +211,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/mimetypes/audiocd.desktop kioslave/media/mimetypes/audiocd.desktop ---- kioslave/media/mimetypes/audiocd.desktop Mon Oct 2 12:44:33 2006 -+++ kioslave/media/mimetypes/audiocd.desktop Mon May 22 20:12:42 2006 -@@ -11,7 +11,6 @@ - Comment[cs]=Zvukové CD - Comment[da]=Lyd-cd - Comment[el]=CD ήχου --Comment[fa]=دیسک فشرده صوتی - Comment[fi]=CD-äänilevy - Comment[fr]=CD audio - Comment[fy]=Audio-Kompaktskiif -@@ -25,7 +24,6 @@ - Comment[it]=CD audio - Comment[ja]=オーディオ CD - Comment[km]=ស៊ីឌីអូឌីយ៉ូ --Comment[mk]=Аудио ЦД - Comment[ms]=CD Audio - Comment[nb]=Lyd-CD - Comment[nds]=Audio-CD -@@ -33,7 +31,7 @@ - Comment[nn]=Lyd-CD - Comment[pa]=ਆਡੀਓ CD - Comment[pl]=Płyta CD Audio --Comment[pt]=CD de áudio -+Comment[pt]=CD áudio - Comment[pt_BR]=CD de Áudio - Comment[ro]=CD Audio - Comment[ru]=Аудио CD -diff -urN kioslave/media/mimetypes/blankcd.desktop kioslave/media/mimetypes/blankcd.desktop ---- kioslave/media/mimetypes/blankcd.desktop Mon Oct 2 12:44:33 2006 -+++ kioslave/media/mimetypes/blankcd.desktop Mon May 22 20:12:43 2006 -@@ -16,7 +16,6 @@ - Comment[es]=CD vacío - Comment[et]=Tühi CD - Comment[eu]=CD hutsik --Comment[fa]=دیسک فشرده خام - Comment[fi]=Tyhjä CD - Comment[fr]=CD vierge - Comment[fy]=Blanke Kompaktskiif -@@ -32,7 +31,6 @@ - Comment[km]=ស៊ីឌីទទេ - Comment[lt]=Tuščias CD - Comment[lv]=Tukšs CD --Comment[mk]=Празно ЦД - Comment[ms]=CD Kosong - Comment[nb]=Tom CD - Comment[nds]=Leddige CD -@@ -46,7 +44,6 @@ - Comment[ru]=Чистый CD - Comment[rw]=CD Itanditseho - Comment[se]=Guorus CD --Comment[sk]=Čisté CD - Comment[sl]=Prazen CD - Comment[sr]=Празан CD - Comment[sr@Latn]=Prazan CD -diff -urN kioslave/media/mimetypes/blankdvd.desktop kioslave/media/mimetypes/blankdvd.desktop ---- kioslave/media/mimetypes/blankdvd.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/blankdvd.desktop Mon May 22 20:12:42 2006 -@@ -16,7 +16,6 @@ - Comment[es]=DVD vacío - Comment[et]=Tühi DVD - Comment[eu]=DVD hutsik --Comment[fa]=DVD خام - Comment[fi]=Tyhjä DVD-levy - Comment[fr]=DVD vierge - Comment[fy]=Blanke Dûbelskiif -@@ -32,7 +31,6 @@ - Comment[km]=ឌីវីឌីទទេ - Comment[lt]=Tuščias DVD - Comment[lv]=Tukšs DVD --Comment[mk]=Празно DVD - Comment[ms]=DVD Kosong - Comment[nb]=Tom DVD - Comment[nds]=Leddige DVD -@@ -46,7 +44,6 @@ - Comment[ru]=Чистый DVD - Comment[rw]=DVD Itanditseho - Comment[se]=Guorus DVD --Comment[sk]=Čisté DVD - Comment[sl]=Prazen DVD - Comment[sr]=Празан DVD - Comment[sr@Latn]=Prazan DVD -diff -urN kioslave/media/mimetypes/camera_mounted.desktop kioslave/media/mimetypes/camera_mounted.desktop ---- kioslave/media/mimetypes/camera_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/camera_mounted.desktop Mon May 22 20:12:42 2006 -@@ -16,7 +16,6 @@ - Comment[es]=Cámara montada - Comment[et]=Ühendatud kaamera - Comment[eu]=Kamara muntatuta --Comment[fa]=دوربین سوارشده - Comment[fi]=Liitetty kamera - Comment[fr]=Appareil photo monté - Comment[fy]=Oankeppele kamera -@@ -41,7 +40,6 @@ - Comment[pt_BR]=Câmera montada - Comment[ru]=Подключённая камера - Comment[se]=Čatnon govvenapperáhtta --Comment[sk]=Pripojený digitálny fotoaparát - Comment[sl]=Priklopljen fotoaparat - Comment[sr]=Монтирана камера - Comment[sr@Latn]=Montirana kamera -diff -urN kioslave/media/mimetypes/camera_unmounted.desktop kioslave/media/mimetypes/camera_unmounted.desktop ---- kioslave/media/mimetypes/camera_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/camera_unmounted.desktop Mon May 22 20:12:42 2006 -@@ -16,7 +16,6 @@ - Comment[es]=Cámara desmontada - Comment[et]=Lahutatud kaamera - Comment[eu]=Kamara desmuntatua --Comment[fa]=دوربین پیادهشده - Comment[fi]=Irrotettu kamera - Comment[fr]=Appareil photo non monté - Comment[fy]=Ofkeppele kamera -@@ -41,7 +40,6 @@ - Comment[pt_BR]=Câmera desmontada - Comment[ru]=Неподключённая камера - Comment[se]=Gálgajuvvon govvenapperáhtta --Comment[sk]=Odpojený digitálny fotoaparát - Comment[sl]=Odklopljen fotoaparat - Comment[sr]=Демонтирана камера - Comment[sr@Latn]=Demontirana kamera -diff -urN kioslave/media/mimetypes/cdrom_mounted.desktop kioslave/media/mimetypes/cdrom_mounted.desktop ---- kioslave/media/mimetypes/cdrom_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/cdrom_mounted.desktop Mon May 22 20:12:43 2006 -@@ -21,7 +21,7 @@ - Comment[es]=CD-ROM montado - Comment[et]=Ühendatud CD-ROM - Comment[eu]=CD-ROM muntatua --Comment[fa]=CD-ROM سوارشده -+Comment[fa]=CD سوار شده - Comment[fi]=Liitetty CD-ROM - Comment[fr]=CD-ROM monté - Comment[fy]=Oankeppele Kompaktskiif -diff -urN kioslave/media/mimetypes/cdrom_unmounted.desktop kioslave/media/mimetypes/cdrom_unmounted.desktop ---- kioslave/media/mimetypes/cdrom_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/cdrom_unmounted.desktop Mon May 22 20:12:43 2006 -@@ -21,7 +21,7 @@ - Comment[es]=CD-ROM desmontado - Comment[et]=Lahutatud CD-ROM - Comment[eu]=CD-ROM desmuntatua --Comment[fa]=CD-ROM پیادهشده -+Comment[fa]= CD پیاده شده - Comment[fi]=Irrotettu CD-ROM - Comment[fr]=CD-ROM non monté - Comment[fy]=Ofkeppele Kompaktskiif -diff -urN kioslave/media/mimetypes/cdwriter_mounted.desktop kioslave/media/mimetypes/cdwriter_mounted.desktop ---- kioslave/media/mimetypes/cdwriter_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/cdwriter_mounted.desktop Mon May 22 20:12:42 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Escritor de CDs montado - Comment[et]=Ühendatud CD kirjutaja - Comment[eu]=CD erretzaile muntatua --Comment[fa]=CD Writer سوارشده -+Comment[fa]=CD Writer سوار شده - Comment[fi]=Liitetty CD-kirjoitin - Comment[fr]=Graveur de CD monté - Comment[fy]=Oankeppele Kompaktskiif -diff -urN kioslave/media/mimetypes/cdwriter_unmounted.desktop kioslave/media/mimetypes/cdwriter_unmounted.desktop ---- kioslave/media/mimetypes/cdwriter_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/cdwriter_unmounted.desktop Mon May 22 20:12:42 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Escritor de CDs desmontado - Comment[et]=Lahutatud CD kirjutaja - Comment[eu]=CD erretzaile desmuntatua --Comment[fa]=CD Writer پیادهشده -+Comment[fa]=CD Writer پیاده شده - Comment[fi]=Irrotettu CD-kirjoitin - Comment[fr]=Graveur de CD non monté - Comment[fy]=Ofkeppele Kompaktskiif -diff -urN kioslave/media/mimetypes/dvd_mounted.desktop kioslave/media/mimetypes/dvd_mounted.desktop ---- kioslave/media/mimetypes/dvd_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/dvd_mounted.desktop Mon May 22 20:12:42 2006 -@@ -21,7 +21,7 @@ - Comment[es]=DVD montado - Comment[et]=Ühendatud DVD - Comment[eu]=DVD muntatua --Comment[fa]=DVD سوارشده -+Comment[fa]=DVD سوار شده - Comment[fi]=Liitetty DVD-levy - Comment[fr]=DVD-ROM monté(s) - Comment[fy]=Oankeppele Dûbelskiif -diff -urN kioslave/media/mimetypes/dvd_unmounted.desktop kioslave/media/mimetypes/dvd_unmounted.desktop ---- kioslave/media/mimetypes/dvd_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/dvd_unmounted.desktop Tue May 23 13:33:34 2006 -@@ -21,7 +21,7 @@ - Comment[es]=DVD desmontado - Comment[et]=Lahutatud DVD - Comment[eu]=DVD desmuntatua --Comment[fa]=DVD پیادهشده -+Comment[fa]=DVD پیاده شده - Comment[fi]=Irrotettu DVD-levy - Comment[fr]=DVD-ROM non monté(s) - Comment[fy]=Ofkeppele Dûbelskiif -diff -urN kioslave/media/mimetypes/dvdvideo.desktop kioslave/media/mimetypes/dvdvideo.desktop ---- kioslave/media/mimetypes/dvdvideo.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/dvdvideo.desktop Mon May 22 20:12:43 2006 -@@ -16,7 +16,6 @@ - Comment[es]=Disco de video DVD - Comment[et]=DVD videoplaat - Comment[eu]=DVD bideo diska --Comment[fa]=دیسک ویدئویی DVD - Comment[fi]=DVD-videolevy - Comment[fr]=DVD vidéo - Comment[fy]=Dûbelskiif Fideoskiif -@@ -32,7 +31,6 @@ - Comment[km]=ថាសវីដេអូ ឌីវីឌី - Comment[lt]=DVD video diskas - Comment[lv]=DVD Video Disks --Comment[mk]=DVD Видеодиск - Comment[ms]=Cakera Video DVD - Comment[nb]=DVD-videoplate - Comment[nds]=DVD-Videodisk -@@ -40,13 +38,12 @@ - Comment[nn]=DVD-videoplate - Comment[pa]=DVD ਵੀਡਿਓ ਡਿਸਕ - Comment[pl]=Płyta DVD Video --Comment[pt]=Disco DVD de Vídeo -+Comment[pt]=Disco DVD Vídeo - Comment[pt_BR]=DVD de vídeo - Comment[ro]=Disc video DVD - Comment[ru]=DVD с видео - Comment[rw]=Disiki Videwo DVD - Comment[se]=DVD-videoskearru --Comment[sk]=DVD Video disk - Comment[sl]=DVD Video disk - Comment[sr]=DVD видео диск - Comment[sr@Latn]=DVD video disk -diff -urN kioslave/media/mimetypes/floppy5_mounted.desktop kioslave/media/mimetypes/floppy5_mounted.desktop ---- kioslave/media/mimetypes/floppy5_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/floppy5_mounted.desktop Mon May 22 20:12:42 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disquete 5¼" montado - Comment[et]=Ühendatud 5¼" flopi - Comment[eu]=5¼"ko diskete muntatua --Comment[fa]=فلاپی 5¼" سوارشده -+Comment[fa]=فلاپی 5¼"سوار شده - Comment[fi]=Liitetty 5¼"-levyke - Comment[fr]=Disquette 5¼" montée - Comment[fy]=Oankeppele 5¼" Skiif -diff -urN kioslave/media/mimetypes/floppy5_unmounted.desktop kioslave/media/mimetypes/floppy5_unmounted.desktop ---- kioslave/media/mimetypes/floppy5_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/floppy5_unmounted.desktop Tue May 23 13:33:35 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disquete 5¼" desmontado - Comment[et]=Lahutatud 5¼" flopi - Comment[eu]=5¼"ko diskete desmuntatua --Comment[fa]=فلاپی 5¼" پیادهشده -+Comment[fa]=فلاپی 5¼" پیاده شده - Comment[fi]=Irrotettu 5¼"-levyke - Comment[fr]=Disquette 5¼" non montée - Comment[fy]=Ofkeppele 5¼" Skiif -diff -urN kioslave/media/mimetypes/floppy_mounted.desktop kioslave/media/mimetypes/floppy_mounted.desktop ---- kioslave/media/mimetypes/floppy_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/floppy_mounted.desktop Mon May 22 20:12:43 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disquete montado - Comment[et]=Ühendatud flopi - Comment[eu]=Diskete muntatua --Comment[fa]=فلاپی سوارشده -+Comment[fa]=فلاپی سوار شده - Comment[fi]=Liitetty levyke - Comment[fr]=Disquette montée - Comment[fy]=Oankeppele Skiif -diff -urN kioslave/media/mimetypes/floppy_unmounted.desktop kioslave/media/mimetypes/floppy_unmounted.desktop ---- kioslave/media/mimetypes/floppy_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/floppy_unmounted.desktop Tue May 23 13:33:34 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disquete desmontado - Comment[et]=Lahutatud flopi - Comment[eu]=Diskete desmuntatua --Comment[fa]=فلاپی پیادهشده -+Comment[fa]=فلاپی پیاده شده - Comment[fi]=Irrotettu levyke - Comment[fr]=Disquette non montée - Comment[fy]=Ofkeppele Skiif -diff -urN kioslave/media/mimetypes/gphoto2camera.desktop kioslave/media/mimetypes/gphoto2camera.desktop ---- kioslave/media/mimetypes/gphoto2camera.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/gphoto2camera.desktop Mon May 22 20:12:43 2006 -@@ -18,7 +18,6 @@ - Comment[es]=Cámara - Comment[et]=Kaamera - Comment[eu]=Kamara --Comment[fa]=دوربین - Comment[fi]=Kamera - Comment[fr]=Nouvel appareil photo - Comment[fy]=Kamera -@@ -41,13 +40,12 @@ - Comment[nn]=Kamera - Comment[pa]=ਕੈਮਰਾ - Comment[pl]=Aparat fotograficzny --Comment[pt]=Máquina fotográfica -+Comment[pt]=Máquina Fotográfica - Comment[pt_BR]=Câmera - Comment[ro]=Aparat foto - Comment[ru]=Камера - Comment[rw]=Kamera - Comment[se]=Govvanaperáhtta --Comment[sk]=Digitálny fotoaparát - Comment[sl]=Fotoaparat - Comment[sr]=Камера - Comment[sr@Latn]=Kamera -diff -urN kioslave/media/mimetypes/hdd_mounted.desktop kioslave/media/mimetypes/hdd_mounted.desktop ---- kioslave/media/mimetypes/hdd_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/hdd_mounted.desktop Mon May 22 20:12:43 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Volumen de disco duro montado - Comment[et]=Ühendatud kõvaketta partitsioon - Comment[eu]=Diska gogorraren zatiketa muntatua --Comment[fa]=حجم دیسک سخت سوارشده - Comment[fi]=Liitetty kiintoleyosio - Comment[fr]=Partition de disque dur montée - Comment[fy]=Oankeppele Fêsteskiif folume -@@ -44,13 +43,12 @@ - Comment[nn]=Montert harddiskvolum - Comment[pa]=ਮਾਊਟ ਕੀਤਾ ਹਾਰਡ ਡਿਸਕ ਭਾਗ - Comment[pl]=Zamontowana partycja dysku twardego --Comment[pt]=Volume de disco rígido montado -+Comment[pt]=Volume de Disco Rígido Montado - Comment[pt_BR]=Volume do HD Montado - Comment[ro]=Volum de hard disc montat - Comment[ru]=Смонтированный раздел жёсткого диска - Comment[rw]=Ububiko Disiki Bwashyizwemo - Comment[se]=Čatnon garraskearrooassi --Comment[sk]=Pripojený oddiel pevného disku - Comment[sl]=Priklopljen pogon trdega diska - Comment[sr]=Монтирана партиција хард диска - Comment[sr@Latn]=Montirana particija hard diska -diff -urN kioslave/media/mimetypes/hdd_unmounted.desktop kioslave/media/mimetypes/hdd_unmounted.desktop ---- kioslave/media/mimetypes/hdd_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/hdd_unmounted.desktop Mon May 22 20:12:43 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Volumen de disco duro desmontado - Comment[et]=Lahutatud kõvaketta partitsioon - Comment[eu]=Diska gogorraren zatiketa desmuntatua --Comment[fa]=حجم دیسک سخت پیاده شده - Comment[fi]=Irrotettu kiintolevyosio - Comment[fr]=Partition de disque dur non montée - Comment[fy]=Ofkeppele Fêsteskiif folume -@@ -44,13 +43,12 @@ - Comment[nn]=Umontert harddiskvolum - Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ ਹਾਰਡ ਡਿਸਕ ਭਾਗ - Comment[pl]=Odmontowana partycja dysku twardego --Comment[pt]=Volume de disco rígido desmontado -+Comment[pt]=Volume de Disco Rígido Desmontado - Comment[pt_BR]=Volume do HD Desmontado - Comment[ro]=Volum de hard disc nemontat - Comment[ru]=Отмонтированный раздел жёсткого диска - Comment[rw]=Ububiko Disiki Bwakuwemo - Comment[se]=Gálgajuvvon garraskearrooassi --Comment[sk]=Odpojený oddiel pevného disku - Comment[sl]=Odklopljen pogon trdega diska - Comment[sr]=Демонтирана партиција хард диска - Comment[sr@Latn]=Demontirana particija hard diska -diff -urN kioslave/media/mimetypes/nfs_mounted.desktop kioslave/media/mimetypes/nfs_mounted.desktop ---- kioslave/media/mimetypes/nfs_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/nfs_mounted.desktop Tue May 23 13:33:34 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Recurso NFS montado - Comment[et]=Ühendatud NFS ressurss - Comment[eu]=NFS baliabide muntatua --Comment[fa]=مشترک NFS سوارشده - Comment[fi]=Liitetty NFS-jako - Comment[fr]=Ressource NFS montée - Comment[fy]=Oankeppele NFS-boarne -@@ -44,13 +43,12 @@ - Comment[nn]=Montert delt NFS-ressurs - Comment[pa]=ਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਝ - Comment[pl]=Zamontowany system plików NFS --Comment[pt]=Partilha de NFS montada -+Comment[pt]=Partilha de NFS Montada - Comment[pt_BR]=Volume NFS Montado - Comment[ro]=Partajare NFS montată - Comment[ru]=Смонтированный ресурс NFS - Comment[rw]=Umugabane NFS Washyizwemo - Comment[se]=Čatnon NFS-resursa --Comment[sk]=Pripojený zdroj NFS - Comment[sl]=Priklopljen vir NFS - Comment[sr]=Монтирано NFS дељење - Comment[sr@Latn]=Montirano NFS deljenje -diff -urN kioslave/media/mimetypes/nfs_unmounted.desktop kioslave/media/mimetypes/nfs_unmounted.desktop ---- kioslave/media/mimetypes/nfs_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/nfs_unmounted.desktop Tue May 23 13:33:35 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Recurso NFS desmontado - Comment[et]=Lahutatud NFS ressurss - Comment[eu]=NFS baliabide desmuntatua --Comment[fa]=مشترک NFS پیاده شده - Comment[fi]=Irrotettu NFS-jako - Comment[fr]=Ressource NFS non montée - Comment[fy]=Oankeppele NFS-boarne -@@ -44,13 +43,12 @@ - Comment[nn]=Umontert delt NFS-ressurs - Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਝ - Comment[pl]=Odmontowany system plików NFS --Comment[pt]=Partilha de NFS desmontada -+Comment[pt]=Partilha de NFS Desmontada - Comment[pt_BR]=Volume NFS Desmontado - Comment[ro]=Partajare NFS nemontată - Comment[ru]=Отмонтированный ресурс NFS - Comment[rw]=Umugabane NFS Wakuwemo - Comment[se]=Gálgajuvvon NFS-resursa --Comment[sk]=Odpojený zdroj NFS - Comment[sl]=Odklopljen vir NFS - Comment[sr]=Демонтирано NFS дељење - Comment[sr@Latn]=Demontirano NFS deljenje -diff -urN kioslave/media/mimetypes/removable_mounted.desktop kioslave/media/mimetypes/removable_mounted.desktop ---- kioslave/media/mimetypes/removable_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/removable_mounted.desktop Mon May 22 20:12:42 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Recurso extraíble montado - Comment[et]=Ühendatud eemaldatav andmekandja - Comment[eu]=Euskarri aldagarria muntatua --Comment[fa]=رسانه برداشتنی سوارشده - Comment[fi]=Liitetty irrotettava resurssi - Comment[fr]=Média amovible monté - Comment[fy]=Oankeppele ferwiderber medium -@@ -44,13 +43,12 @@ - Comment[nn]=Montert flyttbart medium - Comment[pa]=ਮਾਊਟ ਕੀਤੇ ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ - Comment[pl]=Zamontowany nośnik wymienny --Comment[pt]=Dispositivo amovível montado -+Comment[pt]=Dispositivo Amovível Montado - Comment[pt_BR]=Mídia Removível Montada - Comment[ro]=Mediu amovibil montat - Comment[ru]=Смонтированный внешний диск - Comment[rw]=Igitangazamakuru Kivanwamo Cyashyizwemo - Comment[se]=Čátnon sirdehahtti medium --Comment[sk]=Pripojené vyberateľné médium - Comment[sl]=Priklopljen odstranljiv medij - Comment[sr]=Монтиран уклоњиви медијум - Comment[sr@Latn]=Montiran uklonjivi medijum -diff -urN kioslave/media/mimetypes/removable_unmounted.desktop kioslave/media/mimetypes/removable_unmounted.desktop ---- kioslave/media/mimetypes/removable_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/removable_unmounted.desktop Mon May 22 20:12:42 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Recurso extraíble desmontado - Comment[et]=Lahutatud eemaldatav andmekandja - Comment[eu]=Euskarri aldagarria desmuntatua --Comment[fa]=رسانه برداشتنی پیاده شده - Comment[fi]=Irrotettu irrotettava resurssi - Comment[fr]=Média amovible non monté - Comment[fy]=Ofkeppele ferwiderber medium -@@ -44,13 +43,12 @@ - Comment[nn]=Umontert flyttbart medium - Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ - Comment[pl]=Odmontowany nośnik wymienny --Comment[pt]=Dispositivo amovível desmontado -+Comment[pt]=Dispositivo Amovível Desmontado - Comment[pt_BR]=Mídia Removível Desmontada - Comment[ro]=Mediu amovibil nemontat - Comment[ru]=Отмонтированный внешний диск - Comment[rw]=Igitangazamakuru Kivanwamo Cyavanwemo - Comment[se]=Gálgaduvvon sirdehahtti medium --Comment[sk]=Odpojené vyberateľné médium - Comment[sl]=Odklopljen odstranljiv medij - Comment[sr]=Демонтиран уклоњиви медијум - Comment[sr@Latn]=Demontiran uklonjivi medijum -diff -urN kioslave/media/mimetypes/smb_mounted.desktop kioslave/media/mimetypes/smb_mounted.desktop ---- kioslave/media/mimetypes/smb_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/smb_mounted.desktop Tue May 23 13:33:34 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Recurso de Samba montado (Red de Microsoft) - Comment[et]=Ühendatud Samba (Microsoft Network) ressurss - Comment[eu]=Samba (Microsoft sarea) partekaketa muntatua --Comment[fa]=مشترک Samba (Microsoft Network) سوار شده -+Comment[fa]=اشتراک سامبای ویندوز سوار شده - Comment[fi]=Liitetty Samba-jako (Microsoft-verkko) - Comment[fr]=Partage Samba (réseau Microsoft) monté - Comment[fy]=Oankeppele Samba-netwurkboarne (Microsoft-netwurken) -diff -urN kioslave/media/mimetypes/smb_unmounted.desktop kioslave/media/mimetypes/smb_unmounted.desktop ---- kioslave/media/mimetypes/smb_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/smb_unmounted.desktop Tue May 23 13:33:34 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Recurso de Samba desmontado (Red de Microsoft) - Comment[et]=Lahutatud Samba (Microsoft Network) ressurss - Comment[eu]=Samba (Microsoft sarea) partekaketa desmuntatua --Comment[fa]=مشترک Samba (Microsoft Network) پیاده شده -+Comment[fa]=اشتراک سامبای ویندوز پیاده شده - Comment[fi]=Irrotettu Samba-jako (Microsoft-verkko) - Comment[fr]=Partage Samba (réseau Microsoft) non monté - Comment[fy]=Ofkeppele Samba-netwurkboarne (Microsoft-netwurken) -diff -urN kioslave/media/mimetypes/svcd.desktop kioslave/media/mimetypes/svcd.desktop ---- kioslave/media/mimetypes/svcd.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/svcd.desktop Mon May 22 20:12:43 2006 -@@ -7,7 +7,6 @@ - Comment[bn]=সুপার ভিডিও সিডি - Comment[ca]=CD Súper Vídeo - Comment[da]=Super Video-cd --Comment[fa]=دیسک فشرده ابرویدئو - Comment[fr]=Super CD vidéo - Comment[fy]=Super Fideo-kompaktskiif - Comment[gl]=Super Vídeo CD -@@ -17,7 +16,6 @@ - Comment[it]=Super video CD - Comment[ja]=スーパービデオ CD - Comment[km]=ស៊ីឌីវីដេអូគុណភាពខ្ពស់ --Comment[mk]=Супер видео ЦД - Comment[ms]=CD Supervideo - Comment[nb]=Super video CD - Comment[nds]=Super-Video-CD -diff -urN kioslave/media/mimetypes/vcd.desktop kioslave/media/mimetypes/vcd.desktop ---- kioslave/media/mimetypes/vcd.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/vcd.desktop Mon May 22 20:12:42 2006 -@@ -9,7 +9,6 @@ - Comment[ca]=CD Vídeo - Comment[da]=Video-cd - Comment[el]=Βίντεο CD --Comment[fa]=دیسک فشرده ویدئویی - Comment[fr]=CD vidéo - Comment[fy]=Fideo-kompaktskiif - Comment[ga]=Dlúthdhiosca Físe -@@ -19,7 +18,6 @@ - Comment[is]=Vídeó CD - Comment[ja]=ビデオ CD - Comment[km]=ស៊ីឌីវីដេអូ --Comment[mk]=Видео ЦД - Comment[ms]=CD Video - Comment[nds]=Video-CD - Comment[nl]=Video-cd -diff -urN kioslave/media/mimetypes/zip_mounted.desktop kioslave/media/mimetypes/zip_mounted.desktop ---- kioslave/media/mimetypes/zip_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/zip_mounted.desktop Tue May 23 13:33:35 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disco Zip montado - Comment[et]=Ühendatud Zip-ketas - Comment[eu]=Zip diska muntatua --Comment[fa]=دیسک فشرده سوارشده -+Comment[fa]=دیسک زیپ سوار شده - Comment[fi]=Liitetty Zip-levy - Comment[fr]=Disque Zip monté - Comment[fy]=Oankeppelee Zip-skiif -diff -urN kioslave/media/mimetypes/zip_unmounted.desktop kioslave/media/mimetypes/zip_unmounted.desktop ---- kioslave/media/mimetypes/zip_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/zip_unmounted.desktop Tue May 23 13:33:35 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disco Zip desmontado - Comment[et]=Lahutatud Zip-ketas - Comment[eu]=Zip diska desmuntatua --Comment[fa]=دیسک فشرده پیاده شده -+Comment[fa]= دیسک زیپ پیاده شده - Comment[fi]=Irrotettu Zip-levy - Comment[fr]=Disque Zip non monté - Comment[fy]=Ofkeppele Zip-skiif -@@ -33,7 +33,7 @@ - Comment[hu]=Leválasztott Zip-lemez - Comment[is]=Aftengdur Zip diskur - Comment[it]=Disco Zip non montato --Comment[ja]=マウントされていない Zip ディスク -+Comment[ja]=マウントされていないZipディスク - Comment[km]=ថាស Zip មិនបានរៀបចំ - Comment[lo]= ຫັງກາລີ - Comment[lt]=Išmontuotas Zip diskas -diff -urN kioslave/media/mounthelper/Makefile.in kioslave/media/mounthelper/Makefile.in ---- kioslave/media/mounthelper/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/mounthelper/Makefile.in Fri May 26 09:54:31 2006 -@@ -57,8 +57,8 @@ - #>+ 1 - kio_media_mounthelper_OBJECTS = kio_media_mounthelper.$(OBJEXT) - am__DEPENDENCIES_1 = --kio_media_mounthelper_DEPENDENCIES = \ -- ../libmediacommon/libmediacommon.la $(am__DEPENDENCIES_1) -+kio_media_mounthelper_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -+ ../libmediacommon/libmediacommon.la - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - am__depfiles_maybe = depfiles -@@ -236,6 +236,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -@@ -575,7 +576,7 @@ - AM_LDFLAGS = $(all_libraries) - kio_media_mounthelper_SOURCES = kio_media_mounthelper.cpp - kio_media_mounthelper_LDFLAGS = $(KDE_RPATH) $(all_libraries) --kio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) -+kio_media_mounthelper_LDADD = $(LIB_KIO) ../libmediacommon/libmediacommon.la - #>- METASOURCES = AUTO - #>- all: all-am - #>+ 1 -diff -urN kioslave/media/mounthelper/kio_media_mounthelper.cpp kioslave/media/mounthelper/kio_media_mounthelper.cpp ---- kioslave/media/mounthelper/kio_media_mounthelper.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/mounthelper/kio_media_mounthelper.cpp Fri Mar 17 11:17:33 2006 -@@ -27,7 +27,6 @@ - #include <dcopclient.h> - #include <dcopref.h> - #include <qtimer.h> --#include <stdlib.h> - #include <kdebug.h> - #include <kglobal.h> - #include <kprocess.h> -@@ -79,30 +78,31 @@ - - if (args->isSet("u")) - { -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "unmount", medium.id()); -- if (reply.isValid()) -- reply.get(m_errorStr); -- kdDebug() << "medium unmount " << m_errorStr << endl; -- if (m_errorStr.isNull()) -- ::exit(0); -- else -- error(); -+ KIO::Job * job = KIO::unmount( mount_point ); -+ -+ connect( job, SIGNAL( result( KIO::Job * ) ), -+ this, SLOT( slotResult( KIO::Job * ) ) ); - } - else if (args->isSet("s") || args->isSet("e")) - { -- invokeEject(device, true); -+ if (medium.isMounted()) -+ { -+ KIO::Job * job = KIO::unmount( mount_point ); -+ -+ m_device = device; -+ connect( job, SIGNAL( result( KIO::Job * ) ), -+ this, SLOT( slotResultSafe( KIO::Job * ) ) ); -+ } -+ else -+ { -+ invokeEject(device, true); -+ } - } - else - { -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "mount", medium.id()); -- if (reply.isValid()) -- reply.get(m_errorStr); -- if (m_errorStr.isNull()) -- ::exit(0); -- else -- error(); -+ KIO::Job* job = KIO::mount( false, 0, device, mount_point); -+ connect( job, SIGNAL( result( KIO::Job * ) ), -+ this, SLOT( slotResult( KIO::Job * ) ) ); - } - } - -@@ -173,12 +173,12 @@ - void MountHelper::error() - { - KMessageBox::error(0, m_errorStr); -- ::exit(1); -+ kapp->exit(1); - } - - void MountHelper::finished() - { -- ::exit(0); -+ kapp->quit(); - } - - static KCmdLineOptions options[] = -@@ -207,7 +207,7 @@ - - KStartupInfo::appStarted(); - app->dcopClient()->attach(); -- return app->exec(); -+ app->exec(); - } - - #include "kio_media_mounthelper.moc" -diff -urN kioslave/media/propsdlgplugin/Makefile.in kioslave/media/propsdlgplugin/Makefile.in ---- kioslave/media/propsdlgplugin/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/propsdlgplugin/Makefile.in Thu Jan 1 01:00:00 1970 -@@ -1,1063 +0,0 @@ --# Makefile.in generated by automake 1.9.6 from Makefile.am. --# KDE tags expanded automatically by am_edit - $Revision: 483858 $ --# @configure_input@ -- --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005 Free Software Foundation, Inc. --# This Makefile.in is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY, to the extent permitted by law; without --# even the implied warranty of MERCHANTABILITY or FITNESS FOR A --# PARTICULAR PURPOSE. -- --@SET_MAKE@ -- -- --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ --VPATH = @srcdir@ --pkgdatadir = $(datadir)/@PACKAGE@ --pkglibdir = $(libdir)/@PACKAGE@ --pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../../.. --am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ --install_sh_DATA = $(install_sh) -c -m 644 --install_sh_PROGRAM = $(install_sh) -c --install_sh_SCRIPT = $(install_sh) -c --INSTALL_HEADER = $(INSTALL_DATA) --transform = $(program_transform_name) --NORMAL_INSTALL = : --PRE_INSTALL = : --POST_INSTALL = : --NORMAL_UNINSTALL = : --PRE_UNINSTALL = : --POST_UNINSTALL = : --build_triplet = @build@ --host_triplet = @host@ --target_triplet = @target@ --subdir = kioslave/media/propsdlgplugin --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(kde_moduledir)" \ -- "$(DESTDIR)$(kde_servicesdir)" --kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(kde_module_LTLIBRARIES) --am__DEPENDENCIES_1 = --media_propsdlgplugin_la_DEPENDENCIES = \ -- ../libmediacommon/libmediacommon.la $(am__DEPENDENCIES_1) --am_media_propsdlgplugin_la_OBJECTS = propertiespage.lo \ -- propsdlgshareplugin.lo --#>- media_propsdlgplugin_la_OBJECTS = \ --#>- $(am_media_propsdlgplugin_la_OBJECTS) --#>+ 5 --media_propsdlgplugin_la_final_OBJECTS = media_propsdlgplugin_la.all_cpp.lo --media_propsdlgplugin_la_nofinal_OBJECTS = propertiespage.lo \ -- propsdlgshareplugin.lo propertiespagegui.lo --@KDE_USE_FINAL_FALSE@media_propsdlgplugin_la_OBJECTS = $(media_propsdlgplugin_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@media_propsdlgplugin_la_OBJECTS = $(media_propsdlgplugin_la_final_OBJECTS) --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --am__depfiles_maybe = depfiles --#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ --#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --#>+ 2 --CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ --#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ --#>- $(AM_CXXFLAGS) $(CXXFLAGS) --#>+ 3 --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --CXXLD = $(CXX) --#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ --#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --#>+ 2 --CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --SOURCES = $(media_propsdlgplugin_la_SOURCES) --DIST_SOURCES = $(media_propsdlgplugin_la_SOURCES) --kde_servicesDATA_INSTALL = $(INSTALL_DATA) --DATA = $(kde_services_DATA) --ETAGS = etags --CTAGS = ctags --#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) --#>+ 1 --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) --ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ --AMTAR = @AMTAR@ --AR = @AR@ --ARTSCCONFIG = @ARTSCCONFIG@ --ARTS_CFLAGS = @ARTS_CFLAGS@ --AUTOCONF = @AUTOCONF@ --AUTODIRS = @AUTODIRS@ --AUTOHEADER = @AUTOHEADER@ --AUTOMAKE = @AUTOMAKE@ --AWK = @AWK@ --CC = @CC@ --CCDEPMODE = @CCDEPMODE@ --CFLAGS = @CFLAGS@ --COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@ --COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@ --CONF_FILES = @CONF_FILES@ --CPP = @CPP@ --CPPFLAGS = @CPPFLAGS@ --CXX = @CXX@ --CXXCPP = @CXXCPP@ --CXXDEPMODE = @CXXDEPMODE@ --CXXFLAGS = @CXXFLAGS@ --CYGPATH_W = @CYGPATH_W@ --DBUSQT_INCS = @DBUSQT_INCS@ --DBUSQT_LIBS = @DBUSQT_LIBS@ --DBUS_CFLAGS = @DBUS_CFLAGS@ --DBUS_INCS = @DBUS_INCS@ --DBUS_LIBS = @DBUS_LIBS@ --DCOPIDL = @DCOPIDL@ --DCOPIDL2CPP = @DCOPIDL2CPP@ --DCOPIDLNG = @DCOPIDLNG@ --DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ --DEFS = @DEFS@ --DEPDIR = @DEPDIR@ --DOXYGEN = @DOXYGEN@ --DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ --DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ --DPMSINC = @DPMSINC@ --DPMSLIB = @DPMSLIB@ --ECHO = @ECHO@ --ECHO_C = @ECHO_C@ --ECHO_N = @ECHO_N@ --ECHO_T = @ECHO_T@ --EGREP = @EGREP@ --ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ --EXEEXT = @EXEEXT@ --EXR_FLAGS = @EXR_FLAGS@ --F77 = @F77@ --FFLAGS = @FFLAGS@ --FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ --GLINC = @GLINC@ --GLLIB = @GLLIB@ --GMSGFMT = @GMSGFMT@ --HALBACKEND = @HALBACKEND@ --HAL_CFLAGS = @HAL_CFLAGS@ --HAL_INCS = @HAL_INCS@ --HAL_LIBS = @HAL_LIBS@ --HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@ --HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@ --HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ --INSTALL_DATA = @INSTALL_DATA@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_SCRIPT = @INSTALL_SCRIPT@ --INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ --JAR = @JAR@ --JAVAC = @JAVAC@ --JAVAH = @JAVAH@ --JVMLIBS = @JVMLIBS@ --KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ --KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@ --KCONFIG_COMPILER = @KCONFIG_COMPILER@ --KDECONFIG = @KDECONFIG@ --KDE_BINDIR = @KDE_BINDIR@ --KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@ --KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ --KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ --KDE_HAVE_DOT = @KDE_HAVE_DOT@ --KDE_INCLUDES = @KDE_INCLUDES@ --KDE_LDFLAGS = @KDE_LDFLAGS@ --KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ --KDE_MT_LIBS = @KDE_MT_LIBS@ --KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ --KDE_PLUGIN = @KDE_PLUGIN@ --KDE_RPATH = @KDE_RPATH@ --KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ --KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ --KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ --KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ --KDE_USE_FPIE = @KDE_USE_FPIE@ --KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ --KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ --KDE_USE_PIE = @KDE_USE_PIE@ --KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ --KDM_PAM_SERVICE = @KDM_PAM_SERVICE@ --KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@ --KRB4_INCS = @KRB4_INCS@ --KRB4_LIBS = @KRB4_LIBS@ --KRB4_RPATH = @KRB4_RPATH@ --KRB5_INCS = @KRB5_INCS@ --KRB5_LIBS = @KRB5_LIBS@ --KRB5_RPATH = @KRB5_RPATH@ --KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@ --LDAP_INCS = @LDAP_INCS@ --LDAP_LIBS = @LDAP_LIBS@ --LDAP_RPATH = @LDAP_RPATH@ --LDFLAGS = @LDFLAGS@ --LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ --LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ --LIBALIB = @LIBALIB@ --LIBART_CFLAGS = @LIBART_CFLAGS@ --LIBART_LIBS = @LIBART_LIBS@ --LIBART_RPATH = @LIBART_RPATH@ --LIBBZ2 = @LIBBZ2@ --LIBCFG = @LIBCFG@ --LIBCOMPAT = @LIBCOMPAT@ --LIBCRYPT = @LIBCRYPT@ --LIBCURSES = @LIBCURSES@ --LIBDEVINFO = @LIBDEVINFO@ --LIBDL = @LIBDL@ --LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@ --LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@ --LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@ --LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@ --LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@ --LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@ --LIBGEN = @LIBGEN@ --LIBHOSTS = @LIBHOSTS@ --LIBJPEG = @LIBJPEG@ --LIBKSTAT = @LIBKSTAT@ --LIBMALLOC = @LIBMALLOC@ --LIBOBJS = @LIBOBJS@ --LIBODM = @LIBODM@ --LIBOSSAUDIO = @LIBOSSAUDIO@ --LIBPNG = @LIBPNG@ --LIBPOSIX4 = @LIBPOSIX4@ --LIBPTHREAD = @LIBPTHREAD@ --LIBRESOLV = @LIBRESOLV@ --LIBRPC = @LIBRPC@ --LIBS = @LIBS@ --LIBSENSORS = @LIBSENSORS@ --LIBSHADOW = @LIBSHADOW@ --LIBSM = @LIBSM@ --LIBSOCKET = @LIBSOCKET@ --LIBSSL = @LIBSSL@ --LIBTOOL = @LIBTOOL@ --LIBUCB = @LIBUCB@ --LIBUSBCONFIG = @LIBUSBCONFIG@ --LIBUTIL = @LIBUTIL@ --LIBXDMCP = @LIBXDMCP@ --LIBXFT_LIB = @LIBXFT_LIB@ --LIBZ = @LIBZ@ --LIB_ARTS = @LIB_ARTS@ --LIB_DNSSD = @LIB_DNSSD@ --LIB_EXR = @LIB_EXR@ --LIB_FONT_ENC = @LIB_FONT_ENC@ --LIB_KAB = @LIB_KAB@ --LIB_KABC = @LIB_KABC@ --LIB_KDECORE = @LIB_KDECORE@ --LIB_KDED = @LIB_KDED@ --LIB_KDEPIM = @LIB_KDEPIM@ --LIB_KDEPRINT = @LIB_KDEPRINT@ --LIB_KDEUI = @LIB_KDEUI@ --LIB_KDNSSD = @LIB_KDNSSD@ --LIB_KFILE = @LIB_KFILE@ --LIB_KFM = @LIB_KFM@ --LIB_KHTML = @LIB_KHTML@ --LIB_KIMPROXY = @LIB_KIMPROXY@ --LIB_KIO = @LIB_KIO@ --LIB_KJS = @LIB_KJS@ --LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ --LIB_KPARTS = @LIB_KPARTS@ --LIB_KSPELL = @LIB_KSPELL@ --LIB_KSYCOCA = @LIB_KSYCOCA@ --LIB_KUNITTEST = @LIB_KUNITTEST@ --LIB_KUTILS = @LIB_KUTILS@ --LIB_KVM = @LIB_KVM@ --LIB_LBER = @LIB_LBER@ --LIB_LIBS = @LIB_LIBS@ --LIB_POLL = @LIB_POLL@ --LIB_QPE = @LIB_QPE@ --LIB_QT = @LIB_QT@ --LIB_SMB = @LIB_SMB@ --LIB_TRU64_MACH = @LIB_TRU64_MACH@ --LIB_X11 = @LIB_X11@ --LIB_XCOMPOSITE = @LIB_XCOMPOSITE@ --LIB_XCURSOR = @LIB_XCURSOR@ --LIB_XEXT = @LIB_XEXT@ --LIB_XF86MISC = @LIB_XF86MISC@ --LIB_XFIXES = @LIB_XFIXES@ --LIB_XINERAMA = @LIB_XINERAMA@ --LIB_XRANDR = @LIB_XRANDR@ --LIB_XRENDER = @LIB_XRENDER@ --LIB_XSS = @LIB_XSS@ --LINUXCDPOLLING = @LINUXCDPOLLING@ --LN_S = @LN_S@ --LTLIBOBJS = @LTLIBOBJS@ --MAKEINFO = @MAKEINFO@ --MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ --MCOPIDL = @MCOPIDL@ --MD5SUM = @MD5SUM@ --MD5SUM_CUT = @MD5SUM_CUT@ --MEINPROC = @MEINPROC@ --MOC = @MOC@ --MSGFMT = @MSGFMT@ --NOOPT_CFLAGS = @NOOPT_CFLAGS@ --NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ --OBJEXT = @OBJEXT@ --PACKAGE = @PACKAGE@ --PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ --PACKAGE_NAME = @PACKAGE_NAME@ --PACKAGE_STRING = @PACKAGE_STRING@ --PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_VERSION = @PACKAGE_VERSION@ --PAMLIBS = @PAMLIBS@ --PASSWDLIBS = @PASSWDLIBS@ --PATH_SEPARATOR = @PATH_SEPARATOR@ --PERL = @PERL@ --PKG_CONFIG = @PKG_CONFIG@ --QTDOCDIR = @QTDOCDIR@ --QTE_NORTTI = @QTE_NORTTI@ --QT_INCLUDES = @QT_INCLUDES@ --QT_LDFLAGS = @QT_LDFLAGS@ --RANLIB = @RANLIB@ --RUN_KAPPFINDER = @RUN_KAPPFINDER@ --SASL2_LIBS = @SASL2_LIBS@ --SETUIDFLAGS = @SETUIDFLAGS@ --SET_MAKE = @SET_MAKE@ --SHELL = @SHELL@ --SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@ --SSL_INCLUDES = @SSL_INCLUDES@ --SSL_LDFLAGS = @SSL_LDFLAGS@ --STRIP = @STRIP@ --TOPSUBDIRS = @TOPSUBDIRS@ --UIC = @UIC@ --UIC_TR = @UIC_TR@ --UNAME = @UNAME@ --USB_CFLAGS = @USB_CFLAGS@ --USB_LIBS = @USB_LIBS@ --USER_INCLUDES = @USER_INCLUDES@ --USER_LDFLAGS = @USER_LDFLAGS@ --USE_EXCEPTIONS = @USE_EXCEPTIONS@ --USE_RTTI = @USE_RTTI@ --USE_THREADS = @USE_THREADS@ --VERSION = @VERSION@ --WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ --XGETTEXT = @XGETTEXT@ --XMLLINT = @XMLLINT@ --XTESTLIB = @XTESTLIB@ --X_EXTRA_LIBS = @X_EXTRA_LIBS@ --X_INCLUDES = @X_INCLUDES@ --X_LDFLAGS = @X_LDFLAGS@ --X_PRE_LIBS = @X_PRE_LIBS@ --X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ --ac_ct_CC = @ac_ct_CC@ --ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ --all_includes = @all_includes@ --all_libraries = @all_libraries@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ --am__include = @am__include@ --am__leading_dot = @am__leading_dot@ --am__quote = @am__quote@ --am__tar = @am__tar@ --am__untar = @am__untar@ --applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@ --applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@ --bindir = @bindir@ --build = @build@ --build_alias = @build_alias@ --build_cpu = @build_cpu@ --build_os = @build_os@ --build_vendor = @build_vendor@ --datadir = @datadir@ --doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ --doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ --drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ --drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ --exec_prefix = @exec_prefix@ --have_xcursor_FALSE = @have_xcursor_FALSE@ --have_xcursor_TRUE = @have_xcursor_TRUE@ --host = @host@ --host_alias = @host_alias@ --host_cpu = @host_cpu@ --host_os = @host_os@ --host_vendor = @host_vendor@ --include_ARTS_FALSE = @include_ARTS_FALSE@ --include_ARTS_TRUE = @include_ARTS_TRUE@ --include_BZIP2_FALSE = @include_BZIP2_FALSE@ --include_BZIP2_TRUE = @include_BZIP2_TRUE@ --include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@ --include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@ --include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@ --include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@ --include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@ --include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@ --include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@ --include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@ --include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@ --include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@ --include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@ --include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@ --include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@ --include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@ --include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@ --include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@ --include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@ --include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@ --include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@ --include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@ --include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@ --include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@ --include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@ --include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@ --include_kompmgr_FALSE = @include_kompmgr_FALSE@ --include_kompmgr_TRUE = @include_kompmgr_TRUE@ --include_ksysguardd_FALSE = @include_ksysguardd_FALSE@ --include_ksysguardd_TRUE = @include_ksysguardd_TRUE@ --include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@ --include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@ --include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@ --include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@ --include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@ --include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@ --include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@ --include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@ --include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@ --include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@ --include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@ --include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@ --include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@ --include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@ --include_media_halbackend_FALSE = @include_media_halbackend_FALSE@ --include_media_halbackend_TRUE = @include_media_halbackend_TRUE@ --include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@ --include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@ --include_x11_FALSE = @include_x11_FALSE@ --include_x11_TRUE = @include_x11_TRUE@ --includedir = @includedir@ --infodir = @infodir@ --install_sh = @install_sh@ --install_usbids_FALSE = @install_usbids_FALSE@ --install_usbids_TRUE = @install_usbids_TRUE@ --jni_includes = @jni_includes@ --kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@ --kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@ --kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@ --kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@ --kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@ --kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@ --kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@ --kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@ --kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@ --kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@ --kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@ --kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@ --kde_appsdir = @kde_appsdir@ --kde_bindir = @kde_bindir@ --kde_confdir = @kde_confdir@ --kde_datadir = @kde_datadir@ --kde_htmldir = @kde_htmldir@ --kde_icondir = @kde_icondir@ --kde_includes = @kde_includes@ --kde_kcfgdir = @kde_kcfgdir@ --kde_libraries = @kde_libraries@ --kde_libs_htmldir = @kde_libs_htmldir@ --kde_libs_prefix = @kde_libs_prefix@ --kde_locale = @kde_locale@ --kde_mimedir = @kde_mimedir@ --kde_moduledir = @kde_moduledir@ --kde_qtver = @kde_qtver@ --kde_servicesdir = @kde_servicesdir@ --kde_servicetypesdir = @kde_servicetypesdir@ --kde_sounddir = @kde_sounddir@ --kde_styledir = @kde_styledir@ --kde_templatesdir = @kde_templatesdir@ --kde_wallpaperdir = @kde_wallpaperdir@ --kde_widgetdir = @kde_widgetdir@ --kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@ --kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@ --kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@ --kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@ --kdeinitdir = @kdeinitdir@ --kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@ --kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@ --kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@ --kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@ --kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@ --kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@ --kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@ --kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@ --kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@ --kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@ --kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@ --kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@ --kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@ --kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@ --kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@ --kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@ --khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@ --khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@ --khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@ --khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@ --kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@ --kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@ --kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@ --kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@ --klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@ --klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@ --kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@ --kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@ --knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@ --knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@ --konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@ --konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@ --konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@ --konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@ --kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@ --kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@ --kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@ --kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@ --kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@ --kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@ --kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@ --kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@ --ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@ --ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@ --ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@ --ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@ --kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@ --kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@ --ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@ --ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@ --ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@ --ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@ --ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@ --ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@ --kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@ --kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@ --kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@ --kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@ --l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@ --l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@ --libdir = @libdir@ --libexecdir = @libexecdir@ --libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ --libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ --localstatedir = @localstatedir@ --mandir = @mandir@ --mkdir_p = @mkdir_p@ --nogroup = @nogroup@ --nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ --nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ --oldincludedir = @oldincludedir@ --pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ --pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ --prefix = @prefix@ --program_transform_name = @program_transform_name@ --qt_includes = @qt_includes@ --qt_libraries = @qt_libraries@ --sbindir = @sbindir@ --sharedstatedir = @sharedstatedir@ --supports_i8k_FALSE = @supports_i8k_FALSE@ --supports_i8k_TRUE = @supports_i8k_TRUE@ --sysconfdir = @sysconfdir@ --target = @target@ --target_alias = @target_alias@ --target_cpu = @target_cpu@ --target_os = @target_os@ --target_vendor = @target_vendor@ --unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ --unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ --x_includes = @x_includes@ --x_libraries = @x_libraries@ --xdg_appsdir = @xdg_appsdir@ --xdg_directorydir = @xdg_directorydir@ --xdg_menudir = @xdg_menudir@ --#>- METASOURCES = AUTO --kde_module_LTLIBRARIES = media_propsdlgplugin.la --media_propsdlgplugin_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) --media_propsdlgplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) --AM_CPPFLAGS = $(all_includes) --kde_services_DATA = media_propsdlgplugin.desktop --#>- media_propsdlgplugin_la_SOURCES = propertiespage.cpp propertiespagegui.ui propsdlgshareplugin.cpp --#>+ 1 --media_propsdlgplugin_la_SOURCES=propertiespage.cpp propsdlgshareplugin.cpp propertiespagegui.cpp --#>- all: all-am --#>+ 1 --all: docs-am all-am -- --.SUFFIXES: --.SUFFIXES: .cpp .lo .o .obj --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) --#>- @for dep in $?; do \ --#>- case '$(am__configure_deps)' in \ --#>- *$$dep*) \ --#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ --#>- && exit 0; \ --#>- exit 1;; \ --#>- esac; \ --#>- done; \ --#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ --#>- cd $(top_srcdir) && \ --#>- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile --#>+ 12 -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ -- cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile -- cd $(top_srcdir) && perl admin/am_edit kioslave/media/propsdlgplugin/Makefile.in --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) -- @$(NORMAL_INSTALL) -- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)" -- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ -- else :; fi; \ -- done -- --uninstall-kde_moduleLTLIBRARIES: -- @$(NORMAL_UNINSTALL) -- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ -- done -- --clean-kde_moduleLTLIBRARIES: -- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES) -- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --#>- media_propsdlgplugin.la: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) --#>+ 2 --@KDE_USE_CLOSURE_TRUE@media_propsdlgplugin.la: media_propsdlgplugin.la.closure $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) --@KDE_USE_CLOSURE_FALSE@media_propsdlgplugin.la: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(kde_moduledir) $(media_propsdlgplugin_la_LDFLAGS) $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_LIBADD) $(LIBS) -- --mostlyclean-compile: -- -rm -f *.$(OBJEXT) -- --distclean-compile: -- -rm -f *.tab.c -- --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/propertiespage.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/propsdlgshareplugin.Plo@am__quote@ -- --.cpp.o: --@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -- --.cpp.obj: --@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -- --.cpp.lo: --@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -- --mostlyclean-libtool: -- -rm -f *.lo -- --clean-libtool: -- -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: --install-kde_servicesDATA: $(kde_services_DATA) -- @$(NORMAL_INSTALL) -- test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)" -- @list='$(kde_services_DATA)'; for p in $$list; do \ -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \ -- $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \ -- done -- --uninstall-kde_servicesDATA: -- @$(NORMAL_UNINSTALL) -- @list='$(kde_services_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \ -- done -- --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- tags=; \ -- here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- tags=; \ -- here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(CTAGS_ARGS)$$tags$$unique" \ -- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -- $$tags $$unique -- --GTAGS: -- here=`$(am__cd) $(top_builddir) && pwd` \ -- && cd $(top_srcdir) \ -- && gtags -i $(GTAGS_ARGS) $$here -- --distclean-tags: -- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -- --distdir: $(DISTFILES) -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkdir_p) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ -- if test -d $$d/$$file; then \ -- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ -- fi; \ -- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ -- else \ -- test -f $(distdir)/$$file \ -- || cp -p $$d/$$file $(distdir)/$$file \ -- || exit 1; \ -- fi; \ -- done --check-am: all-am --check: check-am --all-am: Makefile $(LTLIBRARIES) $(DATA) --installdirs: -- for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \ -- test -z "$$dir" || $(mkdir_p) "$$dir"; \ -- done --install: install-am --install-exec: install-exec-am --install-data: install-data-am --uninstall: uninstall-am -- --install-am: all-am -- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -- --installcheck: installcheck-am --install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install --mostlyclean-generic: -- --clean-generic: -- --distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -- --maintainer-clean-generic: -- @echo "This command is intended for maintainers to use" -- @echo "it deletes files that may require special tools to rebuild." --#>- clean: clean-am --#>+ 1 --clean: kde-rpo-clean clean-am -- --#>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ --#>- mostlyclean-am --#>+ 2 --clean-am: clean-metasources clean-ui clean-closures clean-bcheck clean-final clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ -- mostlyclean-am -- --distclean: distclean-am -- -rm -rf ./$(DEPDIR) -- -rm -f Makefile --distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -- --dvi: dvi-am -- --dvi-am: -- --html: html-am -- --info: info-am -- --info-am: -- --#>- install-data-am: install-kde_moduleLTLIBRARIES \ --#>- install-kde_servicesDATA --#>+ 2 --install-data-am: \ -- install-kde_servicesDATA -- --#>- install-exec-am: --#>+ 1 --install-exec-am: install-kde_moduleLTLIBRARIES -- --install-info: install-info-am -- --install-man: -- --installcheck-am: -- --maintainer-clean: maintainer-clean-am -- -rm -rf ./$(DEPDIR) -- -rm -f Makefile --maintainer-clean-am: distclean-am maintainer-clean-generic -- --mostlyclean: mostlyclean-am -- --mostlyclean-am: mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool -- --pdf: pdf-am -- --pdf-am: -- --ps: ps-am -- --ps-am: -- --uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ -- uninstall-kde_servicesDATA -- --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-exec \ -- install-exec-am install-info install-info-am \ -- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \ -- install-man install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ -- uninstall-am uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ -- uninstall-kde_servicesDATA -- --# Tell versions [3.59,3.63) of GNU make to not export all variables. --# Otherwise a system limit (for SysV at least) may be exceeded. --.NOEXPORT: -- --#>+ 8 --media_propsdlgplugin.la.closure: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) -- @echo "int main() {return 0;}" > media_propsdlgplugin_la_closure.cpp -- @$(LTCXXCOMPILE) -c media_propsdlgplugin_la_closure.cpp -- $(CXXLINK) media_propsdlgplugin_la_closure.lo $(media_propsdlgplugin_la_LDFLAGS) $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_LIBADD) $(LIBS) -- @rm -f media_propsdlgplugin_la_closure.* media_propsdlgplugin.la.closure -- @echo "timestamp" > media_propsdlgplugin.la.closure -- -- --#>+ 3 --propsdlgshareplugin.moc: $(srcdir)/propsdlgshareplugin.h -- $(MOC) $(srcdir)/propsdlgshareplugin.h -o propsdlgshareplugin.moc -- --#>+ 2 --mocs: propsdlgshareplugin.moc -- --#>+ 3 --propertiespage.moc: $(srcdir)/propertiespage.h -- $(MOC) $(srcdir)/propertiespage.h -o propertiespage.moc -- --#>+ 2 --mocs: propertiespage.moc -- --#>+ 3 --clean-metasources: -- -rm -f propsdlgshareplugin.moc propertiespage.moc -- --#>+ 2 --KDE_DIST=propertiespagegui.ui Makefile.in propertiespage.h propsdlgshareplugin.h media_propsdlgplugin.desktop propertiespagegui.ui.h Makefile.am -- --#>+ 4 --clean-ui: -- -rm -f \ -- propertiespagegui.cpp propertiespagegui.h propertiespagegui.moc -- --#>+ 3 --clean-closures: -- -rm -f media_propsdlgplugin.la.closure -- --#>+ 2 --docs-am: -- --#>+ 15 --force-reedit: -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ -- cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile -- cd $(top_srcdir) && perl admin/am_edit kioslave/media/propsdlgplugin/Makefile.in -- -- --#>+ 21 --clean-bcheck: -- rm -f *.bchecktest.cc *.bchecktest.cc.class a.out -- --bcheck: bcheck-am -- --bcheck-am: -- @for i in ; do \ -- if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ -- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ -- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ -- echo "$$i"; \ -- if ! $(CXXCOMPILE) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ -- rm -f $$i.bchecktest.cc; exit 1; \ -- fi ; \ -- echo "" >> $$i.bchecktest.cc.class; \ -- perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ -- rm -f a.out; \ -- fi ; \ -- done -- -- --#>+ 11 --media_propsdlgplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/propertiespage.cpp $(srcdir)/propsdlgshareplugin.cpp propertiespagegui.cpp propsdlgshareplugin.moc propertiespagegui.moc propertiespage.moc -- @echo 'creating media_propsdlgplugin_la.all_cpp.cpp ...'; \ -- rm -f media_propsdlgplugin_la.all_cpp.files media_propsdlgplugin_la.all_cpp.final; \ -- echo "#define KDE_USE_FINAL 1" >> media_propsdlgplugin_la.all_cpp.final; \ -- for file in propertiespage.cpp propsdlgshareplugin.cpp propertiespagegui.cpp ; do \ -- echo "#include \"$$file\"" >> media_propsdlgplugin_la.all_cpp.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> media_propsdlgplugin_la.all_cpp.final; \ -- done; \ -- cat media_propsdlgplugin_la.all_cpp.final media_propsdlgplugin_la.all_cpp.files > media_propsdlgplugin_la.all_cpp.cpp; \ -- rm -f media_propsdlgplugin_la.all_cpp.final media_propsdlgplugin_la.all_cpp.files -- --#>+ 3 --clean-final: -- -rm -f media_propsdlgplugin_la.all_cpp.cpp -- --#>+ 3 --final: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_final_OBJECTS)" all-am -- --#>+ 3 --final-install: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_final_OBJECTS)" install-am -- --#>+ 3 --no-final: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_nofinal_OBJECTS)" all-am -- --#>+ 3 --no-final-install: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_nofinal_OBJECTS)" install-am -- --#>+ 3 --kde-rpo-clean: -- -rm -f *.rpo -- --#>+ 9 --nmcheck: --propsdlgshareplugin.o: propsdlgshareplugin.moc --nmcheck-am: nmcheck --propsdlgshareplugin.lo: propsdlgshareplugin.moc --propertiespage.lo: propertiespage.moc --$(srcdir)/propertiespage.cpp: propertiespagegui.h --$(srcdir)/propsdlgshareplugin.cpp: propertiespagegui.h --propertiespage.o: propertiespage.moc -- --#>+ 15 --propertiespagegui.cpp: $(srcdir)/propertiespagegui.ui propertiespagegui.h propertiespagegui.moc -- rm -f propertiespagegui.cpp -- echo '#include <kdialog.h>' > propertiespagegui.cpp -- echo '#include <klocale.h>' >> propertiespagegui.cpp -- $(UIC) -tr ${UIC_TR} -i propertiespagegui.h $(srcdir)/propertiespagegui.ui > propertiespagegui.cpp.temp ; ret=$$?; \ -- $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" propertiespagegui.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_propertiespagegui,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> propertiespagegui.cpp ;\ -- rm -f propertiespagegui.cpp.temp ;\ -- if test "$$ret" = 0; then echo '#include "propertiespagegui.moc"' >> propertiespagegui.cpp; else rm -f propertiespagegui.cpp ; exit $$ret ; fi -- --propertiespagegui.h: $(srcdir)/propertiespagegui.ui -- rm -rf propertiespagegui.h; -- $(UIC) $(srcdir)/propertiespagegui.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> propertiespagegui.h ; --propertiespagegui.moc: propertiespagegui.h -- $(MOC) propertiespagegui.h -o propertiespagegui.moc -diff -urN kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop ---- kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Thu Jan 1 01:00:00 1970 -@@ -1,73 +0,0 @@ --[Desktop Entry] --Encoding=UTF-8 --Type=Service --Name=Media Properties Page --Name[ca]=Pàgina de propietats de suport --Name[cs]=Stránka vlastností média --Name[da]=Medieegenskabsside --Name[de]=Eigenschaften von Medien --Name[el]=Σελίδα ιδιοτήτων μέσων --Name[es]=Página de propiedades de medios --Name[et]=Andmekandjate omadused --Name[fa]=صفحۀ ویژگیهای رسانه --Name[fi]=Mediaominaisuudet --Name[fr]=Page de propriétés du média --Name[he]=דף מאפייני מדיה --Name[hr]=Stranica svojstva medija --Name[hu]=Médiajellemzők lap --Name[is]=Eiginleikar miðils --Name[it]=Pagina delle proprietà dei dispositivi di archiviazione --Name[ja]=メディア属性ページ --Name[km]=ទំព័រលក្ខណៈសម្បត្តិមេឌៀ --Name[nb]=Side for medievarsling --Name[nds]=Medienegenschappen-Siet --Name[nl]=Pagina met media-eigenschappen --Name[nn]=Side for medieeigenskapar --Name[pl]=Strona właściwości nośnika --Name[pt]=Página de Propriedades de Suportes Físicos --Name[pt_BR]=Página de Propriedades de Suportes Físicos --Name[ru]=Свойства носителя --Name[sk]=Strana vlastností média --Name[sl]=Stran z lastnostmi nosilca --Name[sr]=Страна са својствима медијума --Name[sr@Latn]=Strana sa svojstvima medijuma --Name[sv]=Sida för mediaegenskaper --Name[uk]=Сторінка властивостей носіїв інформації --Name[vi]=Trang tài sản phương tiện --Name[zh_TW]=媒體內容頁 --Comment=Konqueror properties dialog plugin to configure mount behaviour --Comment[ca]=Diàleg de propietats de l'endollable Konqueror per a configurar el comportament de muntatge --Comment[cs]=Dialog nastavení chování připojení modulu pro Konqueror --Comment[da]=Konqueror plugin med egenskabsdialog til at indstille monteringsopførsel --Comment[de]=Konqueror-Modul zum Einstellen des Verhaltens beim Einbinden --Comment[el]=Πρόσθετο διαλόγου ιδιοτήτων του Konqueror για τη ρύθμιση της συμπεριφοράς προσάρτησης --Comment[es]=Plugin de diálogo de propiedades de Konqueror para configurar el comportamiento del montaje --Comment[et]=Konquerori seadistustedialoogi plugin andmekandjate ühendamise seadistamiseks --Comment[fa]=وصلۀ محاورۀ ویژگیهای Konqueror برای پیکربندی رفتار سوار کردن --Comment[fi]=Konquerorin ominaisuussovelma, joka tarkkailee liitospisteitä --Comment[fr]=Module de Konqueror pour configurer le comportement du montage --Comment[he]=תוסף חלון מאפיינים של Konqueror לקביעת אפשרויות חיבור --Comment[hr]=Konqueror dodatak dijaloga svojstava za konfiguriranje načina pristupanja --Comment[hu]=Konqueror beállítómodul a csatlakoztatási mód megadásához --Comment[is]=Konqueror eiginleikagluggi til að stilla tengihegðun --Comment[it]=Plugin della configurazione di Konqueror per configurare il montaggio --Comment[ja]=mountの挙動を設定する、Konqueror属性ダイアログ プラグイン --Comment[km]=កម្មវិធីជំនួយឲ្យមានប្រអប់លក្ខណៈសម្បត្តិ Konqueror ដើម្បីកំណត់រចនាសម្ព័ន្ធឥរិយាបថម៉ោន --Comment[nb]=Et programtillegg for å sette opp montering av enheter i Konqueror --Comment[nds]=Egenschappendialoog-Plugin för Konqueror för't Instellen vun't Inhangbedregen --Comment[nl]=Dialoogvenster voor Konqueror om het aankoppelgedrag in te stellen --Comment[nn]=Programtillegg for oppsett av montering i Konqueror --Comment[pl]=Wtyczka okna właściwości Konquerora do konfiguracji zachowania montowania --Comment[pt]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem --Comment[pt_BR]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem --Comment[ru]=Модуль свойств для Konqueror, отвечающий за поведение при подключении файловых систем --Comment[sk]=Modul Konqueror dialógu vlastností pre konfiguráciu správania pripojenia --Comment[sl]=Vstavek za Konqueror s katerim se nastavlja obnašanje priklopa medijev --Comment[sr]=Прикључак са својствима Konqueror-а за подешавање понашања при монтирању --Comment[sr@Latn]=Priključak sa svojstvima Konqueror-a za podešavanje ponašanja pri montiranju --Comment[sv]=Konqueror insticksprogram med egenskapsdialogruta för att anpassa monteringsbeteende --Comment[uk]=Втулок вікна властивостей Konqueror для налаштування поведінки монтування --Comment[vi]=bổ sung hộp thoại tài sản Konqueror để cấu hình ứng xử gắn kết --Comment[zh_TW]=Konqueror 內容對話框外掛程式，用於設定掛載的行為 --X-KDE-Library=media_propsdlgplugin --ServiceTypes=KPropsDlg/Plugin,media/audiocd,media/hdd_mounted,media/hdd_unmounted,media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/nfs_mounted,media/cdwriter_unmounted,media/nfs_unmounted,media/removable_mounted,media/dvd_mounted,media/removable_unmounted,media/dvd_unmounted,media/smb_mounted,media/dvdvideo,media/smb_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/floppy_mounted,media/zip_mounted,media/floppy_unmounted,media/zip_unmounted,media/camera_mounted,media/camera_unmounted -diff -urN kioslave/media/propsdlgplugin/propertiespage.cpp kioslave/media/propsdlgplugin/propertiespage.cpp ---- kioslave/media/propsdlgplugin/propertiespage.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespage.cpp Thu Jan 1 01:00:00 1970 -@@ -1,217 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program 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 General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ -- --#include <qcheckbox.h> --#include <qtooltip.h> --#include <qbuttongroup.h> --#include <qlineedit.h> --#include <qfileinfo.h> --#include <qlabel.h> --#include <qregexp.h> --#include <kpushbutton.h> --#include <kmessagebox.h> --#include <klocale.h> --#include <qcombobox.h> --#include <qtimer.h> --#include <kdebug.h> --#include "propertiespage.h" --#include <dcopref.h> -- --// keep in sync with .ui and kded module --const char *short_names[] = {"lower", "win95", "winnt", "mixed", 0 }; --const char *journales[] = {"data", "ordered", "writeback", 0 }; -- --PropertiesPage::PropertiesPage(QWidget* parent, const QString &_id) -- : PropertiesPageGUI(parent), id(_id) --{ -- kdDebug() << "props page " << id << endl; -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "mountoptions", id); -- -- QStringList list; -- -- if (reply.isValid()) -- list = reply; -- -- if (list.size()) { -- kdDebug() << "list " << list << endl; -- -- for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it) -- { -- QString key = (*it).left((*it).find('=')); -- QString value = (*it).mid((*it).find('=') + 1); -- kdDebug() << "key '" << key << "' value '" << value << "'\n"; -- options[key] = value; -- } -- -- if (!options.contains("ro")) -- option_ro->hide(); -- else -- option_ro->setChecked(options["ro"] == "true"); -- connect( option_ro, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("quiet")) -- option_quiet->hide(); -- else -- option_quiet->setChecked(options["quiet"] == "true"); -- connect( option_quiet, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("sync")) -- option_sync->hide(); -- else -- option_sync->setChecked(options["sync"] == "true"); -- connect( option_sync, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("atime")) -- option_atime->hide(); -- else -- option_atime->setChecked(options["atime"] == "true"); -- connect( option_atime, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("flush")) -- option_flush->hide(); -- else -- option_flush->setChecked(options["flush"] == "true"); -- connect( option_flush, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("utf8")) -- option_utf8->hide(); -- else -- option_utf8->setChecked(options["utf8"] == "true"); -- connect( option_utf8, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("uid")) -- option_uid->hide(); -- else -- option_uid->setChecked(options["uid"] == "true"); -- connect( option_uid, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("shortname")) -- { -- option_shortname->hide(); -- text_shortname->hide(); -- } -- else -- { -- for (int index = 0; short_names[index]; ++index) -- if (options["shortname"] == short_names[index]) -- { -- option_shortname->setCurrentItem(index); -- break; -- } -- connect( option_shortname, SIGNAL( activated(int) ), SIGNAL( changed() ) ); -- } -- -- if (!options.contains("journaling")) -- { -- text_journaling->hide(); -- option_journaling->hide(); -- } -- else -- { -- for (int index = 0; journales[index]; ++index) -- if (options["journaling"] == journales[index]) -- { -- option_journaling->setCurrentItem(index); -- break; -- } -- connect( option_journaling, SIGNAL( activated(int) ), SIGNAL( changed() ) ); -- } -- -- label_filesystem->setText(i18n("Filesystem: %1").arg(options["filesystem"])); -- option_mountpoint->setText(options["mountpoint"]); -- connect( option_mountpoint, SIGNAL( textChanged( const QString &) ), SIGNAL( changed() ) ); -- option_automount->setChecked(options["automount"] == "true"); -- connect( option_automount, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("journaling") && -- !options.contains("shortname") && -- !options.contains("uid") && -- !options.contains("utf8") && -- !options.contains("flush")) -- groupbox_specific->hide(); -- -- } else { -- -- groupbox_generic->setEnabled(false); -- groupbox_specific->setEnabled(false); -- label_filesystem->hide(); -- } --} -- --PropertiesPage::~PropertiesPage() --{ --} -- --bool PropertiesPage::save() --{ -- QStringList result; -- -- if (options.contains("ro")) -- result << QString("ro=%1").arg(option_ro->isChecked() ? "true" : "false"); -- -- if (options.contains("quiet")) -- result << QString("quiet=%1").arg(option_quiet->isChecked() ? "true" : "false"); -- -- if (options.contains("sync")) -- result << QString("sync=%1").arg(option_sync->isChecked() ? "true" : "false"); -- -- if (options.contains("atime")) -- result << QString("atime=%1").arg(option_atime->isChecked() ? "true" : "false"); -- -- if (options.contains("flush")) -- result << QString("flush=%1").arg(option_flush->isChecked() ? "true" : "false"); -- -- if (options.contains("utf8")) -- result << QString("utf8=%1").arg(option_utf8->isChecked() ? "true" : "false"); -- -- if (options.contains("uid")) -- result << QString("uid=%1").arg(option_uid->isChecked() ? "true" : "false"); -- -- if (options.contains("shortname")) -- result << QString("shortname=%1").arg(short_names[option_shortname->currentItem()]); -- -- if (options.contains("journaling")) -- result << QString("journaling=%1").arg(journales[option_journaling->currentItem()]); -- -- QString mp = option_mountpoint->text(); -- if (!mp.startsWith("/media/")) -- { -- KMessageBox::sorry(this, i18n("Mountpoint has to be below /media")); -- return false; -- } -- result << QString("mountpoint=%1").arg(mp); -- result << QString("automount=%1").arg(option_automount->isChecked() ? "true" : "false"); -- -- kdDebug() << result << endl; -- -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "setMountoptions", id, result); -- -- if (reply.isValid()) -- return (bool)reply; -- else { -- KMessageBox::sorry(this, -- i18n("Saving the changes failed")); -- -- return false; -- } --} -- --#include "propertiespage.moc" -diff -urN kioslave/media/propsdlgplugin/propertiespage.h kioslave/media/propsdlgplugin/propertiespage.h ---- kioslave/media/propsdlgplugin/propertiespage.h Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespage.h Thu Jan 1 01:00:00 1970 -@@ -1,46 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program 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 General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ -- --#ifndef PROPERTIESPAGE_H --#define PROPERTIESPAGE_H -- --#include "propertiespagegui.h" --#include <qmap.h> -- --class QCheckBox; --class Medium; -- --class PropertiesPage : public PropertiesPageGUI --{ -- Q_OBJECT -- --public: -- PropertiesPage(QWidget* parent, const QString &_id); -- virtual ~PropertiesPage(); -- -- bool save(); -- --protected: -- -- QMap<QString,QString> options; -- QString id; -- --}; -- --#endif -diff -urN kioslave/media/propsdlgplugin/propertiespagegui.ui kioslave/media/propsdlgplugin/propertiespagegui.ui ---- kioslave/media/propsdlgplugin/propertiespagegui.ui Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespagegui.ui Thu Jan 1 01:00:00 1970 -@@ -1,387 +0,0 @@ --<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> --<class>PropertiesPageGUI</class> --<widget class="QWidget"> -- <property name="name"> -- <cstring>PropertiesPageGUI</cstring> -- </property> -- <property name="geometry"> -- <rect> -- <x>0</x> -- <y>0</y> -- <width>527</width> -- <height>476</height> -- </rect> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <property name="margin"> -- <number>0</number> -- </property> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout17</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QGroupBox"> -- <property name="name"> -- <cstring>groupbox_generic</cstring> -- </property> -- <property name="title"> -- <string>Generic Mount Options</string> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout15</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_ro</cstring> -- </property> -- <property name="text"> -- <string>Read only</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Mount the file system read-only.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_quiet</cstring> -- </property> -- <property name="text"> -- <string>Quiet</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Attempts to chown or chmod files do not return errors, although they fail. Use with caution!</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_sync</cstring> -- </property> -- <property name="text"> -- <string>Synchronous</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>All I/O to the file system should be done synchronously.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_atime</cstring> -- </property> -- <property name="text"> -- <string>Access time updates</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Update inode access time for each access.</string> -- </property> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout14</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>textLabel3</cstring> -- </property> -- <property name="text"> -- <string>Mountpoint:</string> -- </property> -- <property name="buddy" stdset="0"> -- <cstring>option_mountpoint</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Under what directory this file system shall be mounted. Please note that there is no guarantee that the system will respect your wish. For one the directory has to be below /media - and it does not yet have to exist.</string> -- </property> -- </widget> -- <widget class="QLineEdit"> -- <property name="name"> -- <cstring>option_mountpoint</cstring> -- </property> -- <property name="text"> -- <string></string> -- </property> -- </widget> -- </hbox> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_automount</cstring> -- </property> -- <property name="text"> -- <string>Mount automatically</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Mount this file system automatically.</string> -- </property> -- </widget> -- </vbox> -- </widget> -- </vbox> -- </widget> -- <widget class="QGroupBox"> -- <property name="name"> -- <cstring>groupbox_specific</cstring> -- </property> -- <property name="title"> -- <string>Filesystem Specific Mount Options</string> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout11</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_flush</cstring> -- </property> -- <property name="text"> -- <string>Flushed IO</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Always flush all data to the hot plug devices immediately and don't cache it.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_utf8</cstring> -- </property> -- <property name="text"> -- <string>UTF-8 charset</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the console. It can be be enabled for the filesystem with this option.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_uid</cstring> -- </property> -- <property name="text"> -- <string>Mount as user</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Mount this file system as user.</string> -- </property> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout7</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>text_journaling</cstring> -- </property> -- <property name="text"> -- <string>Journaling:</string> -- </property> -- <property name="buddy" stdset="0"> -- <cstring>option_journaling</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> -- --<h3><b>All Data</b></h3> -- All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. -- --<h3><b>Ordered</b></h3> -- All data is forced directly out to the main file system prior to its metadata being committed to the journal. -- --<h3><b>Write Back</b></h3> -- Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery.</string> -- </property> -- </widget> -- <widget class="QComboBox"> -- <item> -- <property name="text"> -- <string>All Data</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Ordered</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Write Back</string> -- </property> -- </item> -- <property name="name"> -- <cstring>option_journaling</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> -- --<h3><b>All Data</b></h3> -- All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. -- --<h3><b>Ordered</b></h3> -- All data is forced directly out to the main file system prior to its metadata being committed to the journal. -- --<h3><b>Write Back</b></h3> -- Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery.</string> -- </property> -- </widget> -- </hbox> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout14</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>text_shortname</cstring> -- </property> -- <property name="text"> -- <string>Short names:</string> -- </property> -- <property name="buddy" stdset="0"> -- <cstring>option_shortname</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> -- --<h3><b>Lower</b></h3> --Force the short name to lower case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows 95</b></h3> --Force the short name to upper case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows NT</b></h3> --Display the shortname as is; store a long name when the short name is not all lower case or all upper case. -- --<h3><b>Mixed</b></h3> --Display the short name as is; store a long name when the short name is not all upper case.</string> -- </property> -- </widget> -- <widget class="QComboBox"> -- <item> -- <property name="text"> -- <string>Lower</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Windows 95</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Windows NT</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Mixed</string> -- </property> -- </item> -- <property name="name"> -- <cstring>option_shortname</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> -- --<h3><b>Lower</b></h3> --Force the short name to lower case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows 95</b></h3> --Force the short name to upper case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows NT</b></h3> --Display the shortname as is; store a long name when the short name is not all lower case or all upper case. -- --<h3><b>Mixed</b></h3> --Display the short name as is; store a long name when the short name is not all upper case.</string> -- </property> -- </widget> -- </hbox> -- </widget> -- </vbox> -- </widget> -- </vbox> -- </widget> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>label_filesystem</cstring> -- </property> -- <property name="text"> -- <string>Filesystem: iso9660</string> -- </property> -- </widget> -- <spacer> -- <property name="name"> -- <cstring>spacer1</cstring> -- </property> -- <property name="orientation"> -- <enum>Vertical</enum> -- </property> -- <property name="sizeType"> -- <enum>Expanding</enum> -- </property> -- <property name="sizeHint"> -- <size> -- <width>20</width> -- <height>20</height> -- </size> -- </property> -- </spacer> -- </vbox> -- </widget> -- </hbox> --</widget> --<connections> -- <connection> -- <sender>option_ro</sender> -- <signal>stateChanged(int)</signal> -- <receiver>PropertiesPageGUI</receiver> -- <slot>changedSlot()</slot> -- </connection> --</connections> --<variables> -- <variable>bool m_hasChanged;</variable> --</variables> --<signals> -- <signal>changed()</signal> --</signals> --<slots> -- <slot access="protected">changedSlot()</slot> --</slots> --<functions> -- <function returnType="bool">hasChanged()</function> --</functions> --<layoutdefaults spacing="6" margin="11"/> --</UI> -diff -urN kioslave/media/propsdlgplugin/propertiespagegui.ui.h kioslave/media/propsdlgplugin/propertiespagegui.ui.h ---- kioslave/media/propsdlgplugin/propertiespagegui.ui.h Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespagegui.ui.h Thu Jan 1 01:00:00 1970 -@@ -1,22 +0,0 @@ --/**************************************************************************** --** ui.h extension file, included from the uic-generated form implementation. --** --** If you wish to add, delete or rename functions or slots use --** Qt Designer which will update this file, preserving your code. Create an --** init() function in place of a constructor, and a destroy() function in --** place of a destructor. --*****************************************************************************/ -- -- --void PropertiesPageGUI::changedSlot() --{ -- m_hasChanged = true; -- emit changed(); --} -- --bool PropertiesPageGUI::hasChanged() --{ -- return m_hasChanged; --} -- -- -diff -urN kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp ---- kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp Thu Jan 1 01:00:00 1970 -@@ -1,100 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program 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 General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ --#include <qstring.h> --#include <qvbox.h> --#include <qlayout.h> --#include <qlabel.h> --#include <qtimer.h> -- --#include <kgenericfactory.h> --#include <kdebug.h> --#include <kpushbutton.h> --#include <kfileshare.h> --#include <kmessagebox.h> --#include <kprocess.h> --#include <kstandarddirs.h> --#include <kdialog.h> --#include <kglobal.h> --#include <dcopref.h> -- --#include "propertiespage.h" --#include "propsdlgshareplugin.h" --#include "../libmediacommon/medium.h" -- --typedef KGenericFactory<PropsDlgSharePlugin, KPropertiesDialog> PropsDlgSharePluginFactory; -- --K_EXPORT_COMPONENT_FACTORY( media_propsdlgplugin, -- PropsDlgSharePluginFactory("media_propsdlgplugin") ) -- --class PropsDlgSharePlugin::Private --{ -- public: -- PropertiesPage* page; --}; -- --PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg, -- const char *, const QStringList & ) -- : KPropsDlgPlugin(dlg), d(0) --{ -- if (properties->items().count() != 1) -- return; -- -- KFileItem *item = properties->items().first(); -- -- DCOPRef mediamanager("kded", "mediamanager"); -- kdDebug() << "properties " << item->url() << endl; -- DCOPReply reply = mediamanager.call( "properties", item->url().url() ); -- -- if ( !reply.isValid() ) -- return; -- -- QVBox* vbox = properties->addVBoxPage(i18n("&Mounting")); -- -- d = new Private(); -- -- d->page = new PropertiesPage(vbox, Medium::create(reply).id()); -- connect(d->page, SIGNAL(changed()), -- SLOT(slotChanged())); -- -- // QTimer::singleShot(100, this, SLOT(slotChanged())); -- --} -- --void PropsDlgSharePlugin::slotChanged() --{ -- kdDebug() << "slotChanged()\n"; -- setDirty(true); --} -- --PropsDlgSharePlugin::~PropsDlgSharePlugin() --{ -- delete d; --} -- --void PropsDlgSharePlugin::applyChanges() --{ -- kdDebug() << "applychanges\n"; -- if (!d->page->save()) { -- properties->abortApplying(); -- } --} -- -- --#include "propsdlgshareplugin.moc" -- -diff -urN kioslave/media/propsdlgplugin/propsdlgshareplugin.h kioslave/media/propsdlgplugin/propsdlgshareplugin.h ---- kioslave/media/propsdlgplugin/propsdlgshareplugin.h Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propsdlgshareplugin.h Thu Jan 1 01:00:00 1970 -@@ -1,44 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program 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 General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ -- --#ifndef KONQFILESHAREPLUGIN_H --#define KONQFILESHAREPLUGIN_H -- --#include <kpropertiesdialog.h> -- --class PropsDlgSharePlugin : public KPropsDlgPlugin --{ --Q_OBJECT --public: -- PropsDlgSharePlugin( KPropertiesDialog *dlg, const char *, const QStringList & ); -- virtual ~PropsDlgSharePlugin(); -- virtual void applyChanges(); -- --public slots: -- void slotChanged(); -- --private: -- class Private; -- Private *d; -- --}; -- --#endif -- -- -diff -urN kioslave/media/services/Makefile.in kioslave/media/services/Makefile.in ---- kioslave/media/services/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/services/Makefile.in Fri May 26 09:54:31 2006 -@@ -211,6 +211,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/services/media_eject.desktop kioslave/media/services/media_eject.desktop ---- kioslave/media/services/media_eject.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/services/media_eject.desktop Mon May 22 20:12:42 2006 -@@ -24,7 +24,7 @@ - Name[es]=Expulsar - Name[et]=Väljastamine - Name[eu]=Egotzi --Name[fa]=پس زدن -+Name[fa]=اخراج - Name[fi]=Poista - Name[fr]=Éjecter - Name[fy]=Utsmytknop -diff -urN kioslave/media/services/media_safelyremove.desktop kioslave/media/services/media_safelyremove.desktop ---- kioslave/media/services/media_safelyremove.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/services/media_safelyremove.desktop Tue May 23 13:33:34 2006 -@@ -18,10 +18,8 @@ - Name[es]=Extracción segura - Name[et]=Eemalda turvaliselt - Name[eu]=Atera arriskurik gabe --Name[fa]=حذف امن - Name[fi]=Poista turvallisesti - Name[fr]=Enlever en toute sécurité --Name[fy]=Feilich verwiderje - Name[ga]=Bain Amach go Sábháilte - Name[gl]=Eliminar de Maneira Segura - Name[he]=שליפה בבטחה -@@ -46,7 +44,6 @@ - Name[ru]=Безопасно извлечь - Name[rw]=Gukuramo Neza - Name[se]=Dorvvošlaš eretváldin --Name[sk]=Bezpečne odpojiť - Name[sl]=Varno odstrani - Name[sr]=Безбедно уклони - Name[sr@Latn]=Bezbedno ukloni diff --git a/x11/kdebase3/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kdebase3/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp deleted file mode 100644 index 5a6937d40f75..000000000000 --- a/x11/kdebase3/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- kioslave/media/mediamanager/fstabbackend.cpp.orig Mon May 22 20:12:42 2006 -+++ kioslave/media/mediamanager/fstabbackend.cpp Fri Jun 16 08:56:20 2006 -@@ -111,6 +111,7 @@ - if ( mount->mountType() == "swap" - || mount->mountType() == "tmpfs" - || mount->mountType() == "sysfs" -+ || mount->mountType() == "fdescfs" - || mount->mountType() == "kernfs" - || mount->mountType() == "usbfs" - || mount->mountType().contains( "proc" ) diff --git a/x11/kdebase3/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp b/x11/kdebase3/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp index 00685d0fd8a2..e2580f9277c0 100644 --- a/x11/kdebase3/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp +++ b/x11/kdebase3/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp @@ -1,5 +1,5 @@ ---- kioslave/media/mediamanager/halbackend.cpp.orig Sun Oct 1 21:31:54 2006 -+++ kioslave/media/mediamanager/halbackend.cpp Fri Feb 9 22:01:27 2007 +--- kioslave/media/mediamanager/halbackend.cpp.orig Mon Jan 15 12:31:32 2007 ++++ kioslave/media/mediamanager/halbackend.cpp Sat Mar 3 18:00:49 2007 @@ -17,9 +17,14 @@ */ @@ -14,9 +14,9 @@ +#include <langinfo.h> +#endif - #include <qfile.h> - #include <klocale.h> -@@ -66,6 +71,10 @@ + #include <kapplication.h> + #include <qeventloop.h> +@@ -71,6 +76,10 @@ /* Close HAL connection */ if (m_halContext) { @@ -27,7 +27,7 @@ const QPtrList<Medium> medlist = m_mediaList.list(); QPtrListIterator<Medium> it (medlist); for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) -@@ -185,6 +194,10 @@ +@@ -184,6 +193,10 @@ libhal_free_string_array( halDeviceList ); @@ -38,9 +38,9 @@ return true; } -@@ -242,11 +255,11 @@ - Medium* medium = new Medium(udi, ""); - +@@ -251,11 +264,11 @@ + } + } QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi)); - kdDebug() << "automount " << options["automount"] << endl; + kdDebug(1219) << "automount " << options["automount"] << endl; @@ -50,9 +50,9 @@ - kdDebug() << "error " << error << endl; + kdDebug(1219) << "error " << error << endl; } - setVolumeProperties(medium); m_mediaList.addMedium(medium, allowNotification); -@@ -264,6 +277,11 @@ + +@@ -272,6 +285,11 @@ Medium* medium = new Medium(udi, ""); setFloppyProperties(medium); m_mediaList.addMedium(medium, allowNotification); @@ -64,7 +64,7 @@ return; } -@@ -285,12 +303,23 @@ +@@ -293,12 +311,23 @@ void HALBackend::RemoveDevice(const char *udi) { @@ -89,7 +89,7 @@ const char* mediumUdi = findMediumUdiFromUdi(udi); if (!mediumUdi) return; -@@ -326,7 +355,7 @@ +@@ -334,7 +363,7 @@ } const char* mediumUdi = findMediumUdiFromUdi(udi); @@ -98,7 +98,7 @@ if (!mediumUdi) return; -@@ -384,7 +413,7 @@ +@@ -392,7 +421,7 @@ { Medium m( *cmedium ); if ( setFstabProperties( &m ) ) { @@ -107,7 +107,7 @@ m_mediaList.changeMediumState(m, false); } return; -@@ -399,6 +428,7 @@ +@@ -407,6 +436,7 @@ setFloppyProperties(m); if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) setCameraProperties(m); @@ -115,7 +115,7 @@ m_mediaList.changeMediumState(*m, false); -@@ -469,28 +499,23 @@ +@@ -479,28 +509,23 @@ else mimeType = "media/dvd" + MOUNT_SUFFIX; @@ -155,7 +155,7 @@ } else { -@@ -575,7 +600,7 @@ +@@ -584,7 +609,7 @@ } } @@ -164,7 +164,7 @@ QString fstype = medium->fsType(); if ( fstype.isNull() ) fstype = "auto"; -@@ -762,7 +787,7 @@ +@@ -794,7 +819,7 @@ if (t.endsWith("=")) t = t.left(t.length() - 1); valids[t] = true; @@ -173,7 +173,7 @@ } libhal_free_string_array(array); QStringList result; -@@ -882,12 +908,20 @@ +@@ -915,12 +940,20 @@ result << "journaling=ordered"; } @@ -195,7 +195,7 @@ KConfig config("mediamanagerrc"); config.setGroup(name); -@@ -927,7 +959,7 @@ +@@ -960,7 +993,7 @@ if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, "org.freedesktop.Hal.Device.Volume", "Mount"))) { @@ -204,7 +204,7 @@ return i18n("Internal Error"); } -@@ -935,7 +967,7 @@ +@@ -968,7 +1001,7 @@ DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &poptions, noptions, DBUS_TYPE_INVALID)) { @@ -213,7 +213,7 @@ dbus_message_unref (dmesg); return i18n("Internal Error"); } -@@ -963,7 +995,7 @@ +@@ -996,7 +1029,7 @@ return qerror; } @@ -222,18 +222,25 @@ dbus_message_unref (dmesg); dbus_message_unref (reply); -@@ -974,15 +1006,33 @@ +@@ -1044,7 +1077,7 @@ void HALBackend::slotResult(KIO::Job *job) { - kdDebug() << "slotResult " << mount_jobs[job] << endl; + kdDebug(1219) << "slotResult " << mount_jobs[job] << endl; - if (job->error()) - { - KMessageBox::error(0, job->errorText()); + + struct mount_job_data *data = mount_jobs[job]; + QString& qerror = data->errorMessage; +@@ -1071,7 +1104,6 @@ + qerror = job->errorText(); } -- ResetProperties( mount_jobs[job].latin1() ); + +- ResetProperties( medium->id().latin1() ); mount_jobs.remove(job); + + /* Job completed. Notify the caller */ +@@ -1080,6 +1112,25 @@ + kapp->eventLoop()->exitLoop(); } +#ifdef Q_OS_FREEBSD @@ -247,7 +254,7 @@ + { + bool mounted = false; + const char *dev = (*it)->deviceNode().ascii(); -+ for (int n = mntNum-1; n >= 0 && !mounted; n--) ++ for (int n = mntNum-1; n >= 0 && !mounted; n--) + mounted = !strcmp(dev, mntBuf[n].f_mntfromname); + if ((*it)->isMounted() != mounted) + ResetProperties((*it)->id().latin1()); @@ -258,31 +265,32 @@ QString HALBackend::isInFstab(const Medium *medium) { KMountPoint::List fstab = KMountPoint::possibleMountPoints(KMountPoint::NeedMountOptions|KMountPoint::NeedRealDeviceName); -@@ -992,11 +1042,13 @@ - - for (; it!=end; ++it) - { -- kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl; -+ kdDebug(1219) << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl; - if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && (*it)->realDeviceName() == medium->deviceNode() ) ) +@@ -1092,12 +1143,14 @@ + QString reald = (*it)->realDeviceName(); + if ( reald.endsWith( "/" ) ) + reald = reald.left( reald.length() - 1 ); +- kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << reald << "- -" << (*it)->mountedFrom() << "-" << endl; ++ kdDebug(1219) << "isInFstab -" << medium->deviceNode() << "- -" << reald << "- -" << (*it)->mountedFrom() << "-" << endl; + if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && reald == medium->deviceNode() ) ) { +#ifndef Q_OS_FREEBSD QStringList opts = (*it)->mountOptions(); if (opts.contains("user") || opts.contains("users")) -+#endif return (*it)->mountPoint(); ++#endif } } -@@ -1012,7 +1064,7 @@ - QString mountPoint = isInFstab(medium); - if (!mountPoint.isNull()) - { + +@@ -1116,7 +1169,7 @@ + data.completed = false; + data.medium = medium; + - kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; + kdDebug(1219) << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint ); connect(job, SIGNAL( result (KIO::Job *)), SLOT( slotResult( KIO::Job *))); -@@ -1023,7 +1075,7 @@ +@@ -1134,7 +1187,7 @@ QStringList soptions; @@ -291,7 +299,7 @@ QMap<QString,QString> valids = MediaManagerUtils::splitOptions(mountoptions(medium->id())); if (valids["flush"] == "true") -@@ -1036,10 +1088,10 @@ +@@ -1147,10 +1200,10 @@ if (valids["ro"] == "true") soptions << "ro"; @@ -304,7 +312,7 @@ if (valids["quiet"] == "true") soptions << "quiet"; -@@ -1069,6 +1121,13 @@ +@@ -1180,6 +1233,13 @@ soptions << QString("data=ordered"); } @@ -318,7 +326,7 @@ const char **options = new const char*[soptions.size() + 1]; uint noptions = 0; for (QStringList::ConstIterator it = soptions.begin(); it != soptions.end(); ++it, ++noptions) -@@ -1081,9 +1140,6 @@ +@@ -1192,9 +1252,6 @@ return qerror; } @@ -328,16 +336,7 @@ return QString(); } -@@ -1121,7 +1177,7 @@ - QString mountPoint = isInFstab(medium); - if (!mountPoint.isNull()) - { -- kdDebug() << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl; -+ kdDebug(1219) << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl; - KIO::Job *job = KIO::unmount( medium->mountPoint(), false ); - connect(job, SIGNAL( result (KIO::Job *)), - SLOT( slotResult( KIO::Job *))); -@@ -1134,7 +1190,7 @@ +@@ -1255,7 +1312,7 @@ const char *options[2]; const char *udi = medium->id().latin1(); @@ -346,7 +345,7 @@ dbus_error_init(&error); DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -@@ -1147,7 +1203,7 @@ +@@ -1268,7 +1325,7 @@ if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, "org.freedesktop.Hal.Device.Volume", "Unmount"))) { @@ -355,7 +354,7 @@ return i18n("Internal Error"); } -@@ -1157,7 +1213,7 @@ +@@ -1278,7 +1335,7 @@ if (!dbus_message_append_args (dmesg, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, 0, DBUS_TYPE_INVALID)) { @@ -364,16 +363,16 @@ dbus_message_unref (dmesg); return i18n("Internal Error"); } -@@ -1165,7 +1221,7 @@ - dbus_error_init (&error); - if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) +@@ -1288,7 +1345,7 @@ { + QString qerror, reason; + - kdDebug() << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl; + kdDebug(1219) << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl; - QString qerror = error.message; - if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.Busy")) { - qerror = QString("<qt>") + i18n("Device is Busy:"); -@@ -1201,13 +1257,10 @@ + qerror = "<qt>"; + qerror += i18n("Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and " + "currently mounted at <b>%4</b> could not be unmounted. ").arg( +@@ -1318,13 +1375,10 @@ return qerror; } diff --git a/x11/kdebase3/files/extrapatch-kioslave_media_mediamanager-halbackend.h b/x11/kdebase3/files/extrapatch-kioslave_media_mediamanager-halbackend.h index df548eb39905..21672b565977 100644 --- a/x11/kdebase3/files/extrapatch-kioslave_media_mediamanager-halbackend.h +++ b/x11/kdebase3/files/extrapatch-kioslave_media_mediamanager-halbackend.h @@ -1,5 +1,5 @@ ---- kioslave/media/mediamanager/halbackend.h.orig Sun Jan 28 23:58:13 2007 -+++ kioslave/media/mediamanager/halbackend.h Thu Feb 1 02:51:48 2007 +--- kioslave/media/mediamanager/halbackend.h.orig Mon Jan 15 12:31:32 2007 ++++ kioslave/media/mediamanager/halbackend.h Wed Feb 21 15:01:12 2007 @@ -34,6 +34,9 @@ #include <qobject.h> #include <qstringlist.h> @@ -10,7 +10,7 @@ #include <config.h> -@@ -154,6 +157,9 @@ +@@ -156,6 +159,9 @@ private slots: void slotResult(KIO::Job *job); @@ -20,10 +20,10 @@ /* Hal call-backs -- from gvm*/ public: -@@ -217,6 +223,10 @@ - DBusConnection *dbus_connection; +@@ -233,6 +239,10 @@ + }; - QMap<KIO::Job *, QString> mount_jobs; + QMap<KIO::Job *, struct mount_job_data*> mount_jobs; +#ifdef Q_OS_FREEBSD + QTimer m_pollTimer; + QPtrList<Medium> m_pollMediaList; diff --git a/x11/kdebase3/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp b/x11/kdebase3/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp index 508019a14f3c..7d0fbfa81767 100644 --- a/x11/kdebase3/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp +++ b/x11/kdebase3/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp @@ -1,6 +1,6 @@ ---- kioslave/media/mounthelper/kio_media_mounthelper.cpp.orig Sat Jan 27 01:58:24 2007 -+++ kioslave/media/mounthelper/kio_media_mounthelper.cpp Sat Jan 27 02:35:28 2007 -@@ -77,7 +77,9 @@ +--- kioslave/media/mounthelper/kio_media_mounthelper.cpp.orig Mon Jan 15 12:31:31 2007 ++++ kioslave/media/mounthelper/kio_media_mounthelper.cpp Wed Feb 21 15:17:23 2007 +@@ -89,7 +89,9 @@ m_isCdrom = medium.mimeType().find("dvd")!=-1 || medium.mimeType().find("cd")!=-1; @@ -11,7 +11,7 @@ { DCOPRef mediamanager("kded", "mediamanager"); DCOPReply reply = mediamanager.call( "unmount", medium.id()); -@@ -85,13 +87,14 @@ +@@ -97,30 +99,14 @@ reply.get(m_errorStr); kdDebug() << "medium unmount " << m_errorStr << endl; if (m_errorStr.isNull()) @@ -26,6 +26,23 @@ - } - else if (args->isSet("s") || args->isSet("e")) - { +- /* +- * We want to call mediamanager unmount before invoking eject. That's +- * because unmount would provide an informative error message in case of +- * failure. However, there are cases when unmount would fail +- * (supermount, slackware, see bug#116209) but eject would succeed. +- * Thus if unmount fails, save unmount error message and invokeEject() +- * anyway. Only if both unmount and eject fail, notify the user by +- * displaying the saved error message (see ejectFinished()). +- */ +- if (medium.isMounted()) +- { +- DCOPRef mediamanager("kded", "mediamanager"); +- DCOPReply reply = mediamanager.call( "unmount", medium.id()); +- if (reply.isValid()) +- reply.get(m_errorStr); +- m_device = device; +- } - invokeEject(device, true); } else diff --git a/x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c deleted file mode 100644 index e0179de4e074..000000000000 --- a/x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c +++ /dev/null @@ -1,11 +0,0 @@ ---- kdm/kfrontend/genkdmconf.c.orig Mon Jun 5 14:34:06 2006 -+++ kdm/kfrontend/genkdmconf.c Mon Jun 5 14:35:52 2006 -@@ -1684,7 +1684,7 @@ - linkfile( ce ); - else { - tmpf = locate( "mktemp" ) ? -- "`mktemp`" : -+ "`mktemp /tmp/xsess-env-XXXXXX`" : - locate( "tempfile" ) ? - "`tempfile`" : - "$HOME/.xsession-env-$DISPLAY"; diff --git a/x11/kdebase3/files/patch-kwin-client.cpp b/x11/kdebase3/files/patch-kwin-client.cpp deleted file mode 100644 index d8e0f91db691..000000000000 --- a/x11/kdebase3/files/patch-kwin-client.cpp +++ /dev/null @@ -1,39 +0,0 @@ ---- kwin/client.cpp.orig Mon Oct 2 03:02:07 2006 -+++ kwin/client.cpp Mon Jan 8 10:54:19 2007 -@@ -477,17 +477,30 @@ - // calls it or when the decoration is created/destroyed - - if( Shape::version() >= 0x11 ) // 1.1, has input shape support -- { // there appears to be no way to find out if a window has input -- // shape set or not, so always set propagate the input shape -- // (it's the same like the bounding shape by default) -- XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, 0, 0, -+ { // There appears to be no way to find out if a window has input -+ // shape set or not, so always propagate the input shape -+ // (it's the same like the bounding shape by default). -+ // Also, build the shape using a helper window, not directly -+ // in the frame window, because the sequence set-shape-to-frame, -+ // remove-shape-of-client, add-input-shape-of-client has the problem -+ // that after the second step there's a hole in the input shape -+ // until the real shape of the client is added and that can make -+ // the window lose focus (which is a problem with mouse focus policies) -+ static Window helper_window = None; -+ if( helper_window == None ) -+ helper_window = XCreateSimpleWindow( qt_xdisplay(), qt_xrootwin(), -+ 0, 0, 1, 1, 0, 0, 0 ); -+ XResizeWindow( qt_xdisplay(), helper_window, width(), height()); -+ XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput, 0, 0, - frameId(), ShapeBounding, ShapeSet ); -- XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, -+ XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput, - clientPos().x(), clientPos().y(), - window(), ShapeBounding, ShapeSubtract ); -- XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, -+ XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput, - clientPos().x(), clientPos().y(), - window(), ShapeInput, ShapeUnion ); -+ XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, 0, 0, -+ helper_window, ShapeInput, ShapeSet ); - } - } - diff --git a/x11/kdebase3/pkg-plist b/x11/kdebase3/pkg-plist index 46ca7f96cbe8..bd60a8fa6ce8 100644 --- a/x11/kdebase3/pkg-plist +++ b/x11/kdebase3/pkg-plist @@ -440,6 +440,9 @@ lib/kde3/kicker.so lib/kde3/kickermenu_find.a lib/kde3/kickermenu_find.la lib/kde3/kickermenu_find.so +lib/kde3/kickermenu_kate.a +lib/kde3/kickermenu_kate.la +lib/kde3/kickermenu_kate.so lib/kde3/kickermenu_kdeprint.a lib/kde3/kickermenu_kdeprint.la lib/kde3/kickermenu_kdeprint.so @@ -1158,6 +1161,7 @@ share/apps/kappfinder/apps/Internet/mozilla.desktop share/apps/kappfinder/apps/Internet/netscape.desktop share/apps/kappfinder/apps/Internet/netscape6.desktop share/apps/kappfinder/apps/Internet/opera.desktop +share/apps/kappfinder/apps/Internet/wireshark.desktop share/apps/kappfinder/apps/Internet/xbiff.desktop share/apps/kappfinder/apps/Internet/xchat.desktop share/apps/kappfinder/apps/Internet/xfmail.desktop @@ -1628,6 +1632,7 @@ share/apps/kicker/icons/locolor/16x16/actions/modified.png share/apps/kicker/menuext/find.desktop share/apps/kicker/menuext/find/kfind.desktop share/apps/kicker/menuext/find/websearch.desktop +share/apps/kicker/menuext/katesessionmenu.desktop share/apps/kicker/menuext/konquerormenu.desktop share/apps/kicker/menuext/konsolemenu.desktop share/apps/kicker/menuext/prefmenu.desktop @@ -2081,7 +2086,7 @@ share/desktop-directories/kde-edutainment.directory share/desktop-directories/kde-games-arcade.directory share/desktop-directories/kde-games-board.directory share/desktop-directories/kde-games-card.directory -share/desktop-directories/kde-games-kidsgames.directory +share/desktop-directories/kde-games-kids.directory share/desktop-directories/kde-games-roguelikes.directory share/desktop-directories/kde-games-strategy.directory share/desktop-directories/kde-games.directory @@ -2420,6 +2425,7 @@ share/doc/HTML/en/khelpcenter/userguide/common share/doc/HTML/en/khelpcenter/userguide/control-center.docbook share/doc/HTML/en/khelpcenter/userguide/creating-graphics.docbook share/doc/HTML/en/khelpcenter/userguide/credits-and-license.docbook +share/doc/HTML/en/khelpcenter/userguide/customizing-desktop.docbook share/doc/HTML/en/khelpcenter/userguide/desktop.png share/doc/HTML/en/khelpcenter/userguide/email.docbook share/doc/HTML/en/khelpcenter/userguide/extragear-applications.docbook @@ -2480,6 +2486,7 @@ share/doc/HTML/en/khelpcenter/userguide/ripsettings.png share/doc/HTML/en/khelpcenter/userguide/screen-captures.docbook share/doc/HTML/en/khelpcenter/userguide/services.png share/doc/HTML/en/khelpcenter/userguide/shared-sessions.docbook +share/doc/HTML/en/khelpcenter/userguide/splash-screen.png share/doc/HTML/en/khelpcenter/userguide/standard-menu-entries.docbook share/doc/HTML/en/khelpcenter/userguide/switching-sessions.docbook share/doc/HTML/en/khelpcenter/userguide/the-filemanager.docbook @@ -2492,7 +2499,6 @@ share/doc/HTML/en/khelpcenter/userguide/where-next.docbook share/doc/HTML/en/khelpcenter/userguide/windows-how-to.docbook share/doc/HTML/en/khelpcenter/userguide/your-kde-account.docbook share/doc/HTML/en/khelpcenter/visualdict/common -share/doc/HTML/en/khelpcenter/visualdict/contextmenu.png share/doc/HTML/en/khelpcenter/visualdict/index.cache.bz2 share/doc/HTML/en/khelpcenter/visualdict/index.docbook share/doc/HTML/en/khelpcenter/visualdict/pict1.png @@ -2508,6 +2514,9 @@ share/doc/HTML/en/khelpcenter/visualdict/pict18.png share/doc/HTML/en/khelpcenter/visualdict/pict19.png share/doc/HTML/en/khelpcenter/visualdict/pict2.png share/doc/HTML/en/khelpcenter/visualdict/pict20.png +share/doc/HTML/en/khelpcenter/visualdict/pict21.png +share/doc/HTML/en/khelpcenter/visualdict/pict22.png +share/doc/HTML/en/khelpcenter/visualdict/pict23.png share/doc/HTML/en/khelpcenter/visualdict/pict3.png share/doc/HTML/en/khelpcenter/visualdict/pict4.png share/doc/HTML/en/khelpcenter/visualdict/pict5.png @@ -2649,6 +2658,7 @@ share/doc/HTML/en/knetattach/common share/doc/HTML/en/knetattach/index.cache.bz2 share/doc/HTML/en/knetattach/index.docbook share/doc/HTML/en/knetattach/screenshot.png +share/doc/HTML/en/knetattach/screenshot1.png share/doc/HTML/en/knetattach/screenshot2.png share/doc/HTML/en/knetattach/screenshot3.png share/doc/HTML/en/knetattach/screenshot4.png @@ -2742,7 +2752,6 @@ share/icons/crystalsvg/128x128/apps/licq.png share/icons/crystalsvg/128x128/apps/linuxconf.png share/icons/crystalsvg/128x128/apps/locale.png share/icons/crystalsvg/128x128/apps/looknfeel.png -share/icons/crystalsvg/128x128/apps/mozilla.png share/icons/crystalsvg/128x128/apps/multimedia.png share/icons/crystalsvg/128x128/apps/netscape.png share/icons/crystalsvg/128x128/apps/package.png @@ -2808,7 +2817,6 @@ share/icons/crystalsvg/16x16/apps/enhanced_browsing.png share/icons/crystalsvg/16x16/apps/evolution.png share/icons/crystalsvg/16x16/apps/fifteenpieces.png share/icons/crystalsvg/16x16/apps/filetypes.png -share/icons/crystalsvg/16x16/apps/firefox.png share/icons/crystalsvg/16x16/apps/fonts.png share/icons/crystalsvg/16x16/apps/gabber.png share/icons/crystalsvg/16x16/apps/gaim.png @@ -2862,9 +2870,6 @@ share/icons/crystalsvg/16x16/apps/looknfeel.png share/icons/crystalsvg/16x16/apps/lyx.png share/icons/crystalsvg/16x16/apps/mac.png share/icons/crystalsvg/16x16/apps/mathematica.png -share/icons/crystalsvg/16x16/apps/mozilla.png -share/icons/crystalsvg/16x16/apps/mozilla_m.png -share/icons/crystalsvg/16x16/apps/mozilla_mail.png share/icons/crystalsvg/16x16/apps/multimedia.png share/icons/crystalsvg/16x16/apps/nedit.png share/icons/crystalsvg/16x16/apps/netscape.png @@ -2911,7 +2916,6 @@ share/icons/crystalsvg/16x16/apps/stylesheet.png share/icons/crystalsvg/16x16/apps/systemtray.png share/icons/crystalsvg/16x16/apps/taskbar.png share/icons/crystalsvg/16x16/apps/terminal.png -share/icons/crystalsvg/16x16/apps/thunderbird.png share/icons/crystalsvg/16x16/apps/tux.png share/icons/crystalsvg/16x16/apps/usb.png share/icons/crystalsvg/16x16/apps/vnc.png @@ -3016,7 +3020,6 @@ share/icons/crystalsvg/32x32/apps/error.png share/icons/crystalsvg/32x32/apps/evolution.png share/icons/crystalsvg/32x32/apps/fifteenpieces.png share/icons/crystalsvg/32x32/apps/filetypes.png -share/icons/crystalsvg/32x32/apps/firefox.png share/icons/crystalsvg/32x32/apps/fonts.png share/icons/crystalsvg/32x32/apps/gabber.png share/icons/crystalsvg/32x32/apps/gaim.png @@ -3071,9 +3074,6 @@ share/icons/crystalsvg/32x32/apps/looknfeel.png share/icons/crystalsvg/32x32/apps/lyx.png share/icons/crystalsvg/32x32/apps/mac.png share/icons/crystalsvg/32x32/apps/mathematica.png -share/icons/crystalsvg/32x32/apps/mozilla.png -share/icons/crystalsvg/32x32/apps/mozilla_m.png -share/icons/crystalsvg/32x32/apps/mozilla_mail.png share/icons/crystalsvg/32x32/apps/multimedia.png share/icons/crystalsvg/32x32/apps/nedit.png share/icons/crystalsvg/32x32/apps/netscape.png @@ -3118,7 +3118,6 @@ share/icons/crystalsvg/32x32/apps/stylesheet.png share/icons/crystalsvg/32x32/apps/systemtray.png share/icons/crystalsvg/32x32/apps/taskbar.png share/icons/crystalsvg/32x32/apps/terminal.png -share/icons/crystalsvg/32x32/apps/thunderbird.png share/icons/crystalsvg/32x32/apps/tux.png share/icons/crystalsvg/32x32/apps/usb.png share/icons/crystalsvg/32x32/apps/vnc.png @@ -3177,7 +3176,6 @@ share/icons/crystalsvg/48x48/apps/enhanced_browsing.png share/icons/crystalsvg/48x48/apps/evolution.png share/icons/crystalsvg/48x48/apps/fifteenpieces.png share/icons/crystalsvg/48x48/apps/filetypes.png -share/icons/crystalsvg/48x48/apps/firefox.png share/icons/crystalsvg/48x48/apps/fonts.png share/icons/crystalsvg/48x48/apps/gabber.png share/icons/crystalsvg/48x48/apps/gaim.png @@ -3226,9 +3224,6 @@ share/icons/crystalsvg/48x48/apps/licq.png share/icons/crystalsvg/48x48/apps/linuxconf.png share/icons/crystalsvg/48x48/apps/locale.png share/icons/crystalsvg/48x48/apps/looknfeel.png -share/icons/crystalsvg/48x48/apps/mozilla.png -share/icons/crystalsvg/48x48/apps/mozilla_m.png -share/icons/crystalsvg/48x48/apps/mozilla_mail.png share/icons/crystalsvg/48x48/apps/multimedia.png share/icons/crystalsvg/48x48/apps/nedit.png share/icons/crystalsvg/48x48/apps/netscape.png @@ -3330,7 +3325,6 @@ share/icons/crystalsvg/64x64/apps/licq.png share/icons/crystalsvg/64x64/apps/linuxconf.png share/icons/crystalsvg/64x64/apps/locale.png share/icons/crystalsvg/64x64/apps/looknfeel.png -share/icons/crystalsvg/64x64/apps/mozilla.png share/icons/crystalsvg/64x64/apps/multimedia.png share/icons/crystalsvg/64x64/apps/nedit.png share/icons/crystalsvg/64x64/apps/netscape.png diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index 53cec9a18b5f..b4baad2d68d0 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 4 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -42,7 +41,7 @@ PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp @@ -52,7 +51,7 @@ CONFIGURE_ARGS+=--without-java \ --with-ssl-dir=${OPENSSLBASE} OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ - HAL "Use HAL backend for media:/ (FreeBSD 5+ only)" off \ + HAL "Use HAL backend for media:/ (FreeBSD 5+ only)" on \ HTDIG "Depend on htdig, used to build manual indices" off .include "${.CURDIR}/../../x11/kde3/Makefile.kde" @@ -70,7 +69,7 @@ RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper RUN_DEPENDS+= htdig:${PORTSDIR}/textproc/htdig .endif -.if defined(WITH_HAL) && ${OSVERSION} > 500035 +.if !defined(WITHOUT_HAL) && ${OSVERSION} > 500035 EXTRA_PATCHES= ${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.cpp \ ${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.h \ ${FILESDIR}/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp @@ -79,12 +78,9 @@ LIB_DEPENDS+= dbus-qt-1.1:${PORTSDIR}/devel/dbus-qt3 \ PLIST_SUB+= MEDIA="" .else CONFIGURE_ARGS+=--without-hal -EXTRA_PATCHES= ${FILESDIR}/extrapatch-kio_media \ - ${FILESDIR}/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp PLIST_SUB+= MEDIA="@comment " .endif - post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv diff --git a/x11/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo index 6f53a73368ff..9051c799c5c2 100644 --- a/x11/kdebase4-runtime/distinfo +++ b/x11/kdebase4-runtime/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.5.tar.bz2) = 0c685af1cbca75f9c77b3ed231ba0468 -SHA256 (KDE/kdebase-3.5.5.tar.bz2) = f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0 -SIZE (KDE/kdebase-3.5.5.tar.bz2) = 23851886 +MD5 (KDE/kdebase-3.5.6.tar.bz2) = a53f589f58012e655a52220a6a151019 +SHA256 (KDE/kdebase-3.5.6.tar.bz2) = 245b35f8b2e1533f9ae92b3b07bee5339a716dfb8db363d0126d2e7409b7bd7e +SIZE (KDE/kdebase-3.5.6.tar.bz2) = 24155599 diff --git a/x11/kdebase4-runtime/files/extrapatch-kio_media b/x11/kdebase4-runtime/files/extrapatch-kio_media deleted file mode 100644 index ab1a03b094cb..000000000000 --- a/x11/kdebase4-runtime/files/extrapatch-kio_media +++ /dev/null @@ -1,5814 +0,0 @@ -diff -urN kioslave/media/Makefile.in kioslave/media/Makefile.in ---- kioslave/media/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/Makefile.in Fri May 26 09:54:31 2006 -@@ -122,8 +122,7 @@ - DATA = $(kde_services_DATA) - ETAGS = etags - CTAGS = ctags --DIST_SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ -- kfile-plugin kcmodule mimetypes services propsdlgplugin -+DIST_SUBDIRS = $(SUBDIRS) - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 1 - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -276,6 +275,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -@@ -611,9 +611,8 @@ - xdg_appsdir = @xdg_appsdir@ - xdg_directorydir = @xdg_directorydir@ - xdg_menudir = @xdg_menudir@ --@include_media_halbackend_TRUE@PROPSDLGPLUGINDIR = propsdlgplugin - SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ -- kfile-plugin kcmodule mimetypes services $(PROPSDLGPLUGINDIR) -+ kfile-plugin kcmodule mimetypes services - - INCLUDES = -I$(srcdir)/libmediacommon $(all_includes) - #>- METASOURCES = AUTO -@@ -1092,8 +1091,7 @@ - ./testmedia - - messages: rc.cpp -- $(EXTRACTRC) propsdlgplugin/propertiespagegui.ui >> rc.cpp -- $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp propsdlgplugin/*.cpp -o $(podir)/kio_media.pot -+ $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp -o $(podir)/kio_media.pot - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -diff -urN kioslave/media/kcmodule/Makefile.in kioslave/media/kcmodule/Makefile.in ---- kioslave/media/kcmodule/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/kcmodule/Makefile.in Fri May 26 09:54:31 2006 -@@ -253,6 +253,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/kcmodule/managermodule.cpp kioslave/media/kcmodule/managermodule.cpp ---- kioslave/media/kcmodule/managermodule.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/managermodule.cpp Sun Nov 20 20:14:21 2005 -@@ -39,15 +39,15 @@ - QString hal_text = view->kcfg_HalBackendEnabled->text(); - hal_text += " ("+i18n("No support for HAL on this system")+")"; - view->kcfg_HalBackendEnabled->setText( hal_text ); --#endif - view->kcfg_HalBackendEnabled->setEnabled( false ); -+#endif - - #ifndef COMPILE_LINUXCDPOLLING - QString poll_text = view->kcfg_CdPollingEnabled->text(); - poll_text += " ("+i18n("No support for CD polling on this system")+")"; - view->kcfg_CdPollingEnabled->setText( poll_text ); --#endif - view->kcfg_CdPollingEnabled->setEnabled( false ); -+#endif - - load(); - } -diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.desktop ---- kioslave/media/kcmodule/media.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/kcmodule/media.desktop Mon May 22 20:12:42 2006 -@@ -24,7 +24,6 @@ - Name[es]=Dispositivos de almacenamiento - Name[et]=Andmekandjad - Name[eu]=Biltegiratze-euskarria --Name[fa]=رسانه ذخیرهگاه - Name[fi]=Tallennusmedia - Name[fr]=Support de stockage - Name[fy]=Opslachapparaten -@@ -33,7 +32,7 @@ - Name[he]=התקנים - Name[hi]=भंडार मीडिया - Name[hr]=Mediji za pohranjivanje --Name[hu]=Tárolóeszközök -+Name[hu]=Tárolóeszköz - Name[is]=Geymslumiðlar - Name[it]=Dispositivi di archiviazione - Name[ja]=記憶メディア -@@ -43,7 +42,7 @@ - Name[mk]=Медиуми за податоци - Name[ms]=Media Storan - Name[nb]=Lagringsenheter --Name[nds]=Spiekermedien -+Name[nds]=Spiekerreedschappen - Name[nl]=Opslagapparaten - Name[nn]=Lagringsmedium - Name[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ -@@ -54,7 +53,6 @@ - Name[ru]=Устройства хранения данных - Name[rw]=Uburyo bwo Kubika - Name[se]=Vurkenmedia --Name[sk]=Zálohovacie médiá - Name[sl]=Nosilci za shranjevanje - Name[sr]=Складишни медијуми - Name[sr@Latn]=Skladišni medijumi -@@ -82,13 +80,11 @@ - Comment[es]=Configuración de las medios de almacenamiento - Comment[et]=Salvestusandmekandjate seadistused - Comment[eu]=Konfiguratu biltegiratze-euskarria --Comment[fa]=پیکربندی رسانه ذخیرهگاه - Comment[fi]=Aseta tallennusmedia - Comment[fr]=Configurer le média de stockage - Comment[fy]=Opslachmedia ynstelle - Comment[ga]=Cumraigh Meáin Stórála - Comment[gl]=Configurar Medios de Armacenaxe --Comment[he]=שינוי הגדרות מדיות אחסון - Comment[hr]=Konfiguriranje medija za pohranu - Comment[hu]=A tárolóeszközök beállítása - Comment[is]=Stillingar geymslumiðla -@@ -98,16 +94,15 @@ - Comment[lt]=Konfigūruoti saugojimo įrenginius - Comment[mk]=Конфигурирајте ги медиумите за податоци - Comment[nb]=Sett opp lagringsmedier --Comment[nds]=Spiekermedien instellen -+Comment[nds]=Spiekerreedschappen instellen - Comment[nl]=Opslagmedia instellen - Comment[nn]=Set opp lagringsmedium - Comment[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ ਸੰਰਚਨਾ - Comment[pl]=Konfiguracja nośników danych --Comment[pt]=Configurar os Suportes de Armazenamento -+Comment[pt]=Configurar os Meios de Armazenamento - Comment[pt_BR]=Configura as mídias de armazenamento - Comment[ru]=Настройка подключаемых устройств хранения - Comment[se]=Heivet vurkenmediaid --Comment[sk]=Nastavenie zálohovacích médií - Comment[sl]=Nastavitve nosilcev za shranjevanje - Comment[sr]=Подешавање медијума за складиштење - Comment[sr@Latn]=Podešavanje medijuma za skladištenje -@@ -132,13 +127,11 @@ - Keywords[es]=almacenamiento,medios,usb,cdrom,dispositivo - Keywords[et]=salvestamine,andmekandja,usb,cd,seade - Keywords[eu]=biltegiratzea,euskarriak,usb,cdrom,gailua --Keywords[fa]=ذخیره گاه، رسانه، گذرگاه سریال جهانی، دیسک فشرده، دستگاه - Keywords[fi]=varasto,media,usb,cdrom,laite - Keywords[fr]=stockage,media,medium,usb,cdrom,périphérique - Keywords[fy]=storage,opslach,media,usb,cd-rom,kompakt-skiif,device,apparaat,mp3-speler,usb-stick,geheugenkaart - Keywords[ga]=stóráil,stóras,meáin,meán,usb,cdrom,dlúthdhiosca,gléas - Keywords[gl]=armacenaxe,medios,usb,cdrom,dispositivo --Keywords[he]=storage,media,usb,cdrom,device,מדיה,התקן,סידירום,תקליטור - Keywords[hr]=storage,media,usb,cdrom,device,pohrana,snimanje,mediji,uređaj - Keywords[hu]=tároló,adathordozó,USB,CD-ROM,eszköz - Keywords[is]=geymsla,miðill,usb,cdrom,tæki -@@ -153,7 +146,7 @@ - Keywords[nn]=lagring,media,usb,CD-spiller,CD-ROM,einingar,minnepinnar,harddiskar,HD,eksterne harddiskar,zip-diskar - Keywords[pa]=ਸਟੋਰੇਜ਼,ਮੀਡਿਆ,ਜੰਤਰ,usb,cdrom - Keywords[pl]=dane,przechowywanie danych,nośnik danych,nośniki danych,usb,cdrom,urządzenie --Keywords[pt]=armazenamento,meio,suporte,usb,cdrom,dispositivo -+Keywords[pt]=armazenamento,meio,usb,cdrom,dispositivo - Keywords[pt_BR]=armazenamento,mídia,usb,cd-rom,device,dispositivo - Keywords[ru]=storage,media,usb,cdrom,device,устройство хранения - Keywords[sl]=shranjevanje,nosilec,usb,cdrom,naprava -diff -urN kioslave/media/kcmodule/notifiermodule.cpp kioslave/media/kcmodule/notifiermodule.cpp ---- kioslave/media/kcmodule/notifiermodule.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/notifiermodule.cpp Mon May 22 20:12:42 2006 -@@ -174,8 +174,8 @@ - ActionListBoxItem *action_item - = static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem()); - -- NotifierServiceAction * action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); -- if ( action ) -+ NotifierServiceAction * action; -+ if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() ) ) ) - { - ServiceConfigDialog dialog(action, m_settings.supportedMimetypes(), this); - -@@ -195,8 +195,7 @@ - = static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem()); - - NotifierServiceAction *action; -- action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); -- if ( action ) -+ if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() )) ) - { - m_settings.deleteAction( action ); - updateListBox(); -diff -urN kioslave/media/kfile-plugin/Makefile.in kioslave/media/kfile-plugin/Makefile.in ---- kioslave/media/kfile-plugin/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/kfile-plugin/Makefile.in Fri May 26 09:54:31 2006 -@@ -248,6 +248,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/kfile-plugin/kfile_media.desktop kioslave/media/kfile-plugin/kfile_media.desktop ---- kioslave/media/kfile-plugin/kfile_media.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/kfile-plugin/kfile_media.desktop Mon May 22 20:12:42 2006 -@@ -16,7 +16,6 @@ - Name[es]=Información de recursos - Name[et]=Andmekandja info - Name[eu]=Media informazioa --Name[fa]=اطلاعات رسانه - Name[fi]=Tallenteiden tiedot - Name[fr]=Informations sur le média - Name[fy]=Mediumynformaasje -@@ -47,7 +46,6 @@ - Name[ru]=Сведения о носителе - Name[rw]=Amakuru y'igitangazamakuru - Name[se]=Mediumdieđut --Name[sk]=Informácie o médiu - Name[sl]=Informacije o mediju - Name[sr]=Информације о медијуму - Name[sr@Latn]=Informacije o medijumu -@@ -63,4 +61,4 @@ - Name[zh_TW]=媒體資訊 - ServiceTypes=KFilePlugin - X-KDE-Library=kfile_media --MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera;media/camera_mounted;media/camera_unmounted -+MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera -diff -urN kioslave/media/kfile-plugin/kfilemediaplugin.cpp kioslave/media/kfile-plugin/kfilemediaplugin.cpp ---- kioslave/media/kfile-plugin/kfilemediaplugin.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/kfile-plugin/kfilemediaplugin.cpp Tue Nov 8 23:36:07 2005 -@@ -64,16 +64,12 @@ - addMimeType( "media/floppy_unmounted" ); - addMimeType( "media/zip_unmounted" ); - addMimeType( "media/gphoto2camera" ); -- addMimeType( "media/camera_mounted" ); -- addMimeType( "media/camera_unmounted" ); - } - - bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/) - { -- const Medium medium = askMedium(info); -+ const Medium medium = askMedium(info); - -- kdDebug() << "KFileMediaPlugin::readInfo " << medium.id() << endl; -- - if (medium.id().isNull()) return false; - - QString mount_point = medium.mountPoint(); -@@ -165,8 +161,7 @@ - const Medium KFileMediaPlugin::askMedium(KFileMetaInfo &info) - { - DCOPRef mediamanager("kded", "mediamanager"); -- kdDebug() << "properties " << info.url() << endl; -- DCOPReply reply = mediamanager.call( "properties", info.url().url() ); -+ DCOPReply reply = mediamanager.call( "properties", info.url().fileName() ); - - if ( !reply.isValid() ) - { -diff -urN kioslave/media/libmediacommon/Makefile.in kioslave/media/libmediacommon/Makefile.in ---- kioslave/media/libmediacommon/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/libmediacommon/Makefile.in Fri May 26 09:54:31 2006 -@@ -250,6 +250,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/libmediacommon/medium.cpp kioslave/media/libmediacommon/medium.cpp ---- kioslave/media/libmediacommon/medium.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/libmediacommon/medium.cpp Mon Oct 10 17:04:00 2005 -@@ -40,8 +40,6 @@ - m_properties+= QString::null; /* ICON_NAME */ - - loadUserLabel(); -- -- m_halmounted = false; - } - - Medium::Medium() -@@ -59,8 +57,6 @@ - m_properties+= QString::null; /* BASE_URL */ - m_properties+= QString::null; /* MIME_TYPE */ - m_properties+= QString::null; /* ICON_NAME */ -- -- m_halmounted = false; - } - - const Medium Medium::create(const QStringList &properties) -@@ -163,7 +159,7 @@ - bool Medium::mountableState(bool mounted) - { - if ( m_properties[DEVICE_NODE].isEmpty() -- || ( mounted && m_properties[MOUNT_POINT].isEmpty() ) ) -+ || m_properties[MOUNT_POINT].isEmpty() ) - { - return false; - } -@@ -208,10 +204,14 @@ - - KURL Medium::prettyBaseURL() const - { -- if ( !baseURL().isEmpty() ) -- return baseURL(); -- -+ if ( isMountable() ) -+ { - return KURL( mountPoint() ); -+ } -+ else -+ { -+ return KURL( baseURL() ); -+ } - } - - QString Medium::prettyLabel() const -diff -urN kioslave/media/libmediacommon/medium.h kioslave/media/libmediacommon/medium.h ---- kioslave/media/libmediacommon/medium.h Sat Jul 22 10:15:42 2006 -+++ kioslave/media/libmediacommon/medium.h Mon Oct 10 17:04:00 2005 -@@ -22,7 +22,6 @@ - #include <qstring.h> - #include <qstringlist.h> - #include <kurl.h> --#include <qmap.h> - - class Medium - { -@@ -79,32 +78,14 @@ - - void setMimeType(const QString &mimeType); - void setIconName(const QString &iconName); -- void setHalMounted(bool flag) const { m_halmounted = flag; } -- bool halMounted() const { return m_halmounted; } - - private: - Medium(); - void loadUserLabel(); - - QStringList m_properties; -- mutable bool m_halmounted; -- -+ - friend class QValueListNode<const Medium>; - }; -- --namespace MediaManagerUtils { -- static inline QMap<QString,QString> splitOptions(const QStringList & options) -- { -- QMap<QString,QString> valids; -- -- for (QStringList::ConstIterator it = options.begin(); it != options.end(); ++it) -- { -- QString key = (*it).left((*it).find('=')); -- QString value = (*it).mid((*it).find('=') + 1); -- valids[key] = value; -- } -- return valids; -- } --} - - #endif -diff -urN kioslave/media/mediaimpl.cpp kioslave/media/mediaimpl.cpp ---- kioslave/media/mediaimpl.cpp Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediaimpl.cpp Mon Oct 10 17:04:01 2005 -@@ -226,8 +226,6 @@ - - mp_mounting = &medium; - -- -- /* - KIO::Job* job = KIO::mount(false, 0, - medium.deviceNode(), - medium.mountPoint()); -@@ -236,7 +234,6 @@ - this, SLOT( slotMountResult( KIO::Job * ) ) ); - connect( job, SIGNAL( warning( KIO::Job *, const QString & ) ), - this, SLOT( slotWarning( KIO::Job *, const QString & ) ) ); -- */ - kapp->dcopClient() - ->connectDCOPSignal("kded", "mediamanager", - "mediumChanged(QString, bool)", -@@ -244,17 +241,7 @@ - "slotMediumChanged(QString)", - false); - -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "mount", medium.id()); -- if (reply.isValid()) -- reply.get(m_lastErrorMessage); -- else -- m_lastErrorMessage = i18n("Internal Error"); -- if (!m_lastErrorMessage.isEmpty()) -- m_lastErrorCode = KIO::ERR_SLAVE_DEFINED; -- else { -- qApp->eventLoop()->enterLoop(); -- } -+ qApp->eventLoop()->enterLoop(); - - mp_mounting = 0L; - -diff -urN kioslave/media/mediamanager/Makefile.in kioslave/media/mediamanager/Makefile.in ---- kioslave/media/mediamanager/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/mediamanager/Makefile.in Fri May 26 09:54:31 2006 -@@ -284,6 +284,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/mediamanager/fstabbackend.cpp kioslave/media/mediamanager/fstabbackend.cpp ---- kioslave/media/mediamanager/fstabbackend.cpp Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/fstabbackend.cpp Mon May 22 20:12:42 2006 -@@ -37,9 +37,6 @@ - #endif - - #include <klocale.h> --#include <kio/job.h> --#include <kio/netaccess.h> --#include <kdebug.h> - #include <kdirwatch.h> - #include <kurl.h> - #include <kmountpoint.h> -@@ -97,26 +94,6 @@ - KDirWatch::self()->removeFile(MTAB); - } - --QString FstabBackend::mount( const QString &_udi ) --{ -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- return i18n("No such medium: %1").arg(_udi); -- KIO::Job* job = KIO::mount( false, 0, medium->deviceNode(), medium->mountPoint()); -- KIO::NetAccess::synchronousRun( job, 0 ); -- return QString::null; --} -- --QString FstabBackend::unmount( const QString &_udi ) --{ -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- return i18n("No such medium: %1").arg(_udi); -- KIO::Job* job = KIO::unmount( medium->mountPoint(), false); -- KIO::NetAccess::synchronousRun( job, 0 ); -- return QString::null; --} -- - void FstabBackend::slotDirty(const QString &path) - { - if (path==MTAB) -@@ -134,7 +111,6 @@ - if ( mount->mountType() == "swap" - || mount->mountType() == "tmpfs" - || mount->mountType() == "sysfs" -- || mount->mountType() == "fdescfs" - || mount->mountType() == "kernfs" - || mount->mountType() == "usbfs" - || mount->mountType().contains( "proc" ) -@@ -147,7 +123,6 @@ - || mount->mountPoint() == "/dev/swap" - || mount->mountPoint() == "/dev/pts" - || mount->mountPoint().find("/proc") == 0 -- || mount->mountPoint().find("/sys") == 0 - - // We might want to display only network shares - // since HAL doesn't handle them -@@ -169,7 +144,7 @@ - - void FstabBackend::handleMtabChange(bool allowNotification) - { -- QStringList new_mtabIds; -+ QStringList new_mtabIds, new_mtabEntries; - KMountPoint::List mtab = KMountPoint::currentMountPoints(); - - KMountPoint::List::iterator it = mtab.begin(); -@@ -187,19 +162,18 @@ - nothing has changed, do not stat the mount point. Avoids - hang if network shares are stalling */ - QString mtabEntry = dev + "*" + mp + "*" + fs; -- if(m_mtabEntries.contains(mtabEntry)) { -- new_mtabIds += m_mtabEntries[mtabEntry]; -- continue; -- } -+ bool isOldEntry = m_mtabEntries.contains(mtabEntry); -+ new_mtabEntries+=mtabEntry; -+ if (isOldEntry) continue; - - QString id = generateId(dev, mp); - new_mtabIds+=id; -- m_mtabEntries[mtabEntry] = id; - - if ( !m_mtabIds.contains(id) && m_fstabIds.contains(id) ) - { - QString mime, icon, label; - guess(dev, mp, fs, true, mime, icon, label); -+ - m_mediaList.changeMediumState(id, true, false, - mime, icon, label); - } -@@ -237,10 +211,6 @@ - QString mp = medium->mountPoint(); - QString fs = medium->fsType(); - -- -- QString mtabEntry = dev + "*" + mp + "*" + fs; -- m_mtabEntries.remove(mtabEntry); -- - QString mime, icon, label; - guess(dev, mp, fs, false, mime, icon, label); - -@@ -256,6 +226,7 @@ - } - - m_mtabIds = new_mtabIds; -+ m_mtabEntries = new_mtabEntries; - } - - void FstabBackend::handleFstabChange(bool allowNotification) -diff -urN kioslave/media/mediamanager/fstabbackend.h kioslave/media/mediamanager/fstabbackend.h ---- kioslave/media/mediamanager/fstabbackend.h Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/fstabbackend.h Mon May 22 20:12:42 2006 -@@ -23,7 +23,6 @@ - - #include <qobject.h> - #include <qstringlist.h> --#include <qmap.h> - - #ifdef Q_OS_FREEBSD - #include <qtimer.h> -@@ -41,10 +40,6 @@ - const QString &fsType, bool mounted, - QString &mimeType, QString &iconName, - QString &label); -- -- QString mount(const QString &id); -- QString unmount(const QString &id); -- - private slots: - void slotDirty(const QString &path); - void handleFstabChange(bool allowNotification = true); -@@ -58,7 +53,7 @@ - - bool m_networkSharesOnly; - QStringList m_mtabIds; -- QMap<QString, QString> m_mtabEntries; -+ QStringList m_mtabEntries; - QStringList m_fstabIds; - #ifdef Q_OS_FREEBSD - QTimer m_mtabTimer; -diff -urN kioslave/media/mediamanager/halbackend.cpp kioslave/media/mediamanager/halbackend.cpp ---- kioslave/media/mediamanager/halbackend.cpp Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/halbackend.cpp Thu Jan 19 18:00:58 2006 -@@ -21,16 +21,9 @@ - - #include <stdlib.h> - --#include <qfile.h> - #include <klocale.h> - #include <kurl.h> - #include <kdebug.h> --#include <kprocess.h> --#include <kconfig.h> --#include <qstylesheet.h> --#include <kmountpoint.h> --#include <kmessagebox.h> --#include <kio/job.h> - - #define MOUNT_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mounted") : QString("_unmounted")) - #define MOUNT_ICON_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mount") : QString("_unmount")) -@@ -39,1177 +32,615 @@ - static HALBackend* s_HALBackend; - - /* A macro function to convert HAL string properties to QString */ --QString libhal_device_get_property_QString(LibHalContext *ctx, const char* udi, const char *key) -+QString hal_device_get_property_QString(LibHalContext *ctx, const char* udi, const char *key) - { -- char* _ppt_string; -- QString _ppt_QString; -- _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL); -- _ppt_QString = QString(_ppt_string ? _ppt_string : ""); -- libhal_free_string(_ppt_string); -- return _ppt_QString; -+ char* _ppt_string; -+ QString _ppt_QString; -+ _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL); -+ _ppt_QString = QString(_ppt_string ? _ppt_string : ""); -+ libhal_free_string(_ppt_string); -+ return _ppt_QString; - } - - /* Constructor */ - HALBackend::HALBackend(MediaList &list, QObject* parent) -- : QObject() -- , BackendBase(list) -- , m_halContext(NULL) -- , m_halStoragePolicy(NULL) -- , m_parent(parent) -+ : QObject() -+ , BackendBase(list) -+ , m_halContext(NULL) -+ , m_halStoragePolicy(NULL) -+ , m_parent(parent) - { -- s_HALBackend = this; -+ s_HALBackend = this; - } - - /* Destructor */ - HALBackend::~HALBackend() - { -- /* Close HAL connection */ -- if (m_halContext) -- { -- const QPtrList<Medium> medlist = m_mediaList.list(); -- QPtrListIterator<Medium> it (medlist); -- for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) -- unmount(current_medium->id()); -- -- -- /* Remove all the registered media first */ -- int numDevices; -- char** halDeviceList = libhal_get_all_devices( m_halContext, &numDevices, NULL ); -- -- if ( halDeviceList ) -- { -- for ( int i = 0; i < numDevices; i++ ) -- { -- m_mediaList.removeMedium( halDeviceList[i], false ); -- } -- } -- -- libhal_free_string_array( halDeviceList ); -- -- DBusError error; -- dbus_error_init(&error); -- libhal_ctx_shutdown(m_halContext, &error); -- libhal_ctx_free(m_halContext); -- } -- -- if (m_halStoragePolicy) -- libhal_storage_policy_free(m_halStoragePolicy); -+ /* Close HAL connection */ -+ if (m_halContext) -+ { -+ /* Remove all the registered media first */ -+ int numDevices; -+ char** halDeviceList = libhal_get_all_devices( m_halContext, &numDevices, NULL ); -+ -+ if ( halDeviceList ) -+ { -+ for ( int i = 0; i < numDevices; i++ ) -+ { -+ m_mediaList.removeMedium( halDeviceList[i], false ); -+ } -+ } -+ -+ #ifdef HAL_0_4 -+ hal_shutdown(m_halContext); -+ #else -+ libhal_ctx_shutdown(m_halContext, NULL); -+ libhal_ctx_free(m_halContext); -+ #endif -+ } -+ -+ if (m_halStoragePolicy) -+ libhal_storage_policy_free(m_halStoragePolicy); - } - - /* Connect to the HAL */ - bool HALBackend::InitHal() - { -- kdDebug(1219) << "Context new" << endl; -- m_halContext = libhal_ctx_new(); -- if (!m_halContext) -- { -- kdDebug(1219) << "Failed to initialize HAL!" << endl; -- return false; -- } -- -- // Main loop integration -- kdDebug(1219) << "Main loop integration" << endl; -- DBusError error; -- dbus_error_init(&error); -- dbus_connection = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error); -- -- if (!dbus_connection || dbus_error_is_set(&error)) { -- dbus_error_free(&error); -- libhal_ctx_free(m_halContext); -- m_halContext = NULL; -- return false; -- } -- -- dbus_bus_register(dbus_connection, &error); -- -- if (dbus_error_is_set(&error)) { -- dbus_error_free(&error); -- libhal_ctx_free(m_halContext); -- m_halContext = NULL; -- return false; -- } -- MainLoopIntegration(dbus_connection); -- libhal_ctx_set_dbus_connection(m_halContext, dbus_connection); -- -- // HAL callback functions -- kdDebug(1219) << "Callback functions" << endl; -- libhal_ctx_set_device_added(m_halContext, HALBackend::hal_device_added); -- libhal_ctx_set_device_removed(m_halContext, HALBackend::hal_device_removed); -- libhal_ctx_set_device_new_capability (m_halContext, NULL); -- libhal_ctx_set_device_lost_capability (m_halContext, NULL); -- libhal_ctx_set_device_property_modified (m_halContext, HALBackend::hal_device_property_modified); -- libhal_ctx_set_device_condition(m_halContext, HALBackend::hal_device_condition); -- -- kdDebug(1219) << "Context Init" << endl; -- if (!libhal_ctx_init(m_halContext, &error)) -- { -- if (dbus_error_is_set(&error)) -- dbus_error_free(&error); -- libhal_ctx_free(m_halContext); -- m_halContext = NULL; -- kdDebug(1219) << "Failed to init HAL context!" << endl; -- return false; -- } -- -- /** @todo customize watch policy */ -- kdDebug(1219) << "Watch properties" << endl; -- if (!libhal_device_property_watch_all(m_halContext, &error)) -- { -- kdDebug(1219) << "Failed to watch HAL properties!" << endl; -- return false; -- } -- -- /* libhal-storage initialization */ -- kdDebug(1219) << "Storage Policy" << endl; -- m_halStoragePolicy = libhal_storage_policy_new(); -- /** @todo define libhal-storage icon policy */ -+#ifdef HAL_0_4 /* HAL API 0.4 */ -+ /* libhal initialization */ -+ m_halFunctions.main_loop_integration = HALBackend::hal_main_loop_integration; -+ m_halFunctions.device_added = HALBackend::hal_device_added; -+ m_halFunctions.device_removed = HALBackend::hal_device_removed; -+ m_halFunctions.device_new_capability = NULL; -+ m_halFunctions.device_lost_capability = NULL; -+ m_halFunctions.device_property_modified = HALBackend::hal_device_property_modified; -+ m_halFunctions.device_condition = HALBackend::hal_device_condition; -+ -+ m_halContext = hal_initialize(&m_halFunctions, false); -+ if (!m_halContext) -+ { -+ kdDebug(1219) << "Failed to initialize HAL!" << endl; -+ return false; -+ } -+ -+ /** @todo customize watch policy */ -+ kdDebug(1219) << "Watch properties" << endl; -+ if (libhal_device_property_watch_all(m_halContext, NULL)) -+ { -+ kdDebug(1219) << "Failed to watch HAL properties!" << endl; -+ return false; -+ } -+#else /* HAL API >= 0.5 */ -+ kdDebug(1219) << "Context new" << endl; -+ m_halContext = libhal_ctx_new(); -+ if (!m_halContext) -+ { -+ kdDebug(1219) << "Failed to initialize HAL!" << endl; -+ return false; -+ } -+ -+ // Main loop integration -+ kdDebug(1219) << "Main loop integration" << endl; -+ DBusError error; -+ dbus_error_init(&error); -+ DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -+ if (dbus_error_is_set(&error)) { -+ dbus_error_free(&error); -+ libhal_ctx_free(m_halContext); -+ m_halContext = NULL; -+ return false; -+ } -+ MainLoopIntegration(dbus_connection); -+ libhal_ctx_set_dbus_connection(m_halContext, dbus_connection); -+ -+ // HAL callback functions -+ kdDebug(1219) << "Callback functions" << endl; -+ libhal_ctx_set_device_added(m_halContext, HALBackend::hal_device_added); -+ libhal_ctx_set_device_removed(m_halContext, HALBackend::hal_device_removed); -+ libhal_ctx_set_device_new_capability (m_halContext, NULL); -+ libhal_ctx_set_device_lost_capability (m_halContext, NULL); -+ libhal_ctx_set_device_property_modified (m_halContext, HALBackend::hal_device_property_modified); -+ libhal_ctx_set_device_condition(m_halContext, HALBackend::hal_device_condition); - -- /* List devices at startup */ -- return ListDevices(); -+ kdDebug(1219) << "Context Init" << endl; -+ if (!libhal_ctx_init(m_halContext, &error)) -+ { -+ if (dbus_error_is_set(&error)) -+ dbus_error_free(&error); -+ libhal_ctx_free(m_halContext); -+ m_halContext = NULL; -+ kdDebug(1219) << "Failed to init HAL context!" << endl; -+ return false; -+ } -+ -+ /** @todo customize watch policy */ -+ kdDebug(1219) << "Watch properties" << endl; -+ if (!libhal_device_property_watch_all(m_halContext, &error)) -+ { -+ kdDebug(1219) << "Failed to watch HAL properties!" << endl; -+ return false; -+ } -+#endif -+ -+ /* libhal-storage initialization */ -+ kdDebug(1219) << "Storage Policy" << endl; -+ m_halStoragePolicy = libhal_storage_policy_new(); -+ /** @todo define libhal-storage icon policy */ -+ -+ /* List devices at startup */ -+ return ListDevices(); - } - - /* List devices (at startup)*/ - bool HALBackend::ListDevices() - { -- kdDebug(1219) << "ListDevices" << endl; -+ kdDebug(1219) << "ListDevices" << endl; - -- int numDevices; -- char** halDeviceList = libhal_get_all_devices(m_halContext, &numDevices, NULL); -+ int numDevices; -+ char** halDeviceList = libhal_get_all_devices(m_halContext, &numDevices, NULL); - -- if (!halDeviceList) -- return false; -+ if (!halDeviceList) -+ return false; - -- kdDebug(1219) << "HALBackend::ListDevices : " << numDevices << " devices found" << endl; -- for (int i = 0; i < numDevices; i++) -- AddDevice(halDeviceList[i], false); -+ kdDebug(1219) << "HALBackend::ListDevices : " << numDevices << " devices found" << endl; -+ for (int i = 0; i < numDevices; i++) -+ AddDevice(halDeviceList[i], false); - -- libhal_free_string_array( halDeviceList ); -- -- return true; -+ return true; - } - - /* Create a media instance for the HAL device "udi". -- This functions checks whether the device is worth listing */ -+This functions checks whether the device is worth listing */ - void HALBackend::AddDevice(const char *udi, bool allowNotification) - { -- /* We don't deal with devices that do not expose their capabilities. -- If we don't check this, we will get a lot of warning messages from libhal */ -- if (!libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -- return; -- -- /* If the device is already listed, do not process. -- This should not happen, but who knows... */ -- /** @todo : refresh properties instead ? */ -- if (m_mediaList.findById(udi)) -- return; -- -- if (libhal_device_get_property_bool(m_halContext, "/org/freedesktop/Hal/devices/computer", "storage.disable_volume_handling", NULL)) -- allowNotification=false; -- -- /* Add volume block devices */ -- if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -- { -- /* We only list volume that have a filesystem or volume that have an audio track*/ -- if ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem" && -- !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio", NULL) && -- !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL) ) -- return; -- -- if ( ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") == "filesystem" && -- !libhal_device_get_property_bool(m_halContext, udi, "volume.is_mounted", NULL ) ) && -- ( libhal_device_get_property_bool(m_halContext, udi, "volume.ignore", NULL ) ) ) -- return; -- -- /* Query drive udi */ -- QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -- /* We don't list floppy volumes because we list floppy drives */ -- if ((libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "floppy") || -- (libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "zip") || -- (libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "jaz")) -- return; -- -- // if the device is locked do not act upon it -- if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "info.locked", NULL)) -- allowNotification=false; -- -- // if the device is locked do not act upon it -- if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "storage.partition_table_changed", NULL)) -- allowNotification=false; -- -- /** @todo check exclusion list **/ -- -- /* Create medium */ -- Medium* medium = new Medium(udi, ""); -- -- QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi)); -- kdDebug() << "automount " << options["automount"] << endl; -- if (options["automount"] == "true" && allowNotification ) { -- QString error = mount(medium); -- if (!error.isEmpty()) -- kdDebug() << "error " << error << endl; -- } -- setVolumeProperties(medium); -- m_mediaList.addMedium(medium, allowNotification); -- -- return; -- } -- -- /* Floppy & zip drives */ -- if (libhal_device_query_capability(m_halContext, udi, "storage", NULL)) -- if ((libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") || -- (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") || -- (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "jaz")) -- { -- /* Create medium */ -- Medium* medium = new Medium(udi, ""); -- setFloppyProperties(medium); -- m_mediaList.addMedium(medium, allowNotification); -- return; -- } -- -- /* Camera handled by gphoto2*/ -- if (libhal_device_query_capability(m_halContext, udi, "camera", NULL) && -- ((libhal_device_get_property_QString(m_halContext, udi, "camera.access_method")=="ptp") || -- -- (libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2.support", NULL) && -- libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2.support", NULL))) -- ) -- { -- /* Create medium */ -- Medium* medium = new Medium(udi, ""); -- setCameraProperties(medium); -- m_mediaList.addMedium(medium, allowNotification); -- return; -- } -+ /* We don't deal with devices that do not expose their capabilities. -+ If we don't check this, we will get a lot of warning messages from libhal */ -+ if (!libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -+ return; -+ -+ /* If the device is already listed, do not process. -+ This should not happen, but who knows... */ -+ /** @todo : refresh properties instead ? */ -+ if (m_mediaList.findById(udi)) -+ return; -+ -+ /* Add volume block devices */ -+ if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -+ { -+ /* We only list volume that have a filesystem or volume that have an audio track*/ -+ if ( (hal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem") && -+ (!libhal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio", NULL)) && -+ (!libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL)) ) -+ return; -+ /* Query drive udi */ -+ QString driveUdi = hal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -+ /* We don't list floppy volumes because we list floppy drives */ -+ if ((hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "floppy") || -+ (hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "zip") || -+ (hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "jaz")) -+ return; -+ -+ /** @todo check exclusion list **/ -+ -+ /* Create medium */ -+ Medium* medium = new Medium(udi, ""); -+ setVolumeProperties(medium); -+ m_mediaList.addMedium(medium, allowNotification); -+ -+ return; -+ } -+ -+ /* Floppy & zip drives */ -+ if (libhal_device_query_capability(m_halContext, udi, "storage", NULL)) -+ if ((hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") || -+ (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") || -+ (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "jaz")) -+ { -+ /* Create medium */ -+ Medium* medium = new Medium(udi, ""); -+ setFloppyProperties(medium); -+ m_mediaList.addMedium(medium, allowNotification); -+ return; -+ } -+ -+ /* Camera handled by gphoto2*/ -+ if (libhal_device_query_capability(m_halContext, udi, "camera", NULL) && -+#ifdef HAL_0_4 -+ libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2_support", NULL) && -+ libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2_support", NULL) -+#else -+ ((hal_device_get_property_QString(m_halContext, udi, "camera.access_method")=="ptp") || -+ -+ (libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2.support", NULL) && -+ libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2.support", NULL))) -+#endif -+ ) -+ { -+ /* Create medium */ -+ Medium* medium = new Medium(udi, ""); -+ setCameraProperties(medium); -+ m_mediaList.addMedium(medium, allowNotification); -+ return; -+ } - } - - void HALBackend::RemoveDevice(const char *udi) - { -- m_mediaList.removeMedium(udi, true); -+ m_mediaList.removeMedium(udi, true); - } - - void HALBackend::ModifyDevice(const char *udi, const char* key) - { -- Q_UNUSED(key); -- const char* mediumUdi = findMediumUdiFromUdi(udi); -- if (!mediumUdi) -- return; -- ResetProperties(mediumUdi); -+ Q_UNUSED(key); -+ const char* mediumUdi = findMediumUdiFromUdi(udi); -+ if (!mediumUdi) -+ return; -+ ResetProperties(mediumUdi); - } - - void HALBackend::DeviceCondition(const char* udi, const char* condition) - { -- QString conditionName = QString(condition); -- kdDebug(1219) << "Processing device condition " << conditionName << " for " << udi << endl; -- -- if (conditionName == "EjectPressed") { -- const Medium* medium = m_mediaList.findById(udi); -- if (!medium) { -- /* the ejectpressed appears on the drive and we need to find the volume */ -- const QPtrList<Medium> medlist = m_mediaList.list(); -- QPtrListIterator<Medium> it (medlist); -- for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) -- { -- QString driveUdi = libhal_device_get_property_QString(m_halContext, current_medium->id().latin1(), "block.storage_device"); -- if (driveUdi == udi) -- { -- medium = current_medium; -- break; -- } -- } -- } -- if (medium) { -- KProcess p; -- p << "kio_media_mounthelper" << "-e" << medium->name(); -- p.start(KProcess::DontCare); -- } -- } -- -- const char* mediumUdi = findMediumUdiFromUdi(udi); -- kdDebug() << "findMedumUdiFromUdi " << udi << " returned " << mediumUdi << endl; -- if (!mediumUdi) -- return; -- -- /* TODO: Warn the user that (s)he should unmount devices before unplugging */ -- if (conditionName == "VolumeUnmountForced") -- ResetProperties(mediumUdi); -- -- /* Reset properties after mounting */ -- if (conditionName == "VolumeMount") -- ResetProperties(mediumUdi); -- -- /* Reset properties after unmounting */ -- if (conditionName == "VolumeUnmount") -- ResetProperties(mediumUdi); -- -+ const char* mediumUdi = findMediumUdiFromUdi(udi); -+ if (!mediumUdi) -+ return; -+ -+ QString conditionName = QString(condition); -+ kdDebug(1219) << "Processing device condition " << conditionName << " for " << udi << endl; -+ -+ /* TODO: Warn the user that (s)he should unmount devices before unplugging */ -+ if (conditionName == "VolumeUnmountForced") -+ ResetProperties(mediumUdi); -+ -+ /* Reset properties after mounting */ -+ if (conditionName == "VolumeMount") -+ ResetProperties(mediumUdi); -+ -+ /* Reset properties after unmounting */ -+ if (conditionName == "VolumeUnmount") -+ ResetProperties(mediumUdi); - } - - void HALBackend::MainLoopIntegration(DBusConnection *dbusConnection) - { -- m_dBusQtConnection = new DBusQt::Connection(m_parent); -- m_dBusQtConnection->dbus_connection_setup_with_qt_main(dbusConnection); -+ m_dBusQtConnection = new DBusQt::Connection(m_parent); -+ m_dBusQtConnection->dbus_connection_setup_with_qt_main(dbusConnection); - } - - /****************************************** -- ** Properties attribution ** -- ******************************************/ -+** Properties attribution ** -+******************************************/ - - /* Return the medium udi that should be updated when recieving a call for -- device udi */ -+device udi */ - const char* HALBackend::findMediumUdiFromUdi(const char* udi) - { -- /* Easy part : this Udi is already registered as a device */ -- const Medium* medium = m_mediaList.findById(udi); -- if (medium) -- return medium->id().ascii(); -- -- /* Hard part : this is a volume whose drive is registered */ -- if (libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -- if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -- { -- QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -- return findMediumUdiFromUdi(driveUdi.ascii()); -- } -+ /* Easy part : this Udi is already registered as a device */ -+ const Medium* medium = m_mediaList.findById(udi); -+ if (medium) -+ return medium->id().ascii(); -+ -+ /* Hard part : this is a volume whose drive is registered */ -+ if (libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -+ if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -+ { -+ QString driveUdi = hal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -+ return findMediumUdiFromUdi(driveUdi.ascii()); -+ } - -- return NULL; -+ return NULL; - } - - void HALBackend::ResetProperties(const char* mediumUdi) - { -- kdDebug(1219) << "HALBackend::setProperties" << endl; -- if ( QString::fromLatin1( mediumUdi ).startsWith( "/org/kde/" ) ) -- { -- const Medium *cmedium = m_mediaList.findById(mediumUdi); -- if ( cmedium ) -- { -- Medium m( *cmedium ); -- if ( setFstabProperties( &m ) ) { -- kdDebug() << "setFstabProperties worked" << endl; -- m_mediaList.changeMediumState(m, false); -- } -- return; -- } -- } -- -- Medium* m = new Medium(mediumUdi, ""); -- -- if (libhal_device_query_capability(m_halContext, mediumUdi, "volume", NULL)) -- setVolumeProperties(m); -- if (libhal_device_query_capability(m_halContext, mediumUdi, "storage", NULL)) -- setFloppyProperties(m); -- if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) -- setCameraProperties(m); -+ kdDebug(1219) << "HALBackend::setProperties" << endl; - -- m_mediaList.changeMediumState(*m, false); -+ Medium* m = new Medium(mediumUdi, ""); -+ -+ if (libhal_device_query_capability(m_halContext, mediumUdi, "volume", NULL)) -+ setVolumeProperties(m); -+ if (libhal_device_query_capability(m_halContext, mediumUdi, "storage", NULL)) -+ setFloppyProperties(m); -+ if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) -+ setCameraProperties(m); - -- delete m; --} -+ m_mediaList.changeMediumState(*m, false); - --void HALBackend::setVolumeProperties(Medium* medium) --{ -- kdDebug(1219) << "HALBackend::setVolumeProperties for " << medium->id() << endl; -- -- const char* udi = medium->id().ascii(); -- /* Check if the device still exists */ -- if (!libhal_device_exists(m_halContext, udi, NULL)) -- return; -- -- /* Get device information from libhal-storage */ -- LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi); -- if (!halVolume) -- return; -- QString driveUdi = libhal_volume_get_storage_device_udi(halVolume); -- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, driveUdi.ascii()); -- if (!halDrive) { -- // at times HAL sends an UnmountForced event before the device is removed -- libhal_volume_free(halVolume); -- return; -- } -- -- medium->setName( -- generateName(libhal_volume_get_device_file(halVolume)) ); -- -- medium->mountableState( -- libhal_volume_get_device_file(halVolume), /* Device node */ -- libhal_volume_get_mount_point(halVolume), /* Mount point */ -- libhal_volume_get_fstype(halVolume), /* Filesystem type */ -- libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -- -- char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -- QString volume_name = QString::fromUtf8(name); -- QString media_name = volume_name; -- medium->setLabel(media_name); -- free(name); -- -- QString mimeType; -- if (libhal_volume_is_disc(halVolume)) -- { -- mimeType = "media/cdrom" + MOUNT_SUFFIX; -- -- LibHalVolumeDiscType discType = libhal_volume_get_disc_type(halVolume); -- if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_CDR) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_CDRW)) -- if (libhal_volume_disc_is_blank(halVolume)) -- { -- mimeType = "media/blankcd"; -- medium->unmountableState(""); -- } -- else -- mimeType = "media/cdwriter" + MOUNT_SUFFIX; -- -- if ((discType == LIBHAL_VOLUME_DISC_TYPE_DVDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRAM) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_DVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRW) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW) ) -- if (libhal_volume_disc_is_blank(halVolume)) -- { -- mimeType = "media/blankdvd"; -- medium->unmountableState(""); -- } -- else -- mimeType = "media/dvd" + MOUNT_SUFFIX; -- -- if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) -- { -- mimeType = "media/audiocd"; -- medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); -- } -- -- medium->setIconName(QString::null); -- -- /* check if the disc id a vcd or a video dvd */ -- DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); -- switch (type) -- { -- case DiscType::VCD: -- mimeType = "media/vcd"; -- break; -- case DiscType::SVCD: -- mimeType = "media/svcd"; -- break; -- case DiscType::DVD: -- mimeType = "media/dvdvideo"; -- break; -- } -- } -- else -- { -- mimeType = "media/hdd" + MOUNT_SUFFIX; -- if (libhal_drive_is_hotpluggable(halDrive)) -- { -- mimeType = "media/removable" + MOUNT_SUFFIX; -- medium->needMounting(); -- switch (libhal_drive_get_type(halDrive)) { -- case LIBHAL_DRIVE_TYPE_COMPACT_FLASH: -- medium->setIconName("compact_flash" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_MEMORY_STICK: -- medium->setIconName("memory_stick" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_SMART_MEDIA: -- medium->setIconName("smart_media" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_SD_MMC: -- medium->setIconName("sd_mmc" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER: -- { -- medium->setIconName("ipod" + MOUNT_ICON_SUFFIX); -- break; -- } -- case LIBHAL_DRIVE_TYPE_CAMERA: -- { -- mimeType = "media/camera" + MOUNT_SUFFIX; -- medium->setIconName("camera" + MOUNT_ICON_SUFFIX); -- const char *physdev = libhal_drive_get_physical_device_udi(halDrive); -- // get model from camera -- if (physdev && libhal_device_query_capability(m_halContext, physdev, "camera", NULL)) -- { -- if (libhal_device_property_exists(m_halContext, physdev, "usb_device.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, "usb_device.product")); -- else if (libhal_device_property_exists(m_halContext, physdev, "usb.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, "usb.product")); -- } -- break; -- } -- case LIBHAL_DRIVE_TYPE_TAPE: -- medium->setIconName(QString::null); //FIXME need icon -- break; -- default: -- medium->setIconName(QString::null); -- } -- -- if (medium->isMounted() && QFile::exists(medium->mountPoint() + "/dcim")) -- { -- mimeType = "media/camera" + MOUNT_SUFFIX; -- medium->setIconName("camera" + MOUNT_ICON_SUFFIX); -- } -- } -- } -- medium->setMimeType(mimeType); -- -- libhal_drive_free(halDrive); -- libhal_volume_free(halVolume); -+ delete m; - } - --bool HALBackend::setFstabProperties( Medium *medium ) -+void HALBackend::setVolumeProperties(Medium* medium) - { -- QString mp = isInFstab(medium); -+ kdDebug(1219) << "HALBackend::setVolumeProperties for " << medium->id() << endl; - -- if (!mp.isNull() && !medium->id().startsWith( "/org/kde" ) ) -- { -- // now that we know it's in fstab, we have to find out if it's mounted -- KMountPoint::List mtab = KMountPoint::currentMountPoints(); -- -- KMountPoint::List::iterator it = mtab.begin(); -- KMountPoint::List::iterator end = mtab.end(); -- -- bool mounted = false; -- -- for (; it!=end; ++it) -- { -- if ((*it)->mountedFrom() == medium->deviceNode() && (*it)->mountPoint() == mp ) -- { -- mounted = true; -- break; -- } -- } -- -- kdDebug() << mp << " " << mounted << " " << medium->deviceNode() << " " << endl; -- QString fstype = medium->fsType(); -- if ( fstype.isNull() ) -- fstype = "auto"; -- -- medium->mountableState( -- medium->deviceNode(), -- mp, /* Mount point */ -- fstype, /* Filesystem type */ -- mounted ); /* Mounted ? */ -+ const char* udi = medium->id().ascii(); -+ /* Check if the device still exists */ -+ if (!libhal_device_exists(m_halContext, udi, NULL)) -+ return; -+ -+ /* Get device information from libhal-storage */ -+ LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi); -+ if (!halVolume) -+ return; -+ QString driveUdi = libhal_volume_get_storage_device_udi(halVolume); -+ LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, driveUdi.ascii()); -+ -+ medium->setName( -+ generateName(libhal_volume_get_device_file(halVolume)) ); -+ -+ medium->mountableState( -+ libhal_volume_get_device_file(halVolume), /* Device node */ -+ libhal_volume_get_mount_point(halVolume), /* Mount point */ -+ libhal_volume_get_fstype(halVolume), /* Filesystem type */ -+ libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -+ -+ char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -+ QString volume_name = QString::fromUtf8(name); -+ QString media_name = volume_name; -+ medium->setLabel(media_name); -+ free(name); - -- return true; -- } -+ QString mimeType; -+ if (libhal_volume_is_disc(halVolume)) -+ { -+ mimeType = "media/cdrom" + MOUNT_SUFFIX; - -- return false; -+ LibHalVolumeDiscType discType = libhal_volume_get_disc_type(halVolume); -+ if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_CDR) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_CDRW)) -+ if (libhal_volume_disc_is_blank(halVolume)) -+ { -+ mimeType = "media/blankcd"; -+ medium->unmountableState(""); -+ } -+ else -+ mimeType = "media/cdwriter" + MOUNT_SUFFIX; -+ -+ if ((discType == LIBHAL_VOLUME_DISC_TYPE_DVDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRAM) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_DVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRW) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW) ) -+ if (libhal_volume_disc_is_blank(halVolume)) -+ { -+ mimeType = "media/blankdvd"; -+ medium->unmountableState(""); -+ } -+ else -+ mimeType = "media/dvd" + MOUNT_SUFFIX; -+ -+ if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) -+ { -+ mimeType = "media/audiocd"; -+ medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); -+ } -+ -+ medium->setIconName(QString::null); -+ -+ /* check if the disc id a vcd or a video dvd */ -+ DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); -+ switch (type) -+ { -+ case DiscType::VCD: -+ mimeType = "media/vcd"; -+ break; -+ case DiscType::SVCD: -+ mimeType = "media/svcd"; -+ break; -+ case DiscType::DVD: -+ mimeType = "media/dvdvideo"; -+ break; -+ } -+ } -+ else -+ { -+ mimeType = "media/hdd" + MOUNT_SUFFIX; -+ const char *physdev = libhal_drive_get_physical_device_udi(halDrive); -+ if (libhal_drive_is_hotpluggable(halDrive)) -+ { -+ mimeType = "media/removable" + MOUNT_SUFFIX; -+ medium->needMounting(); -+ switch (libhal_drive_get_type(halDrive)) { -+ case LIBHAL_DRIVE_TYPE_COMPACT_FLASH: -+ medium->setIconName("compact_flash" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_MEMORY_STICK: -+ medium->setIconName("memory_stick" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_SMART_MEDIA: -+ medium->setIconName("smart_media" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_SD_MMC: -+ medium->setIconName("sd_mmc" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER: -+ medium->setIconName("ipod" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_CAMERA: -+ mimeType = "media/camera" + MOUNT_SUFFIX; -+ medium->setIconName("camera" + MOUNT_ICON_SUFFIX); -+ // get model from camera -+ if (physdev && libhal_device_query_capability(m_halContext, physdev, "camera", NULL)) -+ { -+ if (libhal_device_property_exists(m_halContext, physdev, "usb_device.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, physdev, "usb_device.product")); -+ else if (libhal_device_property_exists(m_halContext, physdev, "usb.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, physdev, "usb.product")); -+ } -+ break; -+ case LIBHAL_DRIVE_TYPE_TAPE: -+ medium->setIconName(QString::null); //FIXME need icon -+ break; -+ default: -+ medium->setIconName(QString::null); -+ }; -+ }; -+ } -+ medium->setMimeType(mimeType); - -+ libhal_drive_free(halDrive); -+ libhal_volume_free(halVolume); - } - - // Handle floppies and zip drives - void HALBackend::setFloppyProperties(Medium* medium) - { -- kdDebug(1219) << "HALBackend::setFloppyProperties for " << medium->id() << endl; -+ kdDebug(1219) << "HALBackend::setFloppyProperties for " << medium->id() << endl; - -- const char* udi = medium->id().ascii(); -- /* Check if the device still exists */ -- if (!libhal_device_exists(m_halContext, udi, NULL)) -- return; -- -- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, udi); -- if (!halDrive) -- return; -- int numVolumes; -- char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); -- LibHalVolume* halVolume = NULL; -- kdDebug(1219) << " found " << numVolumes << " volumes" << endl; -- if (numVolumes) -- halVolume = libhal_volume_from_udi(m_halContext, volumes[0]); -- -- medium->setName( -- generateName(libhal_drive_get_device_file(halDrive)) ); -- -- if (halVolume) -- { -- medium->mountableState( -- libhal_volume_get_device_file(halVolume), /* Device node */ -- libhal_volume_get_mount_point(halVolume), /* Mount point */ -- libhal_volume_get_fstype(halVolume), /* Filesystem type */ -- libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -- } -- else -- { -- // HAL hates floppies - so we have to do it twice ;( -- medium->mountableState(libhal_drive_get_device_file(halDrive), QString::null, QString::null, false); -- setFstabProperties( medium ); -- } -- -- if (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") -- { -- if (medium->isMounted()) // don't use _SUFFIX here as it accesses the volume -- medium->setMimeType("media/floppy_mounted" ); -- else -- medium->setMimeType("media/floppy_unmounted"); -- } -- -- if (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") -- { -- if (medium->isMounted()) -- medium->setMimeType("media/zip_mounted" ); -- else -- medium->setMimeType("media/zip_unmounted"); -- } -- -- /** @todo And mimtype for JAZ drives ? */ -- -- medium->setIconName(QString::null); -- -- char *name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -- -- if (name) { -- medium->setLabel( QString::fromUtf8(name) ); -- free(name); -- } -- -- free(volumes); -- libhal_drive_free(halDrive); -- libhal_volume_free(halVolume); --} -+ const char* udi = medium->id().ascii(); -+ /* Check if the device still exists */ -+ if (!libhal_device_exists(m_halContext, udi, NULL)) -+ return; -+ -+ LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, udi); -+ if (!halDrive) -+ return; -+ int numVolumes; -+ char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); -+ LibHalVolume* halVolume = NULL; -+ kdDebug(1219) << " found " << numVolumes << " volumes" << endl; -+ if (numVolumes) -+ halVolume = libhal_volume_from_udi(m_halContext, volumes[0]); - --void HALBackend::setCameraProperties(Medium* medium) --{ -- kdDebug(1219) << "HALBackend::setCameraProperties for " << medium->id() << endl; -- -- const char* udi = medium->id().ascii(); -- /* Check if the device still exists */ -- if (!libhal_device_exists(m_halContext, udi, NULL)) -- return; -- -- /** @todo find name */ -- medium->setName("camera"); -- -- QString device = "camera:/"; -- -- char *cam = libhal_device_get_property_string(m_halContext, udi, "camera.libgphoto2.name", NULL); -- DBusError error; -- dbus_error_init(&error); -- if (cam && -- libhal_device_property_exists(m_halContext, udi, "usb.linux.device_number", NULL) && -- libhal_device_property_exists(m_halContext, udi, "usb.bus_number", NULL)) -- device.sprintf("camera://%s@[usb:%03d,%03d]/", cam, -- libhal_device_get_property_int(m_halContext, udi, "usb.bus_number", &error), -- libhal_device_get_property_int(m_halContext, udi, "usb.linux.device_number", &error)); -- -- libhal_free_string(cam); -- -- /** @todo find the rest of this URL */ -- medium->unmountableState(device); -- medium->setMimeType("media/gphoto2camera"); -- medium->setIconName(QString::null); -- if (libhal_device_property_exists(m_halContext, udi, "usb_device.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb_device.product")); -- else if (libhal_device_property_exists(m_halContext, udi, "usb.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb.product")); -- else -- medium->setLabel(i18n("Camera")); --} -+ medium->setName( -+ generateName(libhal_drive_get_device_file(halDrive)) ); - --QString HALBackend::generateName(const QString &devNode) --{ -- return KURL(devNode).fileName(); --} -+ if (halVolume) -+ { -+ medium->mountableState( -+ libhal_volume_get_device_file(halVolume), /* Device node */ -+ libhal_volume_get_mount_point(halVolume), /* Mount point */ -+ libhal_volume_get_fstype(halVolume), /* Filesystem type */ -+ libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -+ } -+ else -+ { -+ medium->mountableState( -+ libhal_drive_get_device_file(halDrive), /* Device node */ -+ "", /* Mount point */ -+ "", /* Filesystem type */ -+ false ); /* Mounted ? */ -+ } - --/****************************************** -- ** HAL CALL-BACKS ** -- ******************************************/ -+ if (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") -+ { -+ if (halVolume) -+ medium->setMimeType("media/floppy" + MOUNT_SUFFIX); -+ else -+ medium->setMimeType("media/floppy_unmounted"); -+ } - --void HALBackend::hal_device_added(LibHalContext *ctx, const char *udi) --{ -- kdDebug(1219) << "HALBackend::hal_device_added " << udi << endl; -- Q_UNUSED(ctx); -- s_HALBackend->AddDevice(udi); --} -+ if (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") -+ { -+ if (halVolume) -+ medium->setMimeType("media/zip" + MOUNT_SUFFIX); -+ else -+ medium->setMimeType("media/zip_unmounted"); -+ } - --void HALBackend::hal_device_removed(LibHalContext *ctx, const char *udi) --{ -- kdDebug(1219) << "HALBackend::hal_device_removed " << udi << endl; -- Q_UNUSED(ctx); -- s_HALBackend->RemoveDevice(udi); --} -+ /** @todo And mimtype for JAZ drives ? */ - --void HALBackend::hal_device_property_modified(LibHalContext *ctx, const char *udi, -- const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) --{ -- kdDebug(1219) << "HALBackend::hal_property_modified " << udi << " -- " << key << endl; -- Q_UNUSED(ctx); -- Q_UNUSED(is_removed); -- Q_UNUSED(is_added); -- s_HALBackend->ModifyDevice(udi, key); --} -+ medium->setIconName(QString::null); - --void HALBackend::hal_device_condition(LibHalContext *ctx, const char *udi, -- const char *condition_name, -- const char* message -- ) --{ -- kdDebug(1219) << "HALBackend::hal_device_condition " << udi << " -- " << condition_name << endl; -- Q_UNUSED(ctx); -- Q_UNUSED(message); -- s_HALBackend->DeviceCondition(udi, condition_name); -+ QString media_name; -+ if (halVolume) -+ { -+ char* name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -+ QString volume_name = QString::fromUtf8(name); -+ media_name = volume_name; -+ free(name); -+ } -+ else -+ { -+ char* name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -+ QString drive_name = QString::fromUtf8(name); -+ media_name = drive_name; -+ free(name); -+ } -+ medium->setLabel(media_name); -+ -+ free(volumes); -+ libhal_drive_free(halDrive); -+ libhal_volume_free(halVolume); - } - --QStringList HALBackend::mountoptions(const QString &name) -+void HALBackend::setCameraProperties(Medium* medium) - { -- const Medium* medium = m_mediaList.findById(name); -- if (medium && !isInFstab(medium).isNull()) -- return QStringList(); // not handled by HAL - fstab entry -- -- KConfig config("mediamanagerrc"); -- config.setGroup(name); -- -- char ** array = libhal_device_get_property_strlist(m_halContext, name.latin1(), "volume.mount.valid_options", NULL); -- QMap<QString,bool> valids; -- -- for (int index = 0; array && array[index]; ++index) { -- QString t = array[index]; -- if (t.endsWith("=")) -- t = t.left(t.length() - 1); -- valids[t] = true; -- kdDebug() << "valid " << t << endl; -- } -- libhal_free_string_array(array); -- QStringList result; -- QString tmp; -- -- QString fstype = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.fstype"); -- if (fstype.isNull()) -- fstype = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.policy.mount_filesystem"); -- -- -- QString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device"); -- -- bool removable = libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.removable", NULL) -- || libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.hotpluggable", NULL); -- -- config.setGroup(drive_udi); -- bool value = config.readBoolEntry("automount", false); -- config.setGroup(name); -- -- if (libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_blank", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_vcd", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_svcd", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_videodvd", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.has_audio", NULL)) -- value = false; -- -- result << QString("automount=%1").arg(value ? "true" : "false"); -- -- if (valids.contains("ro")) -- { -- value = config.readBoolEntry("ro", false); -- tmp = QString("ro=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- if (valids.contains("quiet")) -- { -- value = config.readBoolEntry("quiet", false); -- tmp = QString("quiet=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- if (valids.contains("flush")) -- { -- value = config.readBoolEntry("flush", fstype.endsWith("fat")); -- tmp = QString("flush=%1").arg(value ? "true" : "false"); -- result << tmp; -- } -- -- if (valids.contains("uid")) -- { -- value = config.readBoolEntry("uid", true); -- tmp = QString("uid=%1").arg(value ? "true" : "false"); -- result << tmp; -- } -- -- if (valids.contains("utf8")) -- { -- value = config.readBoolEntry("utf8", true); -- tmp = QString("utf8=%1").arg(value ? "true" : "false"); -- result << tmp; -- } -- -- if (valids.contains("shortname")) -- { -- QString svalue = config.readEntry("shortname", "lower").lower(); -- if (svalue == "winnt") -- result << "shortname=winnt"; -- else if (svalue == "win95") -- result << "shortname=win95"; -- else if (svalue == "mixed") -- result << "shortname=mixed"; -- else -- result << "shortname=lower"; -- } -- -- if (valids.contains("sync")) -- { -- value = config.readBoolEntry("sync", !fstype.endsWith("fat") && removable); -- tmp = QString("sync=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- if (valids.contains("noatime")) -- { -- value = config.readBoolEntry("atime", !fstype.endsWith("fat")); -- tmp = QString("atime=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- QString mount_point = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.mount_point"); -- if (mount_point.isEmpty()) -- mount_point = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.policy.desired_mount_point"); -- -- mount_point = config.readEntry("mountpoint", mount_point); -- -- if (!mount_point.startsWith("/")) -- mount_point = "/media/" + mount_point; -- -- result << QString("mountpoint=%1").arg(mount_point); -- result << QString("filesystem=%1").arg(fstype); -- -- if (valids.contains("data")) -- { -- QString svalue = config.readEntry("journaling").lower(); -- if (svalue == "ordered") -- result << "journaling=ordered"; -- else if (svalue == "writeback") -- result << "journaling=writeback"; -- else if (svalue == "data") -- result << "journaling=data"; -- else -- result << "journaling=ordered"; -- } -+ kdDebug(1219) << "HALBackend::setCameraProperties for " << medium->id() << endl; - -- return result; -+ const char* udi = medium->id().ascii(); -+ /* Check if the device still exists */ -+ if (!libhal_device_exists(m_halContext, udi, NULL)) -+ return; -+ -+ /** @todo find name */ -+ medium->setName("camera"); -+ /** @todo find the rest of this URL */ -+ medium->unmountableState("camera:/"); -+ medium->setMimeType("media/gphoto2camera"); -+ medium->setIconName(QString::null); -+ if (libhal_device_property_exists(m_halContext, udi, "usb_device.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, udi, "usb_device.product")); -+ else if (libhal_device_property_exists(m_halContext, udi, "usb.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, udi, "usb.product")); -+ else -+ medium->setLabel(i18n("Camera")); - } - --bool HALBackend::setMountoptions(const QString &name, const QStringList &options ) -+QString HALBackend::generateName(const QString &devNode) - { -- kdDebug() << "setMountoptions " << name << " " << options << endl; -- -- KConfig config("mediamanagerrc"); -- config.setGroup(name); -- -- QMap<QString,QString> valids = MediaManagerUtils::splitOptions(options); -- -- const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 }; -- for (int index = 0; names[index]; ++index) -- if (valids.contains(names[index])) -- config.writeEntry(names[index], valids[names[index]] == "true"); -- -- if (valids.contains("shortname")) -- config.writeEntry("shortname", valids["shortname"]); -- -- if (valids.contains("journaling")) -- config.writeEntry("journaling", valids["journaling"]); -- -- if (!mountoptions(name).contains(QString("mountpoint=%1").arg(valids["mountpoint"]))) -- config.writeEntry("mountpoint", valids["mountpoint"]); -- -- if (valids.contains("automount")) { -- QString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device"); -- config.setGroup(drive_udi); -- config.writeEntry("automount", valids["automount"]); -- } -- -- return true; -+ return KURL(devNode).fileName(); - } - --static QString mount_priv(const char *udi, const char *mount_point, const char **poptions, int noptions, -- DBusConnection *dbus_connection) --{ -- DBusMessage *dmesg, *reply; -- DBusError error; -- -- const char *fstype = ""; -- if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, -- "org.freedesktop.Hal.Device.Volume", -- "Mount"))) { -- kdDebug() << "mount failed for " << udi << ": could not create dbus message\n"; -- return i18n("Internal Error"); -- } -- -- if (!dbus_message_append_args (dmesg, DBUS_TYPE_STRING, &mount_point, DBUS_TYPE_STRING, &fstype, -- DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &poptions, noptions, -- DBUS_TYPE_INVALID)) -- { -- kdDebug() << "mount failed for " << udi << ": could not append args to dbus message\n"; -- dbus_message_unref (dmesg); -- return i18n("Internal Error"); -- } -- -- QString qerror; -- -- dbus_error_init (&error); -- if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) -- { -- QString qerror = error.message; -- kdError() << "mount failed for " << udi << ": " << error.name << " - " << qerror << endl; -- if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.UnknownFilesystemType")) -- qerror = i18n("Invalid filesystem type"); -- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.PermissionDenied")) -- qerror = i18n("Permissions denied"); -- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.AlreadyMounted")) -- qerror = i18n("Device is already mounted."); -- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.InvalidMountpoint") && strlen(mount_point)) { -- dbus_message_unref (dmesg); -- dbus_error_free (&error); -- return mount_priv(udi, "", poptions, noptions, dbus_connection); -- } -- dbus_message_unref (dmesg); -- dbus_error_free (&error); -- return qerror; -- } -- -- kdDebug() << "mount queued for " << udi << endl; -- -- dbus_message_unref (dmesg); -- dbus_message_unref (reply); -- -- return qerror; -+/****************************************** -+** HAL CALL-BACKS ** -+******************************************/ - -+#ifdef HAL_0_4 -+void HALBackend::hal_main_loop_integration(LibHalContext *ctx, -+ DBusConnection *dbus_connection) -+{ -+ kdDebug(1219) << "HALBackend::hal_main_loop_integration" << endl; -+ Q_UNUSED(ctx); -+ s_HALBackend->MainLoopIntegration(dbus_connection); - } -+#endif - --void HALBackend::slotResult(KIO::Job *job) -+void HALBackend::hal_device_added(LibHalContext *ctx, const char *udi) - { -- kdDebug() << "slotResult " << mount_jobs[job] << endl; -- if (job->error()) -- { -- KMessageBox::error(0, job->errorText()); -- } -- ResetProperties( mount_jobs[job].latin1() ); -- mount_jobs.remove(job); -+ kdDebug(1219) << "HALBackend::hal_device_added " << udi << endl; -+ Q_UNUSED(ctx); -+ s_HALBackend->AddDevice(udi); - } - --QString HALBackend::isInFstab(const Medium *medium) -+void HALBackend::hal_device_removed(LibHalContext *ctx, const char *udi) - { -- KMountPoint::List fstab = KMountPoint::possibleMountPoints(KMountPoint::NeedMountOptions|KMountPoint::NeedRealDeviceName); -- -- KMountPoint::List::iterator it = fstab.begin(); -- KMountPoint::List::iterator end = fstab.end(); -- -- for (; it!=end; ++it) -- { -- kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl; -- if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && (*it)->realDeviceName() == medium->deviceNode() ) ) -- { -- QStringList opts = (*it)->mountOptions(); -- if (opts.contains("user") || opts.contains("users")) -- return (*it)->mountPoint(); -- } -- } -- -- return QString::null; -+ kdDebug(1219) << "HALBackend::hal_device_removed " << udi << endl; -+ Q_UNUSED(ctx); -+ s_HALBackend->RemoveDevice(udi); - } - --QString HALBackend::mount(const Medium *medium) --{ -- if (medium->isMounted()) -- return QString(); // that was easy -- -- QString mountPoint = isInFstab(medium); -- if (!mountPoint.isNull()) -- { -- kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; -- KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint ); -- connect(job, SIGNAL( result (KIO::Job *)), -- SLOT( slotResult( KIO::Job *))); -- mount_jobs[job] = medium->id(); -- return QString(); // we won't report an error here -- } else if (medium->id().startsWith("/org/kde/") ) -- return i18n("Permissions denied"); -- -- QStringList soptions; -- -- kdDebug() << "mounting " << medium->id() << "..." << endl; -- -- QMap<QString,QString> valids = MediaManagerUtils::splitOptions(mountoptions(medium->id())); -- if (valids["flush"] == "true") -- soptions << "flush"; -- -- if (valids["uid"] == "true") -- { -- soptions << QString("uid=%1").arg(getuid()); -- } -- -- if (valids["ro"] == "true") -- soptions << "ro"; -- -- if (valids["atime"] != "true") -- soptions << "noatime"; -- -- if (valids["quiet"] == "true") -- soptions << "quiet"; -- -- if (valids["utf8"] == "true") -- soptions << "utf8"; -- -- if (valids["sync"] == "true") -- soptions << "sync"; -- -- QString mount_point = valids["mountpoint"]; -- if (mount_point.startsWith("/media/")) -- mount_point = mount_point.mid(7); -- -- if (valids.contains("shortname")) -- { -- soptions << QString("shortname=%1").arg(valids["shortname"]); -- } -- -- if (valids.contains("journaling")) -- { -- QString option = valids["journaling"]; -- if (option == "data") -- soptions << QString("data=journal"); -- else if (option == "writeback") -- soptions << QString("data=writeback"); -- else -- soptions << QString("data=ordered"); -- } -- -- const char **options = new const char*[soptions.size() + 1]; -- uint noptions = 0; -- for (QStringList::ConstIterator it = soptions.begin(); it != soptions.end(); ++it, ++noptions) -- options[noptions] = (*it).latin1(); -- options[noptions] = NULL; -- -- QString qerror = mount_priv(medium->id().latin1(), mount_point.utf8(), options, noptions, dbus_connection); -- if (!qerror.isEmpty()) { -- kdError() << "mounting " << medium->id() << " returned " << qerror << endl; -- return qerror; -- } -- -- medium->setHalMounted(true); -- ResetProperties(medium->id().latin1()); -- -- return QString(); --} -- --QString HALBackend::mount(const QString &_udi) -+void HALBackend::hal_device_property_modified(LibHalContext *ctx, const char *udi, -+ const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) - { -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- return i18n("No such medium: %1").arg(_udi); -- -- return mount(medium); -+ kdDebug(1219) << "HALBackend::hal_property_modified " << udi << " -- " << key << endl; -+ Q_UNUSED(ctx); -+ Q_UNUSED(is_removed); -+ Q_UNUSED(is_added); -+ s_HALBackend->ModifyDevice(udi, key); - } - --QString HALBackend::unmount(const QString &_udi) --{ -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- { // now we get fancy: if the udi is no volume, it _might_ be a device with only one -- // volume on it (think CDs) - so we're so nice to the caller to unmount that volume -- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, _udi.latin1()); -- if (halDrive) -- { -- int numVolumes; -- char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); -- if (numVolumes == 1) -- medium = m_mediaList.findById( volumes[0] ); -- } -- } -- -- if ( !medium ) -- return i18n("No such medium: %1").arg(_udi); -- -- if (!medium->isMounted()) -- return QString(); // that was easy -- -- QString mountPoint = isInFstab(medium); -- if (!mountPoint.isNull()) -- { -- kdDebug() << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl; -- KIO::Job *job = KIO::unmount( medium->mountPoint(), false ); -- connect(job, SIGNAL( result (KIO::Job *)), -- SLOT( slotResult( KIO::Job *))); -- mount_jobs[job] = medium->id(); -- return QString(); // we won't report an error here -- } -- -- DBusMessage *dmesg, *reply; -- DBusError error; -- const char *options[2]; -- -- const char *udi = medium->id().latin1(); -- kdDebug() << "unmounting " << udi << "..." << endl; -- -- dbus_error_init(&error); -- DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -- if (dbus_error_is_set(&error)) -- { -- dbus_error_free(&error); -- return false; -- } -- -- if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, -- "org.freedesktop.Hal.Device.Volume", -- "Unmount"))) { -- kdDebug() << "unmount failed for " << udi << ": could not create dbus message\n"; -- return i18n("Internal Error"); -- } -- -- options[0] = "force"; -- options[1] = 0; -- -- if (!dbus_message_append_args (dmesg, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, 0, -- DBUS_TYPE_INVALID)) -- { -- kdDebug() << "unmount failed for " << udi << ": could not append args to dbus message\n"; -- dbus_message_unref (dmesg); -- return i18n("Internal Error"); -- } -- -- dbus_error_init (&error); -- if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) -- { -- kdDebug() << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl; -- QString qerror = error.message; -- if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.Busy")) { -- qerror = QString("<qt>") + i18n("Device is Busy:"); -- QString cmdline = QString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint())); -- FILE *fuser = popen(cmdline.latin1(), "r"); -- uint counter = 0; -- if (fuser) { -- qerror += "<pre>"; -- QTextIStream is(fuser); -- QString tmp; -- while (!is.atEnd()) { -- tmp = is.readLine(); -- tmp = QStyleSheet::escape(tmp) + "\n"; -- -- qerror += tmp; -- if (counter++ > 20) -- { -- qerror += "..."; -- break; -- } -- } -- qerror += "</pre>"; -- (void)pclose( fuser ); -- } -- qerror += "</qt>"; -- } else if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.NotMounted")) { -- // this is faking. The error is that the device wasn't mounted by hal (but by the system) -- qerror = i18n("Permissions denied"); -- } -- -- dbus_message_unref (dmesg); -- dbus_error_free (&error); -- return qerror; -- } -- -- kdDebug() << "unmount queued for " << udi << endl; -- -- dbus_message_unref (dmesg); -- dbus_message_unref (reply); -- -- medium->setHalMounted(false); -- ResetProperties(udi); -- -- return QString(); -+void HALBackend::hal_device_condition(LibHalContext *ctx, const char *udi, -+ const char *condition_name, -+ #ifdef HAL_0_4 -+ DBusMessage *message -+ #else -+ const char* message -+ #endif -+ ) -+{ -+ kdDebug(1219) << "HALBackend::hal_device_condition " << udi << " -- " << condition_name << endl; -+ Q_UNUSED(ctx); -+ Q_UNUSED(message); -+ s_HALBackend->DeviceCondition(udi, condition_name); - } - - #include "halbackend.moc" -diff -urN kioslave/media/mediamanager/halbackend.h kioslave/media/mediamanager/halbackend.h ---- kioslave/media/mediamanager/halbackend.h Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/halbackend.h Mon Oct 10 17:04:01 2005 -@@ -45,9 +45,65 @@ - #include <libhal.h> - #include <libhal-storage.h> - --namespace KIO { -- class Job; --} -+/* The HAL API changed between 0.4 and 0.5 series. -+These defines enable backward compatibility */ -+#ifdef HAL_0_4 -+ // libhal-storage 0.4 API -+ #define LibHalStoragePolicy HalStoragePolicy -+ #define LibHalDrive HalDrive -+ #define LibHalVolume HalVolume -+ #define LibHalVolumeDiscType HalVolumeDiscType -+ #define libhal_storage_policy_free hal_storage_policy_free -+ #define libhal_storage_policy_new hal_storage_policy_new -+ #define libhal_drive_from_udi hal_drive_from_udi -+ #define libhal_drive_find_all_volumes hal_drive_find_all_volumes -+ #define libhal_drive_get_type hal_drive_get_type -+ #define libhal_drive_get_device_file hal_drive_get_device_file -+ #define libhal_drive_free hal_drive_free -+ #define libhal_drive_policy_compute_display_name hal_drive_policy_compute_display_name -+ #define libhal_drive_is_hotpluggable hal_drive_is_hotpluggable -+ #define libhal_drive_get_physical_device_udi hal_drive_get_physical_device_udi -+ #define libhal_volume_from_udi hal_volume_from_udi -+ #define libhal_volume_get_device_file hal_volume_get_device_file -+ #define libhal_volume_get_mount_point hal_volume_get_mount_point -+ #define libhal_volume_get_fstype hal_volume_get_fstype -+ #define libhal_volume_is_mounted hal_volume_is_mounted -+ #define libhal_volume_get_disc_type hal_volume_get_disc_type -+ #define libhal_volume_free hal_volume_free -+ #define libhal_volume_policy_compute_display_name hal_volume_policy_compute_display_name -+ #define libhal_volume_disc_has_data hal_volume_disc_has_data -+ #define libhal_volume_disc_has_audio hal_volume_disc_has_audio -+ #define libhal_volume_disc_is_blank hal_volume_disc_is_blank -+ #define libhal_volume_is_disc hal_volume_is_disc -+ #define libhal_volume_get_storage_device_udi hal_volume_get_storage_device_udi -+ #define LIBHAL_VOLUME_DISC_TYPE_CDROM HAL_VOLUME_DISC_TYPE_CDROM -+ #define LIBHAL_VOLUME_DISC_TYPE_CDR HAL_VOLUME_DISC_TYPE_CDR -+ #define LIBHAL_VOLUME_DISC_TYPE_CDRW HAL_VOLUME_DISC_TYPE_CDRW -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDROM HAL_VOLUME_DISC_TYPE_DVDROM -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDRAM HAL_VOLUME_DISC_TYPE_DVDRAM -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDR HAL_VOLUME_DISC_TYPE_DVDR -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDRW HAL_VOLUME_DISC_TYPE_DVDRW -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR HAL_VOLUME_DISC_TYPE_DVDPLUSR -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW HAL_VOLUME_DISC_TYPE_DVDPLUSRW -+ #define LIBHAL_DRIVE_TYPE_COMPACT_FLASH HAL_DRIVE_TYPE_COMPACT_FLASH -+ #define LIBHAL_DRIVE_TYPE_MEMORY_STICK HAL_DRIVE_TYPE_MEMORY_STICK -+ #define LIBHAL_DRIVE_TYPE_SMART_MEDIA HAL_DRIVE_TYPE_SMART_MEDIA -+ #define LIBHAL_DRIVE_TYPE_SD_MMC HAL_DRIVE_TYPE_SD_MMC -+ #define LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER HAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER -+ #define LIBHAL_DRIVE_TYPE_CAMERA HAL_DRIVE_TYPE_CAMERA -+ #define LIBHAL_DRIVE_TYPE_TAPE HAL_DRIVE_TYPE_TAPE -+ -+ // libhal 0.4 API -+ #define libhal_free_string hal_free_string -+ #define libhal_device_exists(ctx, udi, error) hal_device_exists(ctx, udi) -+ #define libhal_device_property_watch_all(ctx, error) hal_device_property_watch_all(ctx) -+ #define libhal_get_all_devices(ctx, num_devices, error) hal_get_all_devices(ctx, num_devices) -+ #define libhal_device_property_exists(ctx, udi, key, error) hal_device_property_exists(ctx, udi, key) -+ #define libhal_device_get_property_bool(ctx, udi, key, error) hal_device_get_property_bool(ctx, udi, key) -+ #define libhal_device_get_property_string(ctx, udi, key, error) hal_device_get_property_string(ctx, udi, key) -+ #define libhal_device_query_capability(ctx, udi, capability, error) hal_device_query_capability(ctx, udi, capability) -+#endif -+ - - /** - * A handy function to query a hal string -@@ -88,14 +144,6 @@ - */ - bool ListDevices(); - -- QStringList mountoptions(const QString &id); -- -- bool setMountoptions(const QString &id, const QStringList &options); -- -- QString mount(const QString &id); -- QString mount(const Medium *medium); -- QString unmount(const QString &id); -- - private: - /** - * Append a device in the media list. This function will check if the device -@@ -147,16 +195,20 @@ - - void setVolumeProperties(Medium* medium); - void setFloppyProperties(Medium* medium); -- bool setFstabProperties(Medium* medium); - void setCameraProperties(Medium* medium); - QString generateName(const QString &devNode); -- static QString isInFstab(const Medium *medium); -- --private slots: -- void slotResult(KIO::Job *job); - - /* Hal call-backs -- from gvm*/ - public: -+#ifdef HAL_0_4 -+ /** Invoked by libhal for integration with our mainloop. -+ * -+ * @param ctx LibHal context -+ * @param dbus_connection D-BUS connection to integrate -+ */ -+ static void hal_main_loop_integration(LibHalContext *ctx, DBusConnection *dbus_connection); -+#endif -+ - /** Invoked when a device is added to the Global Device List. - * - * @param ctx LibHal context -@@ -189,7 +241,11 @@ - */ - static void hal_device_condition(LibHalContext *ctx, const char *udi, - const char *condition_name, -+ #ifdef HAL_0_4 -+ DBusMessage *message -+ #else - const char* message -+ #endif - ); - - /* HAL and DBus structures */ -@@ -199,6 +255,13 @@ - */ - LibHalContext* m_halContext; - -+#ifdef HAL_0_4 -+ /** -+ * Structure defining the hal callback function for devices events -+ */ -+ LibHalFunctions m_halFunctions; -+#endif -+ - /** - * libhal-storage HAL policy, e.g. for icon names - */ -@@ -213,10 +276,6 @@ - * Object for the kded module - */ - QObject* m_parent; -- -- DBusConnection *dbus_connection; -- -- QMap<KIO::Job *, QString> mount_jobs; - }; - - #endif /* _HALBACKEND_H_ */ -diff -urN kioslave/media/mediamanager/linuxcdpolling.cpp kioslave/media/mediamanager/linuxcdpolling.cpp ---- kioslave/media/mediamanager/linuxcdpolling.cpp Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/linuxcdpolling.cpp Mon Oct 10 17:04:01 2005 -@@ -23,6 +23,7 @@ - - #include <qthread.h> - #include <qmutex.h> -+#include <qtimer.h> - #include <qfile.h> - - #include <kdebug.h> -@@ -188,7 +189,9 @@ - const QString &, bool, bool)), - this, SLOT(slotMediumStateChanged(const QString &)) ); - -- connect(&m_timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); -+ QTimer *timer = new QTimer(this); -+ connect(timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); -+ timer->start(500); - } - - LinuxCDPolling::~LinuxCDPolling() -@@ -226,7 +229,6 @@ - PollingThread *thread = new PollingThread(dev); - m_threads[id] = thread; - thread->start(); -- m_timer.start(500); - } - } - -@@ -266,7 +268,6 @@ - PollingThread *thread = new PollingThread(dev); - m_threads[id] = thread; - thread->start(); -- m_timer.start(500); - } - else if (m_threads.contains(id) && medium->isMounted()) - { -@@ -281,12 +282,6 @@ - void LinuxCDPolling::slotTimeout() - { - //kdDebug(1219) << "LinuxCDPolling::slotTimeout()" << endl; -- -- if (m_threads.isEmpty()) -- { -- m_timer.stop(); -- return; -- } - - QMap<QString, PollingThread*>::iterator it = m_threads.begin(); - QMap<QString, PollingThread*>::iterator end = m_threads.end(); -diff -urN kioslave/media/mediamanager/linuxcdpolling.h kioslave/media/mediamanager/linuxcdpolling.h ---- kioslave/media/mediamanager/linuxcdpolling.h Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/linuxcdpolling.h Mon Oct 10 17:04:01 2005 -@@ -24,7 +24,6 @@ - #include <qobject.h> - #include <qcstring.h> - #include <qmap.h> --#include <qtimer.h> - - class DiscType - { -@@ -80,7 +79,6 @@ - - QMap<QString, PollingThread*> m_threads; - QStringList m_excludeNotification; -- QTimer m_timer; - }; - - #endif -diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanager/mediamanager.cpp ---- kioslave/media/mediamanager/mediamanager.cpp Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/mediamanager.cpp Mon Oct 10 17:04:01 2005 -@@ -43,287 +43,201 @@ - MediaManager::MediaManager(const QCString &obj) - : KDEDModule(obj), m_dirNotify(m_mediaList) - { -- connect( &m_mediaList, SIGNAL(mediumAdded(const QString&, const QString&, bool)), -- SLOT(slotMediumAdded(const QString&, const QString&, bool)) ); -- connect( &m_mediaList, SIGNAL(mediumRemoved(const QString&, const QString&, bool)), -- SLOT(slotMediumRemoved(const QString&, const QString&, bool)) ); -- connect( &m_mediaList, -- SIGNAL(mediumStateChanged(const QString&, const QString&, bool, bool)), -- SLOT(slotMediumChanged(const QString&, const QString&, bool, bool)) ); -+ connect( &m_mediaList, SIGNAL(mediumAdded(const QString&, const QString&, bool)), -+ SLOT(slotMediumAdded(const QString&, const QString&, bool)) ); -+ connect( &m_mediaList, SIGNAL(mediumRemoved(const QString&, const QString&, bool)), -+ SLOT(slotMediumRemoved(const QString&, const QString&, bool)) ); -+ connect( &m_mediaList, -+ SIGNAL(mediumStateChanged(const QString&, const QString&, bool, bool)), -+ SLOT(slotMediumChanged(const QString&, const QString&, bool, bool)) ); - -- QTimer::singleShot( 10, this, SLOT( loadBackends() ) ); -+ QTimer::singleShot( 10, this, SLOT( loadBackends() ) ); - } - - MediaManager::~MediaManager() - { -- while ( !m_backends.isEmpty() ) -- { -- BackendBase *b = m_backends.first(); -- m_backends.remove( b ); -- delete b; -- } -+ while ( !m_backends.isEmpty() ) -+ { -+ BackendBase *b = m_backends.first(); -+ m_backends.remove( b ); -+ delete b; -+ } - } - - void MediaManager::loadBackends() - { - m_mediaList.blockSignals(true); - -- while ( !m_backends.isEmpty() ) -- { -- BackendBase *b = m_backends.first(); -- m_backends.remove( b ); -- delete b; -- } -- -- mp_removableBackend = 0L; -- m_halbackend = 0L; -- m_fstabbackend = 0L; -+ while ( !m_backends.isEmpty() ) -+ { -+ BackendBase *b = m_backends.first(); -+ m_backends.remove( b ); -+ delete b; -+ } -+ -+ mp_removableBackend = 0L; - - #ifdef COMPILE_HALBACKEND -- if ( MediaManagerSettings::self()->halBackendEnabled() ) -- { -- m_halbackend = new HALBackend(m_mediaList, this); -- if (m_halbackend->InitHal()) -- { -- m_backends.append( m_halbackend ); -- m_fstabbackend = new FstabBackend(m_mediaList, true); -- m_backends.append( m_fstabbackend ); -- // No need to load something else... -- m_mediaList.blockSignals(false); -- return; -- } -- else -- { -- delete m_halbackend; -- m_halbackend = 0; -- } -- } -+ if ( MediaManagerSettings::self()->halBackendEnabled() ) -+ { -+ HALBackend* hal_backend = new HALBackend(m_mediaList, this); -+ if (hal_backend->InitHal()) -+ { -+ m_backends.append( hal_backend ); -+ m_backends.append( new FstabBackend(m_mediaList, true) ); -+ // No need to load something else... -+ m_mediaList.blockSignals(false); -+ return; -+ } -+ else -+ { -+ delete hal_backend; -+ } -+ } - #endif // COMPILE_HALBACKEND - -- mp_removableBackend = new RemovableBackend(m_mediaList); -- m_backends.append( mp_removableBackend ); -+ mp_removableBackend = new RemovableBackend(m_mediaList); -+ m_backends.append( mp_removableBackend ); - - #ifdef COMPILE_LINUXCDPOLLING -- if ( MediaManagerSettings::self()->cdPollingEnabled() ) -- { -- m_backends.append( new LinuxCDPolling(m_mediaList) ); -- } -+ if ( MediaManagerSettings::self()->cdPollingEnabled() ) -+ { -+ m_backends.append( new LinuxCDPolling(m_mediaList) ); -+ } - #endif //COMPILE_LINUXCDPOLLING - -- m_fstabbackend = new FstabBackend(m_mediaList); -- m_backends.append( m_fstabbackend ); -- m_mediaList.blockSignals(false); -+ m_backends.append( new FstabBackend(m_mediaList) ); -+ m_mediaList.blockSignals(false); - } - - - QStringList MediaManager::fullList() - { -- QPtrList<Medium> list = m_mediaList.list(); -+ QPtrList<Medium> list = m_mediaList.list(); - -- QStringList result; -+ QStringList result; - -- QPtrList<Medium>::const_iterator it = list.begin(); -- QPtrList<Medium>::const_iterator end = list.end(); -- for (; it!=end; ++it) -- { -- result+= (*it)->properties(); -- result+= Medium::SEPARATOR; -- } -+ QPtrList<Medium>::const_iterator it = list.begin(); -+ QPtrList<Medium>::const_iterator end = list.end(); -+ for (; it!=end; ++it) -+ { -+ result+= (*it)->properties(); -+ result+= Medium::SEPARATOR; -+ } - -- return result; -+ return result; - } - - QStringList MediaManager::properties(const QString &name) - { -- const Medium *m = m_mediaList.findByName(name); -- -- if (!m) -- { -- KURL u(name); -- kdDebug() << "Media::prop " << name << " " << u.isValid() << endl; -- if (u.isValid()) -- { -- if (u.protocol() == "system") -- { -- QString path = u.path(); -- if (path.startsWith("/media/")) -- path = path.mid(strlen("/media/")); -- m = m_mediaList.findByName(path); -- kdDebug() << "findByName " << path << m << endl; -- } -- else if (u.protocol() == "media") -- { -- m = m_mediaList.findByName(u.filename()); -- kdDebug() << "findByName " << u.filename() << m << endl; -- } -- else if (u.protocol() == "file") -- { -- // look for the mount point -- QPtrList<Medium> list = m_mediaList.list(); -- QPtrList<Medium>::const_iterator it = list.begin(); -- QPtrList<Medium>::const_iterator end = list.end(); -- for (; it!=end; ++it) -- { -- kdDebug() << "comparing " << (*it)->mountPoint() << " " << u.path() << " " << (*it)->deviceNode() << endl; -- if ((*it)->mountPoint() == u.path() || (*it)->deviceNode() == u.path()) { -- m = *it; -- break; -- } -- } -- } -- } -- } -- -- if (m) -- return m->properties(); -- else -- return QStringList(); --} -+ const Medium *m = m_mediaList.findByName(name); - --QStringList MediaManager::mountoptions(const QString &name) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return QStringList(); -- return m_halbackend->mountoptions(name); --#else -- return QStringList(); --#endif --} -- --bool MediaManager::setMountoptions(const QString &name, const QStringList &options) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return false; -- return m_halbackend->setMountoptions(name, options); --#else -- return false; --#endif --} -- --QString MediaManager::mount(const QString &name) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return i18n("Feature only available with HAL"); -- return m_halbackend->mount(name); --#else -- if ( !m_fstabbackend ) // lying :) -- return i18n("Feature only available with HAL"); -- return m_fstabbackend->mount( name ); --#endif --} -- --QString MediaManager::unmount(const QString &name) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return i18n("Feature only available with HAL"); -- return m_halbackend->unmount(name); --#else -- if ( !m_fstabbackend ) // lying :) -- return i18n("Feature only available with HAL"); -- return m_fstabbackend->unmount( name ); --#endif -+ if (m!=0L) -+ { -+ return m->properties(); -+ } -+ else -+ { -+ return QStringList(); -+ } - } - - QString MediaManager::nameForLabel(const QString &label) - { -- const QPtrList<Medium> media = m_mediaList.list(); -+ const QPtrList<Medium> media = m_mediaList.list(); - -- QPtrList<Medium>::const_iterator it = media.begin(); -- QPtrList<Medium>::const_iterator end = media.end(); -- for (; it!=end; ++it) -- { -- const Medium *m = *it; -- -- if (m->prettyLabel()==label) -- { -- return m->name(); -- } -- } -+ QPtrList<Medium>::const_iterator it = media.begin(); -+ QPtrList<Medium>::const_iterator end = media.end(); -+ for (; it!=end; ++it) -+ { -+ const Medium *m = *it; -+ -+ if (m->prettyLabel()==label) -+ { -+ return m->name(); -+ } -+ } - -- return QString::null; -+ return QString::null; - } - - ASYNC MediaManager::setUserLabel(const QString &name, const QString &label) - { -- m_mediaList.setUserLabel(name, label); -+ m_mediaList.setUserLabel(name, label); - } - - ASYNC MediaManager::reloadBackends() - { -- MediaManagerSettings::self()->readConfig(); -- loadBackends(); -+ MediaManagerSettings::self()->readConfig(); -+ loadBackends(); - } - - bool MediaManager::removablePlug(const QString &devNode, const QString &label) - { -- if (mp_removableBackend) -- { -- return mp_removableBackend->plug(devNode, label); -- } -- return false; -+ if (mp_removableBackend) -+ { -+ return mp_removableBackend->plug(devNode, label); -+ } -+ return false; - } - - bool MediaManager::removableUnplug(const QString &devNode) - { -- if (mp_removableBackend) -- { -- return mp_removableBackend->unplug(devNode); -- } -- return false; -+ if (mp_removableBackend) -+ { -+ return mp_removableBackend->unplug(devNode); -+ } -+ return false; - } - - bool MediaManager::removableCamera(const QString &devNode) - { -- if (mp_removableBackend) -- { -- return mp_removableBackend->camera(devNode); -- } -- return false; -+ if (mp_removableBackend) -+ { -+ return mp_removableBackend->camera(devNode); -+ } -+ return false; - } - - - void MediaManager::slotMediumAdded(const QString &/*id*/, const QString &name, - bool allowNotification) - { -- kdDebug(1219) << "MediaManager::slotMediumAdded: " << name << endl; -+ kdDebug(1219) << "MediaManager::slotMediumAdded: " << name << endl; - -- KDirNotify_stub notifier("*", "*"); -- notifier.FilesAdded( KURL("media:/") ); -+ KDirNotify_stub notifier("*", "*"); -+ notifier.FilesAdded( KURL("media:/") ); - -- emit mediumAdded(name, allowNotification); -- emit mediumAdded(name); -+ emit mediumAdded(name, allowNotification); -+ emit mediumAdded(name); - } - - void MediaManager::slotMediumRemoved(const QString &/*id*/, const QString &name, - bool allowNotification) - { -- kdDebug(1219) << "MediaManager::slotMediumRemoved: " << name << endl; -+ kdDebug(1219) << "MediaManager::slotMediumRemoved: " << name << endl; - -- KDirNotify_stub notifier("*", "*"); -- notifier.FilesRemoved( KURL("media:/"+name) ); -+ KDirNotify_stub notifier("*", "*"); -+ notifier.FilesRemoved( KURL("media:/"+name) ); - -- emit mediumRemoved(name, allowNotification); -- emit mediumRemoved(name); -+ emit mediumRemoved(name, allowNotification); -+ emit mediumRemoved(name); - } - - void MediaManager::slotMediumChanged(const QString &/*id*/, const QString &name, - bool mounted, bool allowNotification) - { -- kdDebug(1219) << "MediaManager::slotMediumChanged: " << name << endl; -+ kdDebug(1219) << "MediaManager::slotMediumChanged: " << name << endl; - -- KDirNotify_stub notifier("*", "*"); -- if (!mounted) -- { -- notifier.FilesRemoved( KURL("media:/"+name) ); -- } -- notifier.FilesChanged( KURL("media:/"+name) ); -+ KDirNotify_stub notifier("*", "*"); -+ if (!mounted) -+ { -+ notifier.FilesRemoved( KURL("media:/"+name) ); -+ } -+ notifier.FilesChanged( KURL("media:/"+name) ); - -- emit mediumChanged(name, allowNotification); -- emit mediumChanged(name); -+ emit mediumChanged(name, allowNotification); -+ emit mediumChanged(name); - } - - -diff -urN kioslave/media/mediamanager/mediamanager.desktop kioslave/media/mediamanager/mediamanager.desktop ---- kioslave/media/mediamanager/mediamanager.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/mediamanager.desktop Tue May 23 13:33:34 2006 -@@ -16,13 +16,11 @@ - Name[es]=Administrador de recursos KDED - Name[et]=KDED andmekandjate haldur - Name[eu]=KDED media kudeatzailea --Name[fa]=مدیر رسانه KDED - Name[fi]=KDED-tallennusmedianhallinta - Name[fr]=Gestionnaire de médias KDED - Name[fy]=KDEDED-mediabehearder - Name[ga]=Bainisteoir Meán KDED - Name[gl]=Xestor de Meios de KDED --Name[he]=מנהל המדיה של KDED - Name[hi]=केडीईडी मीडिया प्रबंधक - Name[hr]=KDED upravitelj medija - Name[hu]=KDED médiakezelő -@@ -45,7 +43,6 @@ - Name[ru]=Управление подключаемыми устройствами - Name[rw]=Mugenga Igihuza KDED - Name[se]=KDED-mediagieđahalli --Name[sk]=KDED správca médií - Name[sl]=Upravitelj medijev KDED - Name[sr]=Менаџер медијума, KDED - Name[sr@Latn]=Menadžer medijuma, KDED -@@ -73,18 +70,16 @@ - Comment[es]=Monitoriza las actividades de los recursos y permite (des)montarlos (media:/) - Comment[et]=Hoiab silma peal andmekandjate aktiivsusel ja võimaldab neid ühendada/lahutada (media:/) - Comment[eu]=Montatzeak begiztatzen ditu (media:/) eta desmontatzen uzten du --Comment[fa]=حفظ رد فعالیتهای رسانه و اجازه سو ار(پیاده) کردن (media:/) - Comment[fi]=Pidä kirjaa tallennustapahtumista ja salli tallennusvälineen liittäminen/irrotus (devices:/) - Comment[fr]=Gardez une trace des montages et permettre le (dé)montage (media:/) - Comment[fy]=Hâld de media-aktiviteiten by en stien ta om media oan- en ôf te keppelje (media:/) - Comment[gl]=Seguimento das actividades dos meios e permite-lle (des)montar (media:/) --Comment[he]=מנטר אחר פעילויות מדיה, ומאפשר לחבר או לנתק התקנים (media:/) - Comment[hi]=मीडिया क्रियाओं की जानकारी रखे तथा (अन)माउन्ट करने दे (मीडिया:/) - Comment[hr]=Praćenje aktivnosti medija i omogućavanje pristupanja i napuštanja - Comment[hu]=Az adathordozók követése, csatlakoztatása és leválasztása (media:/) - Comment[is]=Fylgjast með breytingum á tækjum og bjóða upp á (af)tengingu (media:/) - Comment[it]=Tiene traccia delle attività dei supporti e permette di montarli o smontarli (device:/) --Comment[ja]=メディアの活動を追跡し、(media:/) をマウントしたりアンマウントします -+Comment[ja]=メディアの活動を捕捉し、マウントしたりアンマウントします。(media:/) - Comment[km]=តាមដានសកម្មភាពព័ត៌មាន និងអនុញ្ញាតឲ្យរៀបចំ (មិនរៀបចំ) (media:/) - Comment[lt]=Stebi laikmenose vykdomus veiksmus ir leidžia (iš)montuoti (media:/) - Comment[lv]=Seko datu nesēju aktivitātēm un ļauj montēt/nomontēt tos (media:/) -@@ -103,7 +98,6 @@ - Comment[ru]=Автоматическое подключение устройств (media:/) - Comment[rw]=Kugumana inzira y'ibikorwa by'ibitangazamakuru no kwemerera gushyiramo(gukuramo) (ibitangazamakuru:/) - Comment[se]=Gozit mii dáhpáhuvvá median ja diktá du gálgat ja čadnat daid (media:/) --Comment[sk]=Sledovanie pripojenia/odpojenia medií (media:/) - Comment[sl]=Nadzoruj dejanja medija in dovilo priklop/odklop (media:/) - Comment[sr]=Прати активност медијума и омогућава (де)монтирање (media:/) - Comment[sr@Latn]=Prati aktivnost medijuma i omogućava (de)montiranje (media:/) -@@ -122,4 +116,3 @@ - X-KDE-FactoryName=mediamanager - X-KDE-Kded-autoload=true - X-KDE-Kded-load-on-demand=true --X-KDE-Kded-phase=1 -diff -urN kioslave/media/mediamanager/mediamanager.h kioslave/media/mediamanager/mediamanager.h ---- kioslave/media/mediamanager/mediamanager.h Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/mediamanager.h Mon Oct 10 17:04:01 2005 -@@ -28,8 +28,6 @@ - #include "removablebackend.h" - #include "mediadirnotify.h" - --class HALBackend; --class FstabBackend; - - class MediaManager : public KDEDModule - { -@@ -42,12 +40,6 @@ - k_dcop: - QStringList fullList(); - QStringList properties(const QString &name); -- QStringList mountoptions(const QString &name); -- bool setMountoptions(const QString &name, const QStringList &options); -- -- QString mount(const QString &uid); -- QString unmount(const QString &uid); -- - QString nameForLabel(const QString &label); - ASYNC setUserLabel(const QString &name, const QString &label); - -@@ -82,9 +74,7 @@ - MediaList m_mediaList; - QValueList<BackendBase*> m_backends; - RemovableBackend *mp_removableBackend; -- HALBackend *m_halbackend; - MediaDirNotify m_dirNotify; -- FstabBackend *m_fstabbackend; - }; - - #endif -diff -urN kioslave/media/medianotifier/Makefile.in kioslave/media/medianotifier/Makefile.in ---- kioslave/media/medianotifier/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/medianotifier/Makefile.in Fri May 26 09:54:31 2006 -@@ -254,6 +254,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/medianotifier/medianotifier.cpp kioslave/media/medianotifier/medianotifier.cpp ---- kioslave/media/medianotifier/medianotifier.cpp Sun Oct 1 19:31:53 2006 -+++ kioslave/media/medianotifier/medianotifier.cpp Fri Mar 17 11:17:33 2006 -@@ -48,21 +48,13 @@ - - MediaNotifier::~MediaNotifier() - { -- disconnectDCOPSignal( "kded", "mediamanager", "mediumAdded(QString, bool)", -- "onMediumChange(QString, bool)" ); -- -- disconnectDCOPSignal( "kded", "mediamanager", "mediumChanged(QString, bool)", -- "onMediumChange(QString, bool)" ); - } - - void MediaNotifier::onMediumChange( const QString &name, bool allowNotification ) - { - kdDebug() << "MediaNotifier::onMediumChange( " << name << ", " - << allowNotification << ")" << endl; -- -- if ( !allowNotification ) -- return; -- -+ - // Update user activity timestamp, otherwise the notification dialog will be shown - // in the background due to focus stealing prevention. Entering a new media can - // be seen as a kind of user activity after all. It'd be better to update the timestamp -@@ -103,11 +95,11 @@ - { - QString mimetype = medium.mimetype(); - -- bool is_cdrom = mimetype.startsWith( "cd" ) || mimetype.startsWith( "dvd" ); -+ bool is_cdrom = mimetype.contains( "cd" ) || mimetype.contains( "dvd" ); - bool is_mounted = mimetype.endsWith( "_mounted" ); - - // We autorun only on CD/DVD or removable disks (USB, Firewire) -- if ( !( is_cdrom || is_mounted ) -+ if ( !( is_cdrom && is_mounted ) - && mimetype!="media/removable_mounted" ) - { - return false; -diff -urN kioslave/media/medianotifier/medianotifier.desktop kioslave/media/medianotifier/medianotifier.desktop ---- kioslave/media/medianotifier/medianotifier.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/medianotifier/medianotifier.desktop Mon May 22 20:12:42 2006 -@@ -18,12 +18,10 @@ - Name[es]=Demonio de notificaciones de medios - Name[et]=Andmekandjate märguannete deemon - Name[eu]=Euskarrien jakinarazpen daemon-a --Name[fa]=شبح اخطاردهنده رسانه - Name[fi]=Mediahuomautin - Name[fr]=Démon de notifications des média - Name[fy]=Medianotifikaasje-daemon - Name[gl]=Daemon Notificador de Medios --Name[he]=שירות הודעות מערכת - Name[hr]=Demon obavijesti o medijima - Name[hu]=Lemezfigyelő szolgáltatás - Name[is]=Miðils tilkynningarpúki -@@ -34,12 +32,10 @@ - Name[nb]=Medievarslingsnisse - Name[nds]=Medien-Narichtendämoon - Name[nl]=Medianotificatie-daemon --Name[nn]=Mediepåminningsnisse - Name[pl]=Usługa powiadamiania o nośnikach - Name[pt]=Servidor de Notificação de Dispositivos - Name[pt_BR]=Servidor de Notificação de Dispositivos - Name[ru]=Демон уведомлений от подключаемых устройств --Name[sk]=Notifikátor medií - Name[sl]=Demon za obveščanje o nosilcih - Name[sr]=Демон за обавештења о медијумима - Name[sr@Latn]=Demon za obaveštenja o medijumima -@@ -47,7 +43,6 @@ - Name[uk]=Даемон сповіщення про носії інформації - Name[vi]=Trình nền Thông báo Ổ lưu trữ - Name[zh_CN]=介质通知守护程序 --Name[zh_TW]=媒體通知伺服程式 - Comment=A media plugged notifier - Comment[af]='n Inpropbare media inkennissteller - Comment[bg]=Мултимедиен демон за уведомяване при поставяне/включване на ново мултимедийно устройство -@@ -61,7 +56,6 @@ - Comment[es]=Un notificador de medios empotrable - Comment[et]=Andmekandja ühendamisest märkuandev deemon - Comment[eu]=Euskarri konektatze jakinarazlea --Comment[fa]=یک اخطاردهنده وصلشده رسانه - Comment[fi]=Liitetyn median huomautin - Comment[fr]=Notification de connexion de média - Comment[fy]=Meidieling fan oankeppele media -@@ -70,7 +64,7 @@ - Comment[hu]=Lemezérzékelő - Comment[is]=Tilkynnari um tengda miðla - Comment[it]=Notifiche dei dispositivi attaccati --Comment[ja]=メディアの接続を通知します -+Comment[ja]=メディアの接続を通知する - Comment[lt]=Perspėjimo apie media prijungimą priedas - Comment[mk]=Известување за приклучен медиум - Comment[nb]=En medievarsler som programtillegg -@@ -82,7 +76,6 @@ - Comment[pt]=Um notificador ligado aos dispositivos - Comment[pt_BR]=um notificador para mídia que é espetada (plug) - Comment[ru]=Система обработки уведомлений от подключаемых устройств --Comment[sk]=Notifikátor pripojených médií - Comment[sl]=Obveščanje o vstavljenih/priklopljenih nosilcih - Comment[sr]=Обавештавач о укљученим медијима - Comment[sr@Latn]=Obaveštavač o uključenim medijima -diff -urN kioslave/media/medianotifier/notificationdialog.cpp kioslave/media/medianotifier/notificationdialog.cpp ---- kioslave/media/medianotifier/notificationdialog.cpp Sat Oct 7 16:23:12 2006 -+++ kioslave/media/medianotifier/notificationdialog.cpp Mon Oct 10 17:04:00 2005 -@@ -26,7 +26,6 @@ - #include <klistbox.h> - #include <qlabel.h> - #include <qcheckbox.h> --#include <qpushbutton.h> - - #include "actionlistboxitem.h" - #include "notificationdialogview.h" -@@ -71,8 +70,6 @@ - this, SLOT( delayedDestruct() ) ); - - m_actionWatcher->startScan(); -- QPushButton * btn = actionButton( Ok ); -- btn->setFocus(); - } - - NotificationDialog::~NotificationDialog() -diff -urN kioslave/media/mimetypes/Makefile.in kioslave/media/mimetypes/Makefile.in ---- kioslave/media/mimetypes/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/mimetypes/Makefile.in Fri May 26 09:54:31 2006 -@@ -211,6 +211,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/mimetypes/audiocd.desktop kioslave/media/mimetypes/audiocd.desktop ---- kioslave/media/mimetypes/audiocd.desktop Mon Oct 2 12:44:33 2006 -+++ kioslave/media/mimetypes/audiocd.desktop Mon May 22 20:12:42 2006 -@@ -11,7 +11,6 @@ - Comment[cs]=Zvukové CD - Comment[da]=Lyd-cd - Comment[el]=CD ήχου --Comment[fa]=دیسک فشرده صوتی - Comment[fi]=CD-äänilevy - Comment[fr]=CD audio - Comment[fy]=Audio-Kompaktskiif -@@ -25,7 +24,6 @@ - Comment[it]=CD audio - Comment[ja]=オーディオ CD - Comment[km]=ស៊ីឌីអូឌីយ៉ូ --Comment[mk]=Аудио ЦД - Comment[ms]=CD Audio - Comment[nb]=Lyd-CD - Comment[nds]=Audio-CD -@@ -33,7 +31,7 @@ - Comment[nn]=Lyd-CD - Comment[pa]=ਆਡੀਓ CD - Comment[pl]=Płyta CD Audio --Comment[pt]=CD de áudio -+Comment[pt]=CD áudio - Comment[pt_BR]=CD de Áudio - Comment[ro]=CD Audio - Comment[ru]=Аудио CD -diff -urN kioslave/media/mimetypes/blankcd.desktop kioslave/media/mimetypes/blankcd.desktop ---- kioslave/media/mimetypes/blankcd.desktop Mon Oct 2 12:44:33 2006 -+++ kioslave/media/mimetypes/blankcd.desktop Mon May 22 20:12:43 2006 -@@ -16,7 +16,6 @@ - Comment[es]=CD vacío - Comment[et]=Tühi CD - Comment[eu]=CD hutsik --Comment[fa]=دیسک فشرده خام - Comment[fi]=Tyhjä CD - Comment[fr]=CD vierge - Comment[fy]=Blanke Kompaktskiif -@@ -32,7 +31,6 @@ - Comment[km]=ស៊ីឌីទទេ - Comment[lt]=Tuščias CD - Comment[lv]=Tukšs CD --Comment[mk]=Празно ЦД - Comment[ms]=CD Kosong - Comment[nb]=Tom CD - Comment[nds]=Leddige CD -@@ -46,7 +44,6 @@ - Comment[ru]=Чистый CD - Comment[rw]=CD Itanditseho - Comment[se]=Guorus CD --Comment[sk]=Čisté CD - Comment[sl]=Prazen CD - Comment[sr]=Празан CD - Comment[sr@Latn]=Prazan CD -diff -urN kioslave/media/mimetypes/blankdvd.desktop kioslave/media/mimetypes/blankdvd.desktop ---- kioslave/media/mimetypes/blankdvd.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/blankdvd.desktop Mon May 22 20:12:42 2006 -@@ -16,7 +16,6 @@ - Comment[es]=DVD vacío - Comment[et]=Tühi DVD - Comment[eu]=DVD hutsik --Comment[fa]=DVD خام - Comment[fi]=Tyhjä DVD-levy - Comment[fr]=DVD vierge - Comment[fy]=Blanke Dûbelskiif -@@ -32,7 +31,6 @@ - Comment[km]=ឌីវីឌីទទេ - Comment[lt]=Tuščias DVD - Comment[lv]=Tukšs DVD --Comment[mk]=Празно DVD - Comment[ms]=DVD Kosong - Comment[nb]=Tom DVD - Comment[nds]=Leddige DVD -@@ -46,7 +44,6 @@ - Comment[ru]=Чистый DVD - Comment[rw]=DVD Itanditseho - Comment[se]=Guorus DVD --Comment[sk]=Čisté DVD - Comment[sl]=Prazen DVD - Comment[sr]=Празан DVD - Comment[sr@Latn]=Prazan DVD -diff -urN kioslave/media/mimetypes/camera_mounted.desktop kioslave/media/mimetypes/camera_mounted.desktop ---- kioslave/media/mimetypes/camera_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/camera_mounted.desktop Mon May 22 20:12:42 2006 -@@ -16,7 +16,6 @@ - Comment[es]=Cámara montada - Comment[et]=Ühendatud kaamera - Comment[eu]=Kamara muntatuta --Comment[fa]=دوربین سوارشده - Comment[fi]=Liitetty kamera - Comment[fr]=Appareil photo monté - Comment[fy]=Oankeppele kamera -@@ -41,7 +40,6 @@ - Comment[pt_BR]=Câmera montada - Comment[ru]=Подключённая камера - Comment[se]=Čatnon govvenapperáhtta --Comment[sk]=Pripojený digitálny fotoaparát - Comment[sl]=Priklopljen fotoaparat - Comment[sr]=Монтирана камера - Comment[sr@Latn]=Montirana kamera -diff -urN kioslave/media/mimetypes/camera_unmounted.desktop kioslave/media/mimetypes/camera_unmounted.desktop ---- kioslave/media/mimetypes/camera_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/camera_unmounted.desktop Mon May 22 20:12:42 2006 -@@ -16,7 +16,6 @@ - Comment[es]=Cámara desmontada - Comment[et]=Lahutatud kaamera - Comment[eu]=Kamara desmuntatua --Comment[fa]=دوربین پیادهشده - Comment[fi]=Irrotettu kamera - Comment[fr]=Appareil photo non monté - Comment[fy]=Ofkeppele kamera -@@ -41,7 +40,6 @@ - Comment[pt_BR]=Câmera desmontada - Comment[ru]=Неподключённая камера - Comment[se]=Gálgajuvvon govvenapperáhtta --Comment[sk]=Odpojený digitálny fotoaparát - Comment[sl]=Odklopljen fotoaparat - Comment[sr]=Демонтирана камера - Comment[sr@Latn]=Demontirana kamera -diff -urN kioslave/media/mimetypes/cdrom_mounted.desktop kioslave/media/mimetypes/cdrom_mounted.desktop ---- kioslave/media/mimetypes/cdrom_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/cdrom_mounted.desktop Mon May 22 20:12:43 2006 -@@ -21,7 +21,7 @@ - Comment[es]=CD-ROM montado - Comment[et]=Ühendatud CD-ROM - Comment[eu]=CD-ROM muntatua --Comment[fa]=CD-ROM سوارشده -+Comment[fa]=CD سوار شده - Comment[fi]=Liitetty CD-ROM - Comment[fr]=CD-ROM monté - Comment[fy]=Oankeppele Kompaktskiif -diff -urN kioslave/media/mimetypes/cdrom_unmounted.desktop kioslave/media/mimetypes/cdrom_unmounted.desktop ---- kioslave/media/mimetypes/cdrom_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/cdrom_unmounted.desktop Mon May 22 20:12:43 2006 -@@ -21,7 +21,7 @@ - Comment[es]=CD-ROM desmontado - Comment[et]=Lahutatud CD-ROM - Comment[eu]=CD-ROM desmuntatua --Comment[fa]=CD-ROM پیادهشده -+Comment[fa]= CD پیاده شده - Comment[fi]=Irrotettu CD-ROM - Comment[fr]=CD-ROM non monté - Comment[fy]=Ofkeppele Kompaktskiif -diff -urN kioslave/media/mimetypes/cdwriter_mounted.desktop kioslave/media/mimetypes/cdwriter_mounted.desktop ---- kioslave/media/mimetypes/cdwriter_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/cdwriter_mounted.desktop Mon May 22 20:12:42 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Escritor de CDs montado - Comment[et]=Ühendatud CD kirjutaja - Comment[eu]=CD erretzaile muntatua --Comment[fa]=CD Writer سوارشده -+Comment[fa]=CD Writer سوار شده - Comment[fi]=Liitetty CD-kirjoitin - Comment[fr]=Graveur de CD monté - Comment[fy]=Oankeppele Kompaktskiif -diff -urN kioslave/media/mimetypes/cdwriter_unmounted.desktop kioslave/media/mimetypes/cdwriter_unmounted.desktop ---- kioslave/media/mimetypes/cdwriter_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/cdwriter_unmounted.desktop Mon May 22 20:12:42 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Escritor de CDs desmontado - Comment[et]=Lahutatud CD kirjutaja - Comment[eu]=CD erretzaile desmuntatua --Comment[fa]=CD Writer پیادهشده -+Comment[fa]=CD Writer پیاده شده - Comment[fi]=Irrotettu CD-kirjoitin - Comment[fr]=Graveur de CD non monté - Comment[fy]=Ofkeppele Kompaktskiif -diff -urN kioslave/media/mimetypes/dvd_mounted.desktop kioslave/media/mimetypes/dvd_mounted.desktop ---- kioslave/media/mimetypes/dvd_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/dvd_mounted.desktop Mon May 22 20:12:42 2006 -@@ -21,7 +21,7 @@ - Comment[es]=DVD montado - Comment[et]=Ühendatud DVD - Comment[eu]=DVD muntatua --Comment[fa]=DVD سوارشده -+Comment[fa]=DVD سوار شده - Comment[fi]=Liitetty DVD-levy - Comment[fr]=DVD-ROM monté(s) - Comment[fy]=Oankeppele Dûbelskiif -diff -urN kioslave/media/mimetypes/dvd_unmounted.desktop kioslave/media/mimetypes/dvd_unmounted.desktop ---- kioslave/media/mimetypes/dvd_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/dvd_unmounted.desktop Tue May 23 13:33:34 2006 -@@ -21,7 +21,7 @@ - Comment[es]=DVD desmontado - Comment[et]=Lahutatud DVD - Comment[eu]=DVD desmuntatua --Comment[fa]=DVD پیادهشده -+Comment[fa]=DVD پیاده شده - Comment[fi]=Irrotettu DVD-levy - Comment[fr]=DVD-ROM non monté(s) - Comment[fy]=Ofkeppele Dûbelskiif -diff -urN kioslave/media/mimetypes/dvdvideo.desktop kioslave/media/mimetypes/dvdvideo.desktop ---- kioslave/media/mimetypes/dvdvideo.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/dvdvideo.desktop Mon May 22 20:12:43 2006 -@@ -16,7 +16,6 @@ - Comment[es]=Disco de video DVD - Comment[et]=DVD videoplaat - Comment[eu]=DVD bideo diska --Comment[fa]=دیسک ویدئویی DVD - Comment[fi]=DVD-videolevy - Comment[fr]=DVD vidéo - Comment[fy]=Dûbelskiif Fideoskiif -@@ -32,7 +31,6 @@ - Comment[km]=ថាសវីដេអូ ឌីវីឌី - Comment[lt]=DVD video diskas - Comment[lv]=DVD Video Disks --Comment[mk]=DVD Видеодиск - Comment[ms]=Cakera Video DVD - Comment[nb]=DVD-videoplate - Comment[nds]=DVD-Videodisk -@@ -40,13 +38,12 @@ - Comment[nn]=DVD-videoplate - Comment[pa]=DVD ਵੀਡਿਓ ਡਿਸਕ - Comment[pl]=Płyta DVD Video --Comment[pt]=Disco DVD de Vídeo -+Comment[pt]=Disco DVD Vídeo - Comment[pt_BR]=DVD de vídeo - Comment[ro]=Disc video DVD - Comment[ru]=DVD с видео - Comment[rw]=Disiki Videwo DVD - Comment[se]=DVD-videoskearru --Comment[sk]=DVD Video disk - Comment[sl]=DVD Video disk - Comment[sr]=DVD видео диск - Comment[sr@Latn]=DVD video disk -diff -urN kioslave/media/mimetypes/floppy5_mounted.desktop kioslave/media/mimetypes/floppy5_mounted.desktop ---- kioslave/media/mimetypes/floppy5_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/floppy5_mounted.desktop Mon May 22 20:12:42 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disquete 5¼" montado - Comment[et]=Ühendatud 5¼" flopi - Comment[eu]=5¼"ko diskete muntatua --Comment[fa]=فلاپی 5¼" سوارشده -+Comment[fa]=فلاپی 5¼"سوار شده - Comment[fi]=Liitetty 5¼"-levyke - Comment[fr]=Disquette 5¼" montée - Comment[fy]=Oankeppele 5¼" Skiif -diff -urN kioslave/media/mimetypes/floppy5_unmounted.desktop kioslave/media/mimetypes/floppy5_unmounted.desktop ---- kioslave/media/mimetypes/floppy5_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/floppy5_unmounted.desktop Tue May 23 13:33:35 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disquete 5¼" desmontado - Comment[et]=Lahutatud 5¼" flopi - Comment[eu]=5¼"ko diskete desmuntatua --Comment[fa]=فلاپی 5¼" پیادهشده -+Comment[fa]=فلاپی 5¼" پیاده شده - Comment[fi]=Irrotettu 5¼"-levyke - Comment[fr]=Disquette 5¼" non montée - Comment[fy]=Ofkeppele 5¼" Skiif -diff -urN kioslave/media/mimetypes/floppy_mounted.desktop kioslave/media/mimetypes/floppy_mounted.desktop ---- kioslave/media/mimetypes/floppy_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/floppy_mounted.desktop Mon May 22 20:12:43 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disquete montado - Comment[et]=Ühendatud flopi - Comment[eu]=Diskete muntatua --Comment[fa]=فلاپی سوارشده -+Comment[fa]=فلاپی سوار شده - Comment[fi]=Liitetty levyke - Comment[fr]=Disquette montée - Comment[fy]=Oankeppele Skiif -diff -urN kioslave/media/mimetypes/floppy_unmounted.desktop kioslave/media/mimetypes/floppy_unmounted.desktop ---- kioslave/media/mimetypes/floppy_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/floppy_unmounted.desktop Tue May 23 13:33:34 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disquete desmontado - Comment[et]=Lahutatud flopi - Comment[eu]=Diskete desmuntatua --Comment[fa]=فلاپی پیادهشده -+Comment[fa]=فلاپی پیاده شده - Comment[fi]=Irrotettu levyke - Comment[fr]=Disquette non montée - Comment[fy]=Ofkeppele Skiif -diff -urN kioslave/media/mimetypes/gphoto2camera.desktop kioslave/media/mimetypes/gphoto2camera.desktop ---- kioslave/media/mimetypes/gphoto2camera.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/gphoto2camera.desktop Mon May 22 20:12:43 2006 -@@ -18,7 +18,6 @@ - Comment[es]=Cámara - Comment[et]=Kaamera - Comment[eu]=Kamara --Comment[fa]=دوربین - Comment[fi]=Kamera - Comment[fr]=Nouvel appareil photo - Comment[fy]=Kamera -@@ -41,13 +40,12 @@ - Comment[nn]=Kamera - Comment[pa]=ਕੈਮਰਾ - Comment[pl]=Aparat fotograficzny --Comment[pt]=Máquina fotográfica -+Comment[pt]=Máquina Fotográfica - Comment[pt_BR]=Câmera - Comment[ro]=Aparat foto - Comment[ru]=Камера - Comment[rw]=Kamera - Comment[se]=Govvanaperáhtta --Comment[sk]=Digitálny fotoaparát - Comment[sl]=Fotoaparat - Comment[sr]=Камера - Comment[sr@Latn]=Kamera -diff -urN kioslave/media/mimetypes/hdd_mounted.desktop kioslave/media/mimetypes/hdd_mounted.desktop ---- kioslave/media/mimetypes/hdd_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/hdd_mounted.desktop Mon May 22 20:12:43 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Volumen de disco duro montado - Comment[et]=Ühendatud kõvaketta partitsioon - Comment[eu]=Diska gogorraren zatiketa muntatua --Comment[fa]=حجم دیسک سخت سوارشده - Comment[fi]=Liitetty kiintoleyosio - Comment[fr]=Partition de disque dur montée - Comment[fy]=Oankeppele Fêsteskiif folume -@@ -44,13 +43,12 @@ - Comment[nn]=Montert harddiskvolum - Comment[pa]=ਮਾਊਟ ਕੀਤਾ ਹਾਰਡ ਡਿਸਕ ਭਾਗ - Comment[pl]=Zamontowana partycja dysku twardego --Comment[pt]=Volume de disco rígido montado -+Comment[pt]=Volume de Disco Rígido Montado - Comment[pt_BR]=Volume do HD Montado - Comment[ro]=Volum de hard disc montat - Comment[ru]=Смонтированный раздел жёсткого диска - Comment[rw]=Ububiko Disiki Bwashyizwemo - Comment[se]=Čatnon garraskearrooassi --Comment[sk]=Pripojený oddiel pevného disku - Comment[sl]=Priklopljen pogon trdega diska - Comment[sr]=Монтирана партиција хард диска - Comment[sr@Latn]=Montirana particija hard diska -diff -urN kioslave/media/mimetypes/hdd_unmounted.desktop kioslave/media/mimetypes/hdd_unmounted.desktop ---- kioslave/media/mimetypes/hdd_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/hdd_unmounted.desktop Mon May 22 20:12:43 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Volumen de disco duro desmontado - Comment[et]=Lahutatud kõvaketta partitsioon - Comment[eu]=Diska gogorraren zatiketa desmuntatua --Comment[fa]=حجم دیسک سخت پیاده شده - Comment[fi]=Irrotettu kiintolevyosio - Comment[fr]=Partition de disque dur non montée - Comment[fy]=Ofkeppele Fêsteskiif folume -@@ -44,13 +43,12 @@ - Comment[nn]=Umontert harddiskvolum - Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ ਹਾਰਡ ਡਿਸਕ ਭਾਗ - Comment[pl]=Odmontowana partycja dysku twardego --Comment[pt]=Volume de disco rígido desmontado -+Comment[pt]=Volume de Disco Rígido Desmontado - Comment[pt_BR]=Volume do HD Desmontado - Comment[ro]=Volum de hard disc nemontat - Comment[ru]=Отмонтированный раздел жёсткого диска - Comment[rw]=Ububiko Disiki Bwakuwemo - Comment[se]=Gálgajuvvon garraskearrooassi --Comment[sk]=Odpojený oddiel pevného disku - Comment[sl]=Odklopljen pogon trdega diska - Comment[sr]=Демонтирана партиција хард диска - Comment[sr@Latn]=Demontirana particija hard diska -diff -urN kioslave/media/mimetypes/nfs_mounted.desktop kioslave/media/mimetypes/nfs_mounted.desktop ---- kioslave/media/mimetypes/nfs_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/nfs_mounted.desktop Tue May 23 13:33:34 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Recurso NFS montado - Comment[et]=Ühendatud NFS ressurss - Comment[eu]=NFS baliabide muntatua --Comment[fa]=مشترک NFS سوارشده - Comment[fi]=Liitetty NFS-jako - Comment[fr]=Ressource NFS montée - Comment[fy]=Oankeppele NFS-boarne -@@ -44,13 +43,12 @@ - Comment[nn]=Montert delt NFS-ressurs - Comment[pa]=ਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਝ - Comment[pl]=Zamontowany system plików NFS --Comment[pt]=Partilha de NFS montada -+Comment[pt]=Partilha de NFS Montada - Comment[pt_BR]=Volume NFS Montado - Comment[ro]=Partajare NFS montată - Comment[ru]=Смонтированный ресурс NFS - Comment[rw]=Umugabane NFS Washyizwemo - Comment[se]=Čatnon NFS-resursa --Comment[sk]=Pripojený zdroj NFS - Comment[sl]=Priklopljen vir NFS - Comment[sr]=Монтирано NFS дељење - Comment[sr@Latn]=Montirano NFS deljenje -diff -urN kioslave/media/mimetypes/nfs_unmounted.desktop kioslave/media/mimetypes/nfs_unmounted.desktop ---- kioslave/media/mimetypes/nfs_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/nfs_unmounted.desktop Tue May 23 13:33:35 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Recurso NFS desmontado - Comment[et]=Lahutatud NFS ressurss - Comment[eu]=NFS baliabide desmuntatua --Comment[fa]=مشترک NFS پیاده شده - Comment[fi]=Irrotettu NFS-jako - Comment[fr]=Ressource NFS non montée - Comment[fy]=Oankeppele NFS-boarne -@@ -44,13 +43,12 @@ - Comment[nn]=Umontert delt NFS-ressurs - Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਝ - Comment[pl]=Odmontowany system plików NFS --Comment[pt]=Partilha de NFS desmontada -+Comment[pt]=Partilha de NFS Desmontada - Comment[pt_BR]=Volume NFS Desmontado - Comment[ro]=Partajare NFS nemontată - Comment[ru]=Отмонтированный ресурс NFS - Comment[rw]=Umugabane NFS Wakuwemo - Comment[se]=Gálgajuvvon NFS-resursa --Comment[sk]=Odpojený zdroj NFS - Comment[sl]=Odklopljen vir NFS - Comment[sr]=Демонтирано NFS дељење - Comment[sr@Latn]=Demontirano NFS deljenje -diff -urN kioslave/media/mimetypes/removable_mounted.desktop kioslave/media/mimetypes/removable_mounted.desktop ---- kioslave/media/mimetypes/removable_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/removable_mounted.desktop Mon May 22 20:12:42 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Recurso extraíble montado - Comment[et]=Ühendatud eemaldatav andmekandja - Comment[eu]=Euskarri aldagarria muntatua --Comment[fa]=رسانه برداشتنی سوارشده - Comment[fi]=Liitetty irrotettava resurssi - Comment[fr]=Média amovible monté - Comment[fy]=Oankeppele ferwiderber medium -@@ -44,13 +43,12 @@ - Comment[nn]=Montert flyttbart medium - Comment[pa]=ਮਾਊਟ ਕੀਤੇ ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ - Comment[pl]=Zamontowany nośnik wymienny --Comment[pt]=Dispositivo amovível montado -+Comment[pt]=Dispositivo Amovível Montado - Comment[pt_BR]=Mídia Removível Montada - Comment[ro]=Mediu amovibil montat - Comment[ru]=Смонтированный внешний диск - Comment[rw]=Igitangazamakuru Kivanwamo Cyashyizwemo - Comment[se]=Čátnon sirdehahtti medium --Comment[sk]=Pripojené vyberateľné médium - Comment[sl]=Priklopljen odstranljiv medij - Comment[sr]=Монтиран уклоњиви медијум - Comment[sr@Latn]=Montiran uklonjivi medijum -diff -urN kioslave/media/mimetypes/removable_unmounted.desktop kioslave/media/mimetypes/removable_unmounted.desktop ---- kioslave/media/mimetypes/removable_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/removable_unmounted.desktop Mon May 22 20:12:42 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Recurso extraíble desmontado - Comment[et]=Lahutatud eemaldatav andmekandja - Comment[eu]=Euskarri aldagarria desmuntatua --Comment[fa]=رسانه برداشتنی پیاده شده - Comment[fi]=Irrotettu irrotettava resurssi - Comment[fr]=Média amovible non monté - Comment[fy]=Ofkeppele ferwiderber medium -@@ -44,13 +43,12 @@ - Comment[nn]=Umontert flyttbart medium - Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ - Comment[pl]=Odmontowany nośnik wymienny --Comment[pt]=Dispositivo amovível desmontado -+Comment[pt]=Dispositivo Amovível Desmontado - Comment[pt_BR]=Mídia Removível Desmontada - Comment[ro]=Mediu amovibil nemontat - Comment[ru]=Отмонтированный внешний диск - Comment[rw]=Igitangazamakuru Kivanwamo Cyavanwemo - Comment[se]=Gálgaduvvon sirdehahtti medium --Comment[sk]=Odpojené vyberateľné médium - Comment[sl]=Odklopljen odstranljiv medij - Comment[sr]=Демонтиран уклоњиви медијум - Comment[sr@Latn]=Demontiran uklonjivi medijum -diff -urN kioslave/media/mimetypes/smb_mounted.desktop kioslave/media/mimetypes/smb_mounted.desktop ---- kioslave/media/mimetypes/smb_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/smb_mounted.desktop Tue May 23 13:33:34 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Recurso de Samba montado (Red de Microsoft) - Comment[et]=Ühendatud Samba (Microsoft Network) ressurss - Comment[eu]=Samba (Microsoft sarea) partekaketa muntatua --Comment[fa]=مشترک Samba (Microsoft Network) سوار شده -+Comment[fa]=اشتراک سامبای ویندوز سوار شده - Comment[fi]=Liitetty Samba-jako (Microsoft-verkko) - Comment[fr]=Partage Samba (réseau Microsoft) monté - Comment[fy]=Oankeppele Samba-netwurkboarne (Microsoft-netwurken) -diff -urN kioslave/media/mimetypes/smb_unmounted.desktop kioslave/media/mimetypes/smb_unmounted.desktop ---- kioslave/media/mimetypes/smb_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/smb_unmounted.desktop Tue May 23 13:33:34 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Recurso de Samba desmontado (Red de Microsoft) - Comment[et]=Lahutatud Samba (Microsoft Network) ressurss - Comment[eu]=Samba (Microsoft sarea) partekaketa desmuntatua --Comment[fa]=مشترک Samba (Microsoft Network) پیاده شده -+Comment[fa]=اشتراک سامبای ویندوز پیاده شده - Comment[fi]=Irrotettu Samba-jako (Microsoft-verkko) - Comment[fr]=Partage Samba (réseau Microsoft) non monté - Comment[fy]=Ofkeppele Samba-netwurkboarne (Microsoft-netwurken) -diff -urN kioslave/media/mimetypes/svcd.desktop kioslave/media/mimetypes/svcd.desktop ---- kioslave/media/mimetypes/svcd.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/svcd.desktop Mon May 22 20:12:43 2006 -@@ -7,7 +7,6 @@ - Comment[bn]=সুপার ভিডিও সিডি - Comment[ca]=CD Súper Vídeo - Comment[da]=Super Video-cd --Comment[fa]=دیسک فشرده ابرویدئو - Comment[fr]=Super CD vidéo - Comment[fy]=Super Fideo-kompaktskiif - Comment[gl]=Super Vídeo CD -@@ -17,7 +16,6 @@ - Comment[it]=Super video CD - Comment[ja]=スーパービデオ CD - Comment[km]=ស៊ីឌីវីដេអូគុណភាពខ្ពស់ --Comment[mk]=Супер видео ЦД - Comment[ms]=CD Supervideo - Comment[nb]=Super video CD - Comment[nds]=Super-Video-CD -diff -urN kioslave/media/mimetypes/vcd.desktop kioslave/media/mimetypes/vcd.desktop ---- kioslave/media/mimetypes/vcd.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/vcd.desktop Mon May 22 20:12:42 2006 -@@ -9,7 +9,6 @@ - Comment[ca]=CD Vídeo - Comment[da]=Video-cd - Comment[el]=Βίντεο CD --Comment[fa]=دیسک فشرده ویدئویی - Comment[fr]=CD vidéo - Comment[fy]=Fideo-kompaktskiif - Comment[ga]=Dlúthdhiosca Físe -@@ -19,7 +18,6 @@ - Comment[is]=Vídeó CD - Comment[ja]=ビデオ CD - Comment[km]=ស៊ីឌីវីដេអូ --Comment[mk]=Видео ЦД - Comment[ms]=CD Video - Comment[nds]=Video-CD - Comment[nl]=Video-cd -diff -urN kioslave/media/mimetypes/zip_mounted.desktop kioslave/media/mimetypes/zip_mounted.desktop ---- kioslave/media/mimetypes/zip_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/zip_mounted.desktop Tue May 23 13:33:35 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disco Zip montado - Comment[et]=Ühendatud Zip-ketas - Comment[eu]=Zip diska muntatua --Comment[fa]=دیسک فشرده سوارشده -+Comment[fa]=دیسک زیپ سوار شده - Comment[fi]=Liitetty Zip-levy - Comment[fr]=Disque Zip monté - Comment[fy]=Oankeppelee Zip-skiif -diff -urN kioslave/media/mimetypes/zip_unmounted.desktop kioslave/media/mimetypes/zip_unmounted.desktop ---- kioslave/media/mimetypes/zip_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/zip_unmounted.desktop Tue May 23 13:33:35 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disco Zip desmontado - Comment[et]=Lahutatud Zip-ketas - Comment[eu]=Zip diska desmuntatua --Comment[fa]=دیسک فشرده پیاده شده -+Comment[fa]= دیسک زیپ پیاده شده - Comment[fi]=Irrotettu Zip-levy - Comment[fr]=Disque Zip non monté - Comment[fy]=Ofkeppele Zip-skiif -@@ -33,7 +33,7 @@ - Comment[hu]=Leválasztott Zip-lemez - Comment[is]=Aftengdur Zip diskur - Comment[it]=Disco Zip non montato --Comment[ja]=マウントされていない Zip ディスク -+Comment[ja]=マウントされていないZipディスク - Comment[km]=ថាស Zip មិនបានរៀបចំ - Comment[lo]= ຫັງກາລີ - Comment[lt]=Išmontuotas Zip diskas -diff -urN kioslave/media/mounthelper/Makefile.in kioslave/media/mounthelper/Makefile.in ---- kioslave/media/mounthelper/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/mounthelper/Makefile.in Fri May 26 09:54:31 2006 -@@ -57,8 +57,8 @@ - #>+ 1 - kio_media_mounthelper_OBJECTS = kio_media_mounthelper.$(OBJEXT) - am__DEPENDENCIES_1 = --kio_media_mounthelper_DEPENDENCIES = \ -- ../libmediacommon/libmediacommon.la $(am__DEPENDENCIES_1) -+kio_media_mounthelper_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -+ ../libmediacommon/libmediacommon.la - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - am__depfiles_maybe = depfiles -@@ -236,6 +236,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -@@ -575,7 +576,7 @@ - AM_LDFLAGS = $(all_libraries) - kio_media_mounthelper_SOURCES = kio_media_mounthelper.cpp - kio_media_mounthelper_LDFLAGS = $(KDE_RPATH) $(all_libraries) --kio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) -+kio_media_mounthelper_LDADD = $(LIB_KIO) ../libmediacommon/libmediacommon.la - #>- METASOURCES = AUTO - #>- all: all-am - #>+ 1 -diff -urN kioslave/media/mounthelper/kio_media_mounthelper.cpp kioslave/media/mounthelper/kio_media_mounthelper.cpp ---- kioslave/media/mounthelper/kio_media_mounthelper.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/mounthelper/kio_media_mounthelper.cpp Fri Mar 17 11:17:33 2006 -@@ -27,7 +27,6 @@ - #include <dcopclient.h> - #include <dcopref.h> - #include <qtimer.h> --#include <stdlib.h> - #include <kdebug.h> - #include <kglobal.h> - #include <kprocess.h> -@@ -79,30 +78,31 @@ - - if (args->isSet("u")) - { -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "unmount", medium.id()); -- if (reply.isValid()) -- reply.get(m_errorStr); -- kdDebug() << "medium unmount " << m_errorStr << endl; -- if (m_errorStr.isNull()) -- ::exit(0); -- else -- error(); -+ KIO::Job * job = KIO::unmount( mount_point ); -+ -+ connect( job, SIGNAL( result( KIO::Job * ) ), -+ this, SLOT( slotResult( KIO::Job * ) ) ); - } - else if (args->isSet("s") || args->isSet("e")) - { -- invokeEject(device, true); -+ if (medium.isMounted()) -+ { -+ KIO::Job * job = KIO::unmount( mount_point ); -+ -+ m_device = device; -+ connect( job, SIGNAL( result( KIO::Job * ) ), -+ this, SLOT( slotResultSafe( KIO::Job * ) ) ); -+ } -+ else -+ { -+ invokeEject(device, true); -+ } - } - else - { -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "mount", medium.id()); -- if (reply.isValid()) -- reply.get(m_errorStr); -- if (m_errorStr.isNull()) -- ::exit(0); -- else -- error(); -+ KIO::Job* job = KIO::mount( false, 0, device, mount_point); -+ connect( job, SIGNAL( result( KIO::Job * ) ), -+ this, SLOT( slotResult( KIO::Job * ) ) ); - } - } - -@@ -173,12 +173,12 @@ - void MountHelper::error() - { - KMessageBox::error(0, m_errorStr); -- ::exit(1); -+ kapp->exit(1); - } - - void MountHelper::finished() - { -- ::exit(0); -+ kapp->quit(); - } - - static KCmdLineOptions options[] = -@@ -207,7 +207,7 @@ - - KStartupInfo::appStarted(); - app->dcopClient()->attach(); -- return app->exec(); -+ app->exec(); - } - - #include "kio_media_mounthelper.moc" -diff -urN kioslave/media/propsdlgplugin/Makefile.in kioslave/media/propsdlgplugin/Makefile.in ---- kioslave/media/propsdlgplugin/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/propsdlgplugin/Makefile.in Thu Jan 1 01:00:00 1970 -@@ -1,1063 +0,0 @@ --# Makefile.in generated by automake 1.9.6 from Makefile.am. --# KDE tags expanded automatically by am_edit - $Revision: 483858 $ --# @configure_input@ -- --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005 Free Software Foundation, Inc. --# This Makefile.in is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY, to the extent permitted by law; without --# even the implied warranty of MERCHANTABILITY or FITNESS FOR A --# PARTICULAR PURPOSE. -- --@SET_MAKE@ -- -- --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ --VPATH = @srcdir@ --pkgdatadir = $(datadir)/@PACKAGE@ --pkglibdir = $(libdir)/@PACKAGE@ --pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../../.. --am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ --install_sh_DATA = $(install_sh) -c -m 644 --install_sh_PROGRAM = $(install_sh) -c --install_sh_SCRIPT = $(install_sh) -c --INSTALL_HEADER = $(INSTALL_DATA) --transform = $(program_transform_name) --NORMAL_INSTALL = : --PRE_INSTALL = : --POST_INSTALL = : --NORMAL_UNINSTALL = : --PRE_UNINSTALL = : --POST_UNINSTALL = : --build_triplet = @build@ --host_triplet = @host@ --target_triplet = @target@ --subdir = kioslave/media/propsdlgplugin --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(kde_moduledir)" \ -- "$(DESTDIR)$(kde_servicesdir)" --kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(kde_module_LTLIBRARIES) --am__DEPENDENCIES_1 = --media_propsdlgplugin_la_DEPENDENCIES = \ -- ../libmediacommon/libmediacommon.la $(am__DEPENDENCIES_1) --am_media_propsdlgplugin_la_OBJECTS = propertiespage.lo \ -- propsdlgshareplugin.lo --#>- media_propsdlgplugin_la_OBJECTS = \ --#>- $(am_media_propsdlgplugin_la_OBJECTS) --#>+ 5 --media_propsdlgplugin_la_final_OBJECTS = media_propsdlgplugin_la.all_cpp.lo --media_propsdlgplugin_la_nofinal_OBJECTS = propertiespage.lo \ -- propsdlgshareplugin.lo propertiespagegui.lo --@KDE_USE_FINAL_FALSE@media_propsdlgplugin_la_OBJECTS = $(media_propsdlgplugin_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@media_propsdlgplugin_la_OBJECTS = $(media_propsdlgplugin_la_final_OBJECTS) --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --am__depfiles_maybe = depfiles --#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ --#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --#>+ 2 --CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ --#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ --#>- $(AM_CXXFLAGS) $(CXXFLAGS) --#>+ 3 --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --CXXLD = $(CXX) --#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ --#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --#>+ 2 --CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --SOURCES = $(media_propsdlgplugin_la_SOURCES) --DIST_SOURCES = $(media_propsdlgplugin_la_SOURCES) --kde_servicesDATA_INSTALL = $(INSTALL_DATA) --DATA = $(kde_services_DATA) --ETAGS = etags --CTAGS = ctags --#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) --#>+ 1 --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) --ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ --AMTAR = @AMTAR@ --AR = @AR@ --ARTSCCONFIG = @ARTSCCONFIG@ --ARTS_CFLAGS = @ARTS_CFLAGS@ --AUTOCONF = @AUTOCONF@ --AUTODIRS = @AUTODIRS@ --AUTOHEADER = @AUTOHEADER@ --AUTOMAKE = @AUTOMAKE@ --AWK = @AWK@ --CC = @CC@ --CCDEPMODE = @CCDEPMODE@ --CFLAGS = @CFLAGS@ --COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@ --COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@ --CONF_FILES = @CONF_FILES@ --CPP = @CPP@ --CPPFLAGS = @CPPFLAGS@ --CXX = @CXX@ --CXXCPP = @CXXCPP@ --CXXDEPMODE = @CXXDEPMODE@ --CXXFLAGS = @CXXFLAGS@ --CYGPATH_W = @CYGPATH_W@ --DBUSQT_INCS = @DBUSQT_INCS@ --DBUSQT_LIBS = @DBUSQT_LIBS@ --DBUS_CFLAGS = @DBUS_CFLAGS@ --DBUS_INCS = @DBUS_INCS@ --DBUS_LIBS = @DBUS_LIBS@ --DCOPIDL = @DCOPIDL@ --DCOPIDL2CPP = @DCOPIDL2CPP@ --DCOPIDLNG = @DCOPIDLNG@ --DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ --DEFS = @DEFS@ --DEPDIR = @DEPDIR@ --DOXYGEN = @DOXYGEN@ --DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ --DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ --DPMSINC = @DPMSINC@ --DPMSLIB = @DPMSLIB@ --ECHO = @ECHO@ --ECHO_C = @ECHO_C@ --ECHO_N = @ECHO_N@ --ECHO_T = @ECHO_T@ --EGREP = @EGREP@ --ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ --EXEEXT = @EXEEXT@ --EXR_FLAGS = @EXR_FLAGS@ --F77 = @F77@ --FFLAGS = @FFLAGS@ --FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ --GLINC = @GLINC@ --GLLIB = @GLLIB@ --GMSGFMT = @GMSGFMT@ --HALBACKEND = @HALBACKEND@ --HAL_CFLAGS = @HAL_CFLAGS@ --HAL_INCS = @HAL_INCS@ --HAL_LIBS = @HAL_LIBS@ --HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@ --HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@ --HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ --INSTALL_DATA = @INSTALL_DATA@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_SCRIPT = @INSTALL_SCRIPT@ --INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ --JAR = @JAR@ --JAVAC = @JAVAC@ --JAVAH = @JAVAH@ --JVMLIBS = @JVMLIBS@ --KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ --KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@ --KCONFIG_COMPILER = @KCONFIG_COMPILER@ --KDECONFIG = @KDECONFIG@ --KDE_BINDIR = @KDE_BINDIR@ --KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@ --KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ --KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ --KDE_HAVE_DOT = @KDE_HAVE_DOT@ --KDE_INCLUDES = @KDE_INCLUDES@ --KDE_LDFLAGS = @KDE_LDFLAGS@ --KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ --KDE_MT_LIBS = @KDE_MT_LIBS@ --KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ --KDE_PLUGIN = @KDE_PLUGIN@ --KDE_RPATH = @KDE_RPATH@ --KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ --KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ --KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ --KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ --KDE_USE_FPIE = @KDE_USE_FPIE@ --KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ --KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ --KDE_USE_PIE = @KDE_USE_PIE@ --KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ --KDM_PAM_SERVICE = @KDM_PAM_SERVICE@ --KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@ --KRB4_INCS = @KRB4_INCS@ --KRB4_LIBS = @KRB4_LIBS@ --KRB4_RPATH = @KRB4_RPATH@ --KRB5_INCS = @KRB5_INCS@ --KRB5_LIBS = @KRB5_LIBS@ --KRB5_RPATH = @KRB5_RPATH@ --KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@ --LDAP_INCS = @LDAP_INCS@ --LDAP_LIBS = @LDAP_LIBS@ --LDAP_RPATH = @LDAP_RPATH@ --LDFLAGS = @LDFLAGS@ --LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ --LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ --LIBALIB = @LIBALIB@ --LIBART_CFLAGS = @LIBART_CFLAGS@ --LIBART_LIBS = @LIBART_LIBS@ --LIBART_RPATH = @LIBART_RPATH@ --LIBBZ2 = @LIBBZ2@ --LIBCFG = @LIBCFG@ --LIBCOMPAT = @LIBCOMPAT@ --LIBCRYPT = @LIBCRYPT@ --LIBCURSES = @LIBCURSES@ --LIBDEVINFO = @LIBDEVINFO@ --LIBDL = @LIBDL@ --LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@ --LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@ --LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@ --LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@ --LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@ --LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@ --LIBGEN = @LIBGEN@ --LIBHOSTS = @LIBHOSTS@ --LIBJPEG = @LIBJPEG@ --LIBKSTAT = @LIBKSTAT@ --LIBMALLOC = @LIBMALLOC@ --LIBOBJS = @LIBOBJS@ --LIBODM = @LIBODM@ --LIBOSSAUDIO = @LIBOSSAUDIO@ --LIBPNG = @LIBPNG@ --LIBPOSIX4 = @LIBPOSIX4@ --LIBPTHREAD = @LIBPTHREAD@ --LIBRESOLV = @LIBRESOLV@ --LIBRPC = @LIBRPC@ --LIBS = @LIBS@ --LIBSENSORS = @LIBSENSORS@ --LIBSHADOW = @LIBSHADOW@ --LIBSM = @LIBSM@ --LIBSOCKET = @LIBSOCKET@ --LIBSSL = @LIBSSL@ --LIBTOOL = @LIBTOOL@ --LIBUCB = @LIBUCB@ --LIBUSBCONFIG = @LIBUSBCONFIG@ --LIBUTIL = @LIBUTIL@ --LIBXDMCP = @LIBXDMCP@ --LIBXFT_LIB = @LIBXFT_LIB@ --LIBZ = @LIBZ@ --LIB_ARTS = @LIB_ARTS@ --LIB_DNSSD = @LIB_DNSSD@ --LIB_EXR = @LIB_EXR@ --LIB_FONT_ENC = @LIB_FONT_ENC@ --LIB_KAB = @LIB_KAB@ --LIB_KABC = @LIB_KABC@ --LIB_KDECORE = @LIB_KDECORE@ --LIB_KDED = @LIB_KDED@ --LIB_KDEPIM = @LIB_KDEPIM@ --LIB_KDEPRINT = @LIB_KDEPRINT@ --LIB_KDEUI = @LIB_KDEUI@ --LIB_KDNSSD = @LIB_KDNSSD@ --LIB_KFILE = @LIB_KFILE@ --LIB_KFM = @LIB_KFM@ --LIB_KHTML = @LIB_KHTML@ --LIB_KIMPROXY = @LIB_KIMPROXY@ --LIB_KIO = @LIB_KIO@ --LIB_KJS = @LIB_KJS@ --LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ --LIB_KPARTS = @LIB_KPARTS@ --LIB_KSPELL = @LIB_KSPELL@ --LIB_KSYCOCA = @LIB_KSYCOCA@ --LIB_KUNITTEST = @LIB_KUNITTEST@ --LIB_KUTILS = @LIB_KUTILS@ --LIB_KVM = @LIB_KVM@ --LIB_LBER = @LIB_LBER@ --LIB_LIBS = @LIB_LIBS@ --LIB_POLL = @LIB_POLL@ --LIB_QPE = @LIB_QPE@ --LIB_QT = @LIB_QT@ --LIB_SMB = @LIB_SMB@ --LIB_TRU64_MACH = @LIB_TRU64_MACH@ --LIB_X11 = @LIB_X11@ --LIB_XCOMPOSITE = @LIB_XCOMPOSITE@ --LIB_XCURSOR = @LIB_XCURSOR@ --LIB_XEXT = @LIB_XEXT@ --LIB_XF86MISC = @LIB_XF86MISC@ --LIB_XFIXES = @LIB_XFIXES@ --LIB_XINERAMA = @LIB_XINERAMA@ --LIB_XRANDR = @LIB_XRANDR@ --LIB_XRENDER = @LIB_XRENDER@ --LIB_XSS = @LIB_XSS@ --LINUXCDPOLLING = @LINUXCDPOLLING@ --LN_S = @LN_S@ --LTLIBOBJS = @LTLIBOBJS@ --MAKEINFO = @MAKEINFO@ --MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ --MCOPIDL = @MCOPIDL@ --MD5SUM = @MD5SUM@ --MD5SUM_CUT = @MD5SUM_CUT@ --MEINPROC = @MEINPROC@ --MOC = @MOC@ --MSGFMT = @MSGFMT@ --NOOPT_CFLAGS = @NOOPT_CFLAGS@ --NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ --OBJEXT = @OBJEXT@ --PACKAGE = @PACKAGE@ --PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ --PACKAGE_NAME = @PACKAGE_NAME@ --PACKAGE_STRING = @PACKAGE_STRING@ --PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_VERSION = @PACKAGE_VERSION@ --PAMLIBS = @PAMLIBS@ --PASSWDLIBS = @PASSWDLIBS@ --PATH_SEPARATOR = @PATH_SEPARATOR@ --PERL = @PERL@ --PKG_CONFIG = @PKG_CONFIG@ --QTDOCDIR = @QTDOCDIR@ --QTE_NORTTI = @QTE_NORTTI@ --QT_INCLUDES = @QT_INCLUDES@ --QT_LDFLAGS = @QT_LDFLAGS@ --RANLIB = @RANLIB@ --RUN_KAPPFINDER = @RUN_KAPPFINDER@ --SASL2_LIBS = @SASL2_LIBS@ --SETUIDFLAGS = @SETUIDFLAGS@ --SET_MAKE = @SET_MAKE@ --SHELL = @SHELL@ --SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@ --SSL_INCLUDES = @SSL_INCLUDES@ --SSL_LDFLAGS = @SSL_LDFLAGS@ --STRIP = @STRIP@ --TOPSUBDIRS = @TOPSUBDIRS@ --UIC = @UIC@ --UIC_TR = @UIC_TR@ --UNAME = @UNAME@ --USB_CFLAGS = @USB_CFLAGS@ --USB_LIBS = @USB_LIBS@ --USER_INCLUDES = @USER_INCLUDES@ --USER_LDFLAGS = @USER_LDFLAGS@ --USE_EXCEPTIONS = @USE_EXCEPTIONS@ --USE_RTTI = @USE_RTTI@ --USE_THREADS = @USE_THREADS@ --VERSION = @VERSION@ --WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ --XGETTEXT = @XGETTEXT@ --XMLLINT = @XMLLINT@ --XTESTLIB = @XTESTLIB@ --X_EXTRA_LIBS = @X_EXTRA_LIBS@ --X_INCLUDES = @X_INCLUDES@ --X_LDFLAGS = @X_LDFLAGS@ --X_PRE_LIBS = @X_PRE_LIBS@ --X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ --ac_ct_CC = @ac_ct_CC@ --ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ --all_includes = @all_includes@ --all_libraries = @all_libraries@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ --am__include = @am__include@ --am__leading_dot = @am__leading_dot@ --am__quote = @am__quote@ --am__tar = @am__tar@ --am__untar = @am__untar@ --applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@ --applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@ --bindir = @bindir@ --build = @build@ --build_alias = @build_alias@ --build_cpu = @build_cpu@ --build_os = @build_os@ --build_vendor = @build_vendor@ --datadir = @datadir@ --doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ --doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ --drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ --drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ --exec_prefix = @exec_prefix@ --have_xcursor_FALSE = @have_xcursor_FALSE@ --have_xcursor_TRUE = @have_xcursor_TRUE@ --host = @host@ --host_alias = @host_alias@ --host_cpu = @host_cpu@ --host_os = @host_os@ --host_vendor = @host_vendor@ --include_ARTS_FALSE = @include_ARTS_FALSE@ --include_ARTS_TRUE = @include_ARTS_TRUE@ --include_BZIP2_FALSE = @include_BZIP2_FALSE@ --include_BZIP2_TRUE = @include_BZIP2_TRUE@ --include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@ --include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@ --include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@ --include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@ --include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@ --include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@ --include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@ --include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@ --include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@ --include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@ --include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@ --include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@ --include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@ --include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@ --include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@ --include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@ --include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@ --include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@ --include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@ --include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@ --include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@ --include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@ --include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@ --include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@ --include_kompmgr_FALSE = @include_kompmgr_FALSE@ --include_kompmgr_TRUE = @include_kompmgr_TRUE@ --include_ksysguardd_FALSE = @include_ksysguardd_FALSE@ --include_ksysguardd_TRUE = @include_ksysguardd_TRUE@ --include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@ --include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@ --include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@ --include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@ --include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@ --include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@ --include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@ --include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@ --include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@ --include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@ --include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@ --include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@ --include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@ --include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@ --include_media_halbackend_FALSE = @include_media_halbackend_FALSE@ --include_media_halbackend_TRUE = @include_media_halbackend_TRUE@ --include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@ --include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@ --include_x11_FALSE = @include_x11_FALSE@ --include_x11_TRUE = @include_x11_TRUE@ --includedir = @includedir@ --infodir = @infodir@ --install_sh = @install_sh@ --install_usbids_FALSE = @install_usbids_FALSE@ --install_usbids_TRUE = @install_usbids_TRUE@ --jni_includes = @jni_includes@ --kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@ --kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@ --kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@ --kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@ --kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@ --kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@ --kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@ --kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@ --kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@ --kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@ --kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@ --kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@ --kde_appsdir = @kde_appsdir@ --kde_bindir = @kde_bindir@ --kde_confdir = @kde_confdir@ --kde_datadir = @kde_datadir@ --kde_htmldir = @kde_htmldir@ --kde_icondir = @kde_icondir@ --kde_includes = @kde_includes@ --kde_kcfgdir = @kde_kcfgdir@ --kde_libraries = @kde_libraries@ --kde_libs_htmldir = @kde_libs_htmldir@ --kde_libs_prefix = @kde_libs_prefix@ --kde_locale = @kde_locale@ --kde_mimedir = @kde_mimedir@ --kde_moduledir = @kde_moduledir@ --kde_qtver = @kde_qtver@ --kde_servicesdir = @kde_servicesdir@ --kde_servicetypesdir = @kde_servicetypesdir@ --kde_sounddir = @kde_sounddir@ --kde_styledir = @kde_styledir@ --kde_templatesdir = @kde_templatesdir@ --kde_wallpaperdir = @kde_wallpaperdir@ --kde_widgetdir = @kde_widgetdir@ --kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@ --kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@ --kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@ --kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@ --kdeinitdir = @kdeinitdir@ --kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@ --kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@ --kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@ --kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@ --kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@ --kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@ --kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@ --kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@ --kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@ --kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@ --kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@ --kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@ --kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@ --kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@ --kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@ --kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@ --khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@ --khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@ --khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@ --khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@ --kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@ --kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@ --kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@ --kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@ --klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@ --klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@ --kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@ --kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@ --knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@ --knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@ --konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@ --konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@ --konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@ --konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@ --kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@ --kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@ --kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@ --kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@ --kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@ --kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@ --kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@ --kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@ --ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@ --ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@ --ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@ --ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@ --kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@ --kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@ --ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@ --ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@ --ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@ --ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@ --ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@ --ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@ --kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@ --kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@ --kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@ --kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@ --l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@ --l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@ --libdir = @libdir@ --libexecdir = @libexecdir@ --libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ --libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ --localstatedir = @localstatedir@ --mandir = @mandir@ --mkdir_p = @mkdir_p@ --nogroup = @nogroup@ --nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ --nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ --oldincludedir = @oldincludedir@ --pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ --pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ --prefix = @prefix@ --program_transform_name = @program_transform_name@ --qt_includes = @qt_includes@ --qt_libraries = @qt_libraries@ --sbindir = @sbindir@ --sharedstatedir = @sharedstatedir@ --supports_i8k_FALSE = @supports_i8k_FALSE@ --supports_i8k_TRUE = @supports_i8k_TRUE@ --sysconfdir = @sysconfdir@ --target = @target@ --target_alias = @target_alias@ --target_cpu = @target_cpu@ --target_os = @target_os@ --target_vendor = @target_vendor@ --unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ --unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ --x_includes = @x_includes@ --x_libraries = @x_libraries@ --xdg_appsdir = @xdg_appsdir@ --xdg_directorydir = @xdg_directorydir@ --xdg_menudir = @xdg_menudir@ --#>- METASOURCES = AUTO --kde_module_LTLIBRARIES = media_propsdlgplugin.la --media_propsdlgplugin_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) --media_propsdlgplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) --AM_CPPFLAGS = $(all_includes) --kde_services_DATA = media_propsdlgplugin.desktop --#>- media_propsdlgplugin_la_SOURCES = propertiespage.cpp propertiespagegui.ui propsdlgshareplugin.cpp --#>+ 1 --media_propsdlgplugin_la_SOURCES=propertiespage.cpp propsdlgshareplugin.cpp propertiespagegui.cpp --#>- all: all-am --#>+ 1 --all: docs-am all-am -- --.SUFFIXES: --.SUFFIXES: .cpp .lo .o .obj --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) --#>- @for dep in $?; do \ --#>- case '$(am__configure_deps)' in \ --#>- *$$dep*) \ --#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ --#>- && exit 0; \ --#>- exit 1;; \ --#>- esac; \ --#>- done; \ --#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ --#>- cd $(top_srcdir) && \ --#>- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile --#>+ 12 -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ -- cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile -- cd $(top_srcdir) && perl admin/am_edit kioslave/media/propsdlgplugin/Makefile.in --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) -- @$(NORMAL_INSTALL) -- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)" -- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ -- else :; fi; \ -- done -- --uninstall-kde_moduleLTLIBRARIES: -- @$(NORMAL_UNINSTALL) -- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ -- done -- --clean-kde_moduleLTLIBRARIES: -- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES) -- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --#>- media_propsdlgplugin.la: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) --#>+ 2 --@KDE_USE_CLOSURE_TRUE@media_propsdlgplugin.la: media_propsdlgplugin.la.closure $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) --@KDE_USE_CLOSURE_FALSE@media_propsdlgplugin.la: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(kde_moduledir) $(media_propsdlgplugin_la_LDFLAGS) $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_LIBADD) $(LIBS) -- --mostlyclean-compile: -- -rm -f *.$(OBJEXT) -- --distclean-compile: -- -rm -f *.tab.c -- --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/propertiespage.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/propsdlgshareplugin.Plo@am__quote@ -- --.cpp.o: --@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -- --.cpp.obj: --@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -- --.cpp.lo: --@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -- --mostlyclean-libtool: -- -rm -f *.lo -- --clean-libtool: -- -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: --install-kde_servicesDATA: $(kde_services_DATA) -- @$(NORMAL_INSTALL) -- test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)" -- @list='$(kde_services_DATA)'; for p in $$list; do \ -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \ -- $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \ -- done -- --uninstall-kde_servicesDATA: -- @$(NORMAL_UNINSTALL) -- @list='$(kde_services_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \ -- done -- --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- tags=; \ -- here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- tags=; \ -- here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(CTAGS_ARGS)$$tags$$unique" \ -- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -- $$tags $$unique -- --GTAGS: -- here=`$(am__cd) $(top_builddir) && pwd` \ -- && cd $(top_srcdir) \ -- && gtags -i $(GTAGS_ARGS) $$here -- --distclean-tags: -- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -- --distdir: $(DISTFILES) -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkdir_p) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ -- if test -d $$d/$$file; then \ -- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ -- fi; \ -- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ -- else \ -- test -f $(distdir)/$$file \ -- || cp -p $$d/$$file $(distdir)/$$file \ -- || exit 1; \ -- fi; \ -- done --check-am: all-am --check: check-am --all-am: Makefile $(LTLIBRARIES) $(DATA) --installdirs: -- for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \ -- test -z "$$dir" || $(mkdir_p) "$$dir"; \ -- done --install: install-am --install-exec: install-exec-am --install-data: install-data-am --uninstall: uninstall-am -- --install-am: all-am -- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -- --installcheck: installcheck-am --install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install --mostlyclean-generic: -- --clean-generic: -- --distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -- --maintainer-clean-generic: -- @echo "This command is intended for maintainers to use" -- @echo "it deletes files that may require special tools to rebuild." --#>- clean: clean-am --#>+ 1 --clean: kde-rpo-clean clean-am -- --#>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ --#>- mostlyclean-am --#>+ 2 --clean-am: clean-metasources clean-ui clean-closures clean-bcheck clean-final clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ -- mostlyclean-am -- --distclean: distclean-am -- -rm -rf ./$(DEPDIR) -- -rm -f Makefile --distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -- --dvi: dvi-am -- --dvi-am: -- --html: html-am -- --info: info-am -- --info-am: -- --#>- install-data-am: install-kde_moduleLTLIBRARIES \ --#>- install-kde_servicesDATA --#>+ 2 --install-data-am: \ -- install-kde_servicesDATA -- --#>- install-exec-am: --#>+ 1 --install-exec-am: install-kde_moduleLTLIBRARIES -- --install-info: install-info-am -- --install-man: -- --installcheck-am: -- --maintainer-clean: maintainer-clean-am -- -rm -rf ./$(DEPDIR) -- -rm -f Makefile --maintainer-clean-am: distclean-am maintainer-clean-generic -- --mostlyclean: mostlyclean-am -- --mostlyclean-am: mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool -- --pdf: pdf-am -- --pdf-am: -- --ps: ps-am -- --ps-am: -- --uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ -- uninstall-kde_servicesDATA -- --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-exec \ -- install-exec-am install-info install-info-am \ -- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \ -- install-man install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ -- uninstall-am uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ -- uninstall-kde_servicesDATA -- --# Tell versions [3.59,3.63) of GNU make to not export all variables. --# Otherwise a system limit (for SysV at least) may be exceeded. --.NOEXPORT: -- --#>+ 8 --media_propsdlgplugin.la.closure: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) -- @echo "int main() {return 0;}" > media_propsdlgplugin_la_closure.cpp -- @$(LTCXXCOMPILE) -c media_propsdlgplugin_la_closure.cpp -- $(CXXLINK) media_propsdlgplugin_la_closure.lo $(media_propsdlgplugin_la_LDFLAGS) $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_LIBADD) $(LIBS) -- @rm -f media_propsdlgplugin_la_closure.* media_propsdlgplugin.la.closure -- @echo "timestamp" > media_propsdlgplugin.la.closure -- -- --#>+ 3 --propsdlgshareplugin.moc: $(srcdir)/propsdlgshareplugin.h -- $(MOC) $(srcdir)/propsdlgshareplugin.h -o propsdlgshareplugin.moc -- --#>+ 2 --mocs: propsdlgshareplugin.moc -- --#>+ 3 --propertiespage.moc: $(srcdir)/propertiespage.h -- $(MOC) $(srcdir)/propertiespage.h -o propertiespage.moc -- --#>+ 2 --mocs: propertiespage.moc -- --#>+ 3 --clean-metasources: -- -rm -f propsdlgshareplugin.moc propertiespage.moc -- --#>+ 2 --KDE_DIST=propertiespagegui.ui Makefile.in propertiespage.h propsdlgshareplugin.h media_propsdlgplugin.desktop propertiespagegui.ui.h Makefile.am -- --#>+ 4 --clean-ui: -- -rm -f \ -- propertiespagegui.cpp propertiespagegui.h propertiespagegui.moc -- --#>+ 3 --clean-closures: -- -rm -f media_propsdlgplugin.la.closure -- --#>+ 2 --docs-am: -- --#>+ 15 --force-reedit: -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ -- cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile -- cd $(top_srcdir) && perl admin/am_edit kioslave/media/propsdlgplugin/Makefile.in -- -- --#>+ 21 --clean-bcheck: -- rm -f *.bchecktest.cc *.bchecktest.cc.class a.out -- --bcheck: bcheck-am -- --bcheck-am: -- @for i in ; do \ -- if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ -- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ -- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ -- echo "$$i"; \ -- if ! $(CXXCOMPILE) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ -- rm -f $$i.bchecktest.cc; exit 1; \ -- fi ; \ -- echo "" >> $$i.bchecktest.cc.class; \ -- perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ -- rm -f a.out; \ -- fi ; \ -- done -- -- --#>+ 11 --media_propsdlgplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/propertiespage.cpp $(srcdir)/propsdlgshareplugin.cpp propertiespagegui.cpp propsdlgshareplugin.moc propertiespagegui.moc propertiespage.moc -- @echo 'creating media_propsdlgplugin_la.all_cpp.cpp ...'; \ -- rm -f media_propsdlgplugin_la.all_cpp.files media_propsdlgplugin_la.all_cpp.final; \ -- echo "#define KDE_USE_FINAL 1" >> media_propsdlgplugin_la.all_cpp.final; \ -- for file in propertiespage.cpp propsdlgshareplugin.cpp propertiespagegui.cpp ; do \ -- echo "#include \"$$file\"" >> media_propsdlgplugin_la.all_cpp.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> media_propsdlgplugin_la.all_cpp.final; \ -- done; \ -- cat media_propsdlgplugin_la.all_cpp.final media_propsdlgplugin_la.all_cpp.files > media_propsdlgplugin_la.all_cpp.cpp; \ -- rm -f media_propsdlgplugin_la.all_cpp.final media_propsdlgplugin_la.all_cpp.files -- --#>+ 3 --clean-final: -- -rm -f media_propsdlgplugin_la.all_cpp.cpp -- --#>+ 3 --final: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_final_OBJECTS)" all-am -- --#>+ 3 --final-install: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_final_OBJECTS)" install-am -- --#>+ 3 --no-final: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_nofinal_OBJECTS)" all-am -- --#>+ 3 --no-final-install: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_nofinal_OBJECTS)" install-am -- --#>+ 3 --kde-rpo-clean: -- -rm -f *.rpo -- --#>+ 9 --nmcheck: --propsdlgshareplugin.o: propsdlgshareplugin.moc --nmcheck-am: nmcheck --propsdlgshareplugin.lo: propsdlgshareplugin.moc --propertiespage.lo: propertiespage.moc --$(srcdir)/propertiespage.cpp: propertiespagegui.h --$(srcdir)/propsdlgshareplugin.cpp: propertiespagegui.h --propertiespage.o: propertiespage.moc -- --#>+ 15 --propertiespagegui.cpp: $(srcdir)/propertiespagegui.ui propertiespagegui.h propertiespagegui.moc -- rm -f propertiespagegui.cpp -- echo '#include <kdialog.h>' > propertiespagegui.cpp -- echo '#include <klocale.h>' >> propertiespagegui.cpp -- $(UIC) -tr ${UIC_TR} -i propertiespagegui.h $(srcdir)/propertiespagegui.ui > propertiespagegui.cpp.temp ; ret=$$?; \ -- $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" propertiespagegui.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_propertiespagegui,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> propertiespagegui.cpp ;\ -- rm -f propertiespagegui.cpp.temp ;\ -- if test "$$ret" = 0; then echo '#include "propertiespagegui.moc"' >> propertiespagegui.cpp; else rm -f propertiespagegui.cpp ; exit $$ret ; fi -- --propertiespagegui.h: $(srcdir)/propertiespagegui.ui -- rm -rf propertiespagegui.h; -- $(UIC) $(srcdir)/propertiespagegui.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> propertiespagegui.h ; --propertiespagegui.moc: propertiespagegui.h -- $(MOC) propertiespagegui.h -o propertiespagegui.moc -diff -urN kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop ---- kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Thu Jan 1 01:00:00 1970 -@@ -1,73 +0,0 @@ --[Desktop Entry] --Encoding=UTF-8 --Type=Service --Name=Media Properties Page --Name[ca]=Pàgina de propietats de suport --Name[cs]=Stránka vlastností média --Name[da]=Medieegenskabsside --Name[de]=Eigenschaften von Medien --Name[el]=Σελίδα ιδιοτήτων μέσων --Name[es]=Página de propiedades de medios --Name[et]=Andmekandjate omadused --Name[fa]=صفحۀ ویژگیهای رسانه --Name[fi]=Mediaominaisuudet --Name[fr]=Page de propriétés du média --Name[he]=דף מאפייני מדיה --Name[hr]=Stranica svojstva medija --Name[hu]=Médiajellemzők lap --Name[is]=Eiginleikar miðils --Name[it]=Pagina delle proprietà dei dispositivi di archiviazione --Name[ja]=メディア属性ページ --Name[km]=ទំព័រលក្ខណៈសម្បត្តិមេឌៀ --Name[nb]=Side for medievarsling --Name[nds]=Medienegenschappen-Siet --Name[nl]=Pagina met media-eigenschappen --Name[nn]=Side for medieeigenskapar --Name[pl]=Strona właściwości nośnika --Name[pt]=Página de Propriedades de Suportes Físicos --Name[pt_BR]=Página de Propriedades de Suportes Físicos --Name[ru]=Свойства носителя --Name[sk]=Strana vlastností média --Name[sl]=Stran z lastnostmi nosilca --Name[sr]=Страна са својствима медијума --Name[sr@Latn]=Strana sa svojstvima medijuma --Name[sv]=Sida för mediaegenskaper --Name[uk]=Сторінка властивостей носіїв інформації --Name[vi]=Trang tài sản phương tiện --Name[zh_TW]=媒體內容頁 --Comment=Konqueror properties dialog plugin to configure mount behaviour --Comment[ca]=Diàleg de propietats de l'endollable Konqueror per a configurar el comportament de muntatge --Comment[cs]=Dialog nastavení chování připojení modulu pro Konqueror --Comment[da]=Konqueror plugin med egenskabsdialog til at indstille monteringsopførsel --Comment[de]=Konqueror-Modul zum Einstellen des Verhaltens beim Einbinden --Comment[el]=Πρόσθετο διαλόγου ιδιοτήτων του Konqueror για τη ρύθμιση της συμπεριφοράς προσάρτησης --Comment[es]=Plugin de diálogo de propiedades de Konqueror para configurar el comportamiento del montaje --Comment[et]=Konquerori seadistustedialoogi plugin andmekandjate ühendamise seadistamiseks --Comment[fa]=وصلۀ محاورۀ ویژگیهای Konqueror برای پیکربندی رفتار سوار کردن --Comment[fi]=Konquerorin ominaisuussovelma, joka tarkkailee liitospisteitä --Comment[fr]=Module de Konqueror pour configurer le comportement du montage --Comment[he]=תוסף חלון מאפיינים של Konqueror לקביעת אפשרויות חיבור --Comment[hr]=Konqueror dodatak dijaloga svojstava za konfiguriranje načina pristupanja --Comment[hu]=Konqueror beállítómodul a csatlakoztatási mód megadásához --Comment[is]=Konqueror eiginleikagluggi til að stilla tengihegðun --Comment[it]=Plugin della configurazione di Konqueror per configurare il montaggio --Comment[ja]=mountの挙動を設定する、Konqueror属性ダイアログ プラグイン --Comment[km]=កម្មវិធីជំនួយឲ្យមានប្រអប់លក្ខណៈសម្បត្តិ Konqueror ដើម្បីកំណត់រចនាសម្ព័ន្ធឥរិយាបថម៉ោន --Comment[nb]=Et programtillegg for å sette opp montering av enheter i Konqueror --Comment[nds]=Egenschappendialoog-Plugin för Konqueror för't Instellen vun't Inhangbedregen --Comment[nl]=Dialoogvenster voor Konqueror om het aankoppelgedrag in te stellen --Comment[nn]=Programtillegg for oppsett av montering i Konqueror --Comment[pl]=Wtyczka okna właściwości Konquerora do konfiguracji zachowania montowania --Comment[pt]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem --Comment[pt_BR]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem --Comment[ru]=Модуль свойств для Konqueror, отвечающий за поведение при подключении файловых систем --Comment[sk]=Modul Konqueror dialógu vlastností pre konfiguráciu správania pripojenia --Comment[sl]=Vstavek za Konqueror s katerim se nastavlja obnašanje priklopa medijev --Comment[sr]=Прикључак са својствима Konqueror-а за подешавање понашања при монтирању --Comment[sr@Latn]=Priključak sa svojstvima Konqueror-a za podešavanje ponašanja pri montiranju --Comment[sv]=Konqueror insticksprogram med egenskapsdialogruta för att anpassa monteringsbeteende --Comment[uk]=Втулок вікна властивостей Konqueror для налаштування поведінки монтування --Comment[vi]=bổ sung hộp thoại tài sản Konqueror để cấu hình ứng xử gắn kết --Comment[zh_TW]=Konqueror 內容對話框外掛程式，用於設定掛載的行為 --X-KDE-Library=media_propsdlgplugin --ServiceTypes=KPropsDlg/Plugin,media/audiocd,media/hdd_mounted,media/hdd_unmounted,media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/nfs_mounted,media/cdwriter_unmounted,media/nfs_unmounted,media/removable_mounted,media/dvd_mounted,media/removable_unmounted,media/dvd_unmounted,media/smb_mounted,media/dvdvideo,media/smb_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/floppy_mounted,media/zip_mounted,media/floppy_unmounted,media/zip_unmounted,media/camera_mounted,media/camera_unmounted -diff -urN kioslave/media/propsdlgplugin/propertiespage.cpp kioslave/media/propsdlgplugin/propertiespage.cpp ---- kioslave/media/propsdlgplugin/propertiespage.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespage.cpp Thu Jan 1 01:00:00 1970 -@@ -1,217 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program 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 General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ -- --#include <qcheckbox.h> --#include <qtooltip.h> --#include <qbuttongroup.h> --#include <qlineedit.h> --#include <qfileinfo.h> --#include <qlabel.h> --#include <qregexp.h> --#include <kpushbutton.h> --#include <kmessagebox.h> --#include <klocale.h> --#include <qcombobox.h> --#include <qtimer.h> --#include <kdebug.h> --#include "propertiespage.h" --#include <dcopref.h> -- --// keep in sync with .ui and kded module --const char *short_names[] = {"lower", "win95", "winnt", "mixed", 0 }; --const char *journales[] = {"data", "ordered", "writeback", 0 }; -- --PropertiesPage::PropertiesPage(QWidget* parent, const QString &_id) -- : PropertiesPageGUI(parent), id(_id) --{ -- kdDebug() << "props page " << id << endl; -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "mountoptions", id); -- -- QStringList list; -- -- if (reply.isValid()) -- list = reply; -- -- if (list.size()) { -- kdDebug() << "list " << list << endl; -- -- for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it) -- { -- QString key = (*it).left((*it).find('=')); -- QString value = (*it).mid((*it).find('=') + 1); -- kdDebug() << "key '" << key << "' value '" << value << "'\n"; -- options[key] = value; -- } -- -- if (!options.contains("ro")) -- option_ro->hide(); -- else -- option_ro->setChecked(options["ro"] == "true"); -- connect( option_ro, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("quiet")) -- option_quiet->hide(); -- else -- option_quiet->setChecked(options["quiet"] == "true"); -- connect( option_quiet, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("sync")) -- option_sync->hide(); -- else -- option_sync->setChecked(options["sync"] == "true"); -- connect( option_sync, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("atime")) -- option_atime->hide(); -- else -- option_atime->setChecked(options["atime"] == "true"); -- connect( option_atime, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("flush")) -- option_flush->hide(); -- else -- option_flush->setChecked(options["flush"] == "true"); -- connect( option_flush, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("utf8")) -- option_utf8->hide(); -- else -- option_utf8->setChecked(options["utf8"] == "true"); -- connect( option_utf8, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("uid")) -- option_uid->hide(); -- else -- option_uid->setChecked(options["uid"] == "true"); -- connect( option_uid, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("shortname")) -- { -- option_shortname->hide(); -- text_shortname->hide(); -- } -- else -- { -- for (int index = 0; short_names[index]; ++index) -- if (options["shortname"] == short_names[index]) -- { -- option_shortname->setCurrentItem(index); -- break; -- } -- connect( option_shortname, SIGNAL( activated(int) ), SIGNAL( changed() ) ); -- } -- -- if (!options.contains("journaling")) -- { -- text_journaling->hide(); -- option_journaling->hide(); -- } -- else -- { -- for (int index = 0; journales[index]; ++index) -- if (options["journaling"] == journales[index]) -- { -- option_journaling->setCurrentItem(index); -- break; -- } -- connect( option_journaling, SIGNAL( activated(int) ), SIGNAL( changed() ) ); -- } -- -- label_filesystem->setText(i18n("Filesystem: %1").arg(options["filesystem"])); -- option_mountpoint->setText(options["mountpoint"]); -- connect( option_mountpoint, SIGNAL( textChanged( const QString &) ), SIGNAL( changed() ) ); -- option_automount->setChecked(options["automount"] == "true"); -- connect( option_automount, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("journaling") && -- !options.contains("shortname") && -- !options.contains("uid") && -- !options.contains("utf8") && -- !options.contains("flush")) -- groupbox_specific->hide(); -- -- } else { -- -- groupbox_generic->setEnabled(false); -- groupbox_specific->setEnabled(false); -- label_filesystem->hide(); -- } --} -- --PropertiesPage::~PropertiesPage() --{ --} -- --bool PropertiesPage::save() --{ -- QStringList result; -- -- if (options.contains("ro")) -- result << QString("ro=%1").arg(option_ro->isChecked() ? "true" : "false"); -- -- if (options.contains("quiet")) -- result << QString("quiet=%1").arg(option_quiet->isChecked() ? "true" : "false"); -- -- if (options.contains("sync")) -- result << QString("sync=%1").arg(option_sync->isChecked() ? "true" : "false"); -- -- if (options.contains("atime")) -- result << QString("atime=%1").arg(option_atime->isChecked() ? "true" : "false"); -- -- if (options.contains("flush")) -- result << QString("flush=%1").arg(option_flush->isChecked() ? "true" : "false"); -- -- if (options.contains("utf8")) -- result << QString("utf8=%1").arg(option_utf8->isChecked() ? "true" : "false"); -- -- if (options.contains("uid")) -- result << QString("uid=%1").arg(option_uid->isChecked() ? "true" : "false"); -- -- if (options.contains("shortname")) -- result << QString("shortname=%1").arg(short_names[option_shortname->currentItem()]); -- -- if (options.contains("journaling")) -- result << QString("journaling=%1").arg(journales[option_journaling->currentItem()]); -- -- QString mp = option_mountpoint->text(); -- if (!mp.startsWith("/media/")) -- { -- KMessageBox::sorry(this, i18n("Mountpoint has to be below /media")); -- return false; -- } -- result << QString("mountpoint=%1").arg(mp); -- result << QString("automount=%1").arg(option_automount->isChecked() ? "true" : "false"); -- -- kdDebug() << result << endl; -- -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "setMountoptions", id, result); -- -- if (reply.isValid()) -- return (bool)reply; -- else { -- KMessageBox::sorry(this, -- i18n("Saving the changes failed")); -- -- return false; -- } --} -- --#include "propertiespage.moc" -diff -urN kioslave/media/propsdlgplugin/propertiespage.h kioslave/media/propsdlgplugin/propertiespage.h ---- kioslave/media/propsdlgplugin/propertiespage.h Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespage.h Thu Jan 1 01:00:00 1970 -@@ -1,46 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program 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 General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ -- --#ifndef PROPERTIESPAGE_H --#define PROPERTIESPAGE_H -- --#include "propertiespagegui.h" --#include <qmap.h> -- --class QCheckBox; --class Medium; -- --class PropertiesPage : public PropertiesPageGUI --{ -- Q_OBJECT -- --public: -- PropertiesPage(QWidget* parent, const QString &_id); -- virtual ~PropertiesPage(); -- -- bool save(); -- --protected: -- -- QMap<QString,QString> options; -- QString id; -- --}; -- --#endif -diff -urN kioslave/media/propsdlgplugin/propertiespagegui.ui kioslave/media/propsdlgplugin/propertiespagegui.ui ---- kioslave/media/propsdlgplugin/propertiespagegui.ui Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespagegui.ui Thu Jan 1 01:00:00 1970 -@@ -1,387 +0,0 @@ --<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> --<class>PropertiesPageGUI</class> --<widget class="QWidget"> -- <property name="name"> -- <cstring>PropertiesPageGUI</cstring> -- </property> -- <property name="geometry"> -- <rect> -- <x>0</x> -- <y>0</y> -- <width>527</width> -- <height>476</height> -- </rect> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <property name="margin"> -- <number>0</number> -- </property> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout17</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QGroupBox"> -- <property name="name"> -- <cstring>groupbox_generic</cstring> -- </property> -- <property name="title"> -- <string>Generic Mount Options</string> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout15</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_ro</cstring> -- </property> -- <property name="text"> -- <string>Read only</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Mount the file system read-only.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_quiet</cstring> -- </property> -- <property name="text"> -- <string>Quiet</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Attempts to chown or chmod files do not return errors, although they fail. Use with caution!</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_sync</cstring> -- </property> -- <property name="text"> -- <string>Synchronous</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>All I/O to the file system should be done synchronously.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_atime</cstring> -- </property> -- <property name="text"> -- <string>Access time updates</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Update inode access time for each access.</string> -- </property> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout14</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>textLabel3</cstring> -- </property> -- <property name="text"> -- <string>Mountpoint:</string> -- </property> -- <property name="buddy" stdset="0"> -- <cstring>option_mountpoint</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Under what directory this file system shall be mounted. Please note that there is no guarantee that the system will respect your wish. For one the directory has to be below /media - and it does not yet have to exist.</string> -- </property> -- </widget> -- <widget class="QLineEdit"> -- <property name="name"> -- <cstring>option_mountpoint</cstring> -- </property> -- <property name="text"> -- <string></string> -- </property> -- </widget> -- </hbox> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_automount</cstring> -- </property> -- <property name="text"> -- <string>Mount automatically</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Mount this file system automatically.</string> -- </property> -- </widget> -- </vbox> -- </widget> -- </vbox> -- </widget> -- <widget class="QGroupBox"> -- <property name="name"> -- <cstring>groupbox_specific</cstring> -- </property> -- <property name="title"> -- <string>Filesystem Specific Mount Options</string> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout11</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_flush</cstring> -- </property> -- <property name="text"> -- <string>Flushed IO</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Always flush all data to the hot plug devices immediately and don't cache it.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_utf8</cstring> -- </property> -- <property name="text"> -- <string>UTF-8 charset</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the console. It can be be enabled for the filesystem with this option.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_uid</cstring> -- </property> -- <property name="text"> -- <string>Mount as user</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Mount this file system as user.</string> -- </property> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout7</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>text_journaling</cstring> -- </property> -- <property name="text"> -- <string>Journaling:</string> -- </property> -- <property name="buddy" stdset="0"> -- <cstring>option_journaling</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> -- --<h3><b>All Data</b></h3> -- All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. -- --<h3><b>Ordered</b></h3> -- All data is forced directly out to the main file system prior to its metadata being committed to the journal. -- --<h3><b>Write Back</b></h3> -- Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery.</string> -- </property> -- </widget> -- <widget class="QComboBox"> -- <item> -- <property name="text"> -- <string>All Data</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Ordered</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Write Back</string> -- </property> -- </item> -- <property name="name"> -- <cstring>option_journaling</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> -- --<h3><b>All Data</b></h3> -- All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. -- --<h3><b>Ordered</b></h3> -- All data is forced directly out to the main file system prior to its metadata being committed to the journal. -- --<h3><b>Write Back</b></h3> -- Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery.</string> -- </property> -- </widget> -- </hbox> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout14</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>text_shortname</cstring> -- </property> -- <property name="text"> -- <string>Short names:</string> -- </property> -- <property name="buddy" stdset="0"> -- <cstring>option_shortname</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> -- --<h3><b>Lower</b></h3> --Force the short name to lower case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows 95</b></h3> --Force the short name to upper case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows NT</b></h3> --Display the shortname as is; store a long name when the short name is not all lower case or all upper case. -- --<h3><b>Mixed</b></h3> --Display the short name as is; store a long name when the short name is not all upper case.</string> -- </property> -- </widget> -- <widget class="QComboBox"> -- <item> -- <property name="text"> -- <string>Lower</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Windows 95</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Windows NT</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Mixed</string> -- </property> -- </item> -- <property name="name"> -- <cstring>option_shortname</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> -- --<h3><b>Lower</b></h3> --Force the short name to lower case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows 95</b></h3> --Force the short name to upper case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows NT</b></h3> --Display the shortname as is; store a long name when the short name is not all lower case or all upper case. -- --<h3><b>Mixed</b></h3> --Display the short name as is; store a long name when the short name is not all upper case.</string> -- </property> -- </widget> -- </hbox> -- </widget> -- </vbox> -- </widget> -- </vbox> -- </widget> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>label_filesystem</cstring> -- </property> -- <property name="text"> -- <string>Filesystem: iso9660</string> -- </property> -- </widget> -- <spacer> -- <property name="name"> -- <cstring>spacer1</cstring> -- </property> -- <property name="orientation"> -- <enum>Vertical</enum> -- </property> -- <property name="sizeType"> -- <enum>Expanding</enum> -- </property> -- <property name="sizeHint"> -- <size> -- <width>20</width> -- <height>20</height> -- </size> -- </property> -- </spacer> -- </vbox> -- </widget> -- </hbox> --</widget> --<connections> -- <connection> -- <sender>option_ro</sender> -- <signal>stateChanged(int)</signal> -- <receiver>PropertiesPageGUI</receiver> -- <slot>changedSlot()</slot> -- </connection> --</connections> --<variables> -- <variable>bool m_hasChanged;</variable> --</variables> --<signals> -- <signal>changed()</signal> --</signals> --<slots> -- <slot access="protected">changedSlot()</slot> --</slots> --<functions> -- <function returnType="bool">hasChanged()</function> --</functions> --<layoutdefaults spacing="6" margin="11"/> --</UI> -diff -urN kioslave/media/propsdlgplugin/propertiespagegui.ui.h kioslave/media/propsdlgplugin/propertiespagegui.ui.h ---- kioslave/media/propsdlgplugin/propertiespagegui.ui.h Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespagegui.ui.h Thu Jan 1 01:00:00 1970 -@@ -1,22 +0,0 @@ --/**************************************************************************** --** ui.h extension file, included from the uic-generated form implementation. --** --** If you wish to add, delete or rename functions or slots use --** Qt Designer which will update this file, preserving your code. Create an --** init() function in place of a constructor, and a destroy() function in --** place of a destructor. --*****************************************************************************/ -- -- --void PropertiesPageGUI::changedSlot() --{ -- m_hasChanged = true; -- emit changed(); --} -- --bool PropertiesPageGUI::hasChanged() --{ -- return m_hasChanged; --} -- -- -diff -urN kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp ---- kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp Thu Jan 1 01:00:00 1970 -@@ -1,100 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program 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 General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ --#include <qstring.h> --#include <qvbox.h> --#include <qlayout.h> --#include <qlabel.h> --#include <qtimer.h> -- --#include <kgenericfactory.h> --#include <kdebug.h> --#include <kpushbutton.h> --#include <kfileshare.h> --#include <kmessagebox.h> --#include <kprocess.h> --#include <kstandarddirs.h> --#include <kdialog.h> --#include <kglobal.h> --#include <dcopref.h> -- --#include "propertiespage.h" --#include "propsdlgshareplugin.h" --#include "../libmediacommon/medium.h" -- --typedef KGenericFactory<PropsDlgSharePlugin, KPropertiesDialog> PropsDlgSharePluginFactory; -- --K_EXPORT_COMPONENT_FACTORY( media_propsdlgplugin, -- PropsDlgSharePluginFactory("media_propsdlgplugin") ) -- --class PropsDlgSharePlugin::Private --{ -- public: -- PropertiesPage* page; --}; -- --PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg, -- const char *, const QStringList & ) -- : KPropsDlgPlugin(dlg), d(0) --{ -- if (properties->items().count() != 1) -- return; -- -- KFileItem *item = properties->items().first(); -- -- DCOPRef mediamanager("kded", "mediamanager"); -- kdDebug() << "properties " << item->url() << endl; -- DCOPReply reply = mediamanager.call( "properties", item->url().url() ); -- -- if ( !reply.isValid() ) -- return; -- -- QVBox* vbox = properties->addVBoxPage(i18n("&Mounting")); -- -- d = new Private(); -- -- d->page = new PropertiesPage(vbox, Medium::create(reply).id()); -- connect(d->page, SIGNAL(changed()), -- SLOT(slotChanged())); -- -- // QTimer::singleShot(100, this, SLOT(slotChanged())); -- --} -- --void PropsDlgSharePlugin::slotChanged() --{ -- kdDebug() << "slotChanged()\n"; -- setDirty(true); --} -- --PropsDlgSharePlugin::~PropsDlgSharePlugin() --{ -- delete d; --} -- --void PropsDlgSharePlugin::applyChanges() --{ -- kdDebug() << "applychanges\n"; -- if (!d->page->save()) { -- properties->abortApplying(); -- } --} -- -- --#include "propsdlgshareplugin.moc" -- -diff -urN kioslave/media/propsdlgplugin/propsdlgshareplugin.h kioslave/media/propsdlgplugin/propsdlgshareplugin.h ---- kioslave/media/propsdlgplugin/propsdlgshareplugin.h Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propsdlgshareplugin.h Thu Jan 1 01:00:00 1970 -@@ -1,44 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program 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 General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ -- --#ifndef KONQFILESHAREPLUGIN_H --#define KONQFILESHAREPLUGIN_H -- --#include <kpropertiesdialog.h> -- --class PropsDlgSharePlugin : public KPropsDlgPlugin --{ --Q_OBJECT --public: -- PropsDlgSharePlugin( KPropertiesDialog *dlg, const char *, const QStringList & ); -- virtual ~PropsDlgSharePlugin(); -- virtual void applyChanges(); -- --public slots: -- void slotChanged(); -- --private: -- class Private; -- Private *d; -- --}; -- --#endif -- -- -diff -urN kioslave/media/services/Makefile.in kioslave/media/services/Makefile.in ---- kioslave/media/services/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/services/Makefile.in Fri May 26 09:54:31 2006 -@@ -211,6 +211,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/services/media_eject.desktop kioslave/media/services/media_eject.desktop ---- kioslave/media/services/media_eject.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/services/media_eject.desktop Mon May 22 20:12:42 2006 -@@ -24,7 +24,7 @@ - Name[es]=Expulsar - Name[et]=Väljastamine - Name[eu]=Egotzi --Name[fa]=پس زدن -+Name[fa]=اخراج - Name[fi]=Poista - Name[fr]=Éjecter - Name[fy]=Utsmytknop -diff -urN kioslave/media/services/media_safelyremove.desktop kioslave/media/services/media_safelyremove.desktop ---- kioslave/media/services/media_safelyremove.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/services/media_safelyremove.desktop Tue May 23 13:33:34 2006 -@@ -18,10 +18,8 @@ - Name[es]=Extracción segura - Name[et]=Eemalda turvaliselt - Name[eu]=Atera arriskurik gabe --Name[fa]=حذف امن - Name[fi]=Poista turvallisesti - Name[fr]=Enlever en toute sécurité --Name[fy]=Feilich verwiderje - Name[ga]=Bain Amach go Sábháilte - Name[gl]=Eliminar de Maneira Segura - Name[he]=שליפה בבטחה -@@ -46,7 +44,6 @@ - Name[ru]=Безопасно извлечь - Name[rw]=Gukuramo Neza - Name[se]=Dorvvošlaš eretváldin --Name[sk]=Bezpečne odpojiť - Name[sl]=Varno odstrani - Name[sr]=Безбедно уклони - Name[sr@Latn]=Bezbedno ukloni diff --git a/x11/kdebase4-runtime/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kdebase4-runtime/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp deleted file mode 100644 index 5a6937d40f75..000000000000 --- a/x11/kdebase4-runtime/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- kioslave/media/mediamanager/fstabbackend.cpp.orig Mon May 22 20:12:42 2006 -+++ kioslave/media/mediamanager/fstabbackend.cpp Fri Jun 16 08:56:20 2006 -@@ -111,6 +111,7 @@ - if ( mount->mountType() == "swap" - || mount->mountType() == "tmpfs" - || mount->mountType() == "sysfs" -+ || mount->mountType() == "fdescfs" - || mount->mountType() == "kernfs" - || mount->mountType() == "usbfs" - || mount->mountType().contains( "proc" ) diff --git a/x11/kdebase4-runtime/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp b/x11/kdebase4-runtime/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp index 00685d0fd8a2..e2580f9277c0 100644 --- a/x11/kdebase4-runtime/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp +++ b/x11/kdebase4-runtime/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp @@ -1,5 +1,5 @@ ---- kioslave/media/mediamanager/halbackend.cpp.orig Sun Oct 1 21:31:54 2006 -+++ kioslave/media/mediamanager/halbackend.cpp Fri Feb 9 22:01:27 2007 +--- kioslave/media/mediamanager/halbackend.cpp.orig Mon Jan 15 12:31:32 2007 ++++ kioslave/media/mediamanager/halbackend.cpp Sat Mar 3 18:00:49 2007 @@ -17,9 +17,14 @@ */ @@ -14,9 +14,9 @@ +#include <langinfo.h> +#endif - #include <qfile.h> - #include <klocale.h> -@@ -66,6 +71,10 @@ + #include <kapplication.h> + #include <qeventloop.h> +@@ -71,6 +76,10 @@ /* Close HAL connection */ if (m_halContext) { @@ -27,7 +27,7 @@ const QPtrList<Medium> medlist = m_mediaList.list(); QPtrListIterator<Medium> it (medlist); for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) -@@ -185,6 +194,10 @@ +@@ -184,6 +193,10 @@ libhal_free_string_array( halDeviceList ); @@ -38,9 +38,9 @@ return true; } -@@ -242,11 +255,11 @@ - Medium* medium = new Medium(udi, ""); - +@@ -251,11 +264,11 @@ + } + } QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi)); - kdDebug() << "automount " << options["automount"] << endl; + kdDebug(1219) << "automount " << options["automount"] << endl; @@ -50,9 +50,9 @@ - kdDebug() << "error " << error << endl; + kdDebug(1219) << "error " << error << endl; } - setVolumeProperties(medium); m_mediaList.addMedium(medium, allowNotification); -@@ -264,6 +277,11 @@ + +@@ -272,6 +285,11 @@ Medium* medium = new Medium(udi, ""); setFloppyProperties(medium); m_mediaList.addMedium(medium, allowNotification); @@ -64,7 +64,7 @@ return; } -@@ -285,12 +303,23 @@ +@@ -293,12 +311,23 @@ void HALBackend::RemoveDevice(const char *udi) { @@ -89,7 +89,7 @@ const char* mediumUdi = findMediumUdiFromUdi(udi); if (!mediumUdi) return; -@@ -326,7 +355,7 @@ +@@ -334,7 +363,7 @@ } const char* mediumUdi = findMediumUdiFromUdi(udi); @@ -98,7 +98,7 @@ if (!mediumUdi) return; -@@ -384,7 +413,7 @@ +@@ -392,7 +421,7 @@ { Medium m( *cmedium ); if ( setFstabProperties( &m ) ) { @@ -107,7 +107,7 @@ m_mediaList.changeMediumState(m, false); } return; -@@ -399,6 +428,7 @@ +@@ -407,6 +436,7 @@ setFloppyProperties(m); if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) setCameraProperties(m); @@ -115,7 +115,7 @@ m_mediaList.changeMediumState(*m, false); -@@ -469,28 +499,23 @@ +@@ -479,28 +509,23 @@ else mimeType = "media/dvd" + MOUNT_SUFFIX; @@ -155,7 +155,7 @@ } else { -@@ -575,7 +600,7 @@ +@@ -584,7 +609,7 @@ } } @@ -164,7 +164,7 @@ QString fstype = medium->fsType(); if ( fstype.isNull() ) fstype = "auto"; -@@ -762,7 +787,7 @@ +@@ -794,7 +819,7 @@ if (t.endsWith("=")) t = t.left(t.length() - 1); valids[t] = true; @@ -173,7 +173,7 @@ } libhal_free_string_array(array); QStringList result; -@@ -882,12 +908,20 @@ +@@ -915,12 +940,20 @@ result << "journaling=ordered"; } @@ -195,7 +195,7 @@ KConfig config("mediamanagerrc"); config.setGroup(name); -@@ -927,7 +959,7 @@ +@@ -960,7 +993,7 @@ if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, "org.freedesktop.Hal.Device.Volume", "Mount"))) { @@ -204,7 +204,7 @@ return i18n("Internal Error"); } -@@ -935,7 +967,7 @@ +@@ -968,7 +1001,7 @@ DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &poptions, noptions, DBUS_TYPE_INVALID)) { @@ -213,7 +213,7 @@ dbus_message_unref (dmesg); return i18n("Internal Error"); } -@@ -963,7 +995,7 @@ +@@ -996,7 +1029,7 @@ return qerror; } @@ -222,18 +222,25 @@ dbus_message_unref (dmesg); dbus_message_unref (reply); -@@ -974,15 +1006,33 @@ +@@ -1044,7 +1077,7 @@ void HALBackend::slotResult(KIO::Job *job) { - kdDebug() << "slotResult " << mount_jobs[job] << endl; + kdDebug(1219) << "slotResult " << mount_jobs[job] << endl; - if (job->error()) - { - KMessageBox::error(0, job->errorText()); + + struct mount_job_data *data = mount_jobs[job]; + QString& qerror = data->errorMessage; +@@ -1071,7 +1104,6 @@ + qerror = job->errorText(); } -- ResetProperties( mount_jobs[job].latin1() ); + +- ResetProperties( medium->id().latin1() ); mount_jobs.remove(job); + + /* Job completed. Notify the caller */ +@@ -1080,6 +1112,25 @@ + kapp->eventLoop()->exitLoop(); } +#ifdef Q_OS_FREEBSD @@ -247,7 +254,7 @@ + { + bool mounted = false; + const char *dev = (*it)->deviceNode().ascii(); -+ for (int n = mntNum-1; n >= 0 && !mounted; n--) ++ for (int n = mntNum-1; n >= 0 && !mounted; n--) + mounted = !strcmp(dev, mntBuf[n].f_mntfromname); + if ((*it)->isMounted() != mounted) + ResetProperties((*it)->id().latin1()); @@ -258,31 +265,32 @@ QString HALBackend::isInFstab(const Medium *medium) { KMountPoint::List fstab = KMountPoint::possibleMountPoints(KMountPoint::NeedMountOptions|KMountPoint::NeedRealDeviceName); -@@ -992,11 +1042,13 @@ - - for (; it!=end; ++it) - { -- kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl; -+ kdDebug(1219) << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl; - if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && (*it)->realDeviceName() == medium->deviceNode() ) ) +@@ -1092,12 +1143,14 @@ + QString reald = (*it)->realDeviceName(); + if ( reald.endsWith( "/" ) ) + reald = reald.left( reald.length() - 1 ); +- kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << reald << "- -" << (*it)->mountedFrom() << "-" << endl; ++ kdDebug(1219) << "isInFstab -" << medium->deviceNode() << "- -" << reald << "- -" << (*it)->mountedFrom() << "-" << endl; + if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && reald == medium->deviceNode() ) ) { +#ifndef Q_OS_FREEBSD QStringList opts = (*it)->mountOptions(); if (opts.contains("user") || opts.contains("users")) -+#endif return (*it)->mountPoint(); ++#endif } } -@@ -1012,7 +1064,7 @@ - QString mountPoint = isInFstab(medium); - if (!mountPoint.isNull()) - { + +@@ -1116,7 +1169,7 @@ + data.completed = false; + data.medium = medium; + - kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; + kdDebug(1219) << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint ); connect(job, SIGNAL( result (KIO::Job *)), SLOT( slotResult( KIO::Job *))); -@@ -1023,7 +1075,7 @@ +@@ -1134,7 +1187,7 @@ QStringList soptions; @@ -291,7 +299,7 @@ QMap<QString,QString> valids = MediaManagerUtils::splitOptions(mountoptions(medium->id())); if (valids["flush"] == "true") -@@ -1036,10 +1088,10 @@ +@@ -1147,10 +1200,10 @@ if (valids["ro"] == "true") soptions << "ro"; @@ -304,7 +312,7 @@ if (valids["quiet"] == "true") soptions << "quiet"; -@@ -1069,6 +1121,13 @@ +@@ -1180,6 +1233,13 @@ soptions << QString("data=ordered"); } @@ -318,7 +326,7 @@ const char **options = new const char*[soptions.size() + 1]; uint noptions = 0; for (QStringList::ConstIterator it = soptions.begin(); it != soptions.end(); ++it, ++noptions) -@@ -1081,9 +1140,6 @@ +@@ -1192,9 +1252,6 @@ return qerror; } @@ -328,16 +336,7 @@ return QString(); } -@@ -1121,7 +1177,7 @@ - QString mountPoint = isInFstab(medium); - if (!mountPoint.isNull()) - { -- kdDebug() << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl; -+ kdDebug(1219) << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl; - KIO::Job *job = KIO::unmount( medium->mountPoint(), false ); - connect(job, SIGNAL( result (KIO::Job *)), - SLOT( slotResult( KIO::Job *))); -@@ -1134,7 +1190,7 @@ +@@ -1255,7 +1312,7 @@ const char *options[2]; const char *udi = medium->id().latin1(); @@ -346,7 +345,7 @@ dbus_error_init(&error); DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -@@ -1147,7 +1203,7 @@ +@@ -1268,7 +1325,7 @@ if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, "org.freedesktop.Hal.Device.Volume", "Unmount"))) { @@ -355,7 +354,7 @@ return i18n("Internal Error"); } -@@ -1157,7 +1213,7 @@ +@@ -1278,7 +1335,7 @@ if (!dbus_message_append_args (dmesg, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, 0, DBUS_TYPE_INVALID)) { @@ -364,16 +363,16 @@ dbus_message_unref (dmesg); return i18n("Internal Error"); } -@@ -1165,7 +1221,7 @@ - dbus_error_init (&error); - if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) +@@ -1288,7 +1345,7 @@ { + QString qerror, reason; + - kdDebug() << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl; + kdDebug(1219) << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl; - QString qerror = error.message; - if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.Busy")) { - qerror = QString("<qt>") + i18n("Device is Busy:"); -@@ -1201,13 +1257,10 @@ + qerror = "<qt>"; + qerror += i18n("Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and " + "currently mounted at <b>%4</b> could not be unmounted. ").arg( +@@ -1318,13 +1375,10 @@ return qerror; } diff --git a/x11/kdebase4-runtime/files/extrapatch-kioslave_media_mediamanager-halbackend.h b/x11/kdebase4-runtime/files/extrapatch-kioslave_media_mediamanager-halbackend.h index df548eb39905..21672b565977 100644 --- a/x11/kdebase4-runtime/files/extrapatch-kioslave_media_mediamanager-halbackend.h +++ b/x11/kdebase4-runtime/files/extrapatch-kioslave_media_mediamanager-halbackend.h @@ -1,5 +1,5 @@ ---- kioslave/media/mediamanager/halbackend.h.orig Sun Jan 28 23:58:13 2007 -+++ kioslave/media/mediamanager/halbackend.h Thu Feb 1 02:51:48 2007 +--- kioslave/media/mediamanager/halbackend.h.orig Mon Jan 15 12:31:32 2007 ++++ kioslave/media/mediamanager/halbackend.h Wed Feb 21 15:01:12 2007 @@ -34,6 +34,9 @@ #include <qobject.h> #include <qstringlist.h> @@ -10,7 +10,7 @@ #include <config.h> -@@ -154,6 +157,9 @@ +@@ -156,6 +159,9 @@ private slots: void slotResult(KIO::Job *job); @@ -20,10 +20,10 @@ /* Hal call-backs -- from gvm*/ public: -@@ -217,6 +223,10 @@ - DBusConnection *dbus_connection; +@@ -233,6 +239,10 @@ + }; - QMap<KIO::Job *, QString> mount_jobs; + QMap<KIO::Job *, struct mount_job_data*> mount_jobs; +#ifdef Q_OS_FREEBSD + QTimer m_pollTimer; + QPtrList<Medium> m_pollMediaList; diff --git a/x11/kdebase4-runtime/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp b/x11/kdebase4-runtime/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp index 508019a14f3c..7d0fbfa81767 100644 --- a/x11/kdebase4-runtime/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp +++ b/x11/kdebase4-runtime/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp @@ -1,6 +1,6 @@ ---- kioslave/media/mounthelper/kio_media_mounthelper.cpp.orig Sat Jan 27 01:58:24 2007 -+++ kioslave/media/mounthelper/kio_media_mounthelper.cpp Sat Jan 27 02:35:28 2007 -@@ -77,7 +77,9 @@ +--- kioslave/media/mounthelper/kio_media_mounthelper.cpp.orig Mon Jan 15 12:31:31 2007 ++++ kioslave/media/mounthelper/kio_media_mounthelper.cpp Wed Feb 21 15:17:23 2007 +@@ -89,7 +89,9 @@ m_isCdrom = medium.mimeType().find("dvd")!=-1 || medium.mimeType().find("cd")!=-1; @@ -11,7 +11,7 @@ { DCOPRef mediamanager("kded", "mediamanager"); DCOPReply reply = mediamanager.call( "unmount", medium.id()); -@@ -85,13 +87,14 @@ +@@ -97,30 +99,14 @@ reply.get(m_errorStr); kdDebug() << "medium unmount " << m_errorStr << endl; if (m_errorStr.isNull()) @@ -26,6 +26,23 @@ - } - else if (args->isSet("s") || args->isSet("e")) - { +- /* +- * We want to call mediamanager unmount before invoking eject. That's +- * because unmount would provide an informative error message in case of +- * failure. However, there are cases when unmount would fail +- * (supermount, slackware, see bug#116209) but eject would succeed. +- * Thus if unmount fails, save unmount error message and invokeEject() +- * anyway. Only if both unmount and eject fail, notify the user by +- * displaying the saved error message (see ejectFinished()). +- */ +- if (medium.isMounted()) +- { +- DCOPRef mediamanager("kded", "mediamanager"); +- DCOPReply reply = mediamanager.call( "unmount", medium.id()); +- if (reply.isValid()) +- reply.get(m_errorStr); +- m_device = device; +- } - invokeEject(device, true); } else diff --git a/x11/kdebase4-runtime/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase4-runtime/files/patch-kdm-kfrontend-genkdmconf.c deleted file mode 100644 index e0179de4e074..000000000000 --- a/x11/kdebase4-runtime/files/patch-kdm-kfrontend-genkdmconf.c +++ /dev/null @@ -1,11 +0,0 @@ ---- kdm/kfrontend/genkdmconf.c.orig Mon Jun 5 14:34:06 2006 -+++ kdm/kfrontend/genkdmconf.c Mon Jun 5 14:35:52 2006 -@@ -1684,7 +1684,7 @@ - linkfile( ce ); - else { - tmpf = locate( "mktemp" ) ? -- "`mktemp`" : -+ "`mktemp /tmp/xsess-env-XXXXXX`" : - locate( "tempfile" ) ? - "`tempfile`" : - "$HOME/.xsession-env-$DISPLAY"; diff --git a/x11/kdebase4-runtime/files/patch-kwin-client.cpp b/x11/kdebase4-runtime/files/patch-kwin-client.cpp deleted file mode 100644 index d8e0f91db691..000000000000 --- a/x11/kdebase4-runtime/files/patch-kwin-client.cpp +++ /dev/null @@ -1,39 +0,0 @@ ---- kwin/client.cpp.orig Mon Oct 2 03:02:07 2006 -+++ kwin/client.cpp Mon Jan 8 10:54:19 2007 -@@ -477,17 +477,30 @@ - // calls it or when the decoration is created/destroyed - - if( Shape::version() >= 0x11 ) // 1.1, has input shape support -- { // there appears to be no way to find out if a window has input -- // shape set or not, so always set propagate the input shape -- // (it's the same like the bounding shape by default) -- XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, 0, 0, -+ { // There appears to be no way to find out if a window has input -+ // shape set or not, so always propagate the input shape -+ // (it's the same like the bounding shape by default). -+ // Also, build the shape using a helper window, not directly -+ // in the frame window, because the sequence set-shape-to-frame, -+ // remove-shape-of-client, add-input-shape-of-client has the problem -+ // that after the second step there's a hole in the input shape -+ // until the real shape of the client is added and that can make -+ // the window lose focus (which is a problem with mouse focus policies) -+ static Window helper_window = None; -+ if( helper_window == None ) -+ helper_window = XCreateSimpleWindow( qt_xdisplay(), qt_xrootwin(), -+ 0, 0, 1, 1, 0, 0, 0 ); -+ XResizeWindow( qt_xdisplay(), helper_window, width(), height()); -+ XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput, 0, 0, - frameId(), ShapeBounding, ShapeSet ); -- XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, -+ XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput, - clientPos().x(), clientPos().y(), - window(), ShapeBounding, ShapeSubtract ); -- XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, -+ XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput, - clientPos().x(), clientPos().y(), - window(), ShapeInput, ShapeUnion ); -+ XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, 0, 0, -+ helper_window, ShapeInput, ShapeSet ); - } - } - diff --git a/x11/kdebase4-runtime/pkg-plist b/x11/kdebase4-runtime/pkg-plist index 46ca7f96cbe8..bd60a8fa6ce8 100644 --- a/x11/kdebase4-runtime/pkg-plist +++ b/x11/kdebase4-runtime/pkg-plist @@ -440,6 +440,9 @@ lib/kde3/kicker.so lib/kde3/kickermenu_find.a lib/kde3/kickermenu_find.la lib/kde3/kickermenu_find.so +lib/kde3/kickermenu_kate.a +lib/kde3/kickermenu_kate.la +lib/kde3/kickermenu_kate.so lib/kde3/kickermenu_kdeprint.a lib/kde3/kickermenu_kdeprint.la lib/kde3/kickermenu_kdeprint.so @@ -1158,6 +1161,7 @@ share/apps/kappfinder/apps/Internet/mozilla.desktop share/apps/kappfinder/apps/Internet/netscape.desktop share/apps/kappfinder/apps/Internet/netscape6.desktop share/apps/kappfinder/apps/Internet/opera.desktop +share/apps/kappfinder/apps/Internet/wireshark.desktop share/apps/kappfinder/apps/Internet/xbiff.desktop share/apps/kappfinder/apps/Internet/xchat.desktop share/apps/kappfinder/apps/Internet/xfmail.desktop @@ -1628,6 +1632,7 @@ share/apps/kicker/icons/locolor/16x16/actions/modified.png share/apps/kicker/menuext/find.desktop share/apps/kicker/menuext/find/kfind.desktop share/apps/kicker/menuext/find/websearch.desktop +share/apps/kicker/menuext/katesessionmenu.desktop share/apps/kicker/menuext/konquerormenu.desktop share/apps/kicker/menuext/konsolemenu.desktop share/apps/kicker/menuext/prefmenu.desktop @@ -2081,7 +2086,7 @@ share/desktop-directories/kde-edutainment.directory share/desktop-directories/kde-games-arcade.directory share/desktop-directories/kde-games-board.directory share/desktop-directories/kde-games-card.directory -share/desktop-directories/kde-games-kidsgames.directory +share/desktop-directories/kde-games-kids.directory share/desktop-directories/kde-games-roguelikes.directory share/desktop-directories/kde-games-strategy.directory share/desktop-directories/kde-games.directory @@ -2420,6 +2425,7 @@ share/doc/HTML/en/khelpcenter/userguide/common share/doc/HTML/en/khelpcenter/userguide/control-center.docbook share/doc/HTML/en/khelpcenter/userguide/creating-graphics.docbook share/doc/HTML/en/khelpcenter/userguide/credits-and-license.docbook +share/doc/HTML/en/khelpcenter/userguide/customizing-desktop.docbook share/doc/HTML/en/khelpcenter/userguide/desktop.png share/doc/HTML/en/khelpcenter/userguide/email.docbook share/doc/HTML/en/khelpcenter/userguide/extragear-applications.docbook @@ -2480,6 +2486,7 @@ share/doc/HTML/en/khelpcenter/userguide/ripsettings.png share/doc/HTML/en/khelpcenter/userguide/screen-captures.docbook share/doc/HTML/en/khelpcenter/userguide/services.png share/doc/HTML/en/khelpcenter/userguide/shared-sessions.docbook +share/doc/HTML/en/khelpcenter/userguide/splash-screen.png share/doc/HTML/en/khelpcenter/userguide/standard-menu-entries.docbook share/doc/HTML/en/khelpcenter/userguide/switching-sessions.docbook share/doc/HTML/en/khelpcenter/userguide/the-filemanager.docbook @@ -2492,7 +2499,6 @@ share/doc/HTML/en/khelpcenter/userguide/where-next.docbook share/doc/HTML/en/khelpcenter/userguide/windows-how-to.docbook share/doc/HTML/en/khelpcenter/userguide/your-kde-account.docbook share/doc/HTML/en/khelpcenter/visualdict/common -share/doc/HTML/en/khelpcenter/visualdict/contextmenu.png share/doc/HTML/en/khelpcenter/visualdict/index.cache.bz2 share/doc/HTML/en/khelpcenter/visualdict/index.docbook share/doc/HTML/en/khelpcenter/visualdict/pict1.png @@ -2508,6 +2514,9 @@ share/doc/HTML/en/khelpcenter/visualdict/pict18.png share/doc/HTML/en/khelpcenter/visualdict/pict19.png share/doc/HTML/en/khelpcenter/visualdict/pict2.png share/doc/HTML/en/khelpcenter/visualdict/pict20.png +share/doc/HTML/en/khelpcenter/visualdict/pict21.png +share/doc/HTML/en/khelpcenter/visualdict/pict22.png +share/doc/HTML/en/khelpcenter/visualdict/pict23.png share/doc/HTML/en/khelpcenter/visualdict/pict3.png share/doc/HTML/en/khelpcenter/visualdict/pict4.png share/doc/HTML/en/khelpcenter/visualdict/pict5.png @@ -2649,6 +2658,7 @@ share/doc/HTML/en/knetattach/common share/doc/HTML/en/knetattach/index.cache.bz2 share/doc/HTML/en/knetattach/index.docbook share/doc/HTML/en/knetattach/screenshot.png +share/doc/HTML/en/knetattach/screenshot1.png share/doc/HTML/en/knetattach/screenshot2.png share/doc/HTML/en/knetattach/screenshot3.png share/doc/HTML/en/knetattach/screenshot4.png @@ -2742,7 +2752,6 @@ share/icons/crystalsvg/128x128/apps/licq.png share/icons/crystalsvg/128x128/apps/linuxconf.png share/icons/crystalsvg/128x128/apps/locale.png share/icons/crystalsvg/128x128/apps/looknfeel.png -share/icons/crystalsvg/128x128/apps/mozilla.png share/icons/crystalsvg/128x128/apps/multimedia.png share/icons/crystalsvg/128x128/apps/netscape.png share/icons/crystalsvg/128x128/apps/package.png @@ -2808,7 +2817,6 @@ share/icons/crystalsvg/16x16/apps/enhanced_browsing.png share/icons/crystalsvg/16x16/apps/evolution.png share/icons/crystalsvg/16x16/apps/fifteenpieces.png share/icons/crystalsvg/16x16/apps/filetypes.png -share/icons/crystalsvg/16x16/apps/firefox.png share/icons/crystalsvg/16x16/apps/fonts.png share/icons/crystalsvg/16x16/apps/gabber.png share/icons/crystalsvg/16x16/apps/gaim.png @@ -2862,9 +2870,6 @@ share/icons/crystalsvg/16x16/apps/looknfeel.png share/icons/crystalsvg/16x16/apps/lyx.png share/icons/crystalsvg/16x16/apps/mac.png share/icons/crystalsvg/16x16/apps/mathematica.png -share/icons/crystalsvg/16x16/apps/mozilla.png -share/icons/crystalsvg/16x16/apps/mozilla_m.png -share/icons/crystalsvg/16x16/apps/mozilla_mail.png share/icons/crystalsvg/16x16/apps/multimedia.png share/icons/crystalsvg/16x16/apps/nedit.png share/icons/crystalsvg/16x16/apps/netscape.png @@ -2911,7 +2916,6 @@ share/icons/crystalsvg/16x16/apps/stylesheet.png share/icons/crystalsvg/16x16/apps/systemtray.png share/icons/crystalsvg/16x16/apps/taskbar.png share/icons/crystalsvg/16x16/apps/terminal.png -share/icons/crystalsvg/16x16/apps/thunderbird.png share/icons/crystalsvg/16x16/apps/tux.png share/icons/crystalsvg/16x16/apps/usb.png share/icons/crystalsvg/16x16/apps/vnc.png @@ -3016,7 +3020,6 @@ share/icons/crystalsvg/32x32/apps/error.png share/icons/crystalsvg/32x32/apps/evolution.png share/icons/crystalsvg/32x32/apps/fifteenpieces.png share/icons/crystalsvg/32x32/apps/filetypes.png -share/icons/crystalsvg/32x32/apps/firefox.png share/icons/crystalsvg/32x32/apps/fonts.png share/icons/crystalsvg/32x32/apps/gabber.png share/icons/crystalsvg/32x32/apps/gaim.png @@ -3071,9 +3074,6 @@ share/icons/crystalsvg/32x32/apps/looknfeel.png share/icons/crystalsvg/32x32/apps/lyx.png share/icons/crystalsvg/32x32/apps/mac.png share/icons/crystalsvg/32x32/apps/mathematica.png -share/icons/crystalsvg/32x32/apps/mozilla.png -share/icons/crystalsvg/32x32/apps/mozilla_m.png -share/icons/crystalsvg/32x32/apps/mozilla_mail.png share/icons/crystalsvg/32x32/apps/multimedia.png share/icons/crystalsvg/32x32/apps/nedit.png share/icons/crystalsvg/32x32/apps/netscape.png @@ -3118,7 +3118,6 @@ share/icons/crystalsvg/32x32/apps/stylesheet.png share/icons/crystalsvg/32x32/apps/systemtray.png share/icons/crystalsvg/32x32/apps/taskbar.png share/icons/crystalsvg/32x32/apps/terminal.png -share/icons/crystalsvg/32x32/apps/thunderbird.png share/icons/crystalsvg/32x32/apps/tux.png share/icons/crystalsvg/32x32/apps/usb.png share/icons/crystalsvg/32x32/apps/vnc.png @@ -3177,7 +3176,6 @@ share/icons/crystalsvg/48x48/apps/enhanced_browsing.png share/icons/crystalsvg/48x48/apps/evolution.png share/icons/crystalsvg/48x48/apps/fifteenpieces.png share/icons/crystalsvg/48x48/apps/filetypes.png -share/icons/crystalsvg/48x48/apps/firefox.png share/icons/crystalsvg/48x48/apps/fonts.png share/icons/crystalsvg/48x48/apps/gabber.png share/icons/crystalsvg/48x48/apps/gaim.png @@ -3226,9 +3224,6 @@ share/icons/crystalsvg/48x48/apps/licq.png share/icons/crystalsvg/48x48/apps/linuxconf.png share/icons/crystalsvg/48x48/apps/locale.png share/icons/crystalsvg/48x48/apps/looknfeel.png -share/icons/crystalsvg/48x48/apps/mozilla.png -share/icons/crystalsvg/48x48/apps/mozilla_m.png -share/icons/crystalsvg/48x48/apps/mozilla_mail.png share/icons/crystalsvg/48x48/apps/multimedia.png share/icons/crystalsvg/48x48/apps/nedit.png share/icons/crystalsvg/48x48/apps/netscape.png @@ -3330,7 +3325,6 @@ share/icons/crystalsvg/64x64/apps/licq.png share/icons/crystalsvg/64x64/apps/linuxconf.png share/icons/crystalsvg/64x64/apps/locale.png share/icons/crystalsvg/64x64/apps/looknfeel.png -share/icons/crystalsvg/64x64/apps/mozilla.png share/icons/crystalsvg/64x64/apps/multimedia.png share/icons/crystalsvg/64x64/apps/nedit.png share/icons/crystalsvg/64x64/apps/netscape.png diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index 53cec9a18b5f..b4baad2d68d0 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 4 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -42,7 +41,7 @@ PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp @@ -52,7 +51,7 @@ CONFIGURE_ARGS+=--without-java \ --with-ssl-dir=${OPENSSLBASE} OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ - HAL "Use HAL backend for media:/ (FreeBSD 5+ only)" off \ + HAL "Use HAL backend for media:/ (FreeBSD 5+ only)" on \ HTDIG "Depend on htdig, used to build manual indices" off .include "${.CURDIR}/../../x11/kde3/Makefile.kde" @@ -70,7 +69,7 @@ RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper RUN_DEPENDS+= htdig:${PORTSDIR}/textproc/htdig .endif -.if defined(WITH_HAL) && ${OSVERSION} > 500035 +.if !defined(WITHOUT_HAL) && ${OSVERSION} > 500035 EXTRA_PATCHES= ${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.cpp \ ${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.h \ ${FILESDIR}/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp @@ -79,12 +78,9 @@ LIB_DEPENDS+= dbus-qt-1.1:${PORTSDIR}/devel/dbus-qt3 \ PLIST_SUB+= MEDIA="" .else CONFIGURE_ARGS+=--without-hal -EXTRA_PATCHES= ${FILESDIR}/extrapatch-kio_media \ - ${FILESDIR}/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp PLIST_SUB+= MEDIA="@comment " .endif - post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo index 6f53a73368ff..9051c799c5c2 100644 --- a/x11/kdebase4-workspace/distinfo +++ b/x11/kdebase4-workspace/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.5.tar.bz2) = 0c685af1cbca75f9c77b3ed231ba0468 -SHA256 (KDE/kdebase-3.5.5.tar.bz2) = f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0 -SIZE (KDE/kdebase-3.5.5.tar.bz2) = 23851886 +MD5 (KDE/kdebase-3.5.6.tar.bz2) = a53f589f58012e655a52220a6a151019 +SHA256 (KDE/kdebase-3.5.6.tar.bz2) = 245b35f8b2e1533f9ae92b3b07bee5339a716dfb8db363d0126d2e7409b7bd7e +SIZE (KDE/kdebase-3.5.6.tar.bz2) = 24155599 diff --git a/x11/kdebase4-workspace/files/extrapatch-kio_media b/x11/kdebase4-workspace/files/extrapatch-kio_media deleted file mode 100644 index ab1a03b094cb..000000000000 --- a/x11/kdebase4-workspace/files/extrapatch-kio_media +++ /dev/null @@ -1,5814 +0,0 @@ -diff -urN kioslave/media/Makefile.in kioslave/media/Makefile.in ---- kioslave/media/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/Makefile.in Fri May 26 09:54:31 2006 -@@ -122,8 +122,7 @@ - DATA = $(kde_services_DATA) - ETAGS = etags - CTAGS = ctags --DIST_SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ -- kfile-plugin kcmodule mimetypes services propsdlgplugin -+DIST_SUBDIRS = $(SUBDIRS) - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 1 - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -276,6 +275,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -@@ -611,9 +611,8 @@ - xdg_appsdir = @xdg_appsdir@ - xdg_directorydir = @xdg_directorydir@ - xdg_menudir = @xdg_menudir@ --@include_media_halbackend_TRUE@PROPSDLGPLUGINDIR = propsdlgplugin - SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ -- kfile-plugin kcmodule mimetypes services $(PROPSDLGPLUGINDIR) -+ kfile-plugin kcmodule mimetypes services - - INCLUDES = -I$(srcdir)/libmediacommon $(all_includes) - #>- METASOURCES = AUTO -@@ -1092,8 +1091,7 @@ - ./testmedia - - messages: rc.cpp -- $(EXTRACTRC) propsdlgplugin/propertiespagegui.ui >> rc.cpp -- $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp propsdlgplugin/*.cpp -o $(podir)/kio_media.pot -+ $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp -o $(podir)/kio_media.pot - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -diff -urN kioslave/media/kcmodule/Makefile.in kioslave/media/kcmodule/Makefile.in ---- kioslave/media/kcmodule/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/kcmodule/Makefile.in Fri May 26 09:54:31 2006 -@@ -253,6 +253,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/kcmodule/managermodule.cpp kioslave/media/kcmodule/managermodule.cpp ---- kioslave/media/kcmodule/managermodule.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/managermodule.cpp Sun Nov 20 20:14:21 2005 -@@ -39,15 +39,15 @@ - QString hal_text = view->kcfg_HalBackendEnabled->text(); - hal_text += " ("+i18n("No support for HAL on this system")+")"; - view->kcfg_HalBackendEnabled->setText( hal_text ); --#endif - view->kcfg_HalBackendEnabled->setEnabled( false ); -+#endif - - #ifndef COMPILE_LINUXCDPOLLING - QString poll_text = view->kcfg_CdPollingEnabled->text(); - poll_text += " ("+i18n("No support for CD polling on this system")+")"; - view->kcfg_CdPollingEnabled->setText( poll_text ); --#endif - view->kcfg_CdPollingEnabled->setEnabled( false ); -+#endif - - load(); - } -diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.desktop ---- kioslave/media/kcmodule/media.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/kcmodule/media.desktop Mon May 22 20:12:42 2006 -@@ -24,7 +24,6 @@ - Name[es]=Dispositivos de almacenamiento - Name[et]=Andmekandjad - Name[eu]=Biltegiratze-euskarria --Name[fa]=رسانه ذخیرهگاه - Name[fi]=Tallennusmedia - Name[fr]=Support de stockage - Name[fy]=Opslachapparaten -@@ -33,7 +32,7 @@ - Name[he]=התקנים - Name[hi]=भंडार मीडिया - Name[hr]=Mediji za pohranjivanje --Name[hu]=Tárolóeszközök -+Name[hu]=Tárolóeszköz - Name[is]=Geymslumiðlar - Name[it]=Dispositivi di archiviazione - Name[ja]=記憶メディア -@@ -43,7 +42,7 @@ - Name[mk]=Медиуми за податоци - Name[ms]=Media Storan - Name[nb]=Lagringsenheter --Name[nds]=Spiekermedien -+Name[nds]=Spiekerreedschappen - Name[nl]=Opslagapparaten - Name[nn]=Lagringsmedium - Name[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ -@@ -54,7 +53,6 @@ - Name[ru]=Устройства хранения данных - Name[rw]=Uburyo bwo Kubika - Name[se]=Vurkenmedia --Name[sk]=Zálohovacie médiá - Name[sl]=Nosilci za shranjevanje - Name[sr]=Складишни медијуми - Name[sr@Latn]=Skladišni medijumi -@@ -82,13 +80,11 @@ - Comment[es]=Configuración de las medios de almacenamiento - Comment[et]=Salvestusandmekandjate seadistused - Comment[eu]=Konfiguratu biltegiratze-euskarria --Comment[fa]=پیکربندی رسانه ذخیرهگاه - Comment[fi]=Aseta tallennusmedia - Comment[fr]=Configurer le média de stockage - Comment[fy]=Opslachmedia ynstelle - Comment[ga]=Cumraigh Meáin Stórála - Comment[gl]=Configurar Medios de Armacenaxe --Comment[he]=שינוי הגדרות מדיות אחסון - Comment[hr]=Konfiguriranje medija za pohranu - Comment[hu]=A tárolóeszközök beállítása - Comment[is]=Stillingar geymslumiðla -@@ -98,16 +94,15 @@ - Comment[lt]=Konfigūruoti saugojimo įrenginius - Comment[mk]=Конфигурирајте ги медиумите за податоци - Comment[nb]=Sett opp lagringsmedier --Comment[nds]=Spiekermedien instellen -+Comment[nds]=Spiekerreedschappen instellen - Comment[nl]=Opslagmedia instellen - Comment[nn]=Set opp lagringsmedium - Comment[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ ਸੰਰਚਨਾ - Comment[pl]=Konfiguracja nośników danych --Comment[pt]=Configurar os Suportes de Armazenamento -+Comment[pt]=Configurar os Meios de Armazenamento - Comment[pt_BR]=Configura as mídias de armazenamento - Comment[ru]=Настройка подключаемых устройств хранения - Comment[se]=Heivet vurkenmediaid --Comment[sk]=Nastavenie zálohovacích médií - Comment[sl]=Nastavitve nosilcev za shranjevanje - Comment[sr]=Подешавање медијума за складиштење - Comment[sr@Latn]=Podešavanje medijuma za skladištenje -@@ -132,13 +127,11 @@ - Keywords[es]=almacenamiento,medios,usb,cdrom,dispositivo - Keywords[et]=salvestamine,andmekandja,usb,cd,seade - Keywords[eu]=biltegiratzea,euskarriak,usb,cdrom,gailua --Keywords[fa]=ذخیره گاه، رسانه، گذرگاه سریال جهانی، دیسک فشرده، دستگاه - Keywords[fi]=varasto,media,usb,cdrom,laite - Keywords[fr]=stockage,media,medium,usb,cdrom,périphérique - Keywords[fy]=storage,opslach,media,usb,cd-rom,kompakt-skiif,device,apparaat,mp3-speler,usb-stick,geheugenkaart - Keywords[ga]=stóráil,stóras,meáin,meán,usb,cdrom,dlúthdhiosca,gléas - Keywords[gl]=armacenaxe,medios,usb,cdrom,dispositivo --Keywords[he]=storage,media,usb,cdrom,device,מדיה,התקן,סידירום,תקליטור - Keywords[hr]=storage,media,usb,cdrom,device,pohrana,snimanje,mediji,uređaj - Keywords[hu]=tároló,adathordozó,USB,CD-ROM,eszköz - Keywords[is]=geymsla,miðill,usb,cdrom,tæki -@@ -153,7 +146,7 @@ - Keywords[nn]=lagring,media,usb,CD-spiller,CD-ROM,einingar,minnepinnar,harddiskar,HD,eksterne harddiskar,zip-diskar - Keywords[pa]=ਸਟੋਰੇਜ਼,ਮੀਡਿਆ,ਜੰਤਰ,usb,cdrom - Keywords[pl]=dane,przechowywanie danych,nośnik danych,nośniki danych,usb,cdrom,urządzenie --Keywords[pt]=armazenamento,meio,suporte,usb,cdrom,dispositivo -+Keywords[pt]=armazenamento,meio,usb,cdrom,dispositivo - Keywords[pt_BR]=armazenamento,mídia,usb,cd-rom,device,dispositivo - Keywords[ru]=storage,media,usb,cdrom,device,устройство хранения - Keywords[sl]=shranjevanje,nosilec,usb,cdrom,naprava -diff -urN kioslave/media/kcmodule/notifiermodule.cpp kioslave/media/kcmodule/notifiermodule.cpp ---- kioslave/media/kcmodule/notifiermodule.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/notifiermodule.cpp Mon May 22 20:12:42 2006 -@@ -174,8 +174,8 @@ - ActionListBoxItem *action_item - = static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem()); - -- NotifierServiceAction * action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); -- if ( action ) -+ NotifierServiceAction * action; -+ if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() ) ) ) - { - ServiceConfigDialog dialog(action, m_settings.supportedMimetypes(), this); - -@@ -195,8 +195,7 @@ - = static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem()); - - NotifierServiceAction *action; -- action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); -- if ( action ) -+ if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() )) ) - { - m_settings.deleteAction( action ); - updateListBox(); -diff -urN kioslave/media/kfile-plugin/Makefile.in kioslave/media/kfile-plugin/Makefile.in ---- kioslave/media/kfile-plugin/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/kfile-plugin/Makefile.in Fri May 26 09:54:31 2006 -@@ -248,6 +248,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/kfile-plugin/kfile_media.desktop kioslave/media/kfile-plugin/kfile_media.desktop ---- kioslave/media/kfile-plugin/kfile_media.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/kfile-plugin/kfile_media.desktop Mon May 22 20:12:42 2006 -@@ -16,7 +16,6 @@ - Name[es]=Información de recursos - Name[et]=Andmekandja info - Name[eu]=Media informazioa --Name[fa]=اطلاعات رسانه - Name[fi]=Tallenteiden tiedot - Name[fr]=Informations sur le média - Name[fy]=Mediumynformaasje -@@ -47,7 +46,6 @@ - Name[ru]=Сведения о носителе - Name[rw]=Amakuru y'igitangazamakuru - Name[se]=Mediumdieđut --Name[sk]=Informácie o médiu - Name[sl]=Informacije o mediju - Name[sr]=Информације о медијуму - Name[sr@Latn]=Informacije o medijumu -@@ -63,4 +61,4 @@ - Name[zh_TW]=媒體資訊 - ServiceTypes=KFilePlugin - X-KDE-Library=kfile_media --MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera;media/camera_mounted;media/camera_unmounted -+MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera -diff -urN kioslave/media/kfile-plugin/kfilemediaplugin.cpp kioslave/media/kfile-plugin/kfilemediaplugin.cpp ---- kioslave/media/kfile-plugin/kfilemediaplugin.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/kfile-plugin/kfilemediaplugin.cpp Tue Nov 8 23:36:07 2005 -@@ -64,16 +64,12 @@ - addMimeType( "media/floppy_unmounted" ); - addMimeType( "media/zip_unmounted" ); - addMimeType( "media/gphoto2camera" ); -- addMimeType( "media/camera_mounted" ); -- addMimeType( "media/camera_unmounted" ); - } - - bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/) - { -- const Medium medium = askMedium(info); -+ const Medium medium = askMedium(info); - -- kdDebug() << "KFileMediaPlugin::readInfo " << medium.id() << endl; -- - if (medium.id().isNull()) return false; - - QString mount_point = medium.mountPoint(); -@@ -165,8 +161,7 @@ - const Medium KFileMediaPlugin::askMedium(KFileMetaInfo &info) - { - DCOPRef mediamanager("kded", "mediamanager"); -- kdDebug() << "properties " << info.url() << endl; -- DCOPReply reply = mediamanager.call( "properties", info.url().url() ); -+ DCOPReply reply = mediamanager.call( "properties", info.url().fileName() ); - - if ( !reply.isValid() ) - { -diff -urN kioslave/media/libmediacommon/Makefile.in kioslave/media/libmediacommon/Makefile.in ---- kioslave/media/libmediacommon/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/libmediacommon/Makefile.in Fri May 26 09:54:31 2006 -@@ -250,6 +250,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/libmediacommon/medium.cpp kioslave/media/libmediacommon/medium.cpp ---- kioslave/media/libmediacommon/medium.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/libmediacommon/medium.cpp Mon Oct 10 17:04:00 2005 -@@ -40,8 +40,6 @@ - m_properties+= QString::null; /* ICON_NAME */ - - loadUserLabel(); -- -- m_halmounted = false; - } - - Medium::Medium() -@@ -59,8 +57,6 @@ - m_properties+= QString::null; /* BASE_URL */ - m_properties+= QString::null; /* MIME_TYPE */ - m_properties+= QString::null; /* ICON_NAME */ -- -- m_halmounted = false; - } - - const Medium Medium::create(const QStringList &properties) -@@ -163,7 +159,7 @@ - bool Medium::mountableState(bool mounted) - { - if ( m_properties[DEVICE_NODE].isEmpty() -- || ( mounted && m_properties[MOUNT_POINT].isEmpty() ) ) -+ || m_properties[MOUNT_POINT].isEmpty() ) - { - return false; - } -@@ -208,10 +204,14 @@ - - KURL Medium::prettyBaseURL() const - { -- if ( !baseURL().isEmpty() ) -- return baseURL(); -- -+ if ( isMountable() ) -+ { - return KURL( mountPoint() ); -+ } -+ else -+ { -+ return KURL( baseURL() ); -+ } - } - - QString Medium::prettyLabel() const -diff -urN kioslave/media/libmediacommon/medium.h kioslave/media/libmediacommon/medium.h ---- kioslave/media/libmediacommon/medium.h Sat Jul 22 10:15:42 2006 -+++ kioslave/media/libmediacommon/medium.h Mon Oct 10 17:04:00 2005 -@@ -22,7 +22,6 @@ - #include <qstring.h> - #include <qstringlist.h> - #include <kurl.h> --#include <qmap.h> - - class Medium - { -@@ -79,32 +78,14 @@ - - void setMimeType(const QString &mimeType); - void setIconName(const QString &iconName); -- void setHalMounted(bool flag) const { m_halmounted = flag; } -- bool halMounted() const { return m_halmounted; } - - private: - Medium(); - void loadUserLabel(); - - QStringList m_properties; -- mutable bool m_halmounted; -- -+ - friend class QValueListNode<const Medium>; - }; -- --namespace MediaManagerUtils { -- static inline QMap<QString,QString> splitOptions(const QStringList & options) -- { -- QMap<QString,QString> valids; -- -- for (QStringList::ConstIterator it = options.begin(); it != options.end(); ++it) -- { -- QString key = (*it).left((*it).find('=')); -- QString value = (*it).mid((*it).find('=') + 1); -- valids[key] = value; -- } -- return valids; -- } --} - - #endif -diff -urN kioslave/media/mediaimpl.cpp kioslave/media/mediaimpl.cpp ---- kioslave/media/mediaimpl.cpp Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediaimpl.cpp Mon Oct 10 17:04:01 2005 -@@ -226,8 +226,6 @@ - - mp_mounting = &medium; - -- -- /* - KIO::Job* job = KIO::mount(false, 0, - medium.deviceNode(), - medium.mountPoint()); -@@ -236,7 +234,6 @@ - this, SLOT( slotMountResult( KIO::Job * ) ) ); - connect( job, SIGNAL( warning( KIO::Job *, const QString & ) ), - this, SLOT( slotWarning( KIO::Job *, const QString & ) ) ); -- */ - kapp->dcopClient() - ->connectDCOPSignal("kded", "mediamanager", - "mediumChanged(QString, bool)", -@@ -244,17 +241,7 @@ - "slotMediumChanged(QString)", - false); - -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "mount", medium.id()); -- if (reply.isValid()) -- reply.get(m_lastErrorMessage); -- else -- m_lastErrorMessage = i18n("Internal Error"); -- if (!m_lastErrorMessage.isEmpty()) -- m_lastErrorCode = KIO::ERR_SLAVE_DEFINED; -- else { -- qApp->eventLoop()->enterLoop(); -- } -+ qApp->eventLoop()->enterLoop(); - - mp_mounting = 0L; - -diff -urN kioslave/media/mediamanager/Makefile.in kioslave/media/mediamanager/Makefile.in ---- kioslave/media/mediamanager/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/mediamanager/Makefile.in Fri May 26 09:54:31 2006 -@@ -284,6 +284,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/mediamanager/fstabbackend.cpp kioslave/media/mediamanager/fstabbackend.cpp ---- kioslave/media/mediamanager/fstabbackend.cpp Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/fstabbackend.cpp Mon May 22 20:12:42 2006 -@@ -37,9 +37,6 @@ - #endif - - #include <klocale.h> --#include <kio/job.h> --#include <kio/netaccess.h> --#include <kdebug.h> - #include <kdirwatch.h> - #include <kurl.h> - #include <kmountpoint.h> -@@ -97,26 +94,6 @@ - KDirWatch::self()->removeFile(MTAB); - } - --QString FstabBackend::mount( const QString &_udi ) --{ -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- return i18n("No such medium: %1").arg(_udi); -- KIO::Job* job = KIO::mount( false, 0, medium->deviceNode(), medium->mountPoint()); -- KIO::NetAccess::synchronousRun( job, 0 ); -- return QString::null; --} -- --QString FstabBackend::unmount( const QString &_udi ) --{ -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- return i18n("No such medium: %1").arg(_udi); -- KIO::Job* job = KIO::unmount( medium->mountPoint(), false); -- KIO::NetAccess::synchronousRun( job, 0 ); -- return QString::null; --} -- - void FstabBackend::slotDirty(const QString &path) - { - if (path==MTAB) -@@ -134,7 +111,6 @@ - if ( mount->mountType() == "swap" - || mount->mountType() == "tmpfs" - || mount->mountType() == "sysfs" -- || mount->mountType() == "fdescfs" - || mount->mountType() == "kernfs" - || mount->mountType() == "usbfs" - || mount->mountType().contains( "proc" ) -@@ -147,7 +123,6 @@ - || mount->mountPoint() == "/dev/swap" - || mount->mountPoint() == "/dev/pts" - || mount->mountPoint().find("/proc") == 0 -- || mount->mountPoint().find("/sys") == 0 - - // We might want to display only network shares - // since HAL doesn't handle them -@@ -169,7 +144,7 @@ - - void FstabBackend::handleMtabChange(bool allowNotification) - { -- QStringList new_mtabIds; -+ QStringList new_mtabIds, new_mtabEntries; - KMountPoint::List mtab = KMountPoint::currentMountPoints(); - - KMountPoint::List::iterator it = mtab.begin(); -@@ -187,19 +162,18 @@ - nothing has changed, do not stat the mount point. Avoids - hang if network shares are stalling */ - QString mtabEntry = dev + "*" + mp + "*" + fs; -- if(m_mtabEntries.contains(mtabEntry)) { -- new_mtabIds += m_mtabEntries[mtabEntry]; -- continue; -- } -+ bool isOldEntry = m_mtabEntries.contains(mtabEntry); -+ new_mtabEntries+=mtabEntry; -+ if (isOldEntry) continue; - - QString id = generateId(dev, mp); - new_mtabIds+=id; -- m_mtabEntries[mtabEntry] = id; - - if ( !m_mtabIds.contains(id) && m_fstabIds.contains(id) ) - { - QString mime, icon, label; - guess(dev, mp, fs, true, mime, icon, label); -+ - m_mediaList.changeMediumState(id, true, false, - mime, icon, label); - } -@@ -237,10 +211,6 @@ - QString mp = medium->mountPoint(); - QString fs = medium->fsType(); - -- -- QString mtabEntry = dev + "*" + mp + "*" + fs; -- m_mtabEntries.remove(mtabEntry); -- - QString mime, icon, label; - guess(dev, mp, fs, false, mime, icon, label); - -@@ -256,6 +226,7 @@ - } - - m_mtabIds = new_mtabIds; -+ m_mtabEntries = new_mtabEntries; - } - - void FstabBackend::handleFstabChange(bool allowNotification) -diff -urN kioslave/media/mediamanager/fstabbackend.h kioslave/media/mediamanager/fstabbackend.h ---- kioslave/media/mediamanager/fstabbackend.h Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/fstabbackend.h Mon May 22 20:12:42 2006 -@@ -23,7 +23,6 @@ - - #include <qobject.h> - #include <qstringlist.h> --#include <qmap.h> - - #ifdef Q_OS_FREEBSD - #include <qtimer.h> -@@ -41,10 +40,6 @@ - const QString &fsType, bool mounted, - QString &mimeType, QString &iconName, - QString &label); -- -- QString mount(const QString &id); -- QString unmount(const QString &id); -- - private slots: - void slotDirty(const QString &path); - void handleFstabChange(bool allowNotification = true); -@@ -58,7 +53,7 @@ - - bool m_networkSharesOnly; - QStringList m_mtabIds; -- QMap<QString, QString> m_mtabEntries; -+ QStringList m_mtabEntries; - QStringList m_fstabIds; - #ifdef Q_OS_FREEBSD - QTimer m_mtabTimer; -diff -urN kioslave/media/mediamanager/halbackend.cpp kioslave/media/mediamanager/halbackend.cpp ---- kioslave/media/mediamanager/halbackend.cpp Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/halbackend.cpp Thu Jan 19 18:00:58 2006 -@@ -21,16 +21,9 @@ - - #include <stdlib.h> - --#include <qfile.h> - #include <klocale.h> - #include <kurl.h> - #include <kdebug.h> --#include <kprocess.h> --#include <kconfig.h> --#include <qstylesheet.h> --#include <kmountpoint.h> --#include <kmessagebox.h> --#include <kio/job.h> - - #define MOUNT_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mounted") : QString("_unmounted")) - #define MOUNT_ICON_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mount") : QString("_unmount")) -@@ -39,1177 +32,615 @@ - static HALBackend* s_HALBackend; - - /* A macro function to convert HAL string properties to QString */ --QString libhal_device_get_property_QString(LibHalContext *ctx, const char* udi, const char *key) -+QString hal_device_get_property_QString(LibHalContext *ctx, const char* udi, const char *key) - { -- char* _ppt_string; -- QString _ppt_QString; -- _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL); -- _ppt_QString = QString(_ppt_string ? _ppt_string : ""); -- libhal_free_string(_ppt_string); -- return _ppt_QString; -+ char* _ppt_string; -+ QString _ppt_QString; -+ _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL); -+ _ppt_QString = QString(_ppt_string ? _ppt_string : ""); -+ libhal_free_string(_ppt_string); -+ return _ppt_QString; - } - - /* Constructor */ - HALBackend::HALBackend(MediaList &list, QObject* parent) -- : QObject() -- , BackendBase(list) -- , m_halContext(NULL) -- , m_halStoragePolicy(NULL) -- , m_parent(parent) -+ : QObject() -+ , BackendBase(list) -+ , m_halContext(NULL) -+ , m_halStoragePolicy(NULL) -+ , m_parent(parent) - { -- s_HALBackend = this; -+ s_HALBackend = this; - } - - /* Destructor */ - HALBackend::~HALBackend() - { -- /* Close HAL connection */ -- if (m_halContext) -- { -- const QPtrList<Medium> medlist = m_mediaList.list(); -- QPtrListIterator<Medium> it (medlist); -- for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) -- unmount(current_medium->id()); -- -- -- /* Remove all the registered media first */ -- int numDevices; -- char** halDeviceList = libhal_get_all_devices( m_halContext, &numDevices, NULL ); -- -- if ( halDeviceList ) -- { -- for ( int i = 0; i < numDevices; i++ ) -- { -- m_mediaList.removeMedium( halDeviceList[i], false ); -- } -- } -- -- libhal_free_string_array( halDeviceList ); -- -- DBusError error; -- dbus_error_init(&error); -- libhal_ctx_shutdown(m_halContext, &error); -- libhal_ctx_free(m_halContext); -- } -- -- if (m_halStoragePolicy) -- libhal_storage_policy_free(m_halStoragePolicy); -+ /* Close HAL connection */ -+ if (m_halContext) -+ { -+ /* Remove all the registered media first */ -+ int numDevices; -+ char** halDeviceList = libhal_get_all_devices( m_halContext, &numDevices, NULL ); -+ -+ if ( halDeviceList ) -+ { -+ for ( int i = 0; i < numDevices; i++ ) -+ { -+ m_mediaList.removeMedium( halDeviceList[i], false ); -+ } -+ } -+ -+ #ifdef HAL_0_4 -+ hal_shutdown(m_halContext); -+ #else -+ libhal_ctx_shutdown(m_halContext, NULL); -+ libhal_ctx_free(m_halContext); -+ #endif -+ } -+ -+ if (m_halStoragePolicy) -+ libhal_storage_policy_free(m_halStoragePolicy); - } - - /* Connect to the HAL */ - bool HALBackend::InitHal() - { -- kdDebug(1219) << "Context new" << endl; -- m_halContext = libhal_ctx_new(); -- if (!m_halContext) -- { -- kdDebug(1219) << "Failed to initialize HAL!" << endl; -- return false; -- } -- -- // Main loop integration -- kdDebug(1219) << "Main loop integration" << endl; -- DBusError error; -- dbus_error_init(&error); -- dbus_connection = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error); -- -- if (!dbus_connection || dbus_error_is_set(&error)) { -- dbus_error_free(&error); -- libhal_ctx_free(m_halContext); -- m_halContext = NULL; -- return false; -- } -- -- dbus_bus_register(dbus_connection, &error); -- -- if (dbus_error_is_set(&error)) { -- dbus_error_free(&error); -- libhal_ctx_free(m_halContext); -- m_halContext = NULL; -- return false; -- } -- MainLoopIntegration(dbus_connection); -- libhal_ctx_set_dbus_connection(m_halContext, dbus_connection); -- -- // HAL callback functions -- kdDebug(1219) << "Callback functions" << endl; -- libhal_ctx_set_device_added(m_halContext, HALBackend::hal_device_added); -- libhal_ctx_set_device_removed(m_halContext, HALBackend::hal_device_removed); -- libhal_ctx_set_device_new_capability (m_halContext, NULL); -- libhal_ctx_set_device_lost_capability (m_halContext, NULL); -- libhal_ctx_set_device_property_modified (m_halContext, HALBackend::hal_device_property_modified); -- libhal_ctx_set_device_condition(m_halContext, HALBackend::hal_device_condition); -- -- kdDebug(1219) << "Context Init" << endl; -- if (!libhal_ctx_init(m_halContext, &error)) -- { -- if (dbus_error_is_set(&error)) -- dbus_error_free(&error); -- libhal_ctx_free(m_halContext); -- m_halContext = NULL; -- kdDebug(1219) << "Failed to init HAL context!" << endl; -- return false; -- } -- -- /** @todo customize watch policy */ -- kdDebug(1219) << "Watch properties" << endl; -- if (!libhal_device_property_watch_all(m_halContext, &error)) -- { -- kdDebug(1219) << "Failed to watch HAL properties!" << endl; -- return false; -- } -- -- /* libhal-storage initialization */ -- kdDebug(1219) << "Storage Policy" << endl; -- m_halStoragePolicy = libhal_storage_policy_new(); -- /** @todo define libhal-storage icon policy */ -+#ifdef HAL_0_4 /* HAL API 0.4 */ -+ /* libhal initialization */ -+ m_halFunctions.main_loop_integration = HALBackend::hal_main_loop_integration; -+ m_halFunctions.device_added = HALBackend::hal_device_added; -+ m_halFunctions.device_removed = HALBackend::hal_device_removed; -+ m_halFunctions.device_new_capability = NULL; -+ m_halFunctions.device_lost_capability = NULL; -+ m_halFunctions.device_property_modified = HALBackend::hal_device_property_modified; -+ m_halFunctions.device_condition = HALBackend::hal_device_condition; -+ -+ m_halContext = hal_initialize(&m_halFunctions, false); -+ if (!m_halContext) -+ { -+ kdDebug(1219) << "Failed to initialize HAL!" << endl; -+ return false; -+ } -+ -+ /** @todo customize watch policy */ -+ kdDebug(1219) << "Watch properties" << endl; -+ if (libhal_device_property_watch_all(m_halContext, NULL)) -+ { -+ kdDebug(1219) << "Failed to watch HAL properties!" << endl; -+ return false; -+ } -+#else /* HAL API >= 0.5 */ -+ kdDebug(1219) << "Context new" << endl; -+ m_halContext = libhal_ctx_new(); -+ if (!m_halContext) -+ { -+ kdDebug(1219) << "Failed to initialize HAL!" << endl; -+ return false; -+ } -+ -+ // Main loop integration -+ kdDebug(1219) << "Main loop integration" << endl; -+ DBusError error; -+ dbus_error_init(&error); -+ DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -+ if (dbus_error_is_set(&error)) { -+ dbus_error_free(&error); -+ libhal_ctx_free(m_halContext); -+ m_halContext = NULL; -+ return false; -+ } -+ MainLoopIntegration(dbus_connection); -+ libhal_ctx_set_dbus_connection(m_halContext, dbus_connection); -+ -+ // HAL callback functions -+ kdDebug(1219) << "Callback functions" << endl; -+ libhal_ctx_set_device_added(m_halContext, HALBackend::hal_device_added); -+ libhal_ctx_set_device_removed(m_halContext, HALBackend::hal_device_removed); -+ libhal_ctx_set_device_new_capability (m_halContext, NULL); -+ libhal_ctx_set_device_lost_capability (m_halContext, NULL); -+ libhal_ctx_set_device_property_modified (m_halContext, HALBackend::hal_device_property_modified); -+ libhal_ctx_set_device_condition(m_halContext, HALBackend::hal_device_condition); - -- /* List devices at startup */ -- return ListDevices(); -+ kdDebug(1219) << "Context Init" << endl; -+ if (!libhal_ctx_init(m_halContext, &error)) -+ { -+ if (dbus_error_is_set(&error)) -+ dbus_error_free(&error); -+ libhal_ctx_free(m_halContext); -+ m_halContext = NULL; -+ kdDebug(1219) << "Failed to init HAL context!" << endl; -+ return false; -+ } -+ -+ /** @todo customize watch policy */ -+ kdDebug(1219) << "Watch properties" << endl; -+ if (!libhal_device_property_watch_all(m_halContext, &error)) -+ { -+ kdDebug(1219) << "Failed to watch HAL properties!" << endl; -+ return false; -+ } -+#endif -+ -+ /* libhal-storage initialization */ -+ kdDebug(1219) << "Storage Policy" << endl; -+ m_halStoragePolicy = libhal_storage_policy_new(); -+ /** @todo define libhal-storage icon policy */ -+ -+ /* List devices at startup */ -+ return ListDevices(); - } - - /* List devices (at startup)*/ - bool HALBackend::ListDevices() - { -- kdDebug(1219) << "ListDevices" << endl; -+ kdDebug(1219) << "ListDevices" << endl; - -- int numDevices; -- char** halDeviceList = libhal_get_all_devices(m_halContext, &numDevices, NULL); -+ int numDevices; -+ char** halDeviceList = libhal_get_all_devices(m_halContext, &numDevices, NULL); - -- if (!halDeviceList) -- return false; -+ if (!halDeviceList) -+ return false; - -- kdDebug(1219) << "HALBackend::ListDevices : " << numDevices << " devices found" << endl; -- for (int i = 0; i < numDevices; i++) -- AddDevice(halDeviceList[i], false); -+ kdDebug(1219) << "HALBackend::ListDevices : " << numDevices << " devices found" << endl; -+ for (int i = 0; i < numDevices; i++) -+ AddDevice(halDeviceList[i], false); - -- libhal_free_string_array( halDeviceList ); -- -- return true; -+ return true; - } - - /* Create a media instance for the HAL device "udi". -- This functions checks whether the device is worth listing */ -+This functions checks whether the device is worth listing */ - void HALBackend::AddDevice(const char *udi, bool allowNotification) - { -- /* We don't deal with devices that do not expose their capabilities. -- If we don't check this, we will get a lot of warning messages from libhal */ -- if (!libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -- return; -- -- /* If the device is already listed, do not process. -- This should not happen, but who knows... */ -- /** @todo : refresh properties instead ? */ -- if (m_mediaList.findById(udi)) -- return; -- -- if (libhal_device_get_property_bool(m_halContext, "/org/freedesktop/Hal/devices/computer", "storage.disable_volume_handling", NULL)) -- allowNotification=false; -- -- /* Add volume block devices */ -- if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -- { -- /* We only list volume that have a filesystem or volume that have an audio track*/ -- if ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem" && -- !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio", NULL) && -- !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL) ) -- return; -- -- if ( ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") == "filesystem" && -- !libhal_device_get_property_bool(m_halContext, udi, "volume.is_mounted", NULL ) ) && -- ( libhal_device_get_property_bool(m_halContext, udi, "volume.ignore", NULL ) ) ) -- return; -- -- /* Query drive udi */ -- QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -- /* We don't list floppy volumes because we list floppy drives */ -- if ((libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "floppy") || -- (libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "zip") || -- (libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "jaz")) -- return; -- -- // if the device is locked do not act upon it -- if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "info.locked", NULL)) -- allowNotification=false; -- -- // if the device is locked do not act upon it -- if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "storage.partition_table_changed", NULL)) -- allowNotification=false; -- -- /** @todo check exclusion list **/ -- -- /* Create medium */ -- Medium* medium = new Medium(udi, ""); -- -- QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi)); -- kdDebug() << "automount " << options["automount"] << endl; -- if (options["automount"] == "true" && allowNotification ) { -- QString error = mount(medium); -- if (!error.isEmpty()) -- kdDebug() << "error " << error << endl; -- } -- setVolumeProperties(medium); -- m_mediaList.addMedium(medium, allowNotification); -- -- return; -- } -- -- /* Floppy & zip drives */ -- if (libhal_device_query_capability(m_halContext, udi, "storage", NULL)) -- if ((libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") || -- (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") || -- (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "jaz")) -- { -- /* Create medium */ -- Medium* medium = new Medium(udi, ""); -- setFloppyProperties(medium); -- m_mediaList.addMedium(medium, allowNotification); -- return; -- } -- -- /* Camera handled by gphoto2*/ -- if (libhal_device_query_capability(m_halContext, udi, "camera", NULL) && -- ((libhal_device_get_property_QString(m_halContext, udi, "camera.access_method")=="ptp") || -- -- (libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2.support", NULL) && -- libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2.support", NULL))) -- ) -- { -- /* Create medium */ -- Medium* medium = new Medium(udi, ""); -- setCameraProperties(medium); -- m_mediaList.addMedium(medium, allowNotification); -- return; -- } -+ /* We don't deal with devices that do not expose their capabilities. -+ If we don't check this, we will get a lot of warning messages from libhal */ -+ if (!libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -+ return; -+ -+ /* If the device is already listed, do not process. -+ This should not happen, but who knows... */ -+ /** @todo : refresh properties instead ? */ -+ if (m_mediaList.findById(udi)) -+ return; -+ -+ /* Add volume block devices */ -+ if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -+ { -+ /* We only list volume that have a filesystem or volume that have an audio track*/ -+ if ( (hal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem") && -+ (!libhal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio", NULL)) && -+ (!libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL)) ) -+ return; -+ /* Query drive udi */ -+ QString driveUdi = hal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -+ /* We don't list floppy volumes because we list floppy drives */ -+ if ((hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "floppy") || -+ (hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "zip") || -+ (hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "jaz")) -+ return; -+ -+ /** @todo check exclusion list **/ -+ -+ /* Create medium */ -+ Medium* medium = new Medium(udi, ""); -+ setVolumeProperties(medium); -+ m_mediaList.addMedium(medium, allowNotification); -+ -+ return; -+ } -+ -+ /* Floppy & zip drives */ -+ if (libhal_device_query_capability(m_halContext, udi, "storage", NULL)) -+ if ((hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") || -+ (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") || -+ (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "jaz")) -+ { -+ /* Create medium */ -+ Medium* medium = new Medium(udi, ""); -+ setFloppyProperties(medium); -+ m_mediaList.addMedium(medium, allowNotification); -+ return; -+ } -+ -+ /* Camera handled by gphoto2*/ -+ if (libhal_device_query_capability(m_halContext, udi, "camera", NULL) && -+#ifdef HAL_0_4 -+ libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2_support", NULL) && -+ libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2_support", NULL) -+#else -+ ((hal_device_get_property_QString(m_halContext, udi, "camera.access_method")=="ptp") || -+ -+ (libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2.support", NULL) && -+ libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2.support", NULL))) -+#endif -+ ) -+ { -+ /* Create medium */ -+ Medium* medium = new Medium(udi, ""); -+ setCameraProperties(medium); -+ m_mediaList.addMedium(medium, allowNotification); -+ return; -+ } - } - - void HALBackend::RemoveDevice(const char *udi) - { -- m_mediaList.removeMedium(udi, true); -+ m_mediaList.removeMedium(udi, true); - } - - void HALBackend::ModifyDevice(const char *udi, const char* key) - { -- Q_UNUSED(key); -- const char* mediumUdi = findMediumUdiFromUdi(udi); -- if (!mediumUdi) -- return; -- ResetProperties(mediumUdi); -+ Q_UNUSED(key); -+ const char* mediumUdi = findMediumUdiFromUdi(udi); -+ if (!mediumUdi) -+ return; -+ ResetProperties(mediumUdi); - } - - void HALBackend::DeviceCondition(const char* udi, const char* condition) - { -- QString conditionName = QString(condition); -- kdDebug(1219) << "Processing device condition " << conditionName << " for " << udi << endl; -- -- if (conditionName == "EjectPressed") { -- const Medium* medium = m_mediaList.findById(udi); -- if (!medium) { -- /* the ejectpressed appears on the drive and we need to find the volume */ -- const QPtrList<Medium> medlist = m_mediaList.list(); -- QPtrListIterator<Medium> it (medlist); -- for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) -- { -- QString driveUdi = libhal_device_get_property_QString(m_halContext, current_medium->id().latin1(), "block.storage_device"); -- if (driveUdi == udi) -- { -- medium = current_medium; -- break; -- } -- } -- } -- if (medium) { -- KProcess p; -- p << "kio_media_mounthelper" << "-e" << medium->name(); -- p.start(KProcess::DontCare); -- } -- } -- -- const char* mediumUdi = findMediumUdiFromUdi(udi); -- kdDebug() << "findMedumUdiFromUdi " << udi << " returned " << mediumUdi << endl; -- if (!mediumUdi) -- return; -- -- /* TODO: Warn the user that (s)he should unmount devices before unplugging */ -- if (conditionName == "VolumeUnmountForced") -- ResetProperties(mediumUdi); -- -- /* Reset properties after mounting */ -- if (conditionName == "VolumeMount") -- ResetProperties(mediumUdi); -- -- /* Reset properties after unmounting */ -- if (conditionName == "VolumeUnmount") -- ResetProperties(mediumUdi); -- -+ const char* mediumUdi = findMediumUdiFromUdi(udi); -+ if (!mediumUdi) -+ return; -+ -+ QString conditionName = QString(condition); -+ kdDebug(1219) << "Processing device condition " << conditionName << " for " << udi << endl; -+ -+ /* TODO: Warn the user that (s)he should unmount devices before unplugging */ -+ if (conditionName == "VolumeUnmountForced") -+ ResetProperties(mediumUdi); -+ -+ /* Reset properties after mounting */ -+ if (conditionName == "VolumeMount") -+ ResetProperties(mediumUdi); -+ -+ /* Reset properties after unmounting */ -+ if (conditionName == "VolumeUnmount") -+ ResetProperties(mediumUdi); - } - - void HALBackend::MainLoopIntegration(DBusConnection *dbusConnection) - { -- m_dBusQtConnection = new DBusQt::Connection(m_parent); -- m_dBusQtConnection->dbus_connection_setup_with_qt_main(dbusConnection); -+ m_dBusQtConnection = new DBusQt::Connection(m_parent); -+ m_dBusQtConnection->dbus_connection_setup_with_qt_main(dbusConnection); - } - - /****************************************** -- ** Properties attribution ** -- ******************************************/ -+** Properties attribution ** -+******************************************/ - - /* Return the medium udi that should be updated when recieving a call for -- device udi */ -+device udi */ - const char* HALBackend::findMediumUdiFromUdi(const char* udi) - { -- /* Easy part : this Udi is already registered as a device */ -- const Medium* medium = m_mediaList.findById(udi); -- if (medium) -- return medium->id().ascii(); -- -- /* Hard part : this is a volume whose drive is registered */ -- if (libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -- if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -- { -- QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -- return findMediumUdiFromUdi(driveUdi.ascii()); -- } -+ /* Easy part : this Udi is already registered as a device */ -+ const Medium* medium = m_mediaList.findById(udi); -+ if (medium) -+ return medium->id().ascii(); -+ -+ /* Hard part : this is a volume whose drive is registered */ -+ if (libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -+ if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -+ { -+ QString driveUdi = hal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -+ return findMediumUdiFromUdi(driveUdi.ascii()); -+ } - -- return NULL; -+ return NULL; - } - - void HALBackend::ResetProperties(const char* mediumUdi) - { -- kdDebug(1219) << "HALBackend::setProperties" << endl; -- if ( QString::fromLatin1( mediumUdi ).startsWith( "/org/kde/" ) ) -- { -- const Medium *cmedium = m_mediaList.findById(mediumUdi); -- if ( cmedium ) -- { -- Medium m( *cmedium ); -- if ( setFstabProperties( &m ) ) { -- kdDebug() << "setFstabProperties worked" << endl; -- m_mediaList.changeMediumState(m, false); -- } -- return; -- } -- } -- -- Medium* m = new Medium(mediumUdi, ""); -- -- if (libhal_device_query_capability(m_halContext, mediumUdi, "volume", NULL)) -- setVolumeProperties(m); -- if (libhal_device_query_capability(m_halContext, mediumUdi, "storage", NULL)) -- setFloppyProperties(m); -- if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) -- setCameraProperties(m); -+ kdDebug(1219) << "HALBackend::setProperties" << endl; - -- m_mediaList.changeMediumState(*m, false); -+ Medium* m = new Medium(mediumUdi, ""); -+ -+ if (libhal_device_query_capability(m_halContext, mediumUdi, "volume", NULL)) -+ setVolumeProperties(m); -+ if (libhal_device_query_capability(m_halContext, mediumUdi, "storage", NULL)) -+ setFloppyProperties(m); -+ if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) -+ setCameraProperties(m); - -- delete m; --} -+ m_mediaList.changeMediumState(*m, false); - --void HALBackend::setVolumeProperties(Medium* medium) --{ -- kdDebug(1219) << "HALBackend::setVolumeProperties for " << medium->id() << endl; -- -- const char* udi = medium->id().ascii(); -- /* Check if the device still exists */ -- if (!libhal_device_exists(m_halContext, udi, NULL)) -- return; -- -- /* Get device information from libhal-storage */ -- LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi); -- if (!halVolume) -- return; -- QString driveUdi = libhal_volume_get_storage_device_udi(halVolume); -- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, driveUdi.ascii()); -- if (!halDrive) { -- // at times HAL sends an UnmountForced event before the device is removed -- libhal_volume_free(halVolume); -- return; -- } -- -- medium->setName( -- generateName(libhal_volume_get_device_file(halVolume)) ); -- -- medium->mountableState( -- libhal_volume_get_device_file(halVolume), /* Device node */ -- libhal_volume_get_mount_point(halVolume), /* Mount point */ -- libhal_volume_get_fstype(halVolume), /* Filesystem type */ -- libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -- -- char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -- QString volume_name = QString::fromUtf8(name); -- QString media_name = volume_name; -- medium->setLabel(media_name); -- free(name); -- -- QString mimeType; -- if (libhal_volume_is_disc(halVolume)) -- { -- mimeType = "media/cdrom" + MOUNT_SUFFIX; -- -- LibHalVolumeDiscType discType = libhal_volume_get_disc_type(halVolume); -- if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_CDR) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_CDRW)) -- if (libhal_volume_disc_is_blank(halVolume)) -- { -- mimeType = "media/blankcd"; -- medium->unmountableState(""); -- } -- else -- mimeType = "media/cdwriter" + MOUNT_SUFFIX; -- -- if ((discType == LIBHAL_VOLUME_DISC_TYPE_DVDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRAM) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_DVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRW) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW) ) -- if (libhal_volume_disc_is_blank(halVolume)) -- { -- mimeType = "media/blankdvd"; -- medium->unmountableState(""); -- } -- else -- mimeType = "media/dvd" + MOUNT_SUFFIX; -- -- if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) -- { -- mimeType = "media/audiocd"; -- medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); -- } -- -- medium->setIconName(QString::null); -- -- /* check if the disc id a vcd or a video dvd */ -- DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); -- switch (type) -- { -- case DiscType::VCD: -- mimeType = "media/vcd"; -- break; -- case DiscType::SVCD: -- mimeType = "media/svcd"; -- break; -- case DiscType::DVD: -- mimeType = "media/dvdvideo"; -- break; -- } -- } -- else -- { -- mimeType = "media/hdd" + MOUNT_SUFFIX; -- if (libhal_drive_is_hotpluggable(halDrive)) -- { -- mimeType = "media/removable" + MOUNT_SUFFIX; -- medium->needMounting(); -- switch (libhal_drive_get_type(halDrive)) { -- case LIBHAL_DRIVE_TYPE_COMPACT_FLASH: -- medium->setIconName("compact_flash" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_MEMORY_STICK: -- medium->setIconName("memory_stick" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_SMART_MEDIA: -- medium->setIconName("smart_media" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_SD_MMC: -- medium->setIconName("sd_mmc" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER: -- { -- medium->setIconName("ipod" + MOUNT_ICON_SUFFIX); -- break; -- } -- case LIBHAL_DRIVE_TYPE_CAMERA: -- { -- mimeType = "media/camera" + MOUNT_SUFFIX; -- medium->setIconName("camera" + MOUNT_ICON_SUFFIX); -- const char *physdev = libhal_drive_get_physical_device_udi(halDrive); -- // get model from camera -- if (physdev && libhal_device_query_capability(m_halContext, physdev, "camera", NULL)) -- { -- if (libhal_device_property_exists(m_halContext, physdev, "usb_device.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, "usb_device.product")); -- else if (libhal_device_property_exists(m_halContext, physdev, "usb.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, "usb.product")); -- } -- break; -- } -- case LIBHAL_DRIVE_TYPE_TAPE: -- medium->setIconName(QString::null); //FIXME need icon -- break; -- default: -- medium->setIconName(QString::null); -- } -- -- if (medium->isMounted() && QFile::exists(medium->mountPoint() + "/dcim")) -- { -- mimeType = "media/camera" + MOUNT_SUFFIX; -- medium->setIconName("camera" + MOUNT_ICON_SUFFIX); -- } -- } -- } -- medium->setMimeType(mimeType); -- -- libhal_drive_free(halDrive); -- libhal_volume_free(halVolume); -+ delete m; - } - --bool HALBackend::setFstabProperties( Medium *medium ) -+void HALBackend::setVolumeProperties(Medium* medium) - { -- QString mp = isInFstab(medium); -+ kdDebug(1219) << "HALBackend::setVolumeProperties for " << medium->id() << endl; - -- if (!mp.isNull() && !medium->id().startsWith( "/org/kde" ) ) -- { -- // now that we know it's in fstab, we have to find out if it's mounted -- KMountPoint::List mtab = KMountPoint::currentMountPoints(); -- -- KMountPoint::List::iterator it = mtab.begin(); -- KMountPoint::List::iterator end = mtab.end(); -- -- bool mounted = false; -- -- for (; it!=end; ++it) -- { -- if ((*it)->mountedFrom() == medium->deviceNode() && (*it)->mountPoint() == mp ) -- { -- mounted = true; -- break; -- } -- } -- -- kdDebug() << mp << " " << mounted << " " << medium->deviceNode() << " " << endl; -- QString fstype = medium->fsType(); -- if ( fstype.isNull() ) -- fstype = "auto"; -- -- medium->mountableState( -- medium->deviceNode(), -- mp, /* Mount point */ -- fstype, /* Filesystem type */ -- mounted ); /* Mounted ? */ -+ const char* udi = medium->id().ascii(); -+ /* Check if the device still exists */ -+ if (!libhal_device_exists(m_halContext, udi, NULL)) -+ return; -+ -+ /* Get device information from libhal-storage */ -+ LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi); -+ if (!halVolume) -+ return; -+ QString driveUdi = libhal_volume_get_storage_device_udi(halVolume); -+ LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, driveUdi.ascii()); -+ -+ medium->setName( -+ generateName(libhal_volume_get_device_file(halVolume)) ); -+ -+ medium->mountableState( -+ libhal_volume_get_device_file(halVolume), /* Device node */ -+ libhal_volume_get_mount_point(halVolume), /* Mount point */ -+ libhal_volume_get_fstype(halVolume), /* Filesystem type */ -+ libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -+ -+ char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -+ QString volume_name = QString::fromUtf8(name); -+ QString media_name = volume_name; -+ medium->setLabel(media_name); -+ free(name); - -- return true; -- } -+ QString mimeType; -+ if (libhal_volume_is_disc(halVolume)) -+ { -+ mimeType = "media/cdrom" + MOUNT_SUFFIX; - -- return false; -+ LibHalVolumeDiscType discType = libhal_volume_get_disc_type(halVolume); -+ if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_CDR) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_CDRW)) -+ if (libhal_volume_disc_is_blank(halVolume)) -+ { -+ mimeType = "media/blankcd"; -+ medium->unmountableState(""); -+ } -+ else -+ mimeType = "media/cdwriter" + MOUNT_SUFFIX; -+ -+ if ((discType == LIBHAL_VOLUME_DISC_TYPE_DVDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRAM) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_DVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRW) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW) ) -+ if (libhal_volume_disc_is_blank(halVolume)) -+ { -+ mimeType = "media/blankdvd"; -+ medium->unmountableState(""); -+ } -+ else -+ mimeType = "media/dvd" + MOUNT_SUFFIX; -+ -+ if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) -+ { -+ mimeType = "media/audiocd"; -+ medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); -+ } -+ -+ medium->setIconName(QString::null); -+ -+ /* check if the disc id a vcd or a video dvd */ -+ DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); -+ switch (type) -+ { -+ case DiscType::VCD: -+ mimeType = "media/vcd"; -+ break; -+ case DiscType::SVCD: -+ mimeType = "media/svcd"; -+ break; -+ case DiscType::DVD: -+ mimeType = "media/dvdvideo"; -+ break; -+ } -+ } -+ else -+ { -+ mimeType = "media/hdd" + MOUNT_SUFFIX; -+ const char *physdev = libhal_drive_get_physical_device_udi(halDrive); -+ if (libhal_drive_is_hotpluggable(halDrive)) -+ { -+ mimeType = "media/removable" + MOUNT_SUFFIX; -+ medium->needMounting(); -+ switch (libhal_drive_get_type(halDrive)) { -+ case LIBHAL_DRIVE_TYPE_COMPACT_FLASH: -+ medium->setIconName("compact_flash" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_MEMORY_STICK: -+ medium->setIconName("memory_stick" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_SMART_MEDIA: -+ medium->setIconName("smart_media" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_SD_MMC: -+ medium->setIconName("sd_mmc" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER: -+ medium->setIconName("ipod" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_CAMERA: -+ mimeType = "media/camera" + MOUNT_SUFFIX; -+ medium->setIconName("camera" + MOUNT_ICON_SUFFIX); -+ // get model from camera -+ if (physdev && libhal_device_query_capability(m_halContext, physdev, "camera", NULL)) -+ { -+ if (libhal_device_property_exists(m_halContext, physdev, "usb_device.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, physdev, "usb_device.product")); -+ else if (libhal_device_property_exists(m_halContext, physdev, "usb.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, physdev, "usb.product")); -+ } -+ break; -+ case LIBHAL_DRIVE_TYPE_TAPE: -+ medium->setIconName(QString::null); //FIXME need icon -+ break; -+ default: -+ medium->setIconName(QString::null); -+ }; -+ }; -+ } -+ medium->setMimeType(mimeType); - -+ libhal_drive_free(halDrive); -+ libhal_volume_free(halVolume); - } - - // Handle floppies and zip drives - void HALBackend::setFloppyProperties(Medium* medium) - { -- kdDebug(1219) << "HALBackend::setFloppyProperties for " << medium->id() << endl; -+ kdDebug(1219) << "HALBackend::setFloppyProperties for " << medium->id() << endl; - -- const char* udi = medium->id().ascii(); -- /* Check if the device still exists */ -- if (!libhal_device_exists(m_halContext, udi, NULL)) -- return; -- -- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, udi); -- if (!halDrive) -- return; -- int numVolumes; -- char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); -- LibHalVolume* halVolume = NULL; -- kdDebug(1219) << " found " << numVolumes << " volumes" << endl; -- if (numVolumes) -- halVolume = libhal_volume_from_udi(m_halContext, volumes[0]); -- -- medium->setName( -- generateName(libhal_drive_get_device_file(halDrive)) ); -- -- if (halVolume) -- { -- medium->mountableState( -- libhal_volume_get_device_file(halVolume), /* Device node */ -- libhal_volume_get_mount_point(halVolume), /* Mount point */ -- libhal_volume_get_fstype(halVolume), /* Filesystem type */ -- libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -- } -- else -- { -- // HAL hates floppies - so we have to do it twice ;( -- medium->mountableState(libhal_drive_get_device_file(halDrive), QString::null, QString::null, false); -- setFstabProperties( medium ); -- } -- -- if (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") -- { -- if (medium->isMounted()) // don't use _SUFFIX here as it accesses the volume -- medium->setMimeType("media/floppy_mounted" ); -- else -- medium->setMimeType("media/floppy_unmounted"); -- } -- -- if (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") -- { -- if (medium->isMounted()) -- medium->setMimeType("media/zip_mounted" ); -- else -- medium->setMimeType("media/zip_unmounted"); -- } -- -- /** @todo And mimtype for JAZ drives ? */ -- -- medium->setIconName(QString::null); -- -- char *name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -- -- if (name) { -- medium->setLabel( QString::fromUtf8(name) ); -- free(name); -- } -- -- free(volumes); -- libhal_drive_free(halDrive); -- libhal_volume_free(halVolume); --} -+ const char* udi = medium->id().ascii(); -+ /* Check if the device still exists */ -+ if (!libhal_device_exists(m_halContext, udi, NULL)) -+ return; -+ -+ LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, udi); -+ if (!halDrive) -+ return; -+ int numVolumes; -+ char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); -+ LibHalVolume* halVolume = NULL; -+ kdDebug(1219) << " found " << numVolumes << " volumes" << endl; -+ if (numVolumes) -+ halVolume = libhal_volume_from_udi(m_halContext, volumes[0]); - --void HALBackend::setCameraProperties(Medium* medium) --{ -- kdDebug(1219) << "HALBackend::setCameraProperties for " << medium->id() << endl; -- -- const char* udi = medium->id().ascii(); -- /* Check if the device still exists */ -- if (!libhal_device_exists(m_halContext, udi, NULL)) -- return; -- -- /** @todo find name */ -- medium->setName("camera"); -- -- QString device = "camera:/"; -- -- char *cam = libhal_device_get_property_string(m_halContext, udi, "camera.libgphoto2.name", NULL); -- DBusError error; -- dbus_error_init(&error); -- if (cam && -- libhal_device_property_exists(m_halContext, udi, "usb.linux.device_number", NULL) && -- libhal_device_property_exists(m_halContext, udi, "usb.bus_number", NULL)) -- device.sprintf("camera://%s@[usb:%03d,%03d]/", cam, -- libhal_device_get_property_int(m_halContext, udi, "usb.bus_number", &error), -- libhal_device_get_property_int(m_halContext, udi, "usb.linux.device_number", &error)); -- -- libhal_free_string(cam); -- -- /** @todo find the rest of this URL */ -- medium->unmountableState(device); -- medium->setMimeType("media/gphoto2camera"); -- medium->setIconName(QString::null); -- if (libhal_device_property_exists(m_halContext, udi, "usb_device.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb_device.product")); -- else if (libhal_device_property_exists(m_halContext, udi, "usb.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb.product")); -- else -- medium->setLabel(i18n("Camera")); --} -+ medium->setName( -+ generateName(libhal_drive_get_device_file(halDrive)) ); - --QString HALBackend::generateName(const QString &devNode) --{ -- return KURL(devNode).fileName(); --} -+ if (halVolume) -+ { -+ medium->mountableState( -+ libhal_volume_get_device_file(halVolume), /* Device node */ -+ libhal_volume_get_mount_point(halVolume), /* Mount point */ -+ libhal_volume_get_fstype(halVolume), /* Filesystem type */ -+ libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -+ } -+ else -+ { -+ medium->mountableState( -+ libhal_drive_get_device_file(halDrive), /* Device node */ -+ "", /* Mount point */ -+ "", /* Filesystem type */ -+ false ); /* Mounted ? */ -+ } - --/****************************************** -- ** HAL CALL-BACKS ** -- ******************************************/ -+ if (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") -+ { -+ if (halVolume) -+ medium->setMimeType("media/floppy" + MOUNT_SUFFIX); -+ else -+ medium->setMimeType("media/floppy_unmounted"); -+ } - --void HALBackend::hal_device_added(LibHalContext *ctx, const char *udi) --{ -- kdDebug(1219) << "HALBackend::hal_device_added " << udi << endl; -- Q_UNUSED(ctx); -- s_HALBackend->AddDevice(udi); --} -+ if (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") -+ { -+ if (halVolume) -+ medium->setMimeType("media/zip" + MOUNT_SUFFIX); -+ else -+ medium->setMimeType("media/zip_unmounted"); -+ } - --void HALBackend::hal_device_removed(LibHalContext *ctx, const char *udi) --{ -- kdDebug(1219) << "HALBackend::hal_device_removed " << udi << endl; -- Q_UNUSED(ctx); -- s_HALBackend->RemoveDevice(udi); --} -+ /** @todo And mimtype for JAZ drives ? */ - --void HALBackend::hal_device_property_modified(LibHalContext *ctx, const char *udi, -- const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) --{ -- kdDebug(1219) << "HALBackend::hal_property_modified " << udi << " -- " << key << endl; -- Q_UNUSED(ctx); -- Q_UNUSED(is_removed); -- Q_UNUSED(is_added); -- s_HALBackend->ModifyDevice(udi, key); --} -+ medium->setIconName(QString::null); - --void HALBackend::hal_device_condition(LibHalContext *ctx, const char *udi, -- const char *condition_name, -- const char* message -- ) --{ -- kdDebug(1219) << "HALBackend::hal_device_condition " << udi << " -- " << condition_name << endl; -- Q_UNUSED(ctx); -- Q_UNUSED(message); -- s_HALBackend->DeviceCondition(udi, condition_name); -+ QString media_name; -+ if (halVolume) -+ { -+ char* name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -+ QString volume_name = QString::fromUtf8(name); -+ media_name = volume_name; -+ free(name); -+ } -+ else -+ { -+ char* name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -+ QString drive_name = QString::fromUtf8(name); -+ media_name = drive_name; -+ free(name); -+ } -+ medium->setLabel(media_name); -+ -+ free(volumes); -+ libhal_drive_free(halDrive); -+ libhal_volume_free(halVolume); - } - --QStringList HALBackend::mountoptions(const QString &name) -+void HALBackend::setCameraProperties(Medium* medium) - { -- const Medium* medium = m_mediaList.findById(name); -- if (medium && !isInFstab(medium).isNull()) -- return QStringList(); // not handled by HAL - fstab entry -- -- KConfig config("mediamanagerrc"); -- config.setGroup(name); -- -- char ** array = libhal_device_get_property_strlist(m_halContext, name.latin1(), "volume.mount.valid_options", NULL); -- QMap<QString,bool> valids; -- -- for (int index = 0; array && array[index]; ++index) { -- QString t = array[index]; -- if (t.endsWith("=")) -- t = t.left(t.length() - 1); -- valids[t] = true; -- kdDebug() << "valid " << t << endl; -- } -- libhal_free_string_array(array); -- QStringList result; -- QString tmp; -- -- QString fstype = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.fstype"); -- if (fstype.isNull()) -- fstype = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.policy.mount_filesystem"); -- -- -- QString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device"); -- -- bool removable = libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.removable", NULL) -- || libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.hotpluggable", NULL); -- -- config.setGroup(drive_udi); -- bool value = config.readBoolEntry("automount", false); -- config.setGroup(name); -- -- if (libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_blank", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_vcd", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_svcd", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_videodvd", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.has_audio", NULL)) -- value = false; -- -- result << QString("automount=%1").arg(value ? "true" : "false"); -- -- if (valids.contains("ro")) -- { -- value = config.readBoolEntry("ro", false); -- tmp = QString("ro=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- if (valids.contains("quiet")) -- { -- value = config.readBoolEntry("quiet", false); -- tmp = QString("quiet=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- if (valids.contains("flush")) -- { -- value = config.readBoolEntry("flush", fstype.endsWith("fat")); -- tmp = QString("flush=%1").arg(value ? "true" : "false"); -- result << tmp; -- } -- -- if (valids.contains("uid")) -- { -- value = config.readBoolEntry("uid", true); -- tmp = QString("uid=%1").arg(value ? "true" : "false"); -- result << tmp; -- } -- -- if (valids.contains("utf8")) -- { -- value = config.readBoolEntry("utf8", true); -- tmp = QString("utf8=%1").arg(value ? "true" : "false"); -- result << tmp; -- } -- -- if (valids.contains("shortname")) -- { -- QString svalue = config.readEntry("shortname", "lower").lower(); -- if (svalue == "winnt") -- result << "shortname=winnt"; -- else if (svalue == "win95") -- result << "shortname=win95"; -- else if (svalue == "mixed") -- result << "shortname=mixed"; -- else -- result << "shortname=lower"; -- } -- -- if (valids.contains("sync")) -- { -- value = config.readBoolEntry("sync", !fstype.endsWith("fat") && removable); -- tmp = QString("sync=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- if (valids.contains("noatime")) -- { -- value = config.readBoolEntry("atime", !fstype.endsWith("fat")); -- tmp = QString("atime=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- QString mount_point = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.mount_point"); -- if (mount_point.isEmpty()) -- mount_point = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.policy.desired_mount_point"); -- -- mount_point = config.readEntry("mountpoint", mount_point); -- -- if (!mount_point.startsWith("/")) -- mount_point = "/media/" + mount_point; -- -- result << QString("mountpoint=%1").arg(mount_point); -- result << QString("filesystem=%1").arg(fstype); -- -- if (valids.contains("data")) -- { -- QString svalue = config.readEntry("journaling").lower(); -- if (svalue == "ordered") -- result << "journaling=ordered"; -- else if (svalue == "writeback") -- result << "journaling=writeback"; -- else if (svalue == "data") -- result << "journaling=data"; -- else -- result << "journaling=ordered"; -- } -+ kdDebug(1219) << "HALBackend::setCameraProperties for " << medium->id() << endl; - -- return result; -+ const char* udi = medium->id().ascii(); -+ /* Check if the device still exists */ -+ if (!libhal_device_exists(m_halContext, udi, NULL)) -+ return; -+ -+ /** @todo find name */ -+ medium->setName("camera"); -+ /** @todo find the rest of this URL */ -+ medium->unmountableState("camera:/"); -+ medium->setMimeType("media/gphoto2camera"); -+ medium->setIconName(QString::null); -+ if (libhal_device_property_exists(m_halContext, udi, "usb_device.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, udi, "usb_device.product")); -+ else if (libhal_device_property_exists(m_halContext, udi, "usb.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, udi, "usb.product")); -+ else -+ medium->setLabel(i18n("Camera")); - } - --bool HALBackend::setMountoptions(const QString &name, const QStringList &options ) -+QString HALBackend::generateName(const QString &devNode) - { -- kdDebug() << "setMountoptions " << name << " " << options << endl; -- -- KConfig config("mediamanagerrc"); -- config.setGroup(name); -- -- QMap<QString,QString> valids = MediaManagerUtils::splitOptions(options); -- -- const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 }; -- for (int index = 0; names[index]; ++index) -- if (valids.contains(names[index])) -- config.writeEntry(names[index], valids[names[index]] == "true"); -- -- if (valids.contains("shortname")) -- config.writeEntry("shortname", valids["shortname"]); -- -- if (valids.contains("journaling")) -- config.writeEntry("journaling", valids["journaling"]); -- -- if (!mountoptions(name).contains(QString("mountpoint=%1").arg(valids["mountpoint"]))) -- config.writeEntry("mountpoint", valids["mountpoint"]); -- -- if (valids.contains("automount")) { -- QString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device"); -- config.setGroup(drive_udi); -- config.writeEntry("automount", valids["automount"]); -- } -- -- return true; -+ return KURL(devNode).fileName(); - } - --static QString mount_priv(const char *udi, const char *mount_point, const char **poptions, int noptions, -- DBusConnection *dbus_connection) --{ -- DBusMessage *dmesg, *reply; -- DBusError error; -- -- const char *fstype = ""; -- if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, -- "org.freedesktop.Hal.Device.Volume", -- "Mount"))) { -- kdDebug() << "mount failed for " << udi << ": could not create dbus message\n"; -- return i18n("Internal Error"); -- } -- -- if (!dbus_message_append_args (dmesg, DBUS_TYPE_STRING, &mount_point, DBUS_TYPE_STRING, &fstype, -- DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &poptions, noptions, -- DBUS_TYPE_INVALID)) -- { -- kdDebug() << "mount failed for " << udi << ": could not append args to dbus message\n"; -- dbus_message_unref (dmesg); -- return i18n("Internal Error"); -- } -- -- QString qerror; -- -- dbus_error_init (&error); -- if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) -- { -- QString qerror = error.message; -- kdError() << "mount failed for " << udi << ": " << error.name << " - " << qerror << endl; -- if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.UnknownFilesystemType")) -- qerror = i18n("Invalid filesystem type"); -- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.PermissionDenied")) -- qerror = i18n("Permissions denied"); -- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.AlreadyMounted")) -- qerror = i18n("Device is already mounted."); -- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.InvalidMountpoint") && strlen(mount_point)) { -- dbus_message_unref (dmesg); -- dbus_error_free (&error); -- return mount_priv(udi, "", poptions, noptions, dbus_connection); -- } -- dbus_message_unref (dmesg); -- dbus_error_free (&error); -- return qerror; -- } -- -- kdDebug() << "mount queued for " << udi << endl; -- -- dbus_message_unref (dmesg); -- dbus_message_unref (reply); -- -- return qerror; -+/****************************************** -+** HAL CALL-BACKS ** -+******************************************/ - -+#ifdef HAL_0_4 -+void HALBackend::hal_main_loop_integration(LibHalContext *ctx, -+ DBusConnection *dbus_connection) -+{ -+ kdDebug(1219) << "HALBackend::hal_main_loop_integration" << endl; -+ Q_UNUSED(ctx); -+ s_HALBackend->MainLoopIntegration(dbus_connection); - } -+#endif - --void HALBackend::slotResult(KIO::Job *job) -+void HALBackend::hal_device_added(LibHalContext *ctx, const char *udi) - { -- kdDebug() << "slotResult " << mount_jobs[job] << endl; -- if (job->error()) -- { -- KMessageBox::error(0, job->errorText()); -- } -- ResetProperties( mount_jobs[job].latin1() ); -- mount_jobs.remove(job); -+ kdDebug(1219) << "HALBackend::hal_device_added " << udi << endl; -+ Q_UNUSED(ctx); -+ s_HALBackend->AddDevice(udi); - } - --QString HALBackend::isInFstab(const Medium *medium) -+void HALBackend::hal_device_removed(LibHalContext *ctx, const char *udi) - { -- KMountPoint::List fstab = KMountPoint::possibleMountPoints(KMountPoint::NeedMountOptions|KMountPoint::NeedRealDeviceName); -- -- KMountPoint::List::iterator it = fstab.begin(); -- KMountPoint::List::iterator end = fstab.end(); -- -- for (; it!=end; ++it) -- { -- kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl; -- if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && (*it)->realDeviceName() == medium->deviceNode() ) ) -- { -- QStringList opts = (*it)->mountOptions(); -- if (opts.contains("user") || opts.contains("users")) -- return (*it)->mountPoint(); -- } -- } -- -- return QString::null; -+ kdDebug(1219) << "HALBackend::hal_device_removed " << udi << endl; -+ Q_UNUSED(ctx); -+ s_HALBackend->RemoveDevice(udi); - } - --QString HALBackend::mount(const Medium *medium) --{ -- if (medium->isMounted()) -- return QString(); // that was easy -- -- QString mountPoint = isInFstab(medium); -- if (!mountPoint.isNull()) -- { -- kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; -- KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint ); -- connect(job, SIGNAL( result (KIO::Job *)), -- SLOT( slotResult( KIO::Job *))); -- mount_jobs[job] = medium->id(); -- return QString(); // we won't report an error here -- } else if (medium->id().startsWith("/org/kde/") ) -- return i18n("Permissions denied"); -- -- QStringList soptions; -- -- kdDebug() << "mounting " << medium->id() << "..." << endl; -- -- QMap<QString,QString> valids = MediaManagerUtils::splitOptions(mountoptions(medium->id())); -- if (valids["flush"] == "true") -- soptions << "flush"; -- -- if (valids["uid"] == "true") -- { -- soptions << QString("uid=%1").arg(getuid()); -- } -- -- if (valids["ro"] == "true") -- soptions << "ro"; -- -- if (valids["atime"] != "true") -- soptions << "noatime"; -- -- if (valids["quiet"] == "true") -- soptions << "quiet"; -- -- if (valids["utf8"] == "true") -- soptions << "utf8"; -- -- if (valids["sync"] == "true") -- soptions << "sync"; -- -- QString mount_point = valids["mountpoint"]; -- if (mount_point.startsWith("/media/")) -- mount_point = mount_point.mid(7); -- -- if (valids.contains("shortname")) -- { -- soptions << QString("shortname=%1").arg(valids["shortname"]); -- } -- -- if (valids.contains("journaling")) -- { -- QString option = valids["journaling"]; -- if (option == "data") -- soptions << QString("data=journal"); -- else if (option == "writeback") -- soptions << QString("data=writeback"); -- else -- soptions << QString("data=ordered"); -- } -- -- const char **options = new const char*[soptions.size() + 1]; -- uint noptions = 0; -- for (QStringList::ConstIterator it = soptions.begin(); it != soptions.end(); ++it, ++noptions) -- options[noptions] = (*it).latin1(); -- options[noptions] = NULL; -- -- QString qerror = mount_priv(medium->id().latin1(), mount_point.utf8(), options, noptions, dbus_connection); -- if (!qerror.isEmpty()) { -- kdError() << "mounting " << medium->id() << " returned " << qerror << endl; -- return qerror; -- } -- -- medium->setHalMounted(true); -- ResetProperties(medium->id().latin1()); -- -- return QString(); --} -- --QString HALBackend::mount(const QString &_udi) -+void HALBackend::hal_device_property_modified(LibHalContext *ctx, const char *udi, -+ const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) - { -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- return i18n("No such medium: %1").arg(_udi); -- -- return mount(medium); -+ kdDebug(1219) << "HALBackend::hal_property_modified " << udi << " -- " << key << endl; -+ Q_UNUSED(ctx); -+ Q_UNUSED(is_removed); -+ Q_UNUSED(is_added); -+ s_HALBackend->ModifyDevice(udi, key); - } - --QString HALBackend::unmount(const QString &_udi) --{ -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- { // now we get fancy: if the udi is no volume, it _might_ be a device with only one -- // volume on it (think CDs) - so we're so nice to the caller to unmount that volume -- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, _udi.latin1()); -- if (halDrive) -- { -- int numVolumes; -- char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); -- if (numVolumes == 1) -- medium = m_mediaList.findById( volumes[0] ); -- } -- } -- -- if ( !medium ) -- return i18n("No such medium: %1").arg(_udi); -- -- if (!medium->isMounted()) -- return QString(); // that was easy -- -- QString mountPoint = isInFstab(medium); -- if (!mountPoint.isNull()) -- { -- kdDebug() << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl; -- KIO::Job *job = KIO::unmount( medium->mountPoint(), false ); -- connect(job, SIGNAL( result (KIO::Job *)), -- SLOT( slotResult( KIO::Job *))); -- mount_jobs[job] = medium->id(); -- return QString(); // we won't report an error here -- } -- -- DBusMessage *dmesg, *reply; -- DBusError error; -- const char *options[2]; -- -- const char *udi = medium->id().latin1(); -- kdDebug() << "unmounting " << udi << "..." << endl; -- -- dbus_error_init(&error); -- DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -- if (dbus_error_is_set(&error)) -- { -- dbus_error_free(&error); -- return false; -- } -- -- if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, -- "org.freedesktop.Hal.Device.Volume", -- "Unmount"))) { -- kdDebug() << "unmount failed for " << udi << ": could not create dbus message\n"; -- return i18n("Internal Error"); -- } -- -- options[0] = "force"; -- options[1] = 0; -- -- if (!dbus_message_append_args (dmesg, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, 0, -- DBUS_TYPE_INVALID)) -- { -- kdDebug() << "unmount failed for " << udi << ": could not append args to dbus message\n"; -- dbus_message_unref (dmesg); -- return i18n("Internal Error"); -- } -- -- dbus_error_init (&error); -- if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) -- { -- kdDebug() << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl; -- QString qerror = error.message; -- if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.Busy")) { -- qerror = QString("<qt>") + i18n("Device is Busy:"); -- QString cmdline = QString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint())); -- FILE *fuser = popen(cmdline.latin1(), "r"); -- uint counter = 0; -- if (fuser) { -- qerror += "<pre>"; -- QTextIStream is(fuser); -- QString tmp; -- while (!is.atEnd()) { -- tmp = is.readLine(); -- tmp = QStyleSheet::escape(tmp) + "\n"; -- -- qerror += tmp; -- if (counter++ > 20) -- { -- qerror += "..."; -- break; -- } -- } -- qerror += "</pre>"; -- (void)pclose( fuser ); -- } -- qerror += "</qt>"; -- } else if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.NotMounted")) { -- // this is faking. The error is that the device wasn't mounted by hal (but by the system) -- qerror = i18n("Permissions denied"); -- } -- -- dbus_message_unref (dmesg); -- dbus_error_free (&error); -- return qerror; -- } -- -- kdDebug() << "unmount queued for " << udi << endl; -- -- dbus_message_unref (dmesg); -- dbus_message_unref (reply); -- -- medium->setHalMounted(false); -- ResetProperties(udi); -- -- return QString(); -+void HALBackend::hal_device_condition(LibHalContext *ctx, const char *udi, -+ const char *condition_name, -+ #ifdef HAL_0_4 -+ DBusMessage *message -+ #else -+ const char* message -+ #endif -+ ) -+{ -+ kdDebug(1219) << "HALBackend::hal_device_condition " << udi << " -- " << condition_name << endl; -+ Q_UNUSED(ctx); -+ Q_UNUSED(message); -+ s_HALBackend->DeviceCondition(udi, condition_name); - } - - #include "halbackend.moc" -diff -urN kioslave/media/mediamanager/halbackend.h kioslave/media/mediamanager/halbackend.h ---- kioslave/media/mediamanager/halbackend.h Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/halbackend.h Mon Oct 10 17:04:01 2005 -@@ -45,9 +45,65 @@ - #include <libhal.h> - #include <libhal-storage.h> - --namespace KIO { -- class Job; --} -+/* The HAL API changed between 0.4 and 0.5 series. -+These defines enable backward compatibility */ -+#ifdef HAL_0_4 -+ // libhal-storage 0.4 API -+ #define LibHalStoragePolicy HalStoragePolicy -+ #define LibHalDrive HalDrive -+ #define LibHalVolume HalVolume -+ #define LibHalVolumeDiscType HalVolumeDiscType -+ #define libhal_storage_policy_free hal_storage_policy_free -+ #define libhal_storage_policy_new hal_storage_policy_new -+ #define libhal_drive_from_udi hal_drive_from_udi -+ #define libhal_drive_find_all_volumes hal_drive_find_all_volumes -+ #define libhal_drive_get_type hal_drive_get_type -+ #define libhal_drive_get_device_file hal_drive_get_device_file -+ #define libhal_drive_free hal_drive_free -+ #define libhal_drive_policy_compute_display_name hal_drive_policy_compute_display_name -+ #define libhal_drive_is_hotpluggable hal_drive_is_hotpluggable -+ #define libhal_drive_get_physical_device_udi hal_drive_get_physical_device_udi -+ #define libhal_volume_from_udi hal_volume_from_udi -+ #define libhal_volume_get_device_file hal_volume_get_device_file -+ #define libhal_volume_get_mount_point hal_volume_get_mount_point -+ #define libhal_volume_get_fstype hal_volume_get_fstype -+ #define libhal_volume_is_mounted hal_volume_is_mounted -+ #define libhal_volume_get_disc_type hal_volume_get_disc_type -+ #define libhal_volume_free hal_volume_free -+ #define libhal_volume_policy_compute_display_name hal_volume_policy_compute_display_name -+ #define libhal_volume_disc_has_data hal_volume_disc_has_data -+ #define libhal_volume_disc_has_audio hal_volume_disc_has_audio -+ #define libhal_volume_disc_is_blank hal_volume_disc_is_blank -+ #define libhal_volume_is_disc hal_volume_is_disc -+ #define libhal_volume_get_storage_device_udi hal_volume_get_storage_device_udi -+ #define LIBHAL_VOLUME_DISC_TYPE_CDROM HAL_VOLUME_DISC_TYPE_CDROM -+ #define LIBHAL_VOLUME_DISC_TYPE_CDR HAL_VOLUME_DISC_TYPE_CDR -+ #define LIBHAL_VOLUME_DISC_TYPE_CDRW HAL_VOLUME_DISC_TYPE_CDRW -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDROM HAL_VOLUME_DISC_TYPE_DVDROM -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDRAM HAL_VOLUME_DISC_TYPE_DVDRAM -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDR HAL_VOLUME_DISC_TYPE_DVDR -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDRW HAL_VOLUME_DISC_TYPE_DVDRW -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR HAL_VOLUME_DISC_TYPE_DVDPLUSR -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW HAL_VOLUME_DISC_TYPE_DVDPLUSRW -+ #define LIBHAL_DRIVE_TYPE_COMPACT_FLASH HAL_DRIVE_TYPE_COMPACT_FLASH -+ #define LIBHAL_DRIVE_TYPE_MEMORY_STICK HAL_DRIVE_TYPE_MEMORY_STICK -+ #define LIBHAL_DRIVE_TYPE_SMART_MEDIA HAL_DRIVE_TYPE_SMART_MEDIA -+ #define LIBHAL_DRIVE_TYPE_SD_MMC HAL_DRIVE_TYPE_SD_MMC -+ #define LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER HAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER -+ #define LIBHAL_DRIVE_TYPE_CAMERA HAL_DRIVE_TYPE_CAMERA -+ #define LIBHAL_DRIVE_TYPE_TAPE HAL_DRIVE_TYPE_TAPE -+ -+ // libhal 0.4 API -+ #define libhal_free_string hal_free_string -+ #define libhal_device_exists(ctx, udi, error) hal_device_exists(ctx, udi) -+ #define libhal_device_property_watch_all(ctx, error) hal_device_property_watch_all(ctx) -+ #define libhal_get_all_devices(ctx, num_devices, error) hal_get_all_devices(ctx, num_devices) -+ #define libhal_device_property_exists(ctx, udi, key, error) hal_device_property_exists(ctx, udi, key) -+ #define libhal_device_get_property_bool(ctx, udi, key, error) hal_device_get_property_bool(ctx, udi, key) -+ #define libhal_device_get_property_string(ctx, udi, key, error) hal_device_get_property_string(ctx, udi, key) -+ #define libhal_device_query_capability(ctx, udi, capability, error) hal_device_query_capability(ctx, udi, capability) -+#endif -+ - - /** - * A handy function to query a hal string -@@ -88,14 +144,6 @@ - */ - bool ListDevices(); - -- QStringList mountoptions(const QString &id); -- -- bool setMountoptions(const QString &id, const QStringList &options); -- -- QString mount(const QString &id); -- QString mount(const Medium *medium); -- QString unmount(const QString &id); -- - private: - /** - * Append a device in the media list. This function will check if the device -@@ -147,16 +195,20 @@ - - void setVolumeProperties(Medium* medium); - void setFloppyProperties(Medium* medium); -- bool setFstabProperties(Medium* medium); - void setCameraProperties(Medium* medium); - QString generateName(const QString &devNode); -- static QString isInFstab(const Medium *medium); -- --private slots: -- void slotResult(KIO::Job *job); - - /* Hal call-backs -- from gvm*/ - public: -+#ifdef HAL_0_4 -+ /** Invoked by libhal for integration with our mainloop. -+ * -+ * @param ctx LibHal context -+ * @param dbus_connection D-BUS connection to integrate -+ */ -+ static void hal_main_loop_integration(LibHalContext *ctx, DBusConnection *dbus_connection); -+#endif -+ - /** Invoked when a device is added to the Global Device List. - * - * @param ctx LibHal context -@@ -189,7 +241,11 @@ - */ - static void hal_device_condition(LibHalContext *ctx, const char *udi, - const char *condition_name, -+ #ifdef HAL_0_4 -+ DBusMessage *message -+ #else - const char* message -+ #endif - ); - - /* HAL and DBus structures */ -@@ -199,6 +255,13 @@ - */ - LibHalContext* m_halContext; - -+#ifdef HAL_0_4 -+ /** -+ * Structure defining the hal callback function for devices events -+ */ -+ LibHalFunctions m_halFunctions; -+#endif -+ - /** - * libhal-storage HAL policy, e.g. for icon names - */ -@@ -213,10 +276,6 @@ - * Object for the kded module - */ - QObject* m_parent; -- -- DBusConnection *dbus_connection; -- -- QMap<KIO::Job *, QString> mount_jobs; - }; - - #endif /* _HALBACKEND_H_ */ -diff -urN kioslave/media/mediamanager/linuxcdpolling.cpp kioslave/media/mediamanager/linuxcdpolling.cpp ---- kioslave/media/mediamanager/linuxcdpolling.cpp Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/linuxcdpolling.cpp Mon Oct 10 17:04:01 2005 -@@ -23,6 +23,7 @@ - - #include <qthread.h> - #include <qmutex.h> -+#include <qtimer.h> - #include <qfile.h> - - #include <kdebug.h> -@@ -188,7 +189,9 @@ - const QString &, bool, bool)), - this, SLOT(slotMediumStateChanged(const QString &)) ); - -- connect(&m_timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); -+ QTimer *timer = new QTimer(this); -+ connect(timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); -+ timer->start(500); - } - - LinuxCDPolling::~LinuxCDPolling() -@@ -226,7 +229,6 @@ - PollingThread *thread = new PollingThread(dev); - m_threads[id] = thread; - thread->start(); -- m_timer.start(500); - } - } - -@@ -266,7 +268,6 @@ - PollingThread *thread = new PollingThread(dev); - m_threads[id] = thread; - thread->start(); -- m_timer.start(500); - } - else if (m_threads.contains(id) && medium->isMounted()) - { -@@ -281,12 +282,6 @@ - void LinuxCDPolling::slotTimeout() - { - //kdDebug(1219) << "LinuxCDPolling::slotTimeout()" << endl; -- -- if (m_threads.isEmpty()) -- { -- m_timer.stop(); -- return; -- } - - QMap<QString, PollingThread*>::iterator it = m_threads.begin(); - QMap<QString, PollingThread*>::iterator end = m_threads.end(); -diff -urN kioslave/media/mediamanager/linuxcdpolling.h kioslave/media/mediamanager/linuxcdpolling.h ---- kioslave/media/mediamanager/linuxcdpolling.h Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/linuxcdpolling.h Mon Oct 10 17:04:01 2005 -@@ -24,7 +24,6 @@ - #include <qobject.h> - #include <qcstring.h> - #include <qmap.h> --#include <qtimer.h> - - class DiscType - { -@@ -80,7 +79,6 @@ - - QMap<QString, PollingThread*> m_threads; - QStringList m_excludeNotification; -- QTimer m_timer; - }; - - #endif -diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanager/mediamanager.cpp ---- kioslave/media/mediamanager/mediamanager.cpp Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/mediamanager.cpp Mon Oct 10 17:04:01 2005 -@@ -43,287 +43,201 @@ - MediaManager::MediaManager(const QCString &obj) - : KDEDModule(obj), m_dirNotify(m_mediaList) - { -- connect( &m_mediaList, SIGNAL(mediumAdded(const QString&, const QString&, bool)), -- SLOT(slotMediumAdded(const QString&, const QString&, bool)) ); -- connect( &m_mediaList, SIGNAL(mediumRemoved(const QString&, const QString&, bool)), -- SLOT(slotMediumRemoved(const QString&, const QString&, bool)) ); -- connect( &m_mediaList, -- SIGNAL(mediumStateChanged(const QString&, const QString&, bool, bool)), -- SLOT(slotMediumChanged(const QString&, const QString&, bool, bool)) ); -+ connect( &m_mediaList, SIGNAL(mediumAdded(const QString&, const QString&, bool)), -+ SLOT(slotMediumAdded(const QString&, const QString&, bool)) ); -+ connect( &m_mediaList, SIGNAL(mediumRemoved(const QString&, const QString&, bool)), -+ SLOT(slotMediumRemoved(const QString&, const QString&, bool)) ); -+ connect( &m_mediaList, -+ SIGNAL(mediumStateChanged(const QString&, const QString&, bool, bool)), -+ SLOT(slotMediumChanged(const QString&, const QString&, bool, bool)) ); - -- QTimer::singleShot( 10, this, SLOT( loadBackends() ) ); -+ QTimer::singleShot( 10, this, SLOT( loadBackends() ) ); - } - - MediaManager::~MediaManager() - { -- while ( !m_backends.isEmpty() ) -- { -- BackendBase *b = m_backends.first(); -- m_backends.remove( b ); -- delete b; -- } -+ while ( !m_backends.isEmpty() ) -+ { -+ BackendBase *b = m_backends.first(); -+ m_backends.remove( b ); -+ delete b; -+ } - } - - void MediaManager::loadBackends() - { - m_mediaList.blockSignals(true); - -- while ( !m_backends.isEmpty() ) -- { -- BackendBase *b = m_backends.first(); -- m_backends.remove( b ); -- delete b; -- } -- -- mp_removableBackend = 0L; -- m_halbackend = 0L; -- m_fstabbackend = 0L; -+ while ( !m_backends.isEmpty() ) -+ { -+ BackendBase *b = m_backends.first(); -+ m_backends.remove( b ); -+ delete b; -+ } -+ -+ mp_removableBackend = 0L; - - #ifdef COMPILE_HALBACKEND -- if ( MediaManagerSettings::self()->halBackendEnabled() ) -- { -- m_halbackend = new HALBackend(m_mediaList, this); -- if (m_halbackend->InitHal()) -- { -- m_backends.append( m_halbackend ); -- m_fstabbackend = new FstabBackend(m_mediaList, true); -- m_backends.append( m_fstabbackend ); -- // No need to load something else... -- m_mediaList.blockSignals(false); -- return; -- } -- else -- { -- delete m_halbackend; -- m_halbackend = 0; -- } -- } -+ if ( MediaManagerSettings::self()->halBackendEnabled() ) -+ { -+ HALBackend* hal_backend = new HALBackend(m_mediaList, this); -+ if (hal_backend->InitHal()) -+ { -+ m_backends.append( hal_backend ); -+ m_backends.append( new FstabBackend(m_mediaList, true) ); -+ // No need to load something else... -+ m_mediaList.blockSignals(false); -+ return; -+ } -+ else -+ { -+ delete hal_backend; -+ } -+ } - #endif // COMPILE_HALBACKEND - -- mp_removableBackend = new RemovableBackend(m_mediaList); -- m_backends.append( mp_removableBackend ); -+ mp_removableBackend = new RemovableBackend(m_mediaList); -+ m_backends.append( mp_removableBackend ); - - #ifdef COMPILE_LINUXCDPOLLING -- if ( MediaManagerSettings::self()->cdPollingEnabled() ) -- { -- m_backends.append( new LinuxCDPolling(m_mediaList) ); -- } -+ if ( MediaManagerSettings::self()->cdPollingEnabled() ) -+ { -+ m_backends.append( new LinuxCDPolling(m_mediaList) ); -+ } - #endif //COMPILE_LINUXCDPOLLING - -- m_fstabbackend = new FstabBackend(m_mediaList); -- m_backends.append( m_fstabbackend ); -- m_mediaList.blockSignals(false); -+ m_backends.append( new FstabBackend(m_mediaList) ); -+ m_mediaList.blockSignals(false); - } - - - QStringList MediaManager::fullList() - { -- QPtrList<Medium> list = m_mediaList.list(); -+ QPtrList<Medium> list = m_mediaList.list(); - -- QStringList result; -+ QStringList result; - -- QPtrList<Medium>::const_iterator it = list.begin(); -- QPtrList<Medium>::const_iterator end = list.end(); -- for (; it!=end; ++it) -- { -- result+= (*it)->properties(); -- result+= Medium::SEPARATOR; -- } -+ QPtrList<Medium>::const_iterator it = list.begin(); -+ QPtrList<Medium>::const_iterator end = list.end(); -+ for (; it!=end; ++it) -+ { -+ result+= (*it)->properties(); -+ result+= Medium::SEPARATOR; -+ } - -- return result; -+ return result; - } - - QStringList MediaManager::properties(const QString &name) - { -- const Medium *m = m_mediaList.findByName(name); -- -- if (!m) -- { -- KURL u(name); -- kdDebug() << "Media::prop " << name << " " << u.isValid() << endl; -- if (u.isValid()) -- { -- if (u.protocol() == "system") -- { -- QString path = u.path(); -- if (path.startsWith("/media/")) -- path = path.mid(strlen("/media/")); -- m = m_mediaList.findByName(path); -- kdDebug() << "findByName " << path << m << endl; -- } -- else if (u.protocol() == "media") -- { -- m = m_mediaList.findByName(u.filename()); -- kdDebug() << "findByName " << u.filename() << m << endl; -- } -- else if (u.protocol() == "file") -- { -- // look for the mount point -- QPtrList<Medium> list = m_mediaList.list(); -- QPtrList<Medium>::const_iterator it = list.begin(); -- QPtrList<Medium>::const_iterator end = list.end(); -- for (; it!=end; ++it) -- { -- kdDebug() << "comparing " << (*it)->mountPoint() << " " << u.path() << " " << (*it)->deviceNode() << endl; -- if ((*it)->mountPoint() == u.path() || (*it)->deviceNode() == u.path()) { -- m = *it; -- break; -- } -- } -- } -- } -- } -- -- if (m) -- return m->properties(); -- else -- return QStringList(); --} -+ const Medium *m = m_mediaList.findByName(name); - --QStringList MediaManager::mountoptions(const QString &name) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return QStringList(); -- return m_halbackend->mountoptions(name); --#else -- return QStringList(); --#endif --} -- --bool MediaManager::setMountoptions(const QString &name, const QStringList &options) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return false; -- return m_halbackend->setMountoptions(name, options); --#else -- return false; --#endif --} -- --QString MediaManager::mount(const QString &name) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return i18n("Feature only available with HAL"); -- return m_halbackend->mount(name); --#else -- if ( !m_fstabbackend ) // lying :) -- return i18n("Feature only available with HAL"); -- return m_fstabbackend->mount( name ); --#endif --} -- --QString MediaManager::unmount(const QString &name) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return i18n("Feature only available with HAL"); -- return m_halbackend->unmount(name); --#else -- if ( !m_fstabbackend ) // lying :) -- return i18n("Feature only available with HAL"); -- return m_fstabbackend->unmount( name ); --#endif -+ if (m!=0L) -+ { -+ return m->properties(); -+ } -+ else -+ { -+ return QStringList(); -+ } - } - - QString MediaManager::nameForLabel(const QString &label) - { -- const QPtrList<Medium> media = m_mediaList.list(); -+ const QPtrList<Medium> media = m_mediaList.list(); - -- QPtrList<Medium>::const_iterator it = media.begin(); -- QPtrList<Medium>::const_iterator end = media.end(); -- for (; it!=end; ++it) -- { -- const Medium *m = *it; -- -- if (m->prettyLabel()==label) -- { -- return m->name(); -- } -- } -+ QPtrList<Medium>::const_iterator it = media.begin(); -+ QPtrList<Medium>::const_iterator end = media.end(); -+ for (; it!=end; ++it) -+ { -+ const Medium *m = *it; -+ -+ if (m->prettyLabel()==label) -+ { -+ return m->name(); -+ } -+ } - -- return QString::null; -+ return QString::null; - } - - ASYNC MediaManager::setUserLabel(const QString &name, const QString &label) - { -- m_mediaList.setUserLabel(name, label); -+ m_mediaList.setUserLabel(name, label); - } - - ASYNC MediaManager::reloadBackends() - { -- MediaManagerSettings::self()->readConfig(); -- loadBackends(); -+ MediaManagerSettings::self()->readConfig(); -+ loadBackends(); - } - - bool MediaManager::removablePlug(const QString &devNode, const QString &label) - { -- if (mp_removableBackend) -- { -- return mp_removableBackend->plug(devNode, label); -- } -- return false; -+ if (mp_removableBackend) -+ { -+ return mp_removableBackend->plug(devNode, label); -+ } -+ return false; - } - - bool MediaManager::removableUnplug(const QString &devNode) - { -- if (mp_removableBackend) -- { -- return mp_removableBackend->unplug(devNode); -- } -- return false; -+ if (mp_removableBackend) -+ { -+ return mp_removableBackend->unplug(devNode); -+ } -+ return false; - } - - bool MediaManager::removableCamera(const QString &devNode) - { -- if (mp_removableBackend) -- { -- return mp_removableBackend->camera(devNode); -- } -- return false; -+ if (mp_removableBackend) -+ { -+ return mp_removableBackend->camera(devNode); -+ } -+ return false; - } - - - void MediaManager::slotMediumAdded(const QString &/*id*/, const QString &name, - bool allowNotification) - { -- kdDebug(1219) << "MediaManager::slotMediumAdded: " << name << endl; -+ kdDebug(1219) << "MediaManager::slotMediumAdded: " << name << endl; - -- KDirNotify_stub notifier("*", "*"); -- notifier.FilesAdded( KURL("media:/") ); -+ KDirNotify_stub notifier("*", "*"); -+ notifier.FilesAdded( KURL("media:/") ); - -- emit mediumAdded(name, allowNotification); -- emit mediumAdded(name); -+ emit mediumAdded(name, allowNotification); -+ emit mediumAdded(name); - } - - void MediaManager::slotMediumRemoved(const QString &/*id*/, const QString &name, - bool allowNotification) - { -- kdDebug(1219) << "MediaManager::slotMediumRemoved: " << name << endl; -+ kdDebug(1219) << "MediaManager::slotMediumRemoved: " << name << endl; - -- KDirNotify_stub notifier("*", "*"); -- notifier.FilesRemoved( KURL("media:/"+name) ); -+ KDirNotify_stub notifier("*", "*"); -+ notifier.FilesRemoved( KURL("media:/"+name) ); - -- emit mediumRemoved(name, allowNotification); -- emit mediumRemoved(name); -+ emit mediumRemoved(name, allowNotification); -+ emit mediumRemoved(name); - } - - void MediaManager::slotMediumChanged(const QString &/*id*/, const QString &name, - bool mounted, bool allowNotification) - { -- kdDebug(1219) << "MediaManager::slotMediumChanged: " << name << endl; -+ kdDebug(1219) << "MediaManager::slotMediumChanged: " << name << endl; - -- KDirNotify_stub notifier("*", "*"); -- if (!mounted) -- { -- notifier.FilesRemoved( KURL("media:/"+name) ); -- } -- notifier.FilesChanged( KURL("media:/"+name) ); -+ KDirNotify_stub notifier("*", "*"); -+ if (!mounted) -+ { -+ notifier.FilesRemoved( KURL("media:/"+name) ); -+ } -+ notifier.FilesChanged( KURL("media:/"+name) ); - -- emit mediumChanged(name, allowNotification); -- emit mediumChanged(name); -+ emit mediumChanged(name, allowNotification); -+ emit mediumChanged(name); - } - - -diff -urN kioslave/media/mediamanager/mediamanager.desktop kioslave/media/mediamanager/mediamanager.desktop ---- kioslave/media/mediamanager/mediamanager.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/mediamanager.desktop Tue May 23 13:33:34 2006 -@@ -16,13 +16,11 @@ - Name[es]=Administrador de recursos KDED - Name[et]=KDED andmekandjate haldur - Name[eu]=KDED media kudeatzailea --Name[fa]=مدیر رسانه KDED - Name[fi]=KDED-tallennusmedianhallinta - Name[fr]=Gestionnaire de médias KDED - Name[fy]=KDEDED-mediabehearder - Name[ga]=Bainisteoir Meán KDED - Name[gl]=Xestor de Meios de KDED --Name[he]=מנהל המדיה של KDED - Name[hi]=केडीईडी मीडिया प्रबंधक - Name[hr]=KDED upravitelj medija - Name[hu]=KDED médiakezelő -@@ -45,7 +43,6 @@ - Name[ru]=Управление подключаемыми устройствами - Name[rw]=Mugenga Igihuza KDED - Name[se]=KDED-mediagieđahalli --Name[sk]=KDED správca médií - Name[sl]=Upravitelj medijev KDED - Name[sr]=Менаџер медијума, KDED - Name[sr@Latn]=Menadžer medijuma, KDED -@@ -73,18 +70,16 @@ - Comment[es]=Monitoriza las actividades de los recursos y permite (des)montarlos (media:/) - Comment[et]=Hoiab silma peal andmekandjate aktiivsusel ja võimaldab neid ühendada/lahutada (media:/) - Comment[eu]=Montatzeak begiztatzen ditu (media:/) eta desmontatzen uzten du --Comment[fa]=حفظ رد فعالیتهای رسانه و اجازه سو ار(پیاده) کردن (media:/) - Comment[fi]=Pidä kirjaa tallennustapahtumista ja salli tallennusvälineen liittäminen/irrotus (devices:/) - Comment[fr]=Gardez une trace des montages et permettre le (dé)montage (media:/) - Comment[fy]=Hâld de media-aktiviteiten by en stien ta om media oan- en ôf te keppelje (media:/) - Comment[gl]=Seguimento das actividades dos meios e permite-lle (des)montar (media:/) --Comment[he]=מנטר אחר פעילויות מדיה, ומאפשר לחבר או לנתק התקנים (media:/) - Comment[hi]=मीडिया क्रियाओं की जानकारी रखे तथा (अन)माउन्ट करने दे (मीडिया:/) - Comment[hr]=Praćenje aktivnosti medija i omogućavanje pristupanja i napuštanja - Comment[hu]=Az adathordozók követése, csatlakoztatása és leválasztása (media:/) - Comment[is]=Fylgjast með breytingum á tækjum og bjóða upp á (af)tengingu (media:/) - Comment[it]=Tiene traccia delle attività dei supporti e permette di montarli o smontarli (device:/) --Comment[ja]=メディアの活動を追跡し、(media:/) をマウントしたりアンマウントします -+Comment[ja]=メディアの活動を捕捉し、マウントしたりアンマウントします。(media:/) - Comment[km]=តាមដានសកម្មភាពព័ត៌មាន និងអនុញ្ញាតឲ្យរៀបចំ (មិនរៀបចំ) (media:/) - Comment[lt]=Stebi laikmenose vykdomus veiksmus ir leidžia (iš)montuoti (media:/) - Comment[lv]=Seko datu nesēju aktivitātēm un ļauj montēt/nomontēt tos (media:/) -@@ -103,7 +98,6 @@ - Comment[ru]=Автоматическое подключение устройств (media:/) - Comment[rw]=Kugumana inzira y'ibikorwa by'ibitangazamakuru no kwemerera gushyiramo(gukuramo) (ibitangazamakuru:/) - Comment[se]=Gozit mii dáhpáhuvvá median ja diktá du gálgat ja čadnat daid (media:/) --Comment[sk]=Sledovanie pripojenia/odpojenia medií (media:/) - Comment[sl]=Nadzoruj dejanja medija in dovilo priklop/odklop (media:/) - Comment[sr]=Прати активност медијума и омогућава (де)монтирање (media:/) - Comment[sr@Latn]=Prati aktivnost medijuma i omogućava (de)montiranje (media:/) -@@ -122,4 +116,3 @@ - X-KDE-FactoryName=mediamanager - X-KDE-Kded-autoload=true - X-KDE-Kded-load-on-demand=true --X-KDE-Kded-phase=1 -diff -urN kioslave/media/mediamanager/mediamanager.h kioslave/media/mediamanager/mediamanager.h ---- kioslave/media/mediamanager/mediamanager.h Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/mediamanager.h Mon Oct 10 17:04:01 2005 -@@ -28,8 +28,6 @@ - #include "removablebackend.h" - #include "mediadirnotify.h" - --class HALBackend; --class FstabBackend; - - class MediaManager : public KDEDModule - { -@@ -42,12 +40,6 @@ - k_dcop: - QStringList fullList(); - QStringList properties(const QString &name); -- QStringList mountoptions(const QString &name); -- bool setMountoptions(const QString &name, const QStringList &options); -- -- QString mount(const QString &uid); -- QString unmount(const QString &uid); -- - QString nameForLabel(const QString &label); - ASYNC setUserLabel(const QString &name, const QString &label); - -@@ -82,9 +74,7 @@ - MediaList m_mediaList; - QValueList<BackendBase*> m_backends; - RemovableBackend *mp_removableBackend; -- HALBackend *m_halbackend; - MediaDirNotify m_dirNotify; -- FstabBackend *m_fstabbackend; - }; - - #endif -diff -urN kioslave/media/medianotifier/Makefile.in kioslave/media/medianotifier/Makefile.in ---- kioslave/media/medianotifier/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/medianotifier/Makefile.in Fri May 26 09:54:31 2006 -@@ -254,6 +254,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/medianotifier/medianotifier.cpp kioslave/media/medianotifier/medianotifier.cpp ---- kioslave/media/medianotifier/medianotifier.cpp Sun Oct 1 19:31:53 2006 -+++ kioslave/media/medianotifier/medianotifier.cpp Fri Mar 17 11:17:33 2006 -@@ -48,21 +48,13 @@ - - MediaNotifier::~MediaNotifier() - { -- disconnectDCOPSignal( "kded", "mediamanager", "mediumAdded(QString, bool)", -- "onMediumChange(QString, bool)" ); -- -- disconnectDCOPSignal( "kded", "mediamanager", "mediumChanged(QString, bool)", -- "onMediumChange(QString, bool)" ); - } - - void MediaNotifier::onMediumChange( const QString &name, bool allowNotification ) - { - kdDebug() << "MediaNotifier::onMediumChange( " << name << ", " - << allowNotification << ")" << endl; -- -- if ( !allowNotification ) -- return; -- -+ - // Update user activity timestamp, otherwise the notification dialog will be shown - // in the background due to focus stealing prevention. Entering a new media can - // be seen as a kind of user activity after all. It'd be better to update the timestamp -@@ -103,11 +95,11 @@ - { - QString mimetype = medium.mimetype(); - -- bool is_cdrom = mimetype.startsWith( "cd" ) || mimetype.startsWith( "dvd" ); -+ bool is_cdrom = mimetype.contains( "cd" ) || mimetype.contains( "dvd" ); - bool is_mounted = mimetype.endsWith( "_mounted" ); - - // We autorun only on CD/DVD or removable disks (USB, Firewire) -- if ( !( is_cdrom || is_mounted ) -+ if ( !( is_cdrom && is_mounted ) - && mimetype!="media/removable_mounted" ) - { - return false; -diff -urN kioslave/media/medianotifier/medianotifier.desktop kioslave/media/medianotifier/medianotifier.desktop ---- kioslave/media/medianotifier/medianotifier.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/medianotifier/medianotifier.desktop Mon May 22 20:12:42 2006 -@@ -18,12 +18,10 @@ - Name[es]=Demonio de notificaciones de medios - Name[et]=Andmekandjate märguannete deemon - Name[eu]=Euskarrien jakinarazpen daemon-a --Name[fa]=شبح اخطاردهنده رسانه - Name[fi]=Mediahuomautin - Name[fr]=Démon de notifications des média - Name[fy]=Medianotifikaasje-daemon - Name[gl]=Daemon Notificador de Medios --Name[he]=שירות הודעות מערכת - Name[hr]=Demon obavijesti o medijima - Name[hu]=Lemezfigyelő szolgáltatás - Name[is]=Miðils tilkynningarpúki -@@ -34,12 +32,10 @@ - Name[nb]=Medievarslingsnisse - Name[nds]=Medien-Narichtendämoon - Name[nl]=Medianotificatie-daemon --Name[nn]=Mediepåminningsnisse - Name[pl]=Usługa powiadamiania o nośnikach - Name[pt]=Servidor de Notificação de Dispositivos - Name[pt_BR]=Servidor de Notificação de Dispositivos - Name[ru]=Демон уведомлений от подключаемых устройств --Name[sk]=Notifikátor medií - Name[sl]=Demon za obveščanje o nosilcih - Name[sr]=Демон за обавештења о медијумима - Name[sr@Latn]=Demon za obaveštenja o medijumima -@@ -47,7 +43,6 @@ - Name[uk]=Даемон сповіщення про носії інформації - Name[vi]=Trình nền Thông báo Ổ lưu trữ - Name[zh_CN]=介质通知守护程序 --Name[zh_TW]=媒體通知伺服程式 - Comment=A media plugged notifier - Comment[af]='n Inpropbare media inkennissteller - Comment[bg]=Мултимедиен демон за уведомяване при поставяне/включване на ново мултимедийно устройство -@@ -61,7 +56,6 @@ - Comment[es]=Un notificador de medios empotrable - Comment[et]=Andmekandja ühendamisest märkuandev deemon - Comment[eu]=Euskarri konektatze jakinarazlea --Comment[fa]=یک اخطاردهنده وصلشده رسانه - Comment[fi]=Liitetyn median huomautin - Comment[fr]=Notification de connexion de média - Comment[fy]=Meidieling fan oankeppele media -@@ -70,7 +64,7 @@ - Comment[hu]=Lemezérzékelő - Comment[is]=Tilkynnari um tengda miðla - Comment[it]=Notifiche dei dispositivi attaccati --Comment[ja]=メディアの接続を通知します -+Comment[ja]=メディアの接続を通知する - Comment[lt]=Perspėjimo apie media prijungimą priedas - Comment[mk]=Известување за приклучен медиум - Comment[nb]=En medievarsler som programtillegg -@@ -82,7 +76,6 @@ - Comment[pt]=Um notificador ligado aos dispositivos - Comment[pt_BR]=um notificador para mídia que é espetada (plug) - Comment[ru]=Система обработки уведомлений от подключаемых устройств --Comment[sk]=Notifikátor pripojených médií - Comment[sl]=Obveščanje o vstavljenih/priklopljenih nosilcih - Comment[sr]=Обавештавач о укљученим медијима - Comment[sr@Latn]=Obaveštavač o uključenim medijima -diff -urN kioslave/media/medianotifier/notificationdialog.cpp kioslave/media/medianotifier/notificationdialog.cpp ---- kioslave/media/medianotifier/notificationdialog.cpp Sat Oct 7 16:23:12 2006 -+++ kioslave/media/medianotifier/notificationdialog.cpp Mon Oct 10 17:04:00 2005 -@@ -26,7 +26,6 @@ - #include <klistbox.h> - #include <qlabel.h> - #include <qcheckbox.h> --#include <qpushbutton.h> - - #include "actionlistboxitem.h" - #include "notificationdialogview.h" -@@ -71,8 +70,6 @@ - this, SLOT( delayedDestruct() ) ); - - m_actionWatcher->startScan(); -- QPushButton * btn = actionButton( Ok ); -- btn->setFocus(); - } - - NotificationDialog::~NotificationDialog() -diff -urN kioslave/media/mimetypes/Makefile.in kioslave/media/mimetypes/Makefile.in ---- kioslave/media/mimetypes/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/mimetypes/Makefile.in Fri May 26 09:54:31 2006 -@@ -211,6 +211,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/mimetypes/audiocd.desktop kioslave/media/mimetypes/audiocd.desktop ---- kioslave/media/mimetypes/audiocd.desktop Mon Oct 2 12:44:33 2006 -+++ kioslave/media/mimetypes/audiocd.desktop Mon May 22 20:12:42 2006 -@@ -11,7 +11,6 @@ - Comment[cs]=Zvukové CD - Comment[da]=Lyd-cd - Comment[el]=CD ήχου --Comment[fa]=دیسک فشرده صوتی - Comment[fi]=CD-äänilevy - Comment[fr]=CD audio - Comment[fy]=Audio-Kompaktskiif -@@ -25,7 +24,6 @@ - Comment[it]=CD audio - Comment[ja]=オーディオ CD - Comment[km]=ស៊ីឌីអូឌីយ៉ូ --Comment[mk]=Аудио ЦД - Comment[ms]=CD Audio - Comment[nb]=Lyd-CD - Comment[nds]=Audio-CD -@@ -33,7 +31,7 @@ - Comment[nn]=Lyd-CD - Comment[pa]=ਆਡੀਓ CD - Comment[pl]=Płyta CD Audio --Comment[pt]=CD de áudio -+Comment[pt]=CD áudio - Comment[pt_BR]=CD de Áudio - Comment[ro]=CD Audio - Comment[ru]=Аудио CD -diff -urN kioslave/media/mimetypes/blankcd.desktop kioslave/media/mimetypes/blankcd.desktop ---- kioslave/media/mimetypes/blankcd.desktop Mon Oct 2 12:44:33 2006 -+++ kioslave/media/mimetypes/blankcd.desktop Mon May 22 20:12:43 2006 -@@ -16,7 +16,6 @@ - Comment[es]=CD vacío - Comment[et]=Tühi CD - Comment[eu]=CD hutsik --Comment[fa]=دیسک فشرده خام - Comment[fi]=Tyhjä CD - Comment[fr]=CD vierge - Comment[fy]=Blanke Kompaktskiif -@@ -32,7 +31,6 @@ - Comment[km]=ស៊ីឌីទទេ - Comment[lt]=Tuščias CD - Comment[lv]=Tukšs CD --Comment[mk]=Празно ЦД - Comment[ms]=CD Kosong - Comment[nb]=Tom CD - Comment[nds]=Leddige CD -@@ -46,7 +44,6 @@ - Comment[ru]=Чистый CD - Comment[rw]=CD Itanditseho - Comment[se]=Guorus CD --Comment[sk]=Čisté CD - Comment[sl]=Prazen CD - Comment[sr]=Празан CD - Comment[sr@Latn]=Prazan CD -diff -urN kioslave/media/mimetypes/blankdvd.desktop kioslave/media/mimetypes/blankdvd.desktop ---- kioslave/media/mimetypes/blankdvd.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/blankdvd.desktop Mon May 22 20:12:42 2006 -@@ -16,7 +16,6 @@ - Comment[es]=DVD vacío - Comment[et]=Tühi DVD - Comment[eu]=DVD hutsik --Comment[fa]=DVD خام - Comment[fi]=Tyhjä DVD-levy - Comment[fr]=DVD vierge - Comment[fy]=Blanke Dûbelskiif -@@ -32,7 +31,6 @@ - Comment[km]=ឌីវីឌីទទេ - Comment[lt]=Tuščias DVD - Comment[lv]=Tukšs DVD --Comment[mk]=Празно DVD - Comment[ms]=DVD Kosong - Comment[nb]=Tom DVD - Comment[nds]=Leddige DVD -@@ -46,7 +44,6 @@ - Comment[ru]=Чистый DVD - Comment[rw]=DVD Itanditseho - Comment[se]=Guorus DVD --Comment[sk]=Čisté DVD - Comment[sl]=Prazen DVD - Comment[sr]=Празан DVD - Comment[sr@Latn]=Prazan DVD -diff -urN kioslave/media/mimetypes/camera_mounted.desktop kioslave/media/mimetypes/camera_mounted.desktop ---- kioslave/media/mimetypes/camera_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/camera_mounted.desktop Mon May 22 20:12:42 2006 -@@ -16,7 +16,6 @@ - Comment[es]=Cámara montada - Comment[et]=Ühendatud kaamera - Comment[eu]=Kamara muntatuta --Comment[fa]=دوربین سوارشده - Comment[fi]=Liitetty kamera - Comment[fr]=Appareil photo monté - Comment[fy]=Oankeppele kamera -@@ -41,7 +40,6 @@ - Comment[pt_BR]=Câmera montada - Comment[ru]=Подключённая камера - Comment[se]=Čatnon govvenapperáhtta --Comment[sk]=Pripojený digitálny fotoaparát - Comment[sl]=Priklopljen fotoaparat - Comment[sr]=Монтирана камера - Comment[sr@Latn]=Montirana kamera -diff -urN kioslave/media/mimetypes/camera_unmounted.desktop kioslave/media/mimetypes/camera_unmounted.desktop ---- kioslave/media/mimetypes/camera_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/camera_unmounted.desktop Mon May 22 20:12:42 2006 -@@ -16,7 +16,6 @@ - Comment[es]=Cámara desmontada - Comment[et]=Lahutatud kaamera - Comment[eu]=Kamara desmuntatua --Comment[fa]=دوربین پیادهشده - Comment[fi]=Irrotettu kamera - Comment[fr]=Appareil photo non monté - Comment[fy]=Ofkeppele kamera -@@ -41,7 +40,6 @@ - Comment[pt_BR]=Câmera desmontada - Comment[ru]=Неподключённая камера - Comment[se]=Gálgajuvvon govvenapperáhtta --Comment[sk]=Odpojený digitálny fotoaparát - Comment[sl]=Odklopljen fotoaparat - Comment[sr]=Демонтирана камера - Comment[sr@Latn]=Demontirana kamera -diff -urN kioslave/media/mimetypes/cdrom_mounted.desktop kioslave/media/mimetypes/cdrom_mounted.desktop ---- kioslave/media/mimetypes/cdrom_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/cdrom_mounted.desktop Mon May 22 20:12:43 2006 -@@ -21,7 +21,7 @@ - Comment[es]=CD-ROM montado - Comment[et]=Ühendatud CD-ROM - Comment[eu]=CD-ROM muntatua --Comment[fa]=CD-ROM سوارشده -+Comment[fa]=CD سوار شده - Comment[fi]=Liitetty CD-ROM - Comment[fr]=CD-ROM monté - Comment[fy]=Oankeppele Kompaktskiif -diff -urN kioslave/media/mimetypes/cdrom_unmounted.desktop kioslave/media/mimetypes/cdrom_unmounted.desktop ---- kioslave/media/mimetypes/cdrom_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/cdrom_unmounted.desktop Mon May 22 20:12:43 2006 -@@ -21,7 +21,7 @@ - Comment[es]=CD-ROM desmontado - Comment[et]=Lahutatud CD-ROM - Comment[eu]=CD-ROM desmuntatua --Comment[fa]=CD-ROM پیادهشده -+Comment[fa]= CD پیاده شده - Comment[fi]=Irrotettu CD-ROM - Comment[fr]=CD-ROM non monté - Comment[fy]=Ofkeppele Kompaktskiif -diff -urN kioslave/media/mimetypes/cdwriter_mounted.desktop kioslave/media/mimetypes/cdwriter_mounted.desktop ---- kioslave/media/mimetypes/cdwriter_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/cdwriter_mounted.desktop Mon May 22 20:12:42 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Escritor de CDs montado - Comment[et]=Ühendatud CD kirjutaja - Comment[eu]=CD erretzaile muntatua --Comment[fa]=CD Writer سوارشده -+Comment[fa]=CD Writer سوار شده - Comment[fi]=Liitetty CD-kirjoitin - Comment[fr]=Graveur de CD monté - Comment[fy]=Oankeppele Kompaktskiif -diff -urN kioslave/media/mimetypes/cdwriter_unmounted.desktop kioslave/media/mimetypes/cdwriter_unmounted.desktop ---- kioslave/media/mimetypes/cdwriter_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/cdwriter_unmounted.desktop Mon May 22 20:12:42 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Escritor de CDs desmontado - Comment[et]=Lahutatud CD kirjutaja - Comment[eu]=CD erretzaile desmuntatua --Comment[fa]=CD Writer پیادهشده -+Comment[fa]=CD Writer پیاده شده - Comment[fi]=Irrotettu CD-kirjoitin - Comment[fr]=Graveur de CD non monté - Comment[fy]=Ofkeppele Kompaktskiif -diff -urN kioslave/media/mimetypes/dvd_mounted.desktop kioslave/media/mimetypes/dvd_mounted.desktop ---- kioslave/media/mimetypes/dvd_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/dvd_mounted.desktop Mon May 22 20:12:42 2006 -@@ -21,7 +21,7 @@ - Comment[es]=DVD montado - Comment[et]=Ühendatud DVD - Comment[eu]=DVD muntatua --Comment[fa]=DVD سوارشده -+Comment[fa]=DVD سوار شده - Comment[fi]=Liitetty DVD-levy - Comment[fr]=DVD-ROM monté(s) - Comment[fy]=Oankeppele Dûbelskiif -diff -urN kioslave/media/mimetypes/dvd_unmounted.desktop kioslave/media/mimetypes/dvd_unmounted.desktop ---- kioslave/media/mimetypes/dvd_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/dvd_unmounted.desktop Tue May 23 13:33:34 2006 -@@ -21,7 +21,7 @@ - Comment[es]=DVD desmontado - Comment[et]=Lahutatud DVD - Comment[eu]=DVD desmuntatua --Comment[fa]=DVD پیادهشده -+Comment[fa]=DVD پیاده شده - Comment[fi]=Irrotettu DVD-levy - Comment[fr]=DVD-ROM non monté(s) - Comment[fy]=Ofkeppele Dûbelskiif -diff -urN kioslave/media/mimetypes/dvdvideo.desktop kioslave/media/mimetypes/dvdvideo.desktop ---- kioslave/media/mimetypes/dvdvideo.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/dvdvideo.desktop Mon May 22 20:12:43 2006 -@@ -16,7 +16,6 @@ - Comment[es]=Disco de video DVD - Comment[et]=DVD videoplaat - Comment[eu]=DVD bideo diska --Comment[fa]=دیسک ویدئویی DVD - Comment[fi]=DVD-videolevy - Comment[fr]=DVD vidéo - Comment[fy]=Dûbelskiif Fideoskiif -@@ -32,7 +31,6 @@ - Comment[km]=ថាសវីដេអូ ឌីវីឌី - Comment[lt]=DVD video diskas - Comment[lv]=DVD Video Disks --Comment[mk]=DVD Видеодиск - Comment[ms]=Cakera Video DVD - Comment[nb]=DVD-videoplate - Comment[nds]=DVD-Videodisk -@@ -40,13 +38,12 @@ - Comment[nn]=DVD-videoplate - Comment[pa]=DVD ਵੀਡਿਓ ਡਿਸਕ - Comment[pl]=Płyta DVD Video --Comment[pt]=Disco DVD de Vídeo -+Comment[pt]=Disco DVD Vídeo - Comment[pt_BR]=DVD de vídeo - Comment[ro]=Disc video DVD - Comment[ru]=DVD с видео - Comment[rw]=Disiki Videwo DVD - Comment[se]=DVD-videoskearru --Comment[sk]=DVD Video disk - Comment[sl]=DVD Video disk - Comment[sr]=DVD видео диск - Comment[sr@Latn]=DVD video disk -diff -urN kioslave/media/mimetypes/floppy5_mounted.desktop kioslave/media/mimetypes/floppy5_mounted.desktop ---- kioslave/media/mimetypes/floppy5_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/floppy5_mounted.desktop Mon May 22 20:12:42 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disquete 5¼" montado - Comment[et]=Ühendatud 5¼" flopi - Comment[eu]=5¼"ko diskete muntatua --Comment[fa]=فلاپی 5¼" سوارشده -+Comment[fa]=فلاپی 5¼"سوار شده - Comment[fi]=Liitetty 5¼"-levyke - Comment[fr]=Disquette 5¼" montée - Comment[fy]=Oankeppele 5¼" Skiif -diff -urN kioslave/media/mimetypes/floppy5_unmounted.desktop kioslave/media/mimetypes/floppy5_unmounted.desktop ---- kioslave/media/mimetypes/floppy5_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/floppy5_unmounted.desktop Tue May 23 13:33:35 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disquete 5¼" desmontado - Comment[et]=Lahutatud 5¼" flopi - Comment[eu]=5¼"ko diskete desmuntatua --Comment[fa]=فلاپی 5¼" پیادهشده -+Comment[fa]=فلاپی 5¼" پیاده شده - Comment[fi]=Irrotettu 5¼"-levyke - Comment[fr]=Disquette 5¼" non montée - Comment[fy]=Ofkeppele 5¼" Skiif -diff -urN kioslave/media/mimetypes/floppy_mounted.desktop kioslave/media/mimetypes/floppy_mounted.desktop ---- kioslave/media/mimetypes/floppy_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/floppy_mounted.desktop Mon May 22 20:12:43 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disquete montado - Comment[et]=Ühendatud flopi - Comment[eu]=Diskete muntatua --Comment[fa]=فلاپی سوارشده -+Comment[fa]=فلاپی سوار شده - Comment[fi]=Liitetty levyke - Comment[fr]=Disquette montée - Comment[fy]=Oankeppele Skiif -diff -urN kioslave/media/mimetypes/floppy_unmounted.desktop kioslave/media/mimetypes/floppy_unmounted.desktop ---- kioslave/media/mimetypes/floppy_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/floppy_unmounted.desktop Tue May 23 13:33:34 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disquete desmontado - Comment[et]=Lahutatud flopi - Comment[eu]=Diskete desmuntatua --Comment[fa]=فلاپی پیادهشده -+Comment[fa]=فلاپی پیاده شده - Comment[fi]=Irrotettu levyke - Comment[fr]=Disquette non montée - Comment[fy]=Ofkeppele Skiif -diff -urN kioslave/media/mimetypes/gphoto2camera.desktop kioslave/media/mimetypes/gphoto2camera.desktop ---- kioslave/media/mimetypes/gphoto2camera.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/gphoto2camera.desktop Mon May 22 20:12:43 2006 -@@ -18,7 +18,6 @@ - Comment[es]=Cámara - Comment[et]=Kaamera - Comment[eu]=Kamara --Comment[fa]=دوربین - Comment[fi]=Kamera - Comment[fr]=Nouvel appareil photo - Comment[fy]=Kamera -@@ -41,13 +40,12 @@ - Comment[nn]=Kamera - Comment[pa]=ਕੈਮਰਾ - Comment[pl]=Aparat fotograficzny --Comment[pt]=Máquina fotográfica -+Comment[pt]=Máquina Fotográfica - Comment[pt_BR]=Câmera - Comment[ro]=Aparat foto - Comment[ru]=Камера - Comment[rw]=Kamera - Comment[se]=Govvanaperáhtta --Comment[sk]=Digitálny fotoaparát - Comment[sl]=Fotoaparat - Comment[sr]=Камера - Comment[sr@Latn]=Kamera -diff -urN kioslave/media/mimetypes/hdd_mounted.desktop kioslave/media/mimetypes/hdd_mounted.desktop ---- kioslave/media/mimetypes/hdd_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/hdd_mounted.desktop Mon May 22 20:12:43 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Volumen de disco duro montado - Comment[et]=Ühendatud kõvaketta partitsioon - Comment[eu]=Diska gogorraren zatiketa muntatua --Comment[fa]=حجم دیسک سخت سوارشده - Comment[fi]=Liitetty kiintoleyosio - Comment[fr]=Partition de disque dur montée - Comment[fy]=Oankeppele Fêsteskiif folume -@@ -44,13 +43,12 @@ - Comment[nn]=Montert harddiskvolum - Comment[pa]=ਮਾਊਟ ਕੀਤਾ ਹਾਰਡ ਡਿਸਕ ਭਾਗ - Comment[pl]=Zamontowana partycja dysku twardego --Comment[pt]=Volume de disco rígido montado -+Comment[pt]=Volume de Disco Rígido Montado - Comment[pt_BR]=Volume do HD Montado - Comment[ro]=Volum de hard disc montat - Comment[ru]=Смонтированный раздел жёсткого диска - Comment[rw]=Ububiko Disiki Bwashyizwemo - Comment[se]=Čatnon garraskearrooassi --Comment[sk]=Pripojený oddiel pevného disku - Comment[sl]=Priklopljen pogon trdega diska - Comment[sr]=Монтирана партиција хард диска - Comment[sr@Latn]=Montirana particija hard diska -diff -urN kioslave/media/mimetypes/hdd_unmounted.desktop kioslave/media/mimetypes/hdd_unmounted.desktop ---- kioslave/media/mimetypes/hdd_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/hdd_unmounted.desktop Mon May 22 20:12:43 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Volumen de disco duro desmontado - Comment[et]=Lahutatud kõvaketta partitsioon - Comment[eu]=Diska gogorraren zatiketa desmuntatua --Comment[fa]=حجم دیسک سخت پیاده شده - Comment[fi]=Irrotettu kiintolevyosio - Comment[fr]=Partition de disque dur non montée - Comment[fy]=Ofkeppele Fêsteskiif folume -@@ -44,13 +43,12 @@ - Comment[nn]=Umontert harddiskvolum - Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ ਹਾਰਡ ਡਿਸਕ ਭਾਗ - Comment[pl]=Odmontowana partycja dysku twardego --Comment[pt]=Volume de disco rígido desmontado -+Comment[pt]=Volume de Disco Rígido Desmontado - Comment[pt_BR]=Volume do HD Desmontado - Comment[ro]=Volum de hard disc nemontat - Comment[ru]=Отмонтированный раздел жёсткого диска - Comment[rw]=Ububiko Disiki Bwakuwemo - Comment[se]=Gálgajuvvon garraskearrooassi --Comment[sk]=Odpojený oddiel pevného disku - Comment[sl]=Odklopljen pogon trdega diska - Comment[sr]=Демонтирана партиција хард диска - Comment[sr@Latn]=Demontirana particija hard diska -diff -urN kioslave/media/mimetypes/nfs_mounted.desktop kioslave/media/mimetypes/nfs_mounted.desktop ---- kioslave/media/mimetypes/nfs_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/nfs_mounted.desktop Tue May 23 13:33:34 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Recurso NFS montado - Comment[et]=Ühendatud NFS ressurss - Comment[eu]=NFS baliabide muntatua --Comment[fa]=مشترک NFS سوارشده - Comment[fi]=Liitetty NFS-jako - Comment[fr]=Ressource NFS montée - Comment[fy]=Oankeppele NFS-boarne -@@ -44,13 +43,12 @@ - Comment[nn]=Montert delt NFS-ressurs - Comment[pa]=ਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਝ - Comment[pl]=Zamontowany system plików NFS --Comment[pt]=Partilha de NFS montada -+Comment[pt]=Partilha de NFS Montada - Comment[pt_BR]=Volume NFS Montado - Comment[ro]=Partajare NFS montată - Comment[ru]=Смонтированный ресурс NFS - Comment[rw]=Umugabane NFS Washyizwemo - Comment[se]=Čatnon NFS-resursa --Comment[sk]=Pripojený zdroj NFS - Comment[sl]=Priklopljen vir NFS - Comment[sr]=Монтирано NFS дељење - Comment[sr@Latn]=Montirano NFS deljenje -diff -urN kioslave/media/mimetypes/nfs_unmounted.desktop kioslave/media/mimetypes/nfs_unmounted.desktop ---- kioslave/media/mimetypes/nfs_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/nfs_unmounted.desktop Tue May 23 13:33:35 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Recurso NFS desmontado - Comment[et]=Lahutatud NFS ressurss - Comment[eu]=NFS baliabide desmuntatua --Comment[fa]=مشترک NFS پیاده شده - Comment[fi]=Irrotettu NFS-jako - Comment[fr]=Ressource NFS non montée - Comment[fy]=Oankeppele NFS-boarne -@@ -44,13 +43,12 @@ - Comment[nn]=Umontert delt NFS-ressurs - Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਝ - Comment[pl]=Odmontowany system plików NFS --Comment[pt]=Partilha de NFS desmontada -+Comment[pt]=Partilha de NFS Desmontada - Comment[pt_BR]=Volume NFS Desmontado - Comment[ro]=Partajare NFS nemontată - Comment[ru]=Отмонтированный ресурс NFS - Comment[rw]=Umugabane NFS Wakuwemo - Comment[se]=Gálgajuvvon NFS-resursa --Comment[sk]=Odpojený zdroj NFS - Comment[sl]=Odklopljen vir NFS - Comment[sr]=Демонтирано NFS дељење - Comment[sr@Latn]=Demontirano NFS deljenje -diff -urN kioslave/media/mimetypes/removable_mounted.desktop kioslave/media/mimetypes/removable_mounted.desktop ---- kioslave/media/mimetypes/removable_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/removable_mounted.desktop Mon May 22 20:12:42 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Recurso extraíble montado - Comment[et]=Ühendatud eemaldatav andmekandja - Comment[eu]=Euskarri aldagarria muntatua --Comment[fa]=رسانه برداشتنی سوارشده - Comment[fi]=Liitetty irrotettava resurssi - Comment[fr]=Média amovible monté - Comment[fy]=Oankeppele ferwiderber medium -@@ -44,13 +43,12 @@ - Comment[nn]=Montert flyttbart medium - Comment[pa]=ਮਾਊਟ ਕੀਤੇ ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ - Comment[pl]=Zamontowany nośnik wymienny --Comment[pt]=Dispositivo amovível montado -+Comment[pt]=Dispositivo Amovível Montado - Comment[pt_BR]=Mídia Removível Montada - Comment[ro]=Mediu amovibil montat - Comment[ru]=Смонтированный внешний диск - Comment[rw]=Igitangazamakuru Kivanwamo Cyashyizwemo - Comment[se]=Čátnon sirdehahtti medium --Comment[sk]=Pripojené vyberateľné médium - Comment[sl]=Priklopljen odstranljiv medij - Comment[sr]=Монтиран уклоњиви медијум - Comment[sr@Latn]=Montiran uklonjivi medijum -diff -urN kioslave/media/mimetypes/removable_unmounted.desktop kioslave/media/mimetypes/removable_unmounted.desktop ---- kioslave/media/mimetypes/removable_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/removable_unmounted.desktop Mon May 22 20:12:42 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Recurso extraíble desmontado - Comment[et]=Lahutatud eemaldatav andmekandja - Comment[eu]=Euskarri aldagarria desmuntatua --Comment[fa]=رسانه برداشتنی پیاده شده - Comment[fi]=Irrotettu irrotettava resurssi - Comment[fr]=Média amovible non monté - Comment[fy]=Ofkeppele ferwiderber medium -@@ -44,13 +43,12 @@ - Comment[nn]=Umontert flyttbart medium - Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ - Comment[pl]=Odmontowany nośnik wymienny --Comment[pt]=Dispositivo amovível desmontado -+Comment[pt]=Dispositivo Amovível Desmontado - Comment[pt_BR]=Mídia Removível Desmontada - Comment[ro]=Mediu amovibil nemontat - Comment[ru]=Отмонтированный внешний диск - Comment[rw]=Igitangazamakuru Kivanwamo Cyavanwemo - Comment[se]=Gálgaduvvon sirdehahtti medium --Comment[sk]=Odpojené vyberateľné médium - Comment[sl]=Odklopljen odstranljiv medij - Comment[sr]=Демонтиран уклоњиви медијум - Comment[sr@Latn]=Demontiran uklonjivi medijum -diff -urN kioslave/media/mimetypes/smb_mounted.desktop kioslave/media/mimetypes/smb_mounted.desktop ---- kioslave/media/mimetypes/smb_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/smb_mounted.desktop Tue May 23 13:33:34 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Recurso de Samba montado (Red de Microsoft) - Comment[et]=Ühendatud Samba (Microsoft Network) ressurss - Comment[eu]=Samba (Microsoft sarea) partekaketa muntatua --Comment[fa]=مشترک Samba (Microsoft Network) سوار شده -+Comment[fa]=اشتراک سامبای ویندوز سوار شده - Comment[fi]=Liitetty Samba-jako (Microsoft-verkko) - Comment[fr]=Partage Samba (réseau Microsoft) monté - Comment[fy]=Oankeppele Samba-netwurkboarne (Microsoft-netwurken) -diff -urN kioslave/media/mimetypes/smb_unmounted.desktop kioslave/media/mimetypes/smb_unmounted.desktop ---- kioslave/media/mimetypes/smb_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/smb_unmounted.desktop Tue May 23 13:33:34 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Recurso de Samba desmontado (Red de Microsoft) - Comment[et]=Lahutatud Samba (Microsoft Network) ressurss - Comment[eu]=Samba (Microsoft sarea) partekaketa desmuntatua --Comment[fa]=مشترک Samba (Microsoft Network) پیاده شده -+Comment[fa]=اشتراک سامبای ویندوز پیاده شده - Comment[fi]=Irrotettu Samba-jako (Microsoft-verkko) - Comment[fr]=Partage Samba (réseau Microsoft) non monté - Comment[fy]=Ofkeppele Samba-netwurkboarne (Microsoft-netwurken) -diff -urN kioslave/media/mimetypes/svcd.desktop kioslave/media/mimetypes/svcd.desktop ---- kioslave/media/mimetypes/svcd.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/svcd.desktop Mon May 22 20:12:43 2006 -@@ -7,7 +7,6 @@ - Comment[bn]=সুপার ভিডিও সিডি - Comment[ca]=CD Súper Vídeo - Comment[da]=Super Video-cd --Comment[fa]=دیسک فشرده ابرویدئو - Comment[fr]=Super CD vidéo - Comment[fy]=Super Fideo-kompaktskiif - Comment[gl]=Super Vídeo CD -@@ -17,7 +16,6 @@ - Comment[it]=Super video CD - Comment[ja]=スーパービデオ CD - Comment[km]=ស៊ីឌីវីដេអូគុណភាពខ្ពស់ --Comment[mk]=Супер видео ЦД - Comment[ms]=CD Supervideo - Comment[nb]=Super video CD - Comment[nds]=Super-Video-CD -diff -urN kioslave/media/mimetypes/vcd.desktop kioslave/media/mimetypes/vcd.desktop ---- kioslave/media/mimetypes/vcd.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/vcd.desktop Mon May 22 20:12:42 2006 -@@ -9,7 +9,6 @@ - Comment[ca]=CD Vídeo - Comment[da]=Video-cd - Comment[el]=Βίντεο CD --Comment[fa]=دیسک فشرده ویدئویی - Comment[fr]=CD vidéo - Comment[fy]=Fideo-kompaktskiif - Comment[ga]=Dlúthdhiosca Físe -@@ -19,7 +18,6 @@ - Comment[is]=Vídeó CD - Comment[ja]=ビデオ CD - Comment[km]=ស៊ីឌីវីដេអូ --Comment[mk]=Видео ЦД - Comment[ms]=CD Video - Comment[nds]=Video-CD - Comment[nl]=Video-cd -diff -urN kioslave/media/mimetypes/zip_mounted.desktop kioslave/media/mimetypes/zip_mounted.desktop ---- kioslave/media/mimetypes/zip_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/zip_mounted.desktop Tue May 23 13:33:35 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disco Zip montado - Comment[et]=Ühendatud Zip-ketas - Comment[eu]=Zip diska muntatua --Comment[fa]=دیسک فشرده سوارشده -+Comment[fa]=دیسک زیپ سوار شده - Comment[fi]=Liitetty Zip-levy - Comment[fr]=Disque Zip monté - Comment[fy]=Oankeppelee Zip-skiif -diff -urN kioslave/media/mimetypes/zip_unmounted.desktop kioslave/media/mimetypes/zip_unmounted.desktop ---- kioslave/media/mimetypes/zip_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/zip_unmounted.desktop Tue May 23 13:33:35 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disco Zip desmontado - Comment[et]=Lahutatud Zip-ketas - Comment[eu]=Zip diska desmuntatua --Comment[fa]=دیسک فشرده پیاده شده -+Comment[fa]= دیسک زیپ پیاده شده - Comment[fi]=Irrotettu Zip-levy - Comment[fr]=Disque Zip non monté - Comment[fy]=Ofkeppele Zip-skiif -@@ -33,7 +33,7 @@ - Comment[hu]=Leválasztott Zip-lemez - Comment[is]=Aftengdur Zip diskur - Comment[it]=Disco Zip non montato --Comment[ja]=マウントされていない Zip ディスク -+Comment[ja]=マウントされていないZipディスク - Comment[km]=ថាស Zip មិនបានរៀបចំ - Comment[lo]= ຫັງກາລີ - Comment[lt]=Išmontuotas Zip diskas -diff -urN kioslave/media/mounthelper/Makefile.in kioslave/media/mounthelper/Makefile.in ---- kioslave/media/mounthelper/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/mounthelper/Makefile.in Fri May 26 09:54:31 2006 -@@ -57,8 +57,8 @@ - #>+ 1 - kio_media_mounthelper_OBJECTS = kio_media_mounthelper.$(OBJEXT) - am__DEPENDENCIES_1 = --kio_media_mounthelper_DEPENDENCIES = \ -- ../libmediacommon/libmediacommon.la $(am__DEPENDENCIES_1) -+kio_media_mounthelper_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -+ ../libmediacommon/libmediacommon.la - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - am__depfiles_maybe = depfiles -@@ -236,6 +236,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -@@ -575,7 +576,7 @@ - AM_LDFLAGS = $(all_libraries) - kio_media_mounthelper_SOURCES = kio_media_mounthelper.cpp - kio_media_mounthelper_LDFLAGS = $(KDE_RPATH) $(all_libraries) --kio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) -+kio_media_mounthelper_LDADD = $(LIB_KIO) ../libmediacommon/libmediacommon.la - #>- METASOURCES = AUTO - #>- all: all-am - #>+ 1 -diff -urN kioslave/media/mounthelper/kio_media_mounthelper.cpp kioslave/media/mounthelper/kio_media_mounthelper.cpp ---- kioslave/media/mounthelper/kio_media_mounthelper.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/mounthelper/kio_media_mounthelper.cpp Fri Mar 17 11:17:33 2006 -@@ -27,7 +27,6 @@ - #include <dcopclient.h> - #include <dcopref.h> - #include <qtimer.h> --#include <stdlib.h> - #include <kdebug.h> - #include <kglobal.h> - #include <kprocess.h> -@@ -79,30 +78,31 @@ - - if (args->isSet("u")) - { -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "unmount", medium.id()); -- if (reply.isValid()) -- reply.get(m_errorStr); -- kdDebug() << "medium unmount " << m_errorStr << endl; -- if (m_errorStr.isNull()) -- ::exit(0); -- else -- error(); -+ KIO::Job * job = KIO::unmount( mount_point ); -+ -+ connect( job, SIGNAL( result( KIO::Job * ) ), -+ this, SLOT( slotResult( KIO::Job * ) ) ); - } - else if (args->isSet("s") || args->isSet("e")) - { -- invokeEject(device, true); -+ if (medium.isMounted()) -+ { -+ KIO::Job * job = KIO::unmount( mount_point ); -+ -+ m_device = device; -+ connect( job, SIGNAL( result( KIO::Job * ) ), -+ this, SLOT( slotResultSafe( KIO::Job * ) ) ); -+ } -+ else -+ { -+ invokeEject(device, true); -+ } - } - else - { -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "mount", medium.id()); -- if (reply.isValid()) -- reply.get(m_errorStr); -- if (m_errorStr.isNull()) -- ::exit(0); -- else -- error(); -+ KIO::Job* job = KIO::mount( false, 0, device, mount_point); -+ connect( job, SIGNAL( result( KIO::Job * ) ), -+ this, SLOT( slotResult( KIO::Job * ) ) ); - } - } - -@@ -173,12 +173,12 @@ - void MountHelper::error() - { - KMessageBox::error(0, m_errorStr); -- ::exit(1); -+ kapp->exit(1); - } - - void MountHelper::finished() - { -- ::exit(0); -+ kapp->quit(); - } - - static KCmdLineOptions options[] = -@@ -207,7 +207,7 @@ - - KStartupInfo::appStarted(); - app->dcopClient()->attach(); -- return app->exec(); -+ app->exec(); - } - - #include "kio_media_mounthelper.moc" -diff -urN kioslave/media/propsdlgplugin/Makefile.in kioslave/media/propsdlgplugin/Makefile.in ---- kioslave/media/propsdlgplugin/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/propsdlgplugin/Makefile.in Thu Jan 1 01:00:00 1970 -@@ -1,1063 +0,0 @@ --# Makefile.in generated by automake 1.9.6 from Makefile.am. --# KDE tags expanded automatically by am_edit - $Revision: 483858 $ --# @configure_input@ -- --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005 Free Software Foundation, Inc. --# This Makefile.in is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY, to the extent permitted by law; without --# even the implied warranty of MERCHANTABILITY or FITNESS FOR A --# PARTICULAR PURPOSE. -- --@SET_MAKE@ -- -- --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ --VPATH = @srcdir@ --pkgdatadir = $(datadir)/@PACKAGE@ --pkglibdir = $(libdir)/@PACKAGE@ --pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../../.. --am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ --install_sh_DATA = $(install_sh) -c -m 644 --install_sh_PROGRAM = $(install_sh) -c --install_sh_SCRIPT = $(install_sh) -c --INSTALL_HEADER = $(INSTALL_DATA) --transform = $(program_transform_name) --NORMAL_INSTALL = : --PRE_INSTALL = : --POST_INSTALL = : --NORMAL_UNINSTALL = : --PRE_UNINSTALL = : --POST_UNINSTALL = : --build_triplet = @build@ --host_triplet = @host@ --target_triplet = @target@ --subdir = kioslave/media/propsdlgplugin --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(kde_moduledir)" \ -- "$(DESTDIR)$(kde_servicesdir)" --kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(kde_module_LTLIBRARIES) --am__DEPENDENCIES_1 = --media_propsdlgplugin_la_DEPENDENCIES = \ -- ../libmediacommon/libmediacommon.la $(am__DEPENDENCIES_1) --am_media_propsdlgplugin_la_OBJECTS = propertiespage.lo \ -- propsdlgshareplugin.lo --#>- media_propsdlgplugin_la_OBJECTS = \ --#>- $(am_media_propsdlgplugin_la_OBJECTS) --#>+ 5 --media_propsdlgplugin_la_final_OBJECTS = media_propsdlgplugin_la.all_cpp.lo --media_propsdlgplugin_la_nofinal_OBJECTS = propertiespage.lo \ -- propsdlgshareplugin.lo propertiespagegui.lo --@KDE_USE_FINAL_FALSE@media_propsdlgplugin_la_OBJECTS = $(media_propsdlgplugin_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@media_propsdlgplugin_la_OBJECTS = $(media_propsdlgplugin_la_final_OBJECTS) --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --am__depfiles_maybe = depfiles --#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ --#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --#>+ 2 --CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ --#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ --#>- $(AM_CXXFLAGS) $(CXXFLAGS) --#>+ 3 --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --CXXLD = $(CXX) --#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ --#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --#>+ 2 --CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --SOURCES = $(media_propsdlgplugin_la_SOURCES) --DIST_SOURCES = $(media_propsdlgplugin_la_SOURCES) --kde_servicesDATA_INSTALL = $(INSTALL_DATA) --DATA = $(kde_services_DATA) --ETAGS = etags --CTAGS = ctags --#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) --#>+ 1 --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) --ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ --AMTAR = @AMTAR@ --AR = @AR@ --ARTSCCONFIG = @ARTSCCONFIG@ --ARTS_CFLAGS = @ARTS_CFLAGS@ --AUTOCONF = @AUTOCONF@ --AUTODIRS = @AUTODIRS@ --AUTOHEADER = @AUTOHEADER@ --AUTOMAKE = @AUTOMAKE@ --AWK = @AWK@ --CC = @CC@ --CCDEPMODE = @CCDEPMODE@ --CFLAGS = @CFLAGS@ --COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@ --COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@ --CONF_FILES = @CONF_FILES@ --CPP = @CPP@ --CPPFLAGS = @CPPFLAGS@ --CXX = @CXX@ --CXXCPP = @CXXCPP@ --CXXDEPMODE = @CXXDEPMODE@ --CXXFLAGS = @CXXFLAGS@ --CYGPATH_W = @CYGPATH_W@ --DBUSQT_INCS = @DBUSQT_INCS@ --DBUSQT_LIBS = @DBUSQT_LIBS@ --DBUS_CFLAGS = @DBUS_CFLAGS@ --DBUS_INCS = @DBUS_INCS@ --DBUS_LIBS = @DBUS_LIBS@ --DCOPIDL = @DCOPIDL@ --DCOPIDL2CPP = @DCOPIDL2CPP@ --DCOPIDLNG = @DCOPIDLNG@ --DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ --DEFS = @DEFS@ --DEPDIR = @DEPDIR@ --DOXYGEN = @DOXYGEN@ --DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ --DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ --DPMSINC = @DPMSINC@ --DPMSLIB = @DPMSLIB@ --ECHO = @ECHO@ --ECHO_C = @ECHO_C@ --ECHO_N = @ECHO_N@ --ECHO_T = @ECHO_T@ --EGREP = @EGREP@ --ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ --EXEEXT = @EXEEXT@ --EXR_FLAGS = @EXR_FLAGS@ --F77 = @F77@ --FFLAGS = @FFLAGS@ --FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ --GLINC = @GLINC@ --GLLIB = @GLLIB@ --GMSGFMT = @GMSGFMT@ --HALBACKEND = @HALBACKEND@ --HAL_CFLAGS = @HAL_CFLAGS@ --HAL_INCS = @HAL_INCS@ --HAL_LIBS = @HAL_LIBS@ --HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@ --HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@ --HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ --INSTALL_DATA = @INSTALL_DATA@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_SCRIPT = @INSTALL_SCRIPT@ --INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ --JAR = @JAR@ --JAVAC = @JAVAC@ --JAVAH = @JAVAH@ --JVMLIBS = @JVMLIBS@ --KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ --KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@ --KCONFIG_COMPILER = @KCONFIG_COMPILER@ --KDECONFIG = @KDECONFIG@ --KDE_BINDIR = @KDE_BINDIR@ --KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@ --KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ --KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ --KDE_HAVE_DOT = @KDE_HAVE_DOT@ --KDE_INCLUDES = @KDE_INCLUDES@ --KDE_LDFLAGS = @KDE_LDFLAGS@ --KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ --KDE_MT_LIBS = @KDE_MT_LIBS@ --KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ --KDE_PLUGIN = @KDE_PLUGIN@ --KDE_RPATH = @KDE_RPATH@ --KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ --KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ --KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ --KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ --KDE_USE_FPIE = @KDE_USE_FPIE@ --KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ --KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ --KDE_USE_PIE = @KDE_USE_PIE@ --KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ --KDM_PAM_SERVICE = @KDM_PAM_SERVICE@ --KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@ --KRB4_INCS = @KRB4_INCS@ --KRB4_LIBS = @KRB4_LIBS@ --KRB4_RPATH = @KRB4_RPATH@ --KRB5_INCS = @KRB5_INCS@ --KRB5_LIBS = @KRB5_LIBS@ --KRB5_RPATH = @KRB5_RPATH@ --KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@ --LDAP_INCS = @LDAP_INCS@ --LDAP_LIBS = @LDAP_LIBS@ --LDAP_RPATH = @LDAP_RPATH@ --LDFLAGS = @LDFLAGS@ --LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ --LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ --LIBALIB = @LIBALIB@ --LIBART_CFLAGS = @LIBART_CFLAGS@ --LIBART_LIBS = @LIBART_LIBS@ --LIBART_RPATH = @LIBART_RPATH@ --LIBBZ2 = @LIBBZ2@ --LIBCFG = @LIBCFG@ --LIBCOMPAT = @LIBCOMPAT@ --LIBCRYPT = @LIBCRYPT@ --LIBCURSES = @LIBCURSES@ --LIBDEVINFO = @LIBDEVINFO@ --LIBDL = @LIBDL@ --LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@ --LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@ --LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@ --LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@ --LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@ --LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@ --LIBGEN = @LIBGEN@ --LIBHOSTS = @LIBHOSTS@ --LIBJPEG = @LIBJPEG@ --LIBKSTAT = @LIBKSTAT@ --LIBMALLOC = @LIBMALLOC@ --LIBOBJS = @LIBOBJS@ --LIBODM = @LIBODM@ --LIBOSSAUDIO = @LIBOSSAUDIO@ --LIBPNG = @LIBPNG@ --LIBPOSIX4 = @LIBPOSIX4@ --LIBPTHREAD = @LIBPTHREAD@ --LIBRESOLV = @LIBRESOLV@ --LIBRPC = @LIBRPC@ --LIBS = @LIBS@ --LIBSENSORS = @LIBSENSORS@ --LIBSHADOW = @LIBSHADOW@ --LIBSM = @LIBSM@ --LIBSOCKET = @LIBSOCKET@ --LIBSSL = @LIBSSL@ --LIBTOOL = @LIBTOOL@ --LIBUCB = @LIBUCB@ --LIBUSBCONFIG = @LIBUSBCONFIG@ --LIBUTIL = @LIBUTIL@ --LIBXDMCP = @LIBXDMCP@ --LIBXFT_LIB = @LIBXFT_LIB@ --LIBZ = @LIBZ@ --LIB_ARTS = @LIB_ARTS@ --LIB_DNSSD = @LIB_DNSSD@ --LIB_EXR = @LIB_EXR@ --LIB_FONT_ENC = @LIB_FONT_ENC@ --LIB_KAB = @LIB_KAB@ --LIB_KABC = @LIB_KABC@ --LIB_KDECORE = @LIB_KDECORE@ --LIB_KDED = @LIB_KDED@ --LIB_KDEPIM = @LIB_KDEPIM@ --LIB_KDEPRINT = @LIB_KDEPRINT@ --LIB_KDEUI = @LIB_KDEUI@ --LIB_KDNSSD = @LIB_KDNSSD@ --LIB_KFILE = @LIB_KFILE@ --LIB_KFM = @LIB_KFM@ --LIB_KHTML = @LIB_KHTML@ --LIB_KIMPROXY = @LIB_KIMPROXY@ --LIB_KIO = @LIB_KIO@ --LIB_KJS = @LIB_KJS@ --LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ --LIB_KPARTS = @LIB_KPARTS@ --LIB_KSPELL = @LIB_KSPELL@ --LIB_KSYCOCA = @LIB_KSYCOCA@ --LIB_KUNITTEST = @LIB_KUNITTEST@ --LIB_KUTILS = @LIB_KUTILS@ --LIB_KVM = @LIB_KVM@ --LIB_LBER = @LIB_LBER@ --LIB_LIBS = @LIB_LIBS@ --LIB_POLL = @LIB_POLL@ --LIB_QPE = @LIB_QPE@ --LIB_QT = @LIB_QT@ --LIB_SMB = @LIB_SMB@ --LIB_TRU64_MACH = @LIB_TRU64_MACH@ --LIB_X11 = @LIB_X11@ --LIB_XCOMPOSITE = @LIB_XCOMPOSITE@ --LIB_XCURSOR = @LIB_XCURSOR@ --LIB_XEXT = @LIB_XEXT@ --LIB_XF86MISC = @LIB_XF86MISC@ --LIB_XFIXES = @LIB_XFIXES@ --LIB_XINERAMA = @LIB_XINERAMA@ --LIB_XRANDR = @LIB_XRANDR@ --LIB_XRENDER = @LIB_XRENDER@ --LIB_XSS = @LIB_XSS@ --LINUXCDPOLLING = @LINUXCDPOLLING@ --LN_S = @LN_S@ --LTLIBOBJS = @LTLIBOBJS@ --MAKEINFO = @MAKEINFO@ --MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ --MCOPIDL = @MCOPIDL@ --MD5SUM = @MD5SUM@ --MD5SUM_CUT = @MD5SUM_CUT@ --MEINPROC = @MEINPROC@ --MOC = @MOC@ --MSGFMT = @MSGFMT@ --NOOPT_CFLAGS = @NOOPT_CFLAGS@ --NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ --OBJEXT = @OBJEXT@ --PACKAGE = @PACKAGE@ --PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ --PACKAGE_NAME = @PACKAGE_NAME@ --PACKAGE_STRING = @PACKAGE_STRING@ --PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_VERSION = @PACKAGE_VERSION@ --PAMLIBS = @PAMLIBS@ --PASSWDLIBS = @PASSWDLIBS@ --PATH_SEPARATOR = @PATH_SEPARATOR@ --PERL = @PERL@ --PKG_CONFIG = @PKG_CONFIG@ --QTDOCDIR = @QTDOCDIR@ --QTE_NORTTI = @QTE_NORTTI@ --QT_INCLUDES = @QT_INCLUDES@ --QT_LDFLAGS = @QT_LDFLAGS@ --RANLIB = @RANLIB@ --RUN_KAPPFINDER = @RUN_KAPPFINDER@ --SASL2_LIBS = @SASL2_LIBS@ --SETUIDFLAGS = @SETUIDFLAGS@ --SET_MAKE = @SET_MAKE@ --SHELL = @SHELL@ --SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@ --SSL_INCLUDES = @SSL_INCLUDES@ --SSL_LDFLAGS = @SSL_LDFLAGS@ --STRIP = @STRIP@ --TOPSUBDIRS = @TOPSUBDIRS@ --UIC = @UIC@ --UIC_TR = @UIC_TR@ --UNAME = @UNAME@ --USB_CFLAGS = @USB_CFLAGS@ --USB_LIBS = @USB_LIBS@ --USER_INCLUDES = @USER_INCLUDES@ --USER_LDFLAGS = @USER_LDFLAGS@ --USE_EXCEPTIONS = @USE_EXCEPTIONS@ --USE_RTTI = @USE_RTTI@ --USE_THREADS = @USE_THREADS@ --VERSION = @VERSION@ --WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ --XGETTEXT = @XGETTEXT@ --XMLLINT = @XMLLINT@ --XTESTLIB = @XTESTLIB@ --X_EXTRA_LIBS = @X_EXTRA_LIBS@ --X_INCLUDES = @X_INCLUDES@ --X_LDFLAGS = @X_LDFLAGS@ --X_PRE_LIBS = @X_PRE_LIBS@ --X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ --ac_ct_CC = @ac_ct_CC@ --ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ --all_includes = @all_includes@ --all_libraries = @all_libraries@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ --am__include = @am__include@ --am__leading_dot = @am__leading_dot@ --am__quote = @am__quote@ --am__tar = @am__tar@ --am__untar = @am__untar@ --applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@ --applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@ --bindir = @bindir@ --build = @build@ --build_alias = @build_alias@ --build_cpu = @build_cpu@ --build_os = @build_os@ --build_vendor = @build_vendor@ --datadir = @datadir@ --doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ --doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ --drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ --drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ --exec_prefix = @exec_prefix@ --have_xcursor_FALSE = @have_xcursor_FALSE@ --have_xcursor_TRUE = @have_xcursor_TRUE@ --host = @host@ --host_alias = @host_alias@ --host_cpu = @host_cpu@ --host_os = @host_os@ --host_vendor = @host_vendor@ --include_ARTS_FALSE = @include_ARTS_FALSE@ --include_ARTS_TRUE = @include_ARTS_TRUE@ --include_BZIP2_FALSE = @include_BZIP2_FALSE@ --include_BZIP2_TRUE = @include_BZIP2_TRUE@ --include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@ --include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@ --include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@ --include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@ --include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@ --include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@ --include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@ --include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@ --include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@ --include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@ --include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@ --include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@ --include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@ --include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@ --include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@ --include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@ --include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@ --include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@ --include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@ --include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@ --include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@ --include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@ --include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@ --include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@ --include_kompmgr_FALSE = @include_kompmgr_FALSE@ --include_kompmgr_TRUE = @include_kompmgr_TRUE@ --include_ksysguardd_FALSE = @include_ksysguardd_FALSE@ --include_ksysguardd_TRUE = @include_ksysguardd_TRUE@ --include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@ --include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@ --include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@ --include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@ --include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@ --include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@ --include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@ --include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@ --include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@ --include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@ --include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@ --include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@ --include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@ --include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@ --include_media_halbackend_FALSE = @include_media_halbackend_FALSE@ --include_media_halbackend_TRUE = @include_media_halbackend_TRUE@ --include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@ --include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@ --include_x11_FALSE = @include_x11_FALSE@ --include_x11_TRUE = @include_x11_TRUE@ --includedir = @includedir@ --infodir = @infodir@ --install_sh = @install_sh@ --install_usbids_FALSE = @install_usbids_FALSE@ --install_usbids_TRUE = @install_usbids_TRUE@ --jni_includes = @jni_includes@ --kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@ --kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@ --kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@ --kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@ --kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@ --kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@ --kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@ --kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@ --kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@ --kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@ --kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@ --kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@ --kde_appsdir = @kde_appsdir@ --kde_bindir = @kde_bindir@ --kde_confdir = @kde_confdir@ --kde_datadir = @kde_datadir@ --kde_htmldir = @kde_htmldir@ --kde_icondir = @kde_icondir@ --kde_includes = @kde_includes@ --kde_kcfgdir = @kde_kcfgdir@ --kde_libraries = @kde_libraries@ --kde_libs_htmldir = @kde_libs_htmldir@ --kde_libs_prefix = @kde_libs_prefix@ --kde_locale = @kde_locale@ --kde_mimedir = @kde_mimedir@ --kde_moduledir = @kde_moduledir@ --kde_qtver = @kde_qtver@ --kde_servicesdir = @kde_servicesdir@ --kde_servicetypesdir = @kde_servicetypesdir@ --kde_sounddir = @kde_sounddir@ --kde_styledir = @kde_styledir@ --kde_templatesdir = @kde_templatesdir@ --kde_wallpaperdir = @kde_wallpaperdir@ --kde_widgetdir = @kde_widgetdir@ --kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@ --kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@ --kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@ --kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@ --kdeinitdir = @kdeinitdir@ --kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@ --kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@ --kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@ --kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@ --kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@ --kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@ --kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@ --kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@ --kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@ --kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@ --kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@ --kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@ --kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@ --kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@ --kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@ --kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@ --khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@ --khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@ --khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@ --khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@ --kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@ --kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@ --kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@ --kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@ --klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@ --klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@ --kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@ --kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@ --knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@ --knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@ --konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@ --konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@ --konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@ --konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@ --kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@ --kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@ --kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@ --kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@ --kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@ --kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@ --kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@ --kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@ --ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@ --ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@ --ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@ --ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@ --kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@ --kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@ --ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@ --ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@ --ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@ --ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@ --ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@ --ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@ --kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@ --kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@ --kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@ --kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@ --l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@ --l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@ --libdir = @libdir@ --libexecdir = @libexecdir@ --libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ --libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ --localstatedir = @localstatedir@ --mandir = @mandir@ --mkdir_p = @mkdir_p@ --nogroup = @nogroup@ --nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ --nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ --oldincludedir = @oldincludedir@ --pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ --pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ --prefix = @prefix@ --program_transform_name = @program_transform_name@ --qt_includes = @qt_includes@ --qt_libraries = @qt_libraries@ --sbindir = @sbindir@ --sharedstatedir = @sharedstatedir@ --supports_i8k_FALSE = @supports_i8k_FALSE@ --supports_i8k_TRUE = @supports_i8k_TRUE@ --sysconfdir = @sysconfdir@ --target = @target@ --target_alias = @target_alias@ --target_cpu = @target_cpu@ --target_os = @target_os@ --target_vendor = @target_vendor@ --unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ --unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ --x_includes = @x_includes@ --x_libraries = @x_libraries@ --xdg_appsdir = @xdg_appsdir@ --xdg_directorydir = @xdg_directorydir@ --xdg_menudir = @xdg_menudir@ --#>- METASOURCES = AUTO --kde_module_LTLIBRARIES = media_propsdlgplugin.la --media_propsdlgplugin_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) --media_propsdlgplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) --AM_CPPFLAGS = $(all_includes) --kde_services_DATA = media_propsdlgplugin.desktop --#>- media_propsdlgplugin_la_SOURCES = propertiespage.cpp propertiespagegui.ui propsdlgshareplugin.cpp --#>+ 1 --media_propsdlgplugin_la_SOURCES=propertiespage.cpp propsdlgshareplugin.cpp propertiespagegui.cpp --#>- all: all-am --#>+ 1 --all: docs-am all-am -- --.SUFFIXES: --.SUFFIXES: .cpp .lo .o .obj --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) --#>- @for dep in $?; do \ --#>- case '$(am__configure_deps)' in \ --#>- *$$dep*) \ --#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ --#>- && exit 0; \ --#>- exit 1;; \ --#>- esac; \ --#>- done; \ --#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ --#>- cd $(top_srcdir) && \ --#>- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile --#>+ 12 -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ -- cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile -- cd $(top_srcdir) && perl admin/am_edit kioslave/media/propsdlgplugin/Makefile.in --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) -- @$(NORMAL_INSTALL) -- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)" -- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ -- else :; fi; \ -- done -- --uninstall-kde_moduleLTLIBRARIES: -- @$(NORMAL_UNINSTALL) -- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ -- done -- --clean-kde_moduleLTLIBRARIES: -- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES) -- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --#>- media_propsdlgplugin.la: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) --#>+ 2 --@KDE_USE_CLOSURE_TRUE@media_propsdlgplugin.la: media_propsdlgplugin.la.closure $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) --@KDE_USE_CLOSURE_FALSE@media_propsdlgplugin.la: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(kde_moduledir) $(media_propsdlgplugin_la_LDFLAGS) $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_LIBADD) $(LIBS) -- --mostlyclean-compile: -- -rm -f *.$(OBJEXT) -- --distclean-compile: -- -rm -f *.tab.c -- --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/propertiespage.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/propsdlgshareplugin.Plo@am__quote@ -- --.cpp.o: --@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -- --.cpp.obj: --@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -- --.cpp.lo: --@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -- --mostlyclean-libtool: -- -rm -f *.lo -- --clean-libtool: -- -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: --install-kde_servicesDATA: $(kde_services_DATA) -- @$(NORMAL_INSTALL) -- test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)" -- @list='$(kde_services_DATA)'; for p in $$list; do \ -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \ -- $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \ -- done -- --uninstall-kde_servicesDATA: -- @$(NORMAL_UNINSTALL) -- @list='$(kde_services_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \ -- done -- --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- tags=; \ -- here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- tags=; \ -- here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(CTAGS_ARGS)$$tags$$unique" \ -- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -- $$tags $$unique -- --GTAGS: -- here=`$(am__cd) $(top_builddir) && pwd` \ -- && cd $(top_srcdir) \ -- && gtags -i $(GTAGS_ARGS) $$here -- --distclean-tags: -- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -- --distdir: $(DISTFILES) -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkdir_p) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ -- if test -d $$d/$$file; then \ -- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ -- fi; \ -- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ -- else \ -- test -f $(distdir)/$$file \ -- || cp -p $$d/$$file $(distdir)/$$file \ -- || exit 1; \ -- fi; \ -- done --check-am: all-am --check: check-am --all-am: Makefile $(LTLIBRARIES) $(DATA) --installdirs: -- for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \ -- test -z "$$dir" || $(mkdir_p) "$$dir"; \ -- done --install: install-am --install-exec: install-exec-am --install-data: install-data-am --uninstall: uninstall-am -- --install-am: all-am -- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -- --installcheck: installcheck-am --install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install --mostlyclean-generic: -- --clean-generic: -- --distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -- --maintainer-clean-generic: -- @echo "This command is intended for maintainers to use" -- @echo "it deletes files that may require special tools to rebuild." --#>- clean: clean-am --#>+ 1 --clean: kde-rpo-clean clean-am -- --#>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ --#>- mostlyclean-am --#>+ 2 --clean-am: clean-metasources clean-ui clean-closures clean-bcheck clean-final clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ -- mostlyclean-am -- --distclean: distclean-am -- -rm -rf ./$(DEPDIR) -- -rm -f Makefile --distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -- --dvi: dvi-am -- --dvi-am: -- --html: html-am -- --info: info-am -- --info-am: -- --#>- install-data-am: install-kde_moduleLTLIBRARIES \ --#>- install-kde_servicesDATA --#>+ 2 --install-data-am: \ -- install-kde_servicesDATA -- --#>- install-exec-am: --#>+ 1 --install-exec-am: install-kde_moduleLTLIBRARIES -- --install-info: install-info-am -- --install-man: -- --installcheck-am: -- --maintainer-clean: maintainer-clean-am -- -rm -rf ./$(DEPDIR) -- -rm -f Makefile --maintainer-clean-am: distclean-am maintainer-clean-generic -- --mostlyclean: mostlyclean-am -- --mostlyclean-am: mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool -- --pdf: pdf-am -- --pdf-am: -- --ps: ps-am -- --ps-am: -- --uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ -- uninstall-kde_servicesDATA -- --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-exec \ -- install-exec-am install-info install-info-am \ -- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \ -- install-man install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ -- uninstall-am uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ -- uninstall-kde_servicesDATA -- --# Tell versions [3.59,3.63) of GNU make to not export all variables. --# Otherwise a system limit (for SysV at least) may be exceeded. --.NOEXPORT: -- --#>+ 8 --media_propsdlgplugin.la.closure: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) -- @echo "int main() {return 0;}" > media_propsdlgplugin_la_closure.cpp -- @$(LTCXXCOMPILE) -c media_propsdlgplugin_la_closure.cpp -- $(CXXLINK) media_propsdlgplugin_la_closure.lo $(media_propsdlgplugin_la_LDFLAGS) $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_LIBADD) $(LIBS) -- @rm -f media_propsdlgplugin_la_closure.* media_propsdlgplugin.la.closure -- @echo "timestamp" > media_propsdlgplugin.la.closure -- -- --#>+ 3 --propsdlgshareplugin.moc: $(srcdir)/propsdlgshareplugin.h -- $(MOC) $(srcdir)/propsdlgshareplugin.h -o propsdlgshareplugin.moc -- --#>+ 2 --mocs: propsdlgshareplugin.moc -- --#>+ 3 --propertiespage.moc: $(srcdir)/propertiespage.h -- $(MOC) $(srcdir)/propertiespage.h -o propertiespage.moc -- --#>+ 2 --mocs: propertiespage.moc -- --#>+ 3 --clean-metasources: -- -rm -f propsdlgshareplugin.moc propertiespage.moc -- --#>+ 2 --KDE_DIST=propertiespagegui.ui Makefile.in propertiespage.h propsdlgshareplugin.h media_propsdlgplugin.desktop propertiespagegui.ui.h Makefile.am -- --#>+ 4 --clean-ui: -- -rm -f \ -- propertiespagegui.cpp propertiespagegui.h propertiespagegui.moc -- --#>+ 3 --clean-closures: -- -rm -f media_propsdlgplugin.la.closure -- --#>+ 2 --docs-am: -- --#>+ 15 --force-reedit: -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ -- cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile -- cd $(top_srcdir) && perl admin/am_edit kioslave/media/propsdlgplugin/Makefile.in -- -- --#>+ 21 --clean-bcheck: -- rm -f *.bchecktest.cc *.bchecktest.cc.class a.out -- --bcheck: bcheck-am -- --bcheck-am: -- @for i in ; do \ -- if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ -- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ -- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ -- echo "$$i"; \ -- if ! $(CXXCOMPILE) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ -- rm -f $$i.bchecktest.cc; exit 1; \ -- fi ; \ -- echo "" >> $$i.bchecktest.cc.class; \ -- perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ -- rm -f a.out; \ -- fi ; \ -- done -- -- --#>+ 11 --media_propsdlgplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/propertiespage.cpp $(srcdir)/propsdlgshareplugin.cpp propertiespagegui.cpp propsdlgshareplugin.moc propertiespagegui.moc propertiespage.moc -- @echo 'creating media_propsdlgplugin_la.all_cpp.cpp ...'; \ -- rm -f media_propsdlgplugin_la.all_cpp.files media_propsdlgplugin_la.all_cpp.final; \ -- echo "#define KDE_USE_FINAL 1" >> media_propsdlgplugin_la.all_cpp.final; \ -- for file in propertiespage.cpp propsdlgshareplugin.cpp propertiespagegui.cpp ; do \ -- echo "#include \"$$file\"" >> media_propsdlgplugin_la.all_cpp.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> media_propsdlgplugin_la.all_cpp.final; \ -- done; \ -- cat media_propsdlgplugin_la.all_cpp.final media_propsdlgplugin_la.all_cpp.files > media_propsdlgplugin_la.all_cpp.cpp; \ -- rm -f media_propsdlgplugin_la.all_cpp.final media_propsdlgplugin_la.all_cpp.files -- --#>+ 3 --clean-final: -- -rm -f media_propsdlgplugin_la.all_cpp.cpp -- --#>+ 3 --final: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_final_OBJECTS)" all-am -- --#>+ 3 --final-install: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_final_OBJECTS)" install-am -- --#>+ 3 --no-final: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_nofinal_OBJECTS)" all-am -- --#>+ 3 --no-final-install: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_nofinal_OBJECTS)" install-am -- --#>+ 3 --kde-rpo-clean: -- -rm -f *.rpo -- --#>+ 9 --nmcheck: --propsdlgshareplugin.o: propsdlgshareplugin.moc --nmcheck-am: nmcheck --propsdlgshareplugin.lo: propsdlgshareplugin.moc --propertiespage.lo: propertiespage.moc --$(srcdir)/propertiespage.cpp: propertiespagegui.h --$(srcdir)/propsdlgshareplugin.cpp: propertiespagegui.h --propertiespage.o: propertiespage.moc -- --#>+ 15 --propertiespagegui.cpp: $(srcdir)/propertiespagegui.ui propertiespagegui.h propertiespagegui.moc -- rm -f propertiespagegui.cpp -- echo '#include <kdialog.h>' > propertiespagegui.cpp -- echo '#include <klocale.h>' >> propertiespagegui.cpp -- $(UIC) -tr ${UIC_TR} -i propertiespagegui.h $(srcdir)/propertiespagegui.ui > propertiespagegui.cpp.temp ; ret=$$?; \ -- $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" propertiespagegui.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_propertiespagegui,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> propertiespagegui.cpp ;\ -- rm -f propertiespagegui.cpp.temp ;\ -- if test "$$ret" = 0; then echo '#include "propertiespagegui.moc"' >> propertiespagegui.cpp; else rm -f propertiespagegui.cpp ; exit $$ret ; fi -- --propertiespagegui.h: $(srcdir)/propertiespagegui.ui -- rm -rf propertiespagegui.h; -- $(UIC) $(srcdir)/propertiespagegui.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> propertiespagegui.h ; --propertiespagegui.moc: propertiespagegui.h -- $(MOC) propertiespagegui.h -o propertiespagegui.moc -diff -urN kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop ---- kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Thu Jan 1 01:00:00 1970 -@@ -1,73 +0,0 @@ --[Desktop Entry] --Encoding=UTF-8 --Type=Service --Name=Media Properties Page --Name[ca]=Pàgina de propietats de suport --Name[cs]=Stránka vlastností média --Name[da]=Medieegenskabsside --Name[de]=Eigenschaften von Medien --Name[el]=Σελίδα ιδιοτήτων μέσων --Name[es]=Página de propiedades de medios --Name[et]=Andmekandjate omadused --Name[fa]=صفحۀ ویژگیهای رسانه --Name[fi]=Mediaominaisuudet --Name[fr]=Page de propriétés du média --Name[he]=דף מאפייני מדיה --Name[hr]=Stranica svojstva medija --Name[hu]=Médiajellemzők lap --Name[is]=Eiginleikar miðils --Name[it]=Pagina delle proprietà dei dispositivi di archiviazione --Name[ja]=メディア属性ページ --Name[km]=ទំព័រលក្ខណៈសម្បត្តិមេឌៀ --Name[nb]=Side for medievarsling --Name[nds]=Medienegenschappen-Siet --Name[nl]=Pagina met media-eigenschappen --Name[nn]=Side for medieeigenskapar --Name[pl]=Strona właściwości nośnika --Name[pt]=Página de Propriedades de Suportes Físicos --Name[pt_BR]=Página de Propriedades de Suportes Físicos --Name[ru]=Свойства носителя --Name[sk]=Strana vlastností média --Name[sl]=Stran z lastnostmi nosilca --Name[sr]=Страна са својствима медијума --Name[sr@Latn]=Strana sa svojstvima medijuma --Name[sv]=Sida för mediaegenskaper --Name[uk]=Сторінка властивостей носіїв інформації --Name[vi]=Trang tài sản phương tiện --Name[zh_TW]=媒體內容頁 --Comment=Konqueror properties dialog plugin to configure mount behaviour --Comment[ca]=Diàleg de propietats de l'endollable Konqueror per a configurar el comportament de muntatge --Comment[cs]=Dialog nastavení chování připojení modulu pro Konqueror --Comment[da]=Konqueror plugin med egenskabsdialog til at indstille monteringsopførsel --Comment[de]=Konqueror-Modul zum Einstellen des Verhaltens beim Einbinden --Comment[el]=Πρόσθετο διαλόγου ιδιοτήτων του Konqueror για τη ρύθμιση της συμπεριφοράς προσάρτησης --Comment[es]=Plugin de diálogo de propiedades de Konqueror para configurar el comportamiento del montaje --Comment[et]=Konquerori seadistustedialoogi plugin andmekandjate ühendamise seadistamiseks --Comment[fa]=وصلۀ محاورۀ ویژگیهای Konqueror برای پیکربندی رفتار سوار کردن --Comment[fi]=Konquerorin ominaisuussovelma, joka tarkkailee liitospisteitä --Comment[fr]=Module de Konqueror pour configurer le comportement du montage --Comment[he]=תוסף חלון מאפיינים של Konqueror לקביעת אפשרויות חיבור --Comment[hr]=Konqueror dodatak dijaloga svojstava za konfiguriranje načina pristupanja --Comment[hu]=Konqueror beállítómodul a csatlakoztatási mód megadásához --Comment[is]=Konqueror eiginleikagluggi til að stilla tengihegðun --Comment[it]=Plugin della configurazione di Konqueror per configurare il montaggio --Comment[ja]=mountの挙動を設定する、Konqueror属性ダイアログ プラグイン --Comment[km]=កម្មវិធីជំនួយឲ្យមានប្រអប់លក្ខណៈសម្បត្តិ Konqueror ដើម្បីកំណត់រចនាសម្ព័ន្ធឥរិយាបថម៉ោន --Comment[nb]=Et programtillegg for å sette opp montering av enheter i Konqueror --Comment[nds]=Egenschappendialoog-Plugin för Konqueror för't Instellen vun't Inhangbedregen --Comment[nl]=Dialoogvenster voor Konqueror om het aankoppelgedrag in te stellen --Comment[nn]=Programtillegg for oppsett av montering i Konqueror --Comment[pl]=Wtyczka okna właściwości Konquerora do konfiguracji zachowania montowania --Comment[pt]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem --Comment[pt_BR]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem --Comment[ru]=Модуль свойств для Konqueror, отвечающий за поведение при подключении файловых систем --Comment[sk]=Modul Konqueror dialógu vlastností pre konfiguráciu správania pripojenia --Comment[sl]=Vstavek za Konqueror s katerim se nastavlja obnašanje priklopa medijev --Comment[sr]=Прикључак са својствима Konqueror-а за подешавање понашања при монтирању --Comment[sr@Latn]=Priključak sa svojstvima Konqueror-a za podešavanje ponašanja pri montiranju --Comment[sv]=Konqueror insticksprogram med egenskapsdialogruta för att anpassa monteringsbeteende --Comment[uk]=Втулок вікна властивостей Konqueror для налаштування поведінки монтування --Comment[vi]=bổ sung hộp thoại tài sản Konqueror để cấu hình ứng xử gắn kết --Comment[zh_TW]=Konqueror 內容對話框外掛程式，用於設定掛載的行為 --X-KDE-Library=media_propsdlgplugin --ServiceTypes=KPropsDlg/Plugin,media/audiocd,media/hdd_mounted,media/hdd_unmounted,media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/nfs_mounted,media/cdwriter_unmounted,media/nfs_unmounted,media/removable_mounted,media/dvd_mounted,media/removable_unmounted,media/dvd_unmounted,media/smb_mounted,media/dvdvideo,media/smb_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/floppy_mounted,media/zip_mounted,media/floppy_unmounted,media/zip_unmounted,media/camera_mounted,media/camera_unmounted -diff -urN kioslave/media/propsdlgplugin/propertiespage.cpp kioslave/media/propsdlgplugin/propertiespage.cpp ---- kioslave/media/propsdlgplugin/propertiespage.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespage.cpp Thu Jan 1 01:00:00 1970 -@@ -1,217 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program 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 General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ -- --#include <qcheckbox.h> --#include <qtooltip.h> --#include <qbuttongroup.h> --#include <qlineedit.h> --#include <qfileinfo.h> --#include <qlabel.h> --#include <qregexp.h> --#include <kpushbutton.h> --#include <kmessagebox.h> --#include <klocale.h> --#include <qcombobox.h> --#include <qtimer.h> --#include <kdebug.h> --#include "propertiespage.h" --#include <dcopref.h> -- --// keep in sync with .ui and kded module --const char *short_names[] = {"lower", "win95", "winnt", "mixed", 0 }; --const char *journales[] = {"data", "ordered", "writeback", 0 }; -- --PropertiesPage::PropertiesPage(QWidget* parent, const QString &_id) -- : PropertiesPageGUI(parent), id(_id) --{ -- kdDebug() << "props page " << id << endl; -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "mountoptions", id); -- -- QStringList list; -- -- if (reply.isValid()) -- list = reply; -- -- if (list.size()) { -- kdDebug() << "list " << list << endl; -- -- for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it) -- { -- QString key = (*it).left((*it).find('=')); -- QString value = (*it).mid((*it).find('=') + 1); -- kdDebug() << "key '" << key << "' value '" << value << "'\n"; -- options[key] = value; -- } -- -- if (!options.contains("ro")) -- option_ro->hide(); -- else -- option_ro->setChecked(options["ro"] == "true"); -- connect( option_ro, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("quiet")) -- option_quiet->hide(); -- else -- option_quiet->setChecked(options["quiet"] == "true"); -- connect( option_quiet, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("sync")) -- option_sync->hide(); -- else -- option_sync->setChecked(options["sync"] == "true"); -- connect( option_sync, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("atime")) -- option_atime->hide(); -- else -- option_atime->setChecked(options["atime"] == "true"); -- connect( option_atime, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("flush")) -- option_flush->hide(); -- else -- option_flush->setChecked(options["flush"] == "true"); -- connect( option_flush, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("utf8")) -- option_utf8->hide(); -- else -- option_utf8->setChecked(options["utf8"] == "true"); -- connect( option_utf8, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("uid")) -- option_uid->hide(); -- else -- option_uid->setChecked(options["uid"] == "true"); -- connect( option_uid, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("shortname")) -- { -- option_shortname->hide(); -- text_shortname->hide(); -- } -- else -- { -- for (int index = 0; short_names[index]; ++index) -- if (options["shortname"] == short_names[index]) -- { -- option_shortname->setCurrentItem(index); -- break; -- } -- connect( option_shortname, SIGNAL( activated(int) ), SIGNAL( changed() ) ); -- } -- -- if (!options.contains("journaling")) -- { -- text_journaling->hide(); -- option_journaling->hide(); -- } -- else -- { -- for (int index = 0; journales[index]; ++index) -- if (options["journaling"] == journales[index]) -- { -- option_journaling->setCurrentItem(index); -- break; -- } -- connect( option_journaling, SIGNAL( activated(int) ), SIGNAL( changed() ) ); -- } -- -- label_filesystem->setText(i18n("Filesystem: %1").arg(options["filesystem"])); -- option_mountpoint->setText(options["mountpoint"]); -- connect( option_mountpoint, SIGNAL( textChanged( const QString &) ), SIGNAL( changed() ) ); -- option_automount->setChecked(options["automount"] == "true"); -- connect( option_automount, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("journaling") && -- !options.contains("shortname") && -- !options.contains("uid") && -- !options.contains("utf8") && -- !options.contains("flush")) -- groupbox_specific->hide(); -- -- } else { -- -- groupbox_generic->setEnabled(false); -- groupbox_specific->setEnabled(false); -- label_filesystem->hide(); -- } --} -- --PropertiesPage::~PropertiesPage() --{ --} -- --bool PropertiesPage::save() --{ -- QStringList result; -- -- if (options.contains("ro")) -- result << QString("ro=%1").arg(option_ro->isChecked() ? "true" : "false"); -- -- if (options.contains("quiet")) -- result << QString("quiet=%1").arg(option_quiet->isChecked() ? "true" : "false"); -- -- if (options.contains("sync")) -- result << QString("sync=%1").arg(option_sync->isChecked() ? "true" : "false"); -- -- if (options.contains("atime")) -- result << QString("atime=%1").arg(option_atime->isChecked() ? "true" : "false"); -- -- if (options.contains("flush")) -- result << QString("flush=%1").arg(option_flush->isChecked() ? "true" : "false"); -- -- if (options.contains("utf8")) -- result << QString("utf8=%1").arg(option_utf8->isChecked() ? "true" : "false"); -- -- if (options.contains("uid")) -- result << QString("uid=%1").arg(option_uid->isChecked() ? "true" : "false"); -- -- if (options.contains("shortname")) -- result << QString("shortname=%1").arg(short_names[option_shortname->currentItem()]); -- -- if (options.contains("journaling")) -- result << QString("journaling=%1").arg(journales[option_journaling->currentItem()]); -- -- QString mp = option_mountpoint->text(); -- if (!mp.startsWith("/media/")) -- { -- KMessageBox::sorry(this, i18n("Mountpoint has to be below /media")); -- return false; -- } -- result << QString("mountpoint=%1").arg(mp); -- result << QString("automount=%1").arg(option_automount->isChecked() ? "true" : "false"); -- -- kdDebug() << result << endl; -- -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "setMountoptions", id, result); -- -- if (reply.isValid()) -- return (bool)reply; -- else { -- KMessageBox::sorry(this, -- i18n("Saving the changes failed")); -- -- return false; -- } --} -- --#include "propertiespage.moc" -diff -urN kioslave/media/propsdlgplugin/propertiespage.h kioslave/media/propsdlgplugin/propertiespage.h ---- kioslave/media/propsdlgplugin/propertiespage.h Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespage.h Thu Jan 1 01:00:00 1970 -@@ -1,46 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program 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 General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ -- --#ifndef PROPERTIESPAGE_H --#define PROPERTIESPAGE_H -- --#include "propertiespagegui.h" --#include <qmap.h> -- --class QCheckBox; --class Medium; -- --class PropertiesPage : public PropertiesPageGUI --{ -- Q_OBJECT -- --public: -- PropertiesPage(QWidget* parent, const QString &_id); -- virtual ~PropertiesPage(); -- -- bool save(); -- --protected: -- -- QMap<QString,QString> options; -- QString id; -- --}; -- --#endif -diff -urN kioslave/media/propsdlgplugin/propertiespagegui.ui kioslave/media/propsdlgplugin/propertiespagegui.ui ---- kioslave/media/propsdlgplugin/propertiespagegui.ui Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespagegui.ui Thu Jan 1 01:00:00 1970 -@@ -1,387 +0,0 @@ --<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> --<class>PropertiesPageGUI</class> --<widget class="QWidget"> -- <property name="name"> -- <cstring>PropertiesPageGUI</cstring> -- </property> -- <property name="geometry"> -- <rect> -- <x>0</x> -- <y>0</y> -- <width>527</width> -- <height>476</height> -- </rect> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <property name="margin"> -- <number>0</number> -- </property> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout17</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QGroupBox"> -- <property name="name"> -- <cstring>groupbox_generic</cstring> -- </property> -- <property name="title"> -- <string>Generic Mount Options</string> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout15</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_ro</cstring> -- </property> -- <property name="text"> -- <string>Read only</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Mount the file system read-only.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_quiet</cstring> -- </property> -- <property name="text"> -- <string>Quiet</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Attempts to chown or chmod files do not return errors, although they fail. Use with caution!</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_sync</cstring> -- </property> -- <property name="text"> -- <string>Synchronous</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>All I/O to the file system should be done synchronously.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_atime</cstring> -- </property> -- <property name="text"> -- <string>Access time updates</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Update inode access time for each access.</string> -- </property> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout14</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>textLabel3</cstring> -- </property> -- <property name="text"> -- <string>Mountpoint:</string> -- </property> -- <property name="buddy" stdset="0"> -- <cstring>option_mountpoint</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Under what directory this file system shall be mounted. Please note that there is no guarantee that the system will respect your wish. For one the directory has to be below /media - and it does not yet have to exist.</string> -- </property> -- </widget> -- <widget class="QLineEdit"> -- <property name="name"> -- <cstring>option_mountpoint</cstring> -- </property> -- <property name="text"> -- <string></string> -- </property> -- </widget> -- </hbox> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_automount</cstring> -- </property> -- <property name="text"> -- <string>Mount automatically</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Mount this file system automatically.</string> -- </property> -- </widget> -- </vbox> -- </widget> -- </vbox> -- </widget> -- <widget class="QGroupBox"> -- <property name="name"> -- <cstring>groupbox_specific</cstring> -- </property> -- <property name="title"> -- <string>Filesystem Specific Mount Options</string> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout11</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_flush</cstring> -- </property> -- <property name="text"> -- <string>Flushed IO</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Always flush all data to the hot plug devices immediately and don't cache it.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_utf8</cstring> -- </property> -- <property name="text"> -- <string>UTF-8 charset</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the console. It can be be enabled for the filesystem with this option.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_uid</cstring> -- </property> -- <property name="text"> -- <string>Mount as user</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Mount this file system as user.</string> -- </property> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout7</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>text_journaling</cstring> -- </property> -- <property name="text"> -- <string>Journaling:</string> -- </property> -- <property name="buddy" stdset="0"> -- <cstring>option_journaling</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> -- --<h3><b>All Data</b></h3> -- All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. -- --<h3><b>Ordered</b></h3> -- All data is forced directly out to the main file system prior to its metadata being committed to the journal. -- --<h3><b>Write Back</b></h3> -- Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery.</string> -- </property> -- </widget> -- <widget class="QComboBox"> -- <item> -- <property name="text"> -- <string>All Data</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Ordered</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Write Back</string> -- </property> -- </item> -- <property name="name"> -- <cstring>option_journaling</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> -- --<h3><b>All Data</b></h3> -- All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. -- --<h3><b>Ordered</b></h3> -- All data is forced directly out to the main file system prior to its metadata being committed to the journal. -- --<h3><b>Write Back</b></h3> -- Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery.</string> -- </property> -- </widget> -- </hbox> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout14</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>text_shortname</cstring> -- </property> -- <property name="text"> -- <string>Short names:</string> -- </property> -- <property name="buddy" stdset="0"> -- <cstring>option_shortname</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> -- --<h3><b>Lower</b></h3> --Force the short name to lower case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows 95</b></h3> --Force the short name to upper case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows NT</b></h3> --Display the shortname as is; store a long name when the short name is not all lower case or all upper case. -- --<h3><b>Mixed</b></h3> --Display the short name as is; store a long name when the short name is not all upper case.</string> -- </property> -- </widget> -- <widget class="QComboBox"> -- <item> -- <property name="text"> -- <string>Lower</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Windows 95</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Windows NT</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Mixed</string> -- </property> -- </item> -- <property name="name"> -- <cstring>option_shortname</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> -- --<h3><b>Lower</b></h3> --Force the short name to lower case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows 95</b></h3> --Force the short name to upper case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows NT</b></h3> --Display the shortname as is; store a long name when the short name is not all lower case or all upper case. -- --<h3><b>Mixed</b></h3> --Display the short name as is; store a long name when the short name is not all upper case.</string> -- </property> -- </widget> -- </hbox> -- </widget> -- </vbox> -- </widget> -- </vbox> -- </widget> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>label_filesystem</cstring> -- </property> -- <property name="text"> -- <string>Filesystem: iso9660</string> -- </property> -- </widget> -- <spacer> -- <property name="name"> -- <cstring>spacer1</cstring> -- </property> -- <property name="orientation"> -- <enum>Vertical</enum> -- </property> -- <property name="sizeType"> -- <enum>Expanding</enum> -- </property> -- <property name="sizeHint"> -- <size> -- <width>20</width> -- <height>20</height> -- </size> -- </property> -- </spacer> -- </vbox> -- </widget> -- </hbox> --</widget> --<connections> -- <connection> -- <sender>option_ro</sender> -- <signal>stateChanged(int)</signal> -- <receiver>PropertiesPageGUI</receiver> -- <slot>changedSlot()</slot> -- </connection> --</connections> --<variables> -- <variable>bool m_hasChanged;</variable> --</variables> --<signals> -- <signal>changed()</signal> --</signals> --<slots> -- <slot access="protected">changedSlot()</slot> --</slots> --<functions> -- <function returnType="bool">hasChanged()</function> --</functions> --<layoutdefaults spacing="6" margin="11"/> --</UI> -diff -urN kioslave/media/propsdlgplugin/propertiespagegui.ui.h kioslave/media/propsdlgplugin/propertiespagegui.ui.h ---- kioslave/media/propsdlgplugin/propertiespagegui.ui.h Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespagegui.ui.h Thu Jan 1 01:00:00 1970 -@@ -1,22 +0,0 @@ --/**************************************************************************** --** ui.h extension file, included from the uic-generated form implementation. --** --** If you wish to add, delete or rename functions or slots use --** Qt Designer which will update this file, preserving your code. Create an --** init() function in place of a constructor, and a destroy() function in --** place of a destructor. --*****************************************************************************/ -- -- --void PropertiesPageGUI::changedSlot() --{ -- m_hasChanged = true; -- emit changed(); --} -- --bool PropertiesPageGUI::hasChanged() --{ -- return m_hasChanged; --} -- -- -diff -urN kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp ---- kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp Thu Jan 1 01:00:00 1970 -@@ -1,100 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program 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 General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ --#include <qstring.h> --#include <qvbox.h> --#include <qlayout.h> --#include <qlabel.h> --#include <qtimer.h> -- --#include <kgenericfactory.h> --#include <kdebug.h> --#include <kpushbutton.h> --#include <kfileshare.h> --#include <kmessagebox.h> --#include <kprocess.h> --#include <kstandarddirs.h> --#include <kdialog.h> --#include <kglobal.h> --#include <dcopref.h> -- --#include "propertiespage.h" --#include "propsdlgshareplugin.h" --#include "../libmediacommon/medium.h" -- --typedef KGenericFactory<PropsDlgSharePlugin, KPropertiesDialog> PropsDlgSharePluginFactory; -- --K_EXPORT_COMPONENT_FACTORY( media_propsdlgplugin, -- PropsDlgSharePluginFactory("media_propsdlgplugin") ) -- --class PropsDlgSharePlugin::Private --{ -- public: -- PropertiesPage* page; --}; -- --PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg, -- const char *, const QStringList & ) -- : KPropsDlgPlugin(dlg), d(0) --{ -- if (properties->items().count() != 1) -- return; -- -- KFileItem *item = properties->items().first(); -- -- DCOPRef mediamanager("kded", "mediamanager"); -- kdDebug() << "properties " << item->url() << endl; -- DCOPReply reply = mediamanager.call( "properties", item->url().url() ); -- -- if ( !reply.isValid() ) -- return; -- -- QVBox* vbox = properties->addVBoxPage(i18n("&Mounting")); -- -- d = new Private(); -- -- d->page = new PropertiesPage(vbox, Medium::create(reply).id()); -- connect(d->page, SIGNAL(changed()), -- SLOT(slotChanged())); -- -- // QTimer::singleShot(100, this, SLOT(slotChanged())); -- --} -- --void PropsDlgSharePlugin::slotChanged() --{ -- kdDebug() << "slotChanged()\n"; -- setDirty(true); --} -- --PropsDlgSharePlugin::~PropsDlgSharePlugin() --{ -- delete d; --} -- --void PropsDlgSharePlugin::applyChanges() --{ -- kdDebug() << "applychanges\n"; -- if (!d->page->save()) { -- properties->abortApplying(); -- } --} -- -- --#include "propsdlgshareplugin.moc" -- -diff -urN kioslave/media/propsdlgplugin/propsdlgshareplugin.h kioslave/media/propsdlgplugin/propsdlgshareplugin.h ---- kioslave/media/propsdlgplugin/propsdlgshareplugin.h Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propsdlgshareplugin.h Thu Jan 1 01:00:00 1970 -@@ -1,44 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program 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 General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ -- --#ifndef KONQFILESHAREPLUGIN_H --#define KONQFILESHAREPLUGIN_H -- --#include <kpropertiesdialog.h> -- --class PropsDlgSharePlugin : public KPropsDlgPlugin --{ --Q_OBJECT --public: -- PropsDlgSharePlugin( KPropertiesDialog *dlg, const char *, const QStringList & ); -- virtual ~PropsDlgSharePlugin(); -- virtual void applyChanges(); -- --public slots: -- void slotChanged(); -- --private: -- class Private; -- Private *d; -- --}; -- --#endif -- -- -diff -urN kioslave/media/services/Makefile.in kioslave/media/services/Makefile.in ---- kioslave/media/services/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/services/Makefile.in Fri May 26 09:54:31 2006 -@@ -211,6 +211,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/services/media_eject.desktop kioslave/media/services/media_eject.desktop ---- kioslave/media/services/media_eject.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/services/media_eject.desktop Mon May 22 20:12:42 2006 -@@ -24,7 +24,7 @@ - Name[es]=Expulsar - Name[et]=Väljastamine - Name[eu]=Egotzi --Name[fa]=پس زدن -+Name[fa]=اخراج - Name[fi]=Poista - Name[fr]=Éjecter - Name[fy]=Utsmytknop -diff -urN kioslave/media/services/media_safelyremove.desktop kioslave/media/services/media_safelyremove.desktop ---- kioslave/media/services/media_safelyremove.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/services/media_safelyremove.desktop Tue May 23 13:33:34 2006 -@@ -18,10 +18,8 @@ - Name[es]=Extracción segura - Name[et]=Eemalda turvaliselt - Name[eu]=Atera arriskurik gabe --Name[fa]=حذف امن - Name[fi]=Poista turvallisesti - Name[fr]=Enlever en toute sécurité --Name[fy]=Feilich verwiderje - Name[ga]=Bain Amach go Sábháilte - Name[gl]=Eliminar de Maneira Segura - Name[he]=שליפה בבטחה -@@ -46,7 +44,6 @@ - Name[ru]=Безопасно извлечь - Name[rw]=Gukuramo Neza - Name[se]=Dorvvošlaš eretváldin --Name[sk]=Bezpečne odpojiť - Name[sl]=Varno odstrani - Name[sr]=Безбедно уклони - Name[sr@Latn]=Bezbedno ukloni diff --git a/x11/kdebase4-workspace/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kdebase4-workspace/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp deleted file mode 100644 index 5a6937d40f75..000000000000 --- a/x11/kdebase4-workspace/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- kioslave/media/mediamanager/fstabbackend.cpp.orig Mon May 22 20:12:42 2006 -+++ kioslave/media/mediamanager/fstabbackend.cpp Fri Jun 16 08:56:20 2006 -@@ -111,6 +111,7 @@ - if ( mount->mountType() == "swap" - || mount->mountType() == "tmpfs" - || mount->mountType() == "sysfs" -+ || mount->mountType() == "fdescfs" - || mount->mountType() == "kernfs" - || mount->mountType() == "usbfs" - || mount->mountType().contains( "proc" ) diff --git a/x11/kdebase4-workspace/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp b/x11/kdebase4-workspace/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp index 00685d0fd8a2..e2580f9277c0 100644 --- a/x11/kdebase4-workspace/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp +++ b/x11/kdebase4-workspace/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp @@ -1,5 +1,5 @@ ---- kioslave/media/mediamanager/halbackend.cpp.orig Sun Oct 1 21:31:54 2006 -+++ kioslave/media/mediamanager/halbackend.cpp Fri Feb 9 22:01:27 2007 +--- kioslave/media/mediamanager/halbackend.cpp.orig Mon Jan 15 12:31:32 2007 ++++ kioslave/media/mediamanager/halbackend.cpp Sat Mar 3 18:00:49 2007 @@ -17,9 +17,14 @@ */ @@ -14,9 +14,9 @@ +#include <langinfo.h> +#endif - #include <qfile.h> - #include <klocale.h> -@@ -66,6 +71,10 @@ + #include <kapplication.h> + #include <qeventloop.h> +@@ -71,6 +76,10 @@ /* Close HAL connection */ if (m_halContext) { @@ -27,7 +27,7 @@ const QPtrList<Medium> medlist = m_mediaList.list(); QPtrListIterator<Medium> it (medlist); for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) -@@ -185,6 +194,10 @@ +@@ -184,6 +193,10 @@ libhal_free_string_array( halDeviceList ); @@ -38,9 +38,9 @@ return true; } -@@ -242,11 +255,11 @@ - Medium* medium = new Medium(udi, ""); - +@@ -251,11 +264,11 @@ + } + } QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi)); - kdDebug() << "automount " << options["automount"] << endl; + kdDebug(1219) << "automount " << options["automount"] << endl; @@ -50,9 +50,9 @@ - kdDebug() << "error " << error << endl; + kdDebug(1219) << "error " << error << endl; } - setVolumeProperties(medium); m_mediaList.addMedium(medium, allowNotification); -@@ -264,6 +277,11 @@ + +@@ -272,6 +285,11 @@ Medium* medium = new Medium(udi, ""); setFloppyProperties(medium); m_mediaList.addMedium(medium, allowNotification); @@ -64,7 +64,7 @@ return; } -@@ -285,12 +303,23 @@ +@@ -293,12 +311,23 @@ void HALBackend::RemoveDevice(const char *udi) { @@ -89,7 +89,7 @@ const char* mediumUdi = findMediumUdiFromUdi(udi); if (!mediumUdi) return; -@@ -326,7 +355,7 @@ +@@ -334,7 +363,7 @@ } const char* mediumUdi = findMediumUdiFromUdi(udi); @@ -98,7 +98,7 @@ if (!mediumUdi) return; -@@ -384,7 +413,7 @@ +@@ -392,7 +421,7 @@ { Medium m( *cmedium ); if ( setFstabProperties( &m ) ) { @@ -107,7 +107,7 @@ m_mediaList.changeMediumState(m, false); } return; -@@ -399,6 +428,7 @@ +@@ -407,6 +436,7 @@ setFloppyProperties(m); if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) setCameraProperties(m); @@ -115,7 +115,7 @@ m_mediaList.changeMediumState(*m, false); -@@ -469,28 +499,23 @@ +@@ -479,28 +509,23 @@ else mimeType = "media/dvd" + MOUNT_SUFFIX; @@ -155,7 +155,7 @@ } else { -@@ -575,7 +600,7 @@ +@@ -584,7 +609,7 @@ } } @@ -164,7 +164,7 @@ QString fstype = medium->fsType(); if ( fstype.isNull() ) fstype = "auto"; -@@ -762,7 +787,7 @@ +@@ -794,7 +819,7 @@ if (t.endsWith("=")) t = t.left(t.length() - 1); valids[t] = true; @@ -173,7 +173,7 @@ } libhal_free_string_array(array); QStringList result; -@@ -882,12 +908,20 @@ +@@ -915,12 +940,20 @@ result << "journaling=ordered"; } @@ -195,7 +195,7 @@ KConfig config("mediamanagerrc"); config.setGroup(name); -@@ -927,7 +959,7 @@ +@@ -960,7 +993,7 @@ if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, "org.freedesktop.Hal.Device.Volume", "Mount"))) { @@ -204,7 +204,7 @@ return i18n("Internal Error"); } -@@ -935,7 +967,7 @@ +@@ -968,7 +1001,7 @@ DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &poptions, noptions, DBUS_TYPE_INVALID)) { @@ -213,7 +213,7 @@ dbus_message_unref (dmesg); return i18n("Internal Error"); } -@@ -963,7 +995,7 @@ +@@ -996,7 +1029,7 @@ return qerror; } @@ -222,18 +222,25 @@ dbus_message_unref (dmesg); dbus_message_unref (reply); -@@ -974,15 +1006,33 @@ +@@ -1044,7 +1077,7 @@ void HALBackend::slotResult(KIO::Job *job) { - kdDebug() << "slotResult " << mount_jobs[job] << endl; + kdDebug(1219) << "slotResult " << mount_jobs[job] << endl; - if (job->error()) - { - KMessageBox::error(0, job->errorText()); + + struct mount_job_data *data = mount_jobs[job]; + QString& qerror = data->errorMessage; +@@ -1071,7 +1104,6 @@ + qerror = job->errorText(); } -- ResetProperties( mount_jobs[job].latin1() ); + +- ResetProperties( medium->id().latin1() ); mount_jobs.remove(job); + + /* Job completed. Notify the caller */ +@@ -1080,6 +1112,25 @@ + kapp->eventLoop()->exitLoop(); } +#ifdef Q_OS_FREEBSD @@ -247,7 +254,7 @@ + { + bool mounted = false; + const char *dev = (*it)->deviceNode().ascii(); -+ for (int n = mntNum-1; n >= 0 && !mounted; n--) ++ for (int n = mntNum-1; n >= 0 && !mounted; n--) + mounted = !strcmp(dev, mntBuf[n].f_mntfromname); + if ((*it)->isMounted() != mounted) + ResetProperties((*it)->id().latin1()); @@ -258,31 +265,32 @@ QString HALBackend::isInFstab(const Medium *medium) { KMountPoint::List fstab = KMountPoint::possibleMountPoints(KMountPoint::NeedMountOptions|KMountPoint::NeedRealDeviceName); -@@ -992,11 +1042,13 @@ - - for (; it!=end; ++it) - { -- kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl; -+ kdDebug(1219) << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl; - if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && (*it)->realDeviceName() == medium->deviceNode() ) ) +@@ -1092,12 +1143,14 @@ + QString reald = (*it)->realDeviceName(); + if ( reald.endsWith( "/" ) ) + reald = reald.left( reald.length() - 1 ); +- kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << reald << "- -" << (*it)->mountedFrom() << "-" << endl; ++ kdDebug(1219) << "isInFstab -" << medium->deviceNode() << "- -" << reald << "- -" << (*it)->mountedFrom() << "-" << endl; + if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && reald == medium->deviceNode() ) ) { +#ifndef Q_OS_FREEBSD QStringList opts = (*it)->mountOptions(); if (opts.contains("user") || opts.contains("users")) -+#endif return (*it)->mountPoint(); ++#endif } } -@@ -1012,7 +1064,7 @@ - QString mountPoint = isInFstab(medium); - if (!mountPoint.isNull()) - { + +@@ -1116,7 +1169,7 @@ + data.completed = false; + data.medium = medium; + - kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; + kdDebug(1219) << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint ); connect(job, SIGNAL( result (KIO::Job *)), SLOT( slotResult( KIO::Job *))); -@@ -1023,7 +1075,7 @@ +@@ -1134,7 +1187,7 @@ QStringList soptions; @@ -291,7 +299,7 @@ QMap<QString,QString> valids = MediaManagerUtils::splitOptions(mountoptions(medium->id())); if (valids["flush"] == "true") -@@ -1036,10 +1088,10 @@ +@@ -1147,10 +1200,10 @@ if (valids["ro"] == "true") soptions << "ro"; @@ -304,7 +312,7 @@ if (valids["quiet"] == "true") soptions << "quiet"; -@@ -1069,6 +1121,13 @@ +@@ -1180,6 +1233,13 @@ soptions << QString("data=ordered"); } @@ -318,7 +326,7 @@ const char **options = new const char*[soptions.size() + 1]; uint noptions = 0; for (QStringList::ConstIterator it = soptions.begin(); it != soptions.end(); ++it, ++noptions) -@@ -1081,9 +1140,6 @@ +@@ -1192,9 +1252,6 @@ return qerror; } @@ -328,16 +336,7 @@ return QString(); } -@@ -1121,7 +1177,7 @@ - QString mountPoint = isInFstab(medium); - if (!mountPoint.isNull()) - { -- kdDebug() << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl; -+ kdDebug(1219) << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl; - KIO::Job *job = KIO::unmount( medium->mountPoint(), false ); - connect(job, SIGNAL( result (KIO::Job *)), - SLOT( slotResult( KIO::Job *))); -@@ -1134,7 +1190,7 @@ +@@ -1255,7 +1312,7 @@ const char *options[2]; const char *udi = medium->id().latin1(); @@ -346,7 +345,7 @@ dbus_error_init(&error); DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -@@ -1147,7 +1203,7 @@ +@@ -1268,7 +1325,7 @@ if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, "org.freedesktop.Hal.Device.Volume", "Unmount"))) { @@ -355,7 +354,7 @@ return i18n("Internal Error"); } -@@ -1157,7 +1213,7 @@ +@@ -1278,7 +1335,7 @@ if (!dbus_message_append_args (dmesg, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, 0, DBUS_TYPE_INVALID)) { @@ -364,16 +363,16 @@ dbus_message_unref (dmesg); return i18n("Internal Error"); } -@@ -1165,7 +1221,7 @@ - dbus_error_init (&error); - if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) +@@ -1288,7 +1345,7 @@ { + QString qerror, reason; + - kdDebug() << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl; + kdDebug(1219) << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl; - QString qerror = error.message; - if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.Busy")) { - qerror = QString("<qt>") + i18n("Device is Busy:"); -@@ -1201,13 +1257,10 @@ + qerror = "<qt>"; + qerror += i18n("Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and " + "currently mounted at <b>%4</b> could not be unmounted. ").arg( +@@ -1318,13 +1375,10 @@ return qerror; } diff --git a/x11/kdebase4-workspace/files/extrapatch-kioslave_media_mediamanager-halbackend.h b/x11/kdebase4-workspace/files/extrapatch-kioslave_media_mediamanager-halbackend.h index df548eb39905..21672b565977 100644 --- a/x11/kdebase4-workspace/files/extrapatch-kioslave_media_mediamanager-halbackend.h +++ b/x11/kdebase4-workspace/files/extrapatch-kioslave_media_mediamanager-halbackend.h @@ -1,5 +1,5 @@ ---- kioslave/media/mediamanager/halbackend.h.orig Sun Jan 28 23:58:13 2007 -+++ kioslave/media/mediamanager/halbackend.h Thu Feb 1 02:51:48 2007 +--- kioslave/media/mediamanager/halbackend.h.orig Mon Jan 15 12:31:32 2007 ++++ kioslave/media/mediamanager/halbackend.h Wed Feb 21 15:01:12 2007 @@ -34,6 +34,9 @@ #include <qobject.h> #include <qstringlist.h> @@ -10,7 +10,7 @@ #include <config.h> -@@ -154,6 +157,9 @@ +@@ -156,6 +159,9 @@ private slots: void slotResult(KIO::Job *job); @@ -20,10 +20,10 @@ /* Hal call-backs -- from gvm*/ public: -@@ -217,6 +223,10 @@ - DBusConnection *dbus_connection; +@@ -233,6 +239,10 @@ + }; - QMap<KIO::Job *, QString> mount_jobs; + QMap<KIO::Job *, struct mount_job_data*> mount_jobs; +#ifdef Q_OS_FREEBSD + QTimer m_pollTimer; + QPtrList<Medium> m_pollMediaList; diff --git a/x11/kdebase4-workspace/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp b/x11/kdebase4-workspace/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp index 508019a14f3c..7d0fbfa81767 100644 --- a/x11/kdebase4-workspace/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp +++ b/x11/kdebase4-workspace/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp @@ -1,6 +1,6 @@ ---- kioslave/media/mounthelper/kio_media_mounthelper.cpp.orig Sat Jan 27 01:58:24 2007 -+++ kioslave/media/mounthelper/kio_media_mounthelper.cpp Sat Jan 27 02:35:28 2007 -@@ -77,7 +77,9 @@ +--- kioslave/media/mounthelper/kio_media_mounthelper.cpp.orig Mon Jan 15 12:31:31 2007 ++++ kioslave/media/mounthelper/kio_media_mounthelper.cpp Wed Feb 21 15:17:23 2007 +@@ -89,7 +89,9 @@ m_isCdrom = medium.mimeType().find("dvd")!=-1 || medium.mimeType().find("cd")!=-1; @@ -11,7 +11,7 @@ { DCOPRef mediamanager("kded", "mediamanager"); DCOPReply reply = mediamanager.call( "unmount", medium.id()); -@@ -85,13 +87,14 @@ +@@ -97,30 +99,14 @@ reply.get(m_errorStr); kdDebug() << "medium unmount " << m_errorStr << endl; if (m_errorStr.isNull()) @@ -26,6 +26,23 @@ - } - else if (args->isSet("s") || args->isSet("e")) - { +- /* +- * We want to call mediamanager unmount before invoking eject. That's +- * because unmount would provide an informative error message in case of +- * failure. However, there are cases when unmount would fail +- * (supermount, slackware, see bug#116209) but eject would succeed. +- * Thus if unmount fails, save unmount error message and invokeEject() +- * anyway. Only if both unmount and eject fail, notify the user by +- * displaying the saved error message (see ejectFinished()). +- */ +- if (medium.isMounted()) +- { +- DCOPRef mediamanager("kded", "mediamanager"); +- DCOPReply reply = mediamanager.call( "unmount", medium.id()); +- if (reply.isValid()) +- reply.get(m_errorStr); +- m_device = device; +- } - invokeEject(device, true); } else diff --git a/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c deleted file mode 100644 index e0179de4e074..000000000000 --- a/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c +++ /dev/null @@ -1,11 +0,0 @@ ---- kdm/kfrontend/genkdmconf.c.orig Mon Jun 5 14:34:06 2006 -+++ kdm/kfrontend/genkdmconf.c Mon Jun 5 14:35:52 2006 -@@ -1684,7 +1684,7 @@ - linkfile( ce ); - else { - tmpf = locate( "mktemp" ) ? -- "`mktemp`" : -+ "`mktemp /tmp/xsess-env-XXXXXX`" : - locate( "tempfile" ) ? - "`tempfile`" : - "$HOME/.xsession-env-$DISPLAY"; diff --git a/x11/kdebase4-workspace/files/patch-kwin-client.cpp b/x11/kdebase4-workspace/files/patch-kwin-client.cpp deleted file mode 100644 index d8e0f91db691..000000000000 --- a/x11/kdebase4-workspace/files/patch-kwin-client.cpp +++ /dev/null @@ -1,39 +0,0 @@ ---- kwin/client.cpp.orig Mon Oct 2 03:02:07 2006 -+++ kwin/client.cpp Mon Jan 8 10:54:19 2007 -@@ -477,17 +477,30 @@ - // calls it or when the decoration is created/destroyed - - if( Shape::version() >= 0x11 ) // 1.1, has input shape support -- { // there appears to be no way to find out if a window has input -- // shape set or not, so always set propagate the input shape -- // (it's the same like the bounding shape by default) -- XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, 0, 0, -+ { // There appears to be no way to find out if a window has input -+ // shape set or not, so always propagate the input shape -+ // (it's the same like the bounding shape by default). -+ // Also, build the shape using a helper window, not directly -+ // in the frame window, because the sequence set-shape-to-frame, -+ // remove-shape-of-client, add-input-shape-of-client has the problem -+ // that after the second step there's a hole in the input shape -+ // until the real shape of the client is added and that can make -+ // the window lose focus (which is a problem with mouse focus policies) -+ static Window helper_window = None; -+ if( helper_window == None ) -+ helper_window = XCreateSimpleWindow( qt_xdisplay(), qt_xrootwin(), -+ 0, 0, 1, 1, 0, 0, 0 ); -+ XResizeWindow( qt_xdisplay(), helper_window, width(), height()); -+ XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput, 0, 0, - frameId(), ShapeBounding, ShapeSet ); -- XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, -+ XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput, - clientPos().x(), clientPos().y(), - window(), ShapeBounding, ShapeSubtract ); -- XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, -+ XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput, - clientPos().x(), clientPos().y(), - window(), ShapeInput, ShapeUnion ); -+ XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, 0, 0, -+ helper_window, ShapeInput, ShapeSet ); - } - } - diff --git a/x11/kdebase4-workspace/pkg-plist b/x11/kdebase4-workspace/pkg-plist index 46ca7f96cbe8..bd60a8fa6ce8 100644 --- a/x11/kdebase4-workspace/pkg-plist +++ b/x11/kdebase4-workspace/pkg-plist @@ -440,6 +440,9 @@ lib/kde3/kicker.so lib/kde3/kickermenu_find.a lib/kde3/kickermenu_find.la lib/kde3/kickermenu_find.so +lib/kde3/kickermenu_kate.a +lib/kde3/kickermenu_kate.la +lib/kde3/kickermenu_kate.so lib/kde3/kickermenu_kdeprint.a lib/kde3/kickermenu_kdeprint.la lib/kde3/kickermenu_kdeprint.so @@ -1158,6 +1161,7 @@ share/apps/kappfinder/apps/Internet/mozilla.desktop share/apps/kappfinder/apps/Internet/netscape.desktop share/apps/kappfinder/apps/Internet/netscape6.desktop share/apps/kappfinder/apps/Internet/opera.desktop +share/apps/kappfinder/apps/Internet/wireshark.desktop share/apps/kappfinder/apps/Internet/xbiff.desktop share/apps/kappfinder/apps/Internet/xchat.desktop share/apps/kappfinder/apps/Internet/xfmail.desktop @@ -1628,6 +1632,7 @@ share/apps/kicker/icons/locolor/16x16/actions/modified.png share/apps/kicker/menuext/find.desktop share/apps/kicker/menuext/find/kfind.desktop share/apps/kicker/menuext/find/websearch.desktop +share/apps/kicker/menuext/katesessionmenu.desktop share/apps/kicker/menuext/konquerormenu.desktop share/apps/kicker/menuext/konsolemenu.desktop share/apps/kicker/menuext/prefmenu.desktop @@ -2081,7 +2086,7 @@ share/desktop-directories/kde-edutainment.directory share/desktop-directories/kde-games-arcade.directory share/desktop-directories/kde-games-board.directory share/desktop-directories/kde-games-card.directory -share/desktop-directories/kde-games-kidsgames.directory +share/desktop-directories/kde-games-kids.directory share/desktop-directories/kde-games-roguelikes.directory share/desktop-directories/kde-games-strategy.directory share/desktop-directories/kde-games.directory @@ -2420,6 +2425,7 @@ share/doc/HTML/en/khelpcenter/userguide/common share/doc/HTML/en/khelpcenter/userguide/control-center.docbook share/doc/HTML/en/khelpcenter/userguide/creating-graphics.docbook share/doc/HTML/en/khelpcenter/userguide/credits-and-license.docbook +share/doc/HTML/en/khelpcenter/userguide/customizing-desktop.docbook share/doc/HTML/en/khelpcenter/userguide/desktop.png share/doc/HTML/en/khelpcenter/userguide/email.docbook share/doc/HTML/en/khelpcenter/userguide/extragear-applications.docbook @@ -2480,6 +2486,7 @@ share/doc/HTML/en/khelpcenter/userguide/ripsettings.png share/doc/HTML/en/khelpcenter/userguide/screen-captures.docbook share/doc/HTML/en/khelpcenter/userguide/services.png share/doc/HTML/en/khelpcenter/userguide/shared-sessions.docbook +share/doc/HTML/en/khelpcenter/userguide/splash-screen.png share/doc/HTML/en/khelpcenter/userguide/standard-menu-entries.docbook share/doc/HTML/en/khelpcenter/userguide/switching-sessions.docbook share/doc/HTML/en/khelpcenter/userguide/the-filemanager.docbook @@ -2492,7 +2499,6 @@ share/doc/HTML/en/khelpcenter/userguide/where-next.docbook share/doc/HTML/en/khelpcenter/userguide/windows-how-to.docbook share/doc/HTML/en/khelpcenter/userguide/your-kde-account.docbook share/doc/HTML/en/khelpcenter/visualdict/common -share/doc/HTML/en/khelpcenter/visualdict/contextmenu.png share/doc/HTML/en/khelpcenter/visualdict/index.cache.bz2 share/doc/HTML/en/khelpcenter/visualdict/index.docbook share/doc/HTML/en/khelpcenter/visualdict/pict1.png @@ -2508,6 +2514,9 @@ share/doc/HTML/en/khelpcenter/visualdict/pict18.png share/doc/HTML/en/khelpcenter/visualdict/pict19.png share/doc/HTML/en/khelpcenter/visualdict/pict2.png share/doc/HTML/en/khelpcenter/visualdict/pict20.png +share/doc/HTML/en/khelpcenter/visualdict/pict21.png +share/doc/HTML/en/khelpcenter/visualdict/pict22.png +share/doc/HTML/en/khelpcenter/visualdict/pict23.png share/doc/HTML/en/khelpcenter/visualdict/pict3.png share/doc/HTML/en/khelpcenter/visualdict/pict4.png share/doc/HTML/en/khelpcenter/visualdict/pict5.png @@ -2649,6 +2658,7 @@ share/doc/HTML/en/knetattach/common share/doc/HTML/en/knetattach/index.cache.bz2 share/doc/HTML/en/knetattach/index.docbook share/doc/HTML/en/knetattach/screenshot.png +share/doc/HTML/en/knetattach/screenshot1.png share/doc/HTML/en/knetattach/screenshot2.png share/doc/HTML/en/knetattach/screenshot3.png share/doc/HTML/en/knetattach/screenshot4.png @@ -2742,7 +2752,6 @@ share/icons/crystalsvg/128x128/apps/licq.png share/icons/crystalsvg/128x128/apps/linuxconf.png share/icons/crystalsvg/128x128/apps/locale.png share/icons/crystalsvg/128x128/apps/looknfeel.png -share/icons/crystalsvg/128x128/apps/mozilla.png share/icons/crystalsvg/128x128/apps/multimedia.png share/icons/crystalsvg/128x128/apps/netscape.png share/icons/crystalsvg/128x128/apps/package.png @@ -2808,7 +2817,6 @@ share/icons/crystalsvg/16x16/apps/enhanced_browsing.png share/icons/crystalsvg/16x16/apps/evolution.png share/icons/crystalsvg/16x16/apps/fifteenpieces.png share/icons/crystalsvg/16x16/apps/filetypes.png -share/icons/crystalsvg/16x16/apps/firefox.png share/icons/crystalsvg/16x16/apps/fonts.png share/icons/crystalsvg/16x16/apps/gabber.png share/icons/crystalsvg/16x16/apps/gaim.png @@ -2862,9 +2870,6 @@ share/icons/crystalsvg/16x16/apps/looknfeel.png share/icons/crystalsvg/16x16/apps/lyx.png share/icons/crystalsvg/16x16/apps/mac.png share/icons/crystalsvg/16x16/apps/mathematica.png -share/icons/crystalsvg/16x16/apps/mozilla.png -share/icons/crystalsvg/16x16/apps/mozilla_m.png -share/icons/crystalsvg/16x16/apps/mozilla_mail.png share/icons/crystalsvg/16x16/apps/multimedia.png share/icons/crystalsvg/16x16/apps/nedit.png share/icons/crystalsvg/16x16/apps/netscape.png @@ -2911,7 +2916,6 @@ share/icons/crystalsvg/16x16/apps/stylesheet.png share/icons/crystalsvg/16x16/apps/systemtray.png share/icons/crystalsvg/16x16/apps/taskbar.png share/icons/crystalsvg/16x16/apps/terminal.png -share/icons/crystalsvg/16x16/apps/thunderbird.png share/icons/crystalsvg/16x16/apps/tux.png share/icons/crystalsvg/16x16/apps/usb.png share/icons/crystalsvg/16x16/apps/vnc.png @@ -3016,7 +3020,6 @@ share/icons/crystalsvg/32x32/apps/error.png share/icons/crystalsvg/32x32/apps/evolution.png share/icons/crystalsvg/32x32/apps/fifteenpieces.png share/icons/crystalsvg/32x32/apps/filetypes.png -share/icons/crystalsvg/32x32/apps/firefox.png share/icons/crystalsvg/32x32/apps/fonts.png share/icons/crystalsvg/32x32/apps/gabber.png share/icons/crystalsvg/32x32/apps/gaim.png @@ -3071,9 +3074,6 @@ share/icons/crystalsvg/32x32/apps/looknfeel.png share/icons/crystalsvg/32x32/apps/lyx.png share/icons/crystalsvg/32x32/apps/mac.png share/icons/crystalsvg/32x32/apps/mathematica.png -share/icons/crystalsvg/32x32/apps/mozilla.png -share/icons/crystalsvg/32x32/apps/mozilla_m.png -share/icons/crystalsvg/32x32/apps/mozilla_mail.png share/icons/crystalsvg/32x32/apps/multimedia.png share/icons/crystalsvg/32x32/apps/nedit.png share/icons/crystalsvg/32x32/apps/netscape.png @@ -3118,7 +3118,6 @@ share/icons/crystalsvg/32x32/apps/stylesheet.png share/icons/crystalsvg/32x32/apps/systemtray.png share/icons/crystalsvg/32x32/apps/taskbar.png share/icons/crystalsvg/32x32/apps/terminal.png -share/icons/crystalsvg/32x32/apps/thunderbird.png share/icons/crystalsvg/32x32/apps/tux.png share/icons/crystalsvg/32x32/apps/usb.png share/icons/crystalsvg/32x32/apps/vnc.png @@ -3177,7 +3176,6 @@ share/icons/crystalsvg/48x48/apps/enhanced_browsing.png share/icons/crystalsvg/48x48/apps/evolution.png share/icons/crystalsvg/48x48/apps/fifteenpieces.png share/icons/crystalsvg/48x48/apps/filetypes.png -share/icons/crystalsvg/48x48/apps/firefox.png share/icons/crystalsvg/48x48/apps/fonts.png share/icons/crystalsvg/48x48/apps/gabber.png share/icons/crystalsvg/48x48/apps/gaim.png @@ -3226,9 +3224,6 @@ share/icons/crystalsvg/48x48/apps/licq.png share/icons/crystalsvg/48x48/apps/linuxconf.png share/icons/crystalsvg/48x48/apps/locale.png share/icons/crystalsvg/48x48/apps/looknfeel.png -share/icons/crystalsvg/48x48/apps/mozilla.png -share/icons/crystalsvg/48x48/apps/mozilla_m.png -share/icons/crystalsvg/48x48/apps/mozilla_mail.png share/icons/crystalsvg/48x48/apps/multimedia.png share/icons/crystalsvg/48x48/apps/nedit.png share/icons/crystalsvg/48x48/apps/netscape.png @@ -3330,7 +3325,6 @@ share/icons/crystalsvg/64x64/apps/licq.png share/icons/crystalsvg/64x64/apps/linuxconf.png share/icons/crystalsvg/64x64/apps/locale.png share/icons/crystalsvg/64x64/apps/looknfeel.png -share/icons/crystalsvg/64x64/apps/mozilla.png share/icons/crystalsvg/64x64/apps/multimedia.png share/icons/crystalsvg/64x64/apps/nedit.png share/icons/crystalsvg/64x64/apps/netscape.png diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index 53cec9a18b5f..b4baad2d68d0 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 4 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -42,7 +41,7 @@ PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp @@ -52,7 +51,7 @@ CONFIGURE_ARGS+=--without-java \ --with-ssl-dir=${OPENSSLBASE} OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ - HAL "Use HAL backend for media:/ (FreeBSD 5+ only)" off \ + HAL "Use HAL backend for media:/ (FreeBSD 5+ only)" on \ HTDIG "Depend on htdig, used to build manual indices" off .include "${.CURDIR}/../../x11/kde3/Makefile.kde" @@ -70,7 +69,7 @@ RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper RUN_DEPENDS+= htdig:${PORTSDIR}/textproc/htdig .endif -.if defined(WITH_HAL) && ${OSVERSION} > 500035 +.if !defined(WITHOUT_HAL) && ${OSVERSION} > 500035 EXTRA_PATCHES= ${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.cpp \ ${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.h \ ${FILESDIR}/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp @@ -79,12 +78,9 @@ LIB_DEPENDS+= dbus-qt-1.1:${PORTSDIR}/devel/dbus-qt3 \ PLIST_SUB+= MEDIA="" .else CONFIGURE_ARGS+=--without-hal -EXTRA_PATCHES= ${FILESDIR}/extrapatch-kio_media \ - ${FILESDIR}/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp PLIST_SUB+= MEDIA="@comment " .endif - post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo index 6f53a73368ff..9051c799c5c2 100644 --- a/x11/kdebase4/distinfo +++ b/x11/kdebase4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.5.tar.bz2) = 0c685af1cbca75f9c77b3ed231ba0468 -SHA256 (KDE/kdebase-3.5.5.tar.bz2) = f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0 -SIZE (KDE/kdebase-3.5.5.tar.bz2) = 23851886 +MD5 (KDE/kdebase-3.5.6.tar.bz2) = a53f589f58012e655a52220a6a151019 +SHA256 (KDE/kdebase-3.5.6.tar.bz2) = 245b35f8b2e1533f9ae92b3b07bee5339a716dfb8db363d0126d2e7409b7bd7e +SIZE (KDE/kdebase-3.5.6.tar.bz2) = 24155599 diff --git a/x11/kdebase4/files/extrapatch-kio_media b/x11/kdebase4/files/extrapatch-kio_media deleted file mode 100644 index ab1a03b094cb..000000000000 --- a/x11/kdebase4/files/extrapatch-kio_media +++ /dev/null @@ -1,5814 +0,0 @@ -diff -urN kioslave/media/Makefile.in kioslave/media/Makefile.in ---- kioslave/media/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/Makefile.in Fri May 26 09:54:31 2006 -@@ -122,8 +122,7 @@ - DATA = $(kde_services_DATA) - ETAGS = etags - CTAGS = ctags --DIST_SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ -- kfile-plugin kcmodule mimetypes services propsdlgplugin -+DIST_SUBDIRS = $(SUBDIRS) - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 1 - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -276,6 +275,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -@@ -611,9 +611,8 @@ - xdg_appsdir = @xdg_appsdir@ - xdg_directorydir = @xdg_directorydir@ - xdg_menudir = @xdg_menudir@ --@include_media_halbackend_TRUE@PROPSDLGPLUGINDIR = propsdlgplugin - SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ -- kfile-plugin kcmodule mimetypes services $(PROPSDLGPLUGINDIR) -+ kfile-plugin kcmodule mimetypes services - - INCLUDES = -I$(srcdir)/libmediacommon $(all_includes) - #>- METASOURCES = AUTO -@@ -1092,8 +1091,7 @@ - ./testmedia - - messages: rc.cpp -- $(EXTRACTRC) propsdlgplugin/propertiespagegui.ui >> rc.cpp -- $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp propsdlgplugin/*.cpp -o $(podir)/kio_media.pot -+ $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp -o $(podir)/kio_media.pot - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -diff -urN kioslave/media/kcmodule/Makefile.in kioslave/media/kcmodule/Makefile.in ---- kioslave/media/kcmodule/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/kcmodule/Makefile.in Fri May 26 09:54:31 2006 -@@ -253,6 +253,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/kcmodule/managermodule.cpp kioslave/media/kcmodule/managermodule.cpp ---- kioslave/media/kcmodule/managermodule.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/managermodule.cpp Sun Nov 20 20:14:21 2005 -@@ -39,15 +39,15 @@ - QString hal_text = view->kcfg_HalBackendEnabled->text(); - hal_text += " ("+i18n("No support for HAL on this system")+")"; - view->kcfg_HalBackendEnabled->setText( hal_text ); --#endif - view->kcfg_HalBackendEnabled->setEnabled( false ); -+#endif - - #ifndef COMPILE_LINUXCDPOLLING - QString poll_text = view->kcfg_CdPollingEnabled->text(); - poll_text += " ("+i18n("No support for CD polling on this system")+")"; - view->kcfg_CdPollingEnabled->setText( poll_text ); --#endif - view->kcfg_CdPollingEnabled->setEnabled( false ); -+#endif - - load(); - } -diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.desktop ---- kioslave/media/kcmodule/media.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/kcmodule/media.desktop Mon May 22 20:12:42 2006 -@@ -24,7 +24,6 @@ - Name[es]=Dispositivos de almacenamiento - Name[et]=Andmekandjad - Name[eu]=Biltegiratze-euskarria --Name[fa]=رسانه ذخیرهگاه - Name[fi]=Tallennusmedia - Name[fr]=Support de stockage - Name[fy]=Opslachapparaten -@@ -33,7 +32,7 @@ - Name[he]=התקנים - Name[hi]=भंडार मीडिया - Name[hr]=Mediji za pohranjivanje --Name[hu]=Tárolóeszközök -+Name[hu]=Tárolóeszköz - Name[is]=Geymslumiðlar - Name[it]=Dispositivi di archiviazione - Name[ja]=記憶メディア -@@ -43,7 +42,7 @@ - Name[mk]=Медиуми за податоци - Name[ms]=Media Storan - Name[nb]=Lagringsenheter --Name[nds]=Spiekermedien -+Name[nds]=Spiekerreedschappen - Name[nl]=Opslagapparaten - Name[nn]=Lagringsmedium - Name[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ -@@ -54,7 +53,6 @@ - Name[ru]=Устройства хранения данных - Name[rw]=Uburyo bwo Kubika - Name[se]=Vurkenmedia --Name[sk]=Zálohovacie médiá - Name[sl]=Nosilci za shranjevanje - Name[sr]=Складишни медијуми - Name[sr@Latn]=Skladišni medijumi -@@ -82,13 +80,11 @@ - Comment[es]=Configuración de las medios de almacenamiento - Comment[et]=Salvestusandmekandjate seadistused - Comment[eu]=Konfiguratu biltegiratze-euskarria --Comment[fa]=پیکربندی رسانه ذخیرهگاه - Comment[fi]=Aseta tallennusmedia - Comment[fr]=Configurer le média de stockage - Comment[fy]=Opslachmedia ynstelle - Comment[ga]=Cumraigh Meáin Stórála - Comment[gl]=Configurar Medios de Armacenaxe --Comment[he]=שינוי הגדרות מדיות אחסון - Comment[hr]=Konfiguriranje medija za pohranu - Comment[hu]=A tárolóeszközök beállítása - Comment[is]=Stillingar geymslumiðla -@@ -98,16 +94,15 @@ - Comment[lt]=Konfigūruoti saugojimo įrenginius - Comment[mk]=Конфигурирајте ги медиумите за податоци - Comment[nb]=Sett opp lagringsmedier --Comment[nds]=Spiekermedien instellen -+Comment[nds]=Spiekerreedschappen instellen - Comment[nl]=Opslagmedia instellen - Comment[nn]=Set opp lagringsmedium - Comment[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ ਸੰਰਚਨਾ - Comment[pl]=Konfiguracja nośników danych --Comment[pt]=Configurar os Suportes de Armazenamento -+Comment[pt]=Configurar os Meios de Armazenamento - Comment[pt_BR]=Configura as mídias de armazenamento - Comment[ru]=Настройка подключаемых устройств хранения - Comment[se]=Heivet vurkenmediaid --Comment[sk]=Nastavenie zálohovacích médií - Comment[sl]=Nastavitve nosilcev za shranjevanje - Comment[sr]=Подешавање медијума за складиштење - Comment[sr@Latn]=Podešavanje medijuma za skladištenje -@@ -132,13 +127,11 @@ - Keywords[es]=almacenamiento,medios,usb,cdrom,dispositivo - Keywords[et]=salvestamine,andmekandja,usb,cd,seade - Keywords[eu]=biltegiratzea,euskarriak,usb,cdrom,gailua --Keywords[fa]=ذخیره گاه، رسانه، گذرگاه سریال جهانی، دیسک فشرده، دستگاه - Keywords[fi]=varasto,media,usb,cdrom,laite - Keywords[fr]=stockage,media,medium,usb,cdrom,périphérique - Keywords[fy]=storage,opslach,media,usb,cd-rom,kompakt-skiif,device,apparaat,mp3-speler,usb-stick,geheugenkaart - Keywords[ga]=stóráil,stóras,meáin,meán,usb,cdrom,dlúthdhiosca,gléas - Keywords[gl]=armacenaxe,medios,usb,cdrom,dispositivo --Keywords[he]=storage,media,usb,cdrom,device,מדיה,התקן,סידירום,תקליטור - Keywords[hr]=storage,media,usb,cdrom,device,pohrana,snimanje,mediji,uređaj - Keywords[hu]=tároló,adathordozó,USB,CD-ROM,eszköz - Keywords[is]=geymsla,miðill,usb,cdrom,tæki -@@ -153,7 +146,7 @@ - Keywords[nn]=lagring,media,usb,CD-spiller,CD-ROM,einingar,minnepinnar,harddiskar,HD,eksterne harddiskar,zip-diskar - Keywords[pa]=ਸਟੋਰੇਜ਼,ਮੀਡਿਆ,ਜੰਤਰ,usb,cdrom - Keywords[pl]=dane,przechowywanie danych,nośnik danych,nośniki danych,usb,cdrom,urządzenie --Keywords[pt]=armazenamento,meio,suporte,usb,cdrom,dispositivo -+Keywords[pt]=armazenamento,meio,usb,cdrom,dispositivo - Keywords[pt_BR]=armazenamento,mídia,usb,cd-rom,device,dispositivo - Keywords[ru]=storage,media,usb,cdrom,device,устройство хранения - Keywords[sl]=shranjevanje,nosilec,usb,cdrom,naprava -diff -urN kioslave/media/kcmodule/notifiermodule.cpp kioslave/media/kcmodule/notifiermodule.cpp ---- kioslave/media/kcmodule/notifiermodule.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/notifiermodule.cpp Mon May 22 20:12:42 2006 -@@ -174,8 +174,8 @@ - ActionListBoxItem *action_item - = static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem()); - -- NotifierServiceAction * action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); -- if ( action ) -+ NotifierServiceAction * action; -+ if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() ) ) ) - { - ServiceConfigDialog dialog(action, m_settings.supportedMimetypes(), this); - -@@ -195,8 +195,7 @@ - = static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem()); - - NotifierServiceAction *action; -- action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); -- if ( action ) -+ if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() )) ) - { - m_settings.deleteAction( action ); - updateListBox(); -diff -urN kioslave/media/kfile-plugin/Makefile.in kioslave/media/kfile-plugin/Makefile.in ---- kioslave/media/kfile-plugin/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/kfile-plugin/Makefile.in Fri May 26 09:54:31 2006 -@@ -248,6 +248,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/kfile-plugin/kfile_media.desktop kioslave/media/kfile-plugin/kfile_media.desktop ---- kioslave/media/kfile-plugin/kfile_media.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/kfile-plugin/kfile_media.desktop Mon May 22 20:12:42 2006 -@@ -16,7 +16,6 @@ - Name[es]=Información de recursos - Name[et]=Andmekandja info - Name[eu]=Media informazioa --Name[fa]=اطلاعات رسانه - Name[fi]=Tallenteiden tiedot - Name[fr]=Informations sur le média - Name[fy]=Mediumynformaasje -@@ -47,7 +46,6 @@ - Name[ru]=Сведения о носителе - Name[rw]=Amakuru y'igitangazamakuru - Name[se]=Mediumdieđut --Name[sk]=Informácie o médiu - Name[sl]=Informacije o mediju - Name[sr]=Информације о медијуму - Name[sr@Latn]=Informacije o medijumu -@@ -63,4 +61,4 @@ - Name[zh_TW]=媒體資訊 - ServiceTypes=KFilePlugin - X-KDE-Library=kfile_media --MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera;media/camera_mounted;media/camera_unmounted -+MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera -diff -urN kioslave/media/kfile-plugin/kfilemediaplugin.cpp kioslave/media/kfile-plugin/kfilemediaplugin.cpp ---- kioslave/media/kfile-plugin/kfilemediaplugin.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/kfile-plugin/kfilemediaplugin.cpp Tue Nov 8 23:36:07 2005 -@@ -64,16 +64,12 @@ - addMimeType( "media/floppy_unmounted" ); - addMimeType( "media/zip_unmounted" ); - addMimeType( "media/gphoto2camera" ); -- addMimeType( "media/camera_mounted" ); -- addMimeType( "media/camera_unmounted" ); - } - - bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/) - { -- const Medium medium = askMedium(info); -+ const Medium medium = askMedium(info); - -- kdDebug() << "KFileMediaPlugin::readInfo " << medium.id() << endl; -- - if (medium.id().isNull()) return false; - - QString mount_point = medium.mountPoint(); -@@ -165,8 +161,7 @@ - const Medium KFileMediaPlugin::askMedium(KFileMetaInfo &info) - { - DCOPRef mediamanager("kded", "mediamanager"); -- kdDebug() << "properties " << info.url() << endl; -- DCOPReply reply = mediamanager.call( "properties", info.url().url() ); -+ DCOPReply reply = mediamanager.call( "properties", info.url().fileName() ); - - if ( !reply.isValid() ) - { -diff -urN kioslave/media/libmediacommon/Makefile.in kioslave/media/libmediacommon/Makefile.in ---- kioslave/media/libmediacommon/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/libmediacommon/Makefile.in Fri May 26 09:54:31 2006 -@@ -250,6 +250,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/libmediacommon/medium.cpp kioslave/media/libmediacommon/medium.cpp ---- kioslave/media/libmediacommon/medium.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/libmediacommon/medium.cpp Mon Oct 10 17:04:00 2005 -@@ -40,8 +40,6 @@ - m_properties+= QString::null; /* ICON_NAME */ - - loadUserLabel(); -- -- m_halmounted = false; - } - - Medium::Medium() -@@ -59,8 +57,6 @@ - m_properties+= QString::null; /* BASE_URL */ - m_properties+= QString::null; /* MIME_TYPE */ - m_properties+= QString::null; /* ICON_NAME */ -- -- m_halmounted = false; - } - - const Medium Medium::create(const QStringList &properties) -@@ -163,7 +159,7 @@ - bool Medium::mountableState(bool mounted) - { - if ( m_properties[DEVICE_NODE].isEmpty() -- || ( mounted && m_properties[MOUNT_POINT].isEmpty() ) ) -+ || m_properties[MOUNT_POINT].isEmpty() ) - { - return false; - } -@@ -208,10 +204,14 @@ - - KURL Medium::prettyBaseURL() const - { -- if ( !baseURL().isEmpty() ) -- return baseURL(); -- -+ if ( isMountable() ) -+ { - return KURL( mountPoint() ); -+ } -+ else -+ { -+ return KURL( baseURL() ); -+ } - } - - QString Medium::prettyLabel() const -diff -urN kioslave/media/libmediacommon/medium.h kioslave/media/libmediacommon/medium.h ---- kioslave/media/libmediacommon/medium.h Sat Jul 22 10:15:42 2006 -+++ kioslave/media/libmediacommon/medium.h Mon Oct 10 17:04:00 2005 -@@ -22,7 +22,6 @@ - #include <qstring.h> - #include <qstringlist.h> - #include <kurl.h> --#include <qmap.h> - - class Medium - { -@@ -79,32 +78,14 @@ - - void setMimeType(const QString &mimeType); - void setIconName(const QString &iconName); -- void setHalMounted(bool flag) const { m_halmounted = flag; } -- bool halMounted() const { return m_halmounted; } - - private: - Medium(); - void loadUserLabel(); - - QStringList m_properties; -- mutable bool m_halmounted; -- -+ - friend class QValueListNode<const Medium>; - }; -- --namespace MediaManagerUtils { -- static inline QMap<QString,QString> splitOptions(const QStringList & options) -- { -- QMap<QString,QString> valids; -- -- for (QStringList::ConstIterator it = options.begin(); it != options.end(); ++it) -- { -- QString key = (*it).left((*it).find('=')); -- QString value = (*it).mid((*it).find('=') + 1); -- valids[key] = value; -- } -- return valids; -- } --} - - #endif -diff -urN kioslave/media/mediaimpl.cpp kioslave/media/mediaimpl.cpp ---- kioslave/media/mediaimpl.cpp Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediaimpl.cpp Mon Oct 10 17:04:01 2005 -@@ -226,8 +226,6 @@ - - mp_mounting = &medium; - -- -- /* - KIO::Job* job = KIO::mount(false, 0, - medium.deviceNode(), - medium.mountPoint()); -@@ -236,7 +234,6 @@ - this, SLOT( slotMountResult( KIO::Job * ) ) ); - connect( job, SIGNAL( warning( KIO::Job *, const QString & ) ), - this, SLOT( slotWarning( KIO::Job *, const QString & ) ) ); -- */ - kapp->dcopClient() - ->connectDCOPSignal("kded", "mediamanager", - "mediumChanged(QString, bool)", -@@ -244,17 +241,7 @@ - "slotMediumChanged(QString)", - false); - -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "mount", medium.id()); -- if (reply.isValid()) -- reply.get(m_lastErrorMessage); -- else -- m_lastErrorMessage = i18n("Internal Error"); -- if (!m_lastErrorMessage.isEmpty()) -- m_lastErrorCode = KIO::ERR_SLAVE_DEFINED; -- else { -- qApp->eventLoop()->enterLoop(); -- } -+ qApp->eventLoop()->enterLoop(); - - mp_mounting = 0L; - -diff -urN kioslave/media/mediamanager/Makefile.in kioslave/media/mediamanager/Makefile.in ---- kioslave/media/mediamanager/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/mediamanager/Makefile.in Fri May 26 09:54:31 2006 -@@ -284,6 +284,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/mediamanager/fstabbackend.cpp kioslave/media/mediamanager/fstabbackend.cpp ---- kioslave/media/mediamanager/fstabbackend.cpp Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/fstabbackend.cpp Mon May 22 20:12:42 2006 -@@ -37,9 +37,6 @@ - #endif - - #include <klocale.h> --#include <kio/job.h> --#include <kio/netaccess.h> --#include <kdebug.h> - #include <kdirwatch.h> - #include <kurl.h> - #include <kmountpoint.h> -@@ -97,26 +94,6 @@ - KDirWatch::self()->removeFile(MTAB); - } - --QString FstabBackend::mount( const QString &_udi ) --{ -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- return i18n("No such medium: %1").arg(_udi); -- KIO::Job* job = KIO::mount( false, 0, medium->deviceNode(), medium->mountPoint()); -- KIO::NetAccess::synchronousRun( job, 0 ); -- return QString::null; --} -- --QString FstabBackend::unmount( const QString &_udi ) --{ -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- return i18n("No such medium: %1").arg(_udi); -- KIO::Job* job = KIO::unmount( medium->mountPoint(), false); -- KIO::NetAccess::synchronousRun( job, 0 ); -- return QString::null; --} -- - void FstabBackend::slotDirty(const QString &path) - { - if (path==MTAB) -@@ -134,7 +111,6 @@ - if ( mount->mountType() == "swap" - || mount->mountType() == "tmpfs" - || mount->mountType() == "sysfs" -- || mount->mountType() == "fdescfs" - || mount->mountType() == "kernfs" - || mount->mountType() == "usbfs" - || mount->mountType().contains( "proc" ) -@@ -147,7 +123,6 @@ - || mount->mountPoint() == "/dev/swap" - || mount->mountPoint() == "/dev/pts" - || mount->mountPoint().find("/proc") == 0 -- || mount->mountPoint().find("/sys") == 0 - - // We might want to display only network shares - // since HAL doesn't handle them -@@ -169,7 +144,7 @@ - - void FstabBackend::handleMtabChange(bool allowNotification) - { -- QStringList new_mtabIds; -+ QStringList new_mtabIds, new_mtabEntries; - KMountPoint::List mtab = KMountPoint::currentMountPoints(); - - KMountPoint::List::iterator it = mtab.begin(); -@@ -187,19 +162,18 @@ - nothing has changed, do not stat the mount point. Avoids - hang if network shares are stalling */ - QString mtabEntry = dev + "*" + mp + "*" + fs; -- if(m_mtabEntries.contains(mtabEntry)) { -- new_mtabIds += m_mtabEntries[mtabEntry]; -- continue; -- } -+ bool isOldEntry = m_mtabEntries.contains(mtabEntry); -+ new_mtabEntries+=mtabEntry; -+ if (isOldEntry) continue; - - QString id = generateId(dev, mp); - new_mtabIds+=id; -- m_mtabEntries[mtabEntry] = id; - - if ( !m_mtabIds.contains(id) && m_fstabIds.contains(id) ) - { - QString mime, icon, label; - guess(dev, mp, fs, true, mime, icon, label); -+ - m_mediaList.changeMediumState(id, true, false, - mime, icon, label); - } -@@ -237,10 +211,6 @@ - QString mp = medium->mountPoint(); - QString fs = medium->fsType(); - -- -- QString mtabEntry = dev + "*" + mp + "*" + fs; -- m_mtabEntries.remove(mtabEntry); -- - QString mime, icon, label; - guess(dev, mp, fs, false, mime, icon, label); - -@@ -256,6 +226,7 @@ - } - - m_mtabIds = new_mtabIds; -+ m_mtabEntries = new_mtabEntries; - } - - void FstabBackend::handleFstabChange(bool allowNotification) -diff -urN kioslave/media/mediamanager/fstabbackend.h kioslave/media/mediamanager/fstabbackend.h ---- kioslave/media/mediamanager/fstabbackend.h Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/fstabbackend.h Mon May 22 20:12:42 2006 -@@ -23,7 +23,6 @@ - - #include <qobject.h> - #include <qstringlist.h> --#include <qmap.h> - - #ifdef Q_OS_FREEBSD - #include <qtimer.h> -@@ -41,10 +40,6 @@ - const QString &fsType, bool mounted, - QString &mimeType, QString &iconName, - QString &label); -- -- QString mount(const QString &id); -- QString unmount(const QString &id); -- - private slots: - void slotDirty(const QString &path); - void handleFstabChange(bool allowNotification = true); -@@ -58,7 +53,7 @@ - - bool m_networkSharesOnly; - QStringList m_mtabIds; -- QMap<QString, QString> m_mtabEntries; -+ QStringList m_mtabEntries; - QStringList m_fstabIds; - #ifdef Q_OS_FREEBSD - QTimer m_mtabTimer; -diff -urN kioslave/media/mediamanager/halbackend.cpp kioslave/media/mediamanager/halbackend.cpp ---- kioslave/media/mediamanager/halbackend.cpp Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/halbackend.cpp Thu Jan 19 18:00:58 2006 -@@ -21,16 +21,9 @@ - - #include <stdlib.h> - --#include <qfile.h> - #include <klocale.h> - #include <kurl.h> - #include <kdebug.h> --#include <kprocess.h> --#include <kconfig.h> --#include <qstylesheet.h> --#include <kmountpoint.h> --#include <kmessagebox.h> --#include <kio/job.h> - - #define MOUNT_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mounted") : QString("_unmounted")) - #define MOUNT_ICON_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mount") : QString("_unmount")) -@@ -39,1177 +32,615 @@ - static HALBackend* s_HALBackend; - - /* A macro function to convert HAL string properties to QString */ --QString libhal_device_get_property_QString(LibHalContext *ctx, const char* udi, const char *key) -+QString hal_device_get_property_QString(LibHalContext *ctx, const char* udi, const char *key) - { -- char* _ppt_string; -- QString _ppt_QString; -- _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL); -- _ppt_QString = QString(_ppt_string ? _ppt_string : ""); -- libhal_free_string(_ppt_string); -- return _ppt_QString; -+ char* _ppt_string; -+ QString _ppt_QString; -+ _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL); -+ _ppt_QString = QString(_ppt_string ? _ppt_string : ""); -+ libhal_free_string(_ppt_string); -+ return _ppt_QString; - } - - /* Constructor */ - HALBackend::HALBackend(MediaList &list, QObject* parent) -- : QObject() -- , BackendBase(list) -- , m_halContext(NULL) -- , m_halStoragePolicy(NULL) -- , m_parent(parent) -+ : QObject() -+ , BackendBase(list) -+ , m_halContext(NULL) -+ , m_halStoragePolicy(NULL) -+ , m_parent(parent) - { -- s_HALBackend = this; -+ s_HALBackend = this; - } - - /* Destructor */ - HALBackend::~HALBackend() - { -- /* Close HAL connection */ -- if (m_halContext) -- { -- const QPtrList<Medium> medlist = m_mediaList.list(); -- QPtrListIterator<Medium> it (medlist); -- for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) -- unmount(current_medium->id()); -- -- -- /* Remove all the registered media first */ -- int numDevices; -- char** halDeviceList = libhal_get_all_devices( m_halContext, &numDevices, NULL ); -- -- if ( halDeviceList ) -- { -- for ( int i = 0; i < numDevices; i++ ) -- { -- m_mediaList.removeMedium( halDeviceList[i], false ); -- } -- } -- -- libhal_free_string_array( halDeviceList ); -- -- DBusError error; -- dbus_error_init(&error); -- libhal_ctx_shutdown(m_halContext, &error); -- libhal_ctx_free(m_halContext); -- } -- -- if (m_halStoragePolicy) -- libhal_storage_policy_free(m_halStoragePolicy); -+ /* Close HAL connection */ -+ if (m_halContext) -+ { -+ /* Remove all the registered media first */ -+ int numDevices; -+ char** halDeviceList = libhal_get_all_devices( m_halContext, &numDevices, NULL ); -+ -+ if ( halDeviceList ) -+ { -+ for ( int i = 0; i < numDevices; i++ ) -+ { -+ m_mediaList.removeMedium( halDeviceList[i], false ); -+ } -+ } -+ -+ #ifdef HAL_0_4 -+ hal_shutdown(m_halContext); -+ #else -+ libhal_ctx_shutdown(m_halContext, NULL); -+ libhal_ctx_free(m_halContext); -+ #endif -+ } -+ -+ if (m_halStoragePolicy) -+ libhal_storage_policy_free(m_halStoragePolicy); - } - - /* Connect to the HAL */ - bool HALBackend::InitHal() - { -- kdDebug(1219) << "Context new" << endl; -- m_halContext = libhal_ctx_new(); -- if (!m_halContext) -- { -- kdDebug(1219) << "Failed to initialize HAL!" << endl; -- return false; -- } -- -- // Main loop integration -- kdDebug(1219) << "Main loop integration" << endl; -- DBusError error; -- dbus_error_init(&error); -- dbus_connection = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error); -- -- if (!dbus_connection || dbus_error_is_set(&error)) { -- dbus_error_free(&error); -- libhal_ctx_free(m_halContext); -- m_halContext = NULL; -- return false; -- } -- -- dbus_bus_register(dbus_connection, &error); -- -- if (dbus_error_is_set(&error)) { -- dbus_error_free(&error); -- libhal_ctx_free(m_halContext); -- m_halContext = NULL; -- return false; -- } -- MainLoopIntegration(dbus_connection); -- libhal_ctx_set_dbus_connection(m_halContext, dbus_connection); -- -- // HAL callback functions -- kdDebug(1219) << "Callback functions" << endl; -- libhal_ctx_set_device_added(m_halContext, HALBackend::hal_device_added); -- libhal_ctx_set_device_removed(m_halContext, HALBackend::hal_device_removed); -- libhal_ctx_set_device_new_capability (m_halContext, NULL); -- libhal_ctx_set_device_lost_capability (m_halContext, NULL); -- libhal_ctx_set_device_property_modified (m_halContext, HALBackend::hal_device_property_modified); -- libhal_ctx_set_device_condition(m_halContext, HALBackend::hal_device_condition); -- -- kdDebug(1219) << "Context Init" << endl; -- if (!libhal_ctx_init(m_halContext, &error)) -- { -- if (dbus_error_is_set(&error)) -- dbus_error_free(&error); -- libhal_ctx_free(m_halContext); -- m_halContext = NULL; -- kdDebug(1219) << "Failed to init HAL context!" << endl; -- return false; -- } -- -- /** @todo customize watch policy */ -- kdDebug(1219) << "Watch properties" << endl; -- if (!libhal_device_property_watch_all(m_halContext, &error)) -- { -- kdDebug(1219) << "Failed to watch HAL properties!" << endl; -- return false; -- } -- -- /* libhal-storage initialization */ -- kdDebug(1219) << "Storage Policy" << endl; -- m_halStoragePolicy = libhal_storage_policy_new(); -- /** @todo define libhal-storage icon policy */ -+#ifdef HAL_0_4 /* HAL API 0.4 */ -+ /* libhal initialization */ -+ m_halFunctions.main_loop_integration = HALBackend::hal_main_loop_integration; -+ m_halFunctions.device_added = HALBackend::hal_device_added; -+ m_halFunctions.device_removed = HALBackend::hal_device_removed; -+ m_halFunctions.device_new_capability = NULL; -+ m_halFunctions.device_lost_capability = NULL; -+ m_halFunctions.device_property_modified = HALBackend::hal_device_property_modified; -+ m_halFunctions.device_condition = HALBackend::hal_device_condition; -+ -+ m_halContext = hal_initialize(&m_halFunctions, false); -+ if (!m_halContext) -+ { -+ kdDebug(1219) << "Failed to initialize HAL!" << endl; -+ return false; -+ } -+ -+ /** @todo customize watch policy */ -+ kdDebug(1219) << "Watch properties" << endl; -+ if (libhal_device_property_watch_all(m_halContext, NULL)) -+ { -+ kdDebug(1219) << "Failed to watch HAL properties!" << endl; -+ return false; -+ } -+#else /* HAL API >= 0.5 */ -+ kdDebug(1219) << "Context new" << endl; -+ m_halContext = libhal_ctx_new(); -+ if (!m_halContext) -+ { -+ kdDebug(1219) << "Failed to initialize HAL!" << endl; -+ return false; -+ } -+ -+ // Main loop integration -+ kdDebug(1219) << "Main loop integration" << endl; -+ DBusError error; -+ dbus_error_init(&error); -+ DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -+ if (dbus_error_is_set(&error)) { -+ dbus_error_free(&error); -+ libhal_ctx_free(m_halContext); -+ m_halContext = NULL; -+ return false; -+ } -+ MainLoopIntegration(dbus_connection); -+ libhal_ctx_set_dbus_connection(m_halContext, dbus_connection); -+ -+ // HAL callback functions -+ kdDebug(1219) << "Callback functions" << endl; -+ libhal_ctx_set_device_added(m_halContext, HALBackend::hal_device_added); -+ libhal_ctx_set_device_removed(m_halContext, HALBackend::hal_device_removed); -+ libhal_ctx_set_device_new_capability (m_halContext, NULL); -+ libhal_ctx_set_device_lost_capability (m_halContext, NULL); -+ libhal_ctx_set_device_property_modified (m_halContext, HALBackend::hal_device_property_modified); -+ libhal_ctx_set_device_condition(m_halContext, HALBackend::hal_device_condition); - -- /* List devices at startup */ -- return ListDevices(); -+ kdDebug(1219) << "Context Init" << endl; -+ if (!libhal_ctx_init(m_halContext, &error)) -+ { -+ if (dbus_error_is_set(&error)) -+ dbus_error_free(&error); -+ libhal_ctx_free(m_halContext); -+ m_halContext = NULL; -+ kdDebug(1219) << "Failed to init HAL context!" << endl; -+ return false; -+ } -+ -+ /** @todo customize watch policy */ -+ kdDebug(1219) << "Watch properties" << endl; -+ if (!libhal_device_property_watch_all(m_halContext, &error)) -+ { -+ kdDebug(1219) << "Failed to watch HAL properties!" << endl; -+ return false; -+ } -+#endif -+ -+ /* libhal-storage initialization */ -+ kdDebug(1219) << "Storage Policy" << endl; -+ m_halStoragePolicy = libhal_storage_policy_new(); -+ /** @todo define libhal-storage icon policy */ -+ -+ /* List devices at startup */ -+ return ListDevices(); - } - - /* List devices (at startup)*/ - bool HALBackend::ListDevices() - { -- kdDebug(1219) << "ListDevices" << endl; -+ kdDebug(1219) << "ListDevices" << endl; - -- int numDevices; -- char** halDeviceList = libhal_get_all_devices(m_halContext, &numDevices, NULL); -+ int numDevices; -+ char** halDeviceList = libhal_get_all_devices(m_halContext, &numDevices, NULL); - -- if (!halDeviceList) -- return false; -+ if (!halDeviceList) -+ return false; - -- kdDebug(1219) << "HALBackend::ListDevices : " << numDevices << " devices found" << endl; -- for (int i = 0; i < numDevices; i++) -- AddDevice(halDeviceList[i], false); -+ kdDebug(1219) << "HALBackend::ListDevices : " << numDevices << " devices found" << endl; -+ for (int i = 0; i < numDevices; i++) -+ AddDevice(halDeviceList[i], false); - -- libhal_free_string_array( halDeviceList ); -- -- return true; -+ return true; - } - - /* Create a media instance for the HAL device "udi". -- This functions checks whether the device is worth listing */ -+This functions checks whether the device is worth listing */ - void HALBackend::AddDevice(const char *udi, bool allowNotification) - { -- /* We don't deal with devices that do not expose their capabilities. -- If we don't check this, we will get a lot of warning messages from libhal */ -- if (!libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -- return; -- -- /* If the device is already listed, do not process. -- This should not happen, but who knows... */ -- /** @todo : refresh properties instead ? */ -- if (m_mediaList.findById(udi)) -- return; -- -- if (libhal_device_get_property_bool(m_halContext, "/org/freedesktop/Hal/devices/computer", "storage.disable_volume_handling", NULL)) -- allowNotification=false; -- -- /* Add volume block devices */ -- if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -- { -- /* We only list volume that have a filesystem or volume that have an audio track*/ -- if ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem" && -- !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio", NULL) && -- !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL) ) -- return; -- -- if ( ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") == "filesystem" && -- !libhal_device_get_property_bool(m_halContext, udi, "volume.is_mounted", NULL ) ) && -- ( libhal_device_get_property_bool(m_halContext, udi, "volume.ignore", NULL ) ) ) -- return; -- -- /* Query drive udi */ -- QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -- /* We don't list floppy volumes because we list floppy drives */ -- if ((libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "floppy") || -- (libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "zip") || -- (libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "jaz")) -- return; -- -- // if the device is locked do not act upon it -- if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "info.locked", NULL)) -- allowNotification=false; -- -- // if the device is locked do not act upon it -- if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "storage.partition_table_changed", NULL)) -- allowNotification=false; -- -- /** @todo check exclusion list **/ -- -- /* Create medium */ -- Medium* medium = new Medium(udi, ""); -- -- QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi)); -- kdDebug() << "automount " << options["automount"] << endl; -- if (options["automount"] == "true" && allowNotification ) { -- QString error = mount(medium); -- if (!error.isEmpty()) -- kdDebug() << "error " << error << endl; -- } -- setVolumeProperties(medium); -- m_mediaList.addMedium(medium, allowNotification); -- -- return; -- } -- -- /* Floppy & zip drives */ -- if (libhal_device_query_capability(m_halContext, udi, "storage", NULL)) -- if ((libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") || -- (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") || -- (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "jaz")) -- { -- /* Create medium */ -- Medium* medium = new Medium(udi, ""); -- setFloppyProperties(medium); -- m_mediaList.addMedium(medium, allowNotification); -- return; -- } -- -- /* Camera handled by gphoto2*/ -- if (libhal_device_query_capability(m_halContext, udi, "camera", NULL) && -- ((libhal_device_get_property_QString(m_halContext, udi, "camera.access_method")=="ptp") || -- -- (libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2.support", NULL) && -- libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2.support", NULL))) -- ) -- { -- /* Create medium */ -- Medium* medium = new Medium(udi, ""); -- setCameraProperties(medium); -- m_mediaList.addMedium(medium, allowNotification); -- return; -- } -+ /* We don't deal with devices that do not expose their capabilities. -+ If we don't check this, we will get a lot of warning messages from libhal */ -+ if (!libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -+ return; -+ -+ /* If the device is already listed, do not process. -+ This should not happen, but who knows... */ -+ /** @todo : refresh properties instead ? */ -+ if (m_mediaList.findById(udi)) -+ return; -+ -+ /* Add volume block devices */ -+ if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -+ { -+ /* We only list volume that have a filesystem or volume that have an audio track*/ -+ if ( (hal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem") && -+ (!libhal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio", NULL)) && -+ (!libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL)) ) -+ return; -+ /* Query drive udi */ -+ QString driveUdi = hal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -+ /* We don't list floppy volumes because we list floppy drives */ -+ if ((hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "floppy") || -+ (hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "zip") || -+ (hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "jaz")) -+ return; -+ -+ /** @todo check exclusion list **/ -+ -+ /* Create medium */ -+ Medium* medium = new Medium(udi, ""); -+ setVolumeProperties(medium); -+ m_mediaList.addMedium(medium, allowNotification); -+ -+ return; -+ } -+ -+ /* Floppy & zip drives */ -+ if (libhal_device_query_capability(m_halContext, udi, "storage", NULL)) -+ if ((hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") || -+ (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") || -+ (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "jaz")) -+ { -+ /* Create medium */ -+ Medium* medium = new Medium(udi, ""); -+ setFloppyProperties(medium); -+ m_mediaList.addMedium(medium, allowNotification); -+ return; -+ } -+ -+ /* Camera handled by gphoto2*/ -+ if (libhal_device_query_capability(m_halContext, udi, "camera", NULL) && -+#ifdef HAL_0_4 -+ libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2_support", NULL) && -+ libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2_support", NULL) -+#else -+ ((hal_device_get_property_QString(m_halContext, udi, "camera.access_method")=="ptp") || -+ -+ (libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2.support", NULL) && -+ libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2.support", NULL))) -+#endif -+ ) -+ { -+ /* Create medium */ -+ Medium* medium = new Medium(udi, ""); -+ setCameraProperties(medium); -+ m_mediaList.addMedium(medium, allowNotification); -+ return; -+ } - } - - void HALBackend::RemoveDevice(const char *udi) - { -- m_mediaList.removeMedium(udi, true); -+ m_mediaList.removeMedium(udi, true); - } - - void HALBackend::ModifyDevice(const char *udi, const char* key) - { -- Q_UNUSED(key); -- const char* mediumUdi = findMediumUdiFromUdi(udi); -- if (!mediumUdi) -- return; -- ResetProperties(mediumUdi); -+ Q_UNUSED(key); -+ const char* mediumUdi = findMediumUdiFromUdi(udi); -+ if (!mediumUdi) -+ return; -+ ResetProperties(mediumUdi); - } - - void HALBackend::DeviceCondition(const char* udi, const char* condition) - { -- QString conditionName = QString(condition); -- kdDebug(1219) << "Processing device condition " << conditionName << " for " << udi << endl; -- -- if (conditionName == "EjectPressed") { -- const Medium* medium = m_mediaList.findById(udi); -- if (!medium) { -- /* the ejectpressed appears on the drive and we need to find the volume */ -- const QPtrList<Medium> medlist = m_mediaList.list(); -- QPtrListIterator<Medium> it (medlist); -- for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) -- { -- QString driveUdi = libhal_device_get_property_QString(m_halContext, current_medium->id().latin1(), "block.storage_device"); -- if (driveUdi == udi) -- { -- medium = current_medium; -- break; -- } -- } -- } -- if (medium) { -- KProcess p; -- p << "kio_media_mounthelper" << "-e" << medium->name(); -- p.start(KProcess::DontCare); -- } -- } -- -- const char* mediumUdi = findMediumUdiFromUdi(udi); -- kdDebug() << "findMedumUdiFromUdi " << udi << " returned " << mediumUdi << endl; -- if (!mediumUdi) -- return; -- -- /* TODO: Warn the user that (s)he should unmount devices before unplugging */ -- if (conditionName == "VolumeUnmountForced") -- ResetProperties(mediumUdi); -- -- /* Reset properties after mounting */ -- if (conditionName == "VolumeMount") -- ResetProperties(mediumUdi); -- -- /* Reset properties after unmounting */ -- if (conditionName == "VolumeUnmount") -- ResetProperties(mediumUdi); -- -+ const char* mediumUdi = findMediumUdiFromUdi(udi); -+ if (!mediumUdi) -+ return; -+ -+ QString conditionName = QString(condition); -+ kdDebug(1219) << "Processing device condition " << conditionName << " for " << udi << endl; -+ -+ /* TODO: Warn the user that (s)he should unmount devices before unplugging */ -+ if (conditionName == "VolumeUnmountForced") -+ ResetProperties(mediumUdi); -+ -+ /* Reset properties after mounting */ -+ if (conditionName == "VolumeMount") -+ ResetProperties(mediumUdi); -+ -+ /* Reset properties after unmounting */ -+ if (conditionName == "VolumeUnmount") -+ ResetProperties(mediumUdi); - } - - void HALBackend::MainLoopIntegration(DBusConnection *dbusConnection) - { -- m_dBusQtConnection = new DBusQt::Connection(m_parent); -- m_dBusQtConnection->dbus_connection_setup_with_qt_main(dbusConnection); -+ m_dBusQtConnection = new DBusQt::Connection(m_parent); -+ m_dBusQtConnection->dbus_connection_setup_with_qt_main(dbusConnection); - } - - /****************************************** -- ** Properties attribution ** -- ******************************************/ -+** Properties attribution ** -+******************************************/ - - /* Return the medium udi that should be updated when recieving a call for -- device udi */ -+device udi */ - const char* HALBackend::findMediumUdiFromUdi(const char* udi) - { -- /* Easy part : this Udi is already registered as a device */ -- const Medium* medium = m_mediaList.findById(udi); -- if (medium) -- return medium->id().ascii(); -- -- /* Hard part : this is a volume whose drive is registered */ -- if (libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -- if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -- { -- QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -- return findMediumUdiFromUdi(driveUdi.ascii()); -- } -+ /* Easy part : this Udi is already registered as a device */ -+ const Medium* medium = m_mediaList.findById(udi); -+ if (medium) -+ return medium->id().ascii(); -+ -+ /* Hard part : this is a volume whose drive is registered */ -+ if (libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -+ if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -+ { -+ QString driveUdi = hal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -+ return findMediumUdiFromUdi(driveUdi.ascii()); -+ } - -- return NULL; -+ return NULL; - } - - void HALBackend::ResetProperties(const char* mediumUdi) - { -- kdDebug(1219) << "HALBackend::setProperties" << endl; -- if ( QString::fromLatin1( mediumUdi ).startsWith( "/org/kde/" ) ) -- { -- const Medium *cmedium = m_mediaList.findById(mediumUdi); -- if ( cmedium ) -- { -- Medium m( *cmedium ); -- if ( setFstabProperties( &m ) ) { -- kdDebug() << "setFstabProperties worked" << endl; -- m_mediaList.changeMediumState(m, false); -- } -- return; -- } -- } -- -- Medium* m = new Medium(mediumUdi, ""); -- -- if (libhal_device_query_capability(m_halContext, mediumUdi, "volume", NULL)) -- setVolumeProperties(m); -- if (libhal_device_query_capability(m_halContext, mediumUdi, "storage", NULL)) -- setFloppyProperties(m); -- if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) -- setCameraProperties(m); -+ kdDebug(1219) << "HALBackend::setProperties" << endl; - -- m_mediaList.changeMediumState(*m, false); -+ Medium* m = new Medium(mediumUdi, ""); -+ -+ if (libhal_device_query_capability(m_halContext, mediumUdi, "volume", NULL)) -+ setVolumeProperties(m); -+ if (libhal_device_query_capability(m_halContext, mediumUdi, "storage", NULL)) -+ setFloppyProperties(m); -+ if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) -+ setCameraProperties(m); - -- delete m; --} -+ m_mediaList.changeMediumState(*m, false); - --void HALBackend::setVolumeProperties(Medium* medium) --{ -- kdDebug(1219) << "HALBackend::setVolumeProperties for " << medium->id() << endl; -- -- const char* udi = medium->id().ascii(); -- /* Check if the device still exists */ -- if (!libhal_device_exists(m_halContext, udi, NULL)) -- return; -- -- /* Get device information from libhal-storage */ -- LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi); -- if (!halVolume) -- return; -- QString driveUdi = libhal_volume_get_storage_device_udi(halVolume); -- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, driveUdi.ascii()); -- if (!halDrive) { -- // at times HAL sends an UnmountForced event before the device is removed -- libhal_volume_free(halVolume); -- return; -- } -- -- medium->setName( -- generateName(libhal_volume_get_device_file(halVolume)) ); -- -- medium->mountableState( -- libhal_volume_get_device_file(halVolume), /* Device node */ -- libhal_volume_get_mount_point(halVolume), /* Mount point */ -- libhal_volume_get_fstype(halVolume), /* Filesystem type */ -- libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -- -- char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -- QString volume_name = QString::fromUtf8(name); -- QString media_name = volume_name; -- medium->setLabel(media_name); -- free(name); -- -- QString mimeType; -- if (libhal_volume_is_disc(halVolume)) -- { -- mimeType = "media/cdrom" + MOUNT_SUFFIX; -- -- LibHalVolumeDiscType discType = libhal_volume_get_disc_type(halVolume); -- if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_CDR) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_CDRW)) -- if (libhal_volume_disc_is_blank(halVolume)) -- { -- mimeType = "media/blankcd"; -- medium->unmountableState(""); -- } -- else -- mimeType = "media/cdwriter" + MOUNT_SUFFIX; -- -- if ((discType == LIBHAL_VOLUME_DISC_TYPE_DVDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRAM) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_DVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRW) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW) ) -- if (libhal_volume_disc_is_blank(halVolume)) -- { -- mimeType = "media/blankdvd"; -- medium->unmountableState(""); -- } -- else -- mimeType = "media/dvd" + MOUNT_SUFFIX; -- -- if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) -- { -- mimeType = "media/audiocd"; -- medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); -- } -- -- medium->setIconName(QString::null); -- -- /* check if the disc id a vcd or a video dvd */ -- DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); -- switch (type) -- { -- case DiscType::VCD: -- mimeType = "media/vcd"; -- break; -- case DiscType::SVCD: -- mimeType = "media/svcd"; -- break; -- case DiscType::DVD: -- mimeType = "media/dvdvideo"; -- break; -- } -- } -- else -- { -- mimeType = "media/hdd" + MOUNT_SUFFIX; -- if (libhal_drive_is_hotpluggable(halDrive)) -- { -- mimeType = "media/removable" + MOUNT_SUFFIX; -- medium->needMounting(); -- switch (libhal_drive_get_type(halDrive)) { -- case LIBHAL_DRIVE_TYPE_COMPACT_FLASH: -- medium->setIconName("compact_flash" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_MEMORY_STICK: -- medium->setIconName("memory_stick" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_SMART_MEDIA: -- medium->setIconName("smart_media" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_SD_MMC: -- medium->setIconName("sd_mmc" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER: -- { -- medium->setIconName("ipod" + MOUNT_ICON_SUFFIX); -- break; -- } -- case LIBHAL_DRIVE_TYPE_CAMERA: -- { -- mimeType = "media/camera" + MOUNT_SUFFIX; -- medium->setIconName("camera" + MOUNT_ICON_SUFFIX); -- const char *physdev = libhal_drive_get_physical_device_udi(halDrive); -- // get model from camera -- if (physdev && libhal_device_query_capability(m_halContext, physdev, "camera", NULL)) -- { -- if (libhal_device_property_exists(m_halContext, physdev, "usb_device.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, "usb_device.product")); -- else if (libhal_device_property_exists(m_halContext, physdev, "usb.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, "usb.product")); -- } -- break; -- } -- case LIBHAL_DRIVE_TYPE_TAPE: -- medium->setIconName(QString::null); //FIXME need icon -- break; -- default: -- medium->setIconName(QString::null); -- } -- -- if (medium->isMounted() && QFile::exists(medium->mountPoint() + "/dcim")) -- { -- mimeType = "media/camera" + MOUNT_SUFFIX; -- medium->setIconName("camera" + MOUNT_ICON_SUFFIX); -- } -- } -- } -- medium->setMimeType(mimeType); -- -- libhal_drive_free(halDrive); -- libhal_volume_free(halVolume); -+ delete m; - } - --bool HALBackend::setFstabProperties( Medium *medium ) -+void HALBackend::setVolumeProperties(Medium* medium) - { -- QString mp = isInFstab(medium); -+ kdDebug(1219) << "HALBackend::setVolumeProperties for " << medium->id() << endl; - -- if (!mp.isNull() && !medium->id().startsWith( "/org/kde" ) ) -- { -- // now that we know it's in fstab, we have to find out if it's mounted -- KMountPoint::List mtab = KMountPoint::currentMountPoints(); -- -- KMountPoint::List::iterator it = mtab.begin(); -- KMountPoint::List::iterator end = mtab.end(); -- -- bool mounted = false; -- -- for (; it!=end; ++it) -- { -- if ((*it)->mountedFrom() == medium->deviceNode() && (*it)->mountPoint() == mp ) -- { -- mounted = true; -- break; -- } -- } -- -- kdDebug() << mp << " " << mounted << " " << medium->deviceNode() << " " << endl; -- QString fstype = medium->fsType(); -- if ( fstype.isNull() ) -- fstype = "auto"; -- -- medium->mountableState( -- medium->deviceNode(), -- mp, /* Mount point */ -- fstype, /* Filesystem type */ -- mounted ); /* Mounted ? */ -+ const char* udi = medium->id().ascii(); -+ /* Check if the device still exists */ -+ if (!libhal_device_exists(m_halContext, udi, NULL)) -+ return; -+ -+ /* Get device information from libhal-storage */ -+ LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi); -+ if (!halVolume) -+ return; -+ QString driveUdi = libhal_volume_get_storage_device_udi(halVolume); -+ LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, driveUdi.ascii()); -+ -+ medium->setName( -+ generateName(libhal_volume_get_device_file(halVolume)) ); -+ -+ medium->mountableState( -+ libhal_volume_get_device_file(halVolume), /* Device node */ -+ libhal_volume_get_mount_point(halVolume), /* Mount point */ -+ libhal_volume_get_fstype(halVolume), /* Filesystem type */ -+ libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -+ -+ char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -+ QString volume_name = QString::fromUtf8(name); -+ QString media_name = volume_name; -+ medium->setLabel(media_name); -+ free(name); - -- return true; -- } -+ QString mimeType; -+ if (libhal_volume_is_disc(halVolume)) -+ { -+ mimeType = "media/cdrom" + MOUNT_SUFFIX; - -- return false; -+ LibHalVolumeDiscType discType = libhal_volume_get_disc_type(halVolume); -+ if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_CDR) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_CDRW)) -+ if (libhal_volume_disc_is_blank(halVolume)) -+ { -+ mimeType = "media/blankcd"; -+ medium->unmountableState(""); -+ } -+ else -+ mimeType = "media/cdwriter" + MOUNT_SUFFIX; -+ -+ if ((discType == LIBHAL_VOLUME_DISC_TYPE_DVDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRAM) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_DVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRW) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW) ) -+ if (libhal_volume_disc_is_blank(halVolume)) -+ { -+ mimeType = "media/blankdvd"; -+ medium->unmountableState(""); -+ } -+ else -+ mimeType = "media/dvd" + MOUNT_SUFFIX; -+ -+ if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) -+ { -+ mimeType = "media/audiocd"; -+ medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); -+ } -+ -+ medium->setIconName(QString::null); -+ -+ /* check if the disc id a vcd or a video dvd */ -+ DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); -+ switch (type) -+ { -+ case DiscType::VCD: -+ mimeType = "media/vcd"; -+ break; -+ case DiscType::SVCD: -+ mimeType = "media/svcd"; -+ break; -+ case DiscType::DVD: -+ mimeType = "media/dvdvideo"; -+ break; -+ } -+ } -+ else -+ { -+ mimeType = "media/hdd" + MOUNT_SUFFIX; -+ const char *physdev = libhal_drive_get_physical_device_udi(halDrive); -+ if (libhal_drive_is_hotpluggable(halDrive)) -+ { -+ mimeType = "media/removable" + MOUNT_SUFFIX; -+ medium->needMounting(); -+ switch (libhal_drive_get_type(halDrive)) { -+ case LIBHAL_DRIVE_TYPE_COMPACT_FLASH: -+ medium->setIconName("compact_flash" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_MEMORY_STICK: -+ medium->setIconName("memory_stick" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_SMART_MEDIA: -+ medium->setIconName("smart_media" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_SD_MMC: -+ medium->setIconName("sd_mmc" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER: -+ medium->setIconName("ipod" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_CAMERA: -+ mimeType = "media/camera" + MOUNT_SUFFIX; -+ medium->setIconName("camera" + MOUNT_ICON_SUFFIX); -+ // get model from camera -+ if (physdev && libhal_device_query_capability(m_halContext, physdev, "camera", NULL)) -+ { -+ if (libhal_device_property_exists(m_halContext, physdev, "usb_device.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, physdev, "usb_device.product")); -+ else if (libhal_device_property_exists(m_halContext, physdev, "usb.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, physdev, "usb.product")); -+ } -+ break; -+ case LIBHAL_DRIVE_TYPE_TAPE: -+ medium->setIconName(QString::null); //FIXME need icon -+ break; -+ default: -+ medium->setIconName(QString::null); -+ }; -+ }; -+ } -+ medium->setMimeType(mimeType); - -+ libhal_drive_free(halDrive); -+ libhal_volume_free(halVolume); - } - - // Handle floppies and zip drives - void HALBackend::setFloppyProperties(Medium* medium) - { -- kdDebug(1219) << "HALBackend::setFloppyProperties for " << medium->id() << endl; -+ kdDebug(1219) << "HALBackend::setFloppyProperties for " << medium->id() << endl; - -- const char* udi = medium->id().ascii(); -- /* Check if the device still exists */ -- if (!libhal_device_exists(m_halContext, udi, NULL)) -- return; -- -- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, udi); -- if (!halDrive) -- return; -- int numVolumes; -- char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); -- LibHalVolume* halVolume = NULL; -- kdDebug(1219) << " found " << numVolumes << " volumes" << endl; -- if (numVolumes) -- halVolume = libhal_volume_from_udi(m_halContext, volumes[0]); -- -- medium->setName( -- generateName(libhal_drive_get_device_file(halDrive)) ); -- -- if (halVolume) -- { -- medium->mountableState( -- libhal_volume_get_device_file(halVolume), /* Device node */ -- libhal_volume_get_mount_point(halVolume), /* Mount point */ -- libhal_volume_get_fstype(halVolume), /* Filesystem type */ -- libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -- } -- else -- { -- // HAL hates floppies - so we have to do it twice ;( -- medium->mountableState(libhal_drive_get_device_file(halDrive), QString::null, QString::null, false); -- setFstabProperties( medium ); -- } -- -- if (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") -- { -- if (medium->isMounted()) // don't use _SUFFIX here as it accesses the volume -- medium->setMimeType("media/floppy_mounted" ); -- else -- medium->setMimeType("media/floppy_unmounted"); -- } -- -- if (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") -- { -- if (medium->isMounted()) -- medium->setMimeType("media/zip_mounted" ); -- else -- medium->setMimeType("media/zip_unmounted"); -- } -- -- /** @todo And mimtype for JAZ drives ? */ -- -- medium->setIconName(QString::null); -- -- char *name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -- -- if (name) { -- medium->setLabel( QString::fromUtf8(name) ); -- free(name); -- } -- -- free(volumes); -- libhal_drive_free(halDrive); -- libhal_volume_free(halVolume); --} -+ const char* udi = medium->id().ascii(); -+ /* Check if the device still exists */ -+ if (!libhal_device_exists(m_halContext, udi, NULL)) -+ return; -+ -+ LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, udi); -+ if (!halDrive) -+ return; -+ int numVolumes; -+ char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); -+ LibHalVolume* halVolume = NULL; -+ kdDebug(1219) << " found " << numVolumes << " volumes" << endl; -+ if (numVolumes) -+ halVolume = libhal_volume_from_udi(m_halContext, volumes[0]); - --void HALBackend::setCameraProperties(Medium* medium) --{ -- kdDebug(1219) << "HALBackend::setCameraProperties for " << medium->id() << endl; -- -- const char* udi = medium->id().ascii(); -- /* Check if the device still exists */ -- if (!libhal_device_exists(m_halContext, udi, NULL)) -- return; -- -- /** @todo find name */ -- medium->setName("camera"); -- -- QString device = "camera:/"; -- -- char *cam = libhal_device_get_property_string(m_halContext, udi, "camera.libgphoto2.name", NULL); -- DBusError error; -- dbus_error_init(&error); -- if (cam && -- libhal_device_property_exists(m_halContext, udi, "usb.linux.device_number", NULL) && -- libhal_device_property_exists(m_halContext, udi, "usb.bus_number", NULL)) -- device.sprintf("camera://%s@[usb:%03d,%03d]/", cam, -- libhal_device_get_property_int(m_halContext, udi, "usb.bus_number", &error), -- libhal_device_get_property_int(m_halContext, udi, "usb.linux.device_number", &error)); -- -- libhal_free_string(cam); -- -- /** @todo find the rest of this URL */ -- medium->unmountableState(device); -- medium->setMimeType("media/gphoto2camera"); -- medium->setIconName(QString::null); -- if (libhal_device_property_exists(m_halContext, udi, "usb_device.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb_device.product")); -- else if (libhal_device_property_exists(m_halContext, udi, "usb.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb.product")); -- else -- medium->setLabel(i18n("Camera")); --} -+ medium->setName( -+ generateName(libhal_drive_get_device_file(halDrive)) ); - --QString HALBackend::generateName(const QString &devNode) --{ -- return KURL(devNode).fileName(); --} -+ if (halVolume) -+ { -+ medium->mountableState( -+ libhal_volume_get_device_file(halVolume), /* Device node */ -+ libhal_volume_get_mount_point(halVolume), /* Mount point */ -+ libhal_volume_get_fstype(halVolume), /* Filesystem type */ -+ libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -+ } -+ else -+ { -+ medium->mountableState( -+ libhal_drive_get_device_file(halDrive), /* Device node */ -+ "", /* Mount point */ -+ "", /* Filesystem type */ -+ false ); /* Mounted ? */ -+ } - --/****************************************** -- ** HAL CALL-BACKS ** -- ******************************************/ -+ if (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") -+ { -+ if (halVolume) -+ medium->setMimeType("media/floppy" + MOUNT_SUFFIX); -+ else -+ medium->setMimeType("media/floppy_unmounted"); -+ } - --void HALBackend::hal_device_added(LibHalContext *ctx, const char *udi) --{ -- kdDebug(1219) << "HALBackend::hal_device_added " << udi << endl; -- Q_UNUSED(ctx); -- s_HALBackend->AddDevice(udi); --} -+ if (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") -+ { -+ if (halVolume) -+ medium->setMimeType("media/zip" + MOUNT_SUFFIX); -+ else -+ medium->setMimeType("media/zip_unmounted"); -+ } - --void HALBackend::hal_device_removed(LibHalContext *ctx, const char *udi) --{ -- kdDebug(1219) << "HALBackend::hal_device_removed " << udi << endl; -- Q_UNUSED(ctx); -- s_HALBackend->RemoveDevice(udi); --} -+ /** @todo And mimtype for JAZ drives ? */ - --void HALBackend::hal_device_property_modified(LibHalContext *ctx, const char *udi, -- const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) --{ -- kdDebug(1219) << "HALBackend::hal_property_modified " << udi << " -- " << key << endl; -- Q_UNUSED(ctx); -- Q_UNUSED(is_removed); -- Q_UNUSED(is_added); -- s_HALBackend->ModifyDevice(udi, key); --} -+ medium->setIconName(QString::null); - --void HALBackend::hal_device_condition(LibHalContext *ctx, const char *udi, -- const char *condition_name, -- const char* message -- ) --{ -- kdDebug(1219) << "HALBackend::hal_device_condition " << udi << " -- " << condition_name << endl; -- Q_UNUSED(ctx); -- Q_UNUSED(message); -- s_HALBackend->DeviceCondition(udi, condition_name); -+ QString media_name; -+ if (halVolume) -+ { -+ char* name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -+ QString volume_name = QString::fromUtf8(name); -+ media_name = volume_name; -+ free(name); -+ } -+ else -+ { -+ char* name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -+ QString drive_name = QString::fromUtf8(name); -+ media_name = drive_name; -+ free(name); -+ } -+ medium->setLabel(media_name); -+ -+ free(volumes); -+ libhal_drive_free(halDrive); -+ libhal_volume_free(halVolume); - } - --QStringList HALBackend::mountoptions(const QString &name) -+void HALBackend::setCameraProperties(Medium* medium) - { -- const Medium* medium = m_mediaList.findById(name); -- if (medium && !isInFstab(medium).isNull()) -- return QStringList(); // not handled by HAL - fstab entry -- -- KConfig config("mediamanagerrc"); -- config.setGroup(name); -- -- char ** array = libhal_device_get_property_strlist(m_halContext, name.latin1(), "volume.mount.valid_options", NULL); -- QMap<QString,bool> valids; -- -- for (int index = 0; array && array[index]; ++index) { -- QString t = array[index]; -- if (t.endsWith("=")) -- t = t.left(t.length() - 1); -- valids[t] = true; -- kdDebug() << "valid " << t << endl; -- } -- libhal_free_string_array(array); -- QStringList result; -- QString tmp; -- -- QString fstype = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.fstype"); -- if (fstype.isNull()) -- fstype = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.policy.mount_filesystem"); -- -- -- QString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device"); -- -- bool removable = libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.removable", NULL) -- || libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.hotpluggable", NULL); -- -- config.setGroup(drive_udi); -- bool value = config.readBoolEntry("automount", false); -- config.setGroup(name); -- -- if (libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_blank", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_vcd", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_svcd", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_videodvd", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.has_audio", NULL)) -- value = false; -- -- result << QString("automount=%1").arg(value ? "true" : "false"); -- -- if (valids.contains("ro")) -- { -- value = config.readBoolEntry("ro", false); -- tmp = QString("ro=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- if (valids.contains("quiet")) -- { -- value = config.readBoolEntry("quiet", false); -- tmp = QString("quiet=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- if (valids.contains("flush")) -- { -- value = config.readBoolEntry("flush", fstype.endsWith("fat")); -- tmp = QString("flush=%1").arg(value ? "true" : "false"); -- result << tmp; -- } -- -- if (valids.contains("uid")) -- { -- value = config.readBoolEntry("uid", true); -- tmp = QString("uid=%1").arg(value ? "true" : "false"); -- result << tmp; -- } -- -- if (valids.contains("utf8")) -- { -- value = config.readBoolEntry("utf8", true); -- tmp = QString("utf8=%1").arg(value ? "true" : "false"); -- result << tmp; -- } -- -- if (valids.contains("shortname")) -- { -- QString svalue = config.readEntry("shortname", "lower").lower(); -- if (svalue == "winnt") -- result << "shortname=winnt"; -- else if (svalue == "win95") -- result << "shortname=win95"; -- else if (svalue == "mixed") -- result << "shortname=mixed"; -- else -- result << "shortname=lower"; -- } -- -- if (valids.contains("sync")) -- { -- value = config.readBoolEntry("sync", !fstype.endsWith("fat") && removable); -- tmp = QString("sync=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- if (valids.contains("noatime")) -- { -- value = config.readBoolEntry("atime", !fstype.endsWith("fat")); -- tmp = QString("atime=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- QString mount_point = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.mount_point"); -- if (mount_point.isEmpty()) -- mount_point = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.policy.desired_mount_point"); -- -- mount_point = config.readEntry("mountpoint", mount_point); -- -- if (!mount_point.startsWith("/")) -- mount_point = "/media/" + mount_point; -- -- result << QString("mountpoint=%1").arg(mount_point); -- result << QString("filesystem=%1").arg(fstype); -- -- if (valids.contains("data")) -- { -- QString svalue = config.readEntry("journaling").lower(); -- if (svalue == "ordered") -- result << "journaling=ordered"; -- else if (svalue == "writeback") -- result << "journaling=writeback"; -- else if (svalue == "data") -- result << "journaling=data"; -- else -- result << "journaling=ordered"; -- } -+ kdDebug(1219) << "HALBackend::setCameraProperties for " << medium->id() << endl; - -- return result; -+ const char* udi = medium->id().ascii(); -+ /* Check if the device still exists */ -+ if (!libhal_device_exists(m_halContext, udi, NULL)) -+ return; -+ -+ /** @todo find name */ -+ medium->setName("camera"); -+ /** @todo find the rest of this URL */ -+ medium->unmountableState("camera:/"); -+ medium->setMimeType("media/gphoto2camera"); -+ medium->setIconName(QString::null); -+ if (libhal_device_property_exists(m_halContext, udi, "usb_device.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, udi, "usb_device.product")); -+ else if (libhal_device_property_exists(m_halContext, udi, "usb.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, udi, "usb.product")); -+ else -+ medium->setLabel(i18n("Camera")); - } - --bool HALBackend::setMountoptions(const QString &name, const QStringList &options ) -+QString HALBackend::generateName(const QString &devNode) - { -- kdDebug() << "setMountoptions " << name << " " << options << endl; -- -- KConfig config("mediamanagerrc"); -- config.setGroup(name); -- -- QMap<QString,QString> valids = MediaManagerUtils::splitOptions(options); -- -- const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 }; -- for (int index = 0; names[index]; ++index) -- if (valids.contains(names[index])) -- config.writeEntry(names[index], valids[names[index]] == "true"); -- -- if (valids.contains("shortname")) -- config.writeEntry("shortname", valids["shortname"]); -- -- if (valids.contains("journaling")) -- config.writeEntry("journaling", valids["journaling"]); -- -- if (!mountoptions(name).contains(QString("mountpoint=%1").arg(valids["mountpoint"]))) -- config.writeEntry("mountpoint", valids["mountpoint"]); -- -- if (valids.contains("automount")) { -- QString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device"); -- config.setGroup(drive_udi); -- config.writeEntry("automount", valids["automount"]); -- } -- -- return true; -+ return KURL(devNode).fileName(); - } - --static QString mount_priv(const char *udi, const char *mount_point, const char **poptions, int noptions, -- DBusConnection *dbus_connection) --{ -- DBusMessage *dmesg, *reply; -- DBusError error; -- -- const char *fstype = ""; -- if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, -- "org.freedesktop.Hal.Device.Volume", -- "Mount"))) { -- kdDebug() << "mount failed for " << udi << ": could not create dbus message\n"; -- return i18n("Internal Error"); -- } -- -- if (!dbus_message_append_args (dmesg, DBUS_TYPE_STRING, &mount_point, DBUS_TYPE_STRING, &fstype, -- DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &poptions, noptions, -- DBUS_TYPE_INVALID)) -- { -- kdDebug() << "mount failed for " << udi << ": could not append args to dbus message\n"; -- dbus_message_unref (dmesg); -- return i18n("Internal Error"); -- } -- -- QString qerror; -- -- dbus_error_init (&error); -- if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) -- { -- QString qerror = error.message; -- kdError() << "mount failed for " << udi << ": " << error.name << " - " << qerror << endl; -- if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.UnknownFilesystemType")) -- qerror = i18n("Invalid filesystem type"); -- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.PermissionDenied")) -- qerror = i18n("Permissions denied"); -- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.AlreadyMounted")) -- qerror = i18n("Device is already mounted."); -- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.InvalidMountpoint") && strlen(mount_point)) { -- dbus_message_unref (dmesg); -- dbus_error_free (&error); -- return mount_priv(udi, "", poptions, noptions, dbus_connection); -- } -- dbus_message_unref (dmesg); -- dbus_error_free (&error); -- return qerror; -- } -- -- kdDebug() << "mount queued for " << udi << endl; -- -- dbus_message_unref (dmesg); -- dbus_message_unref (reply); -- -- return qerror; -+/****************************************** -+** HAL CALL-BACKS ** -+******************************************/ - -+#ifdef HAL_0_4 -+void HALBackend::hal_main_loop_integration(LibHalContext *ctx, -+ DBusConnection *dbus_connection) -+{ -+ kdDebug(1219) << "HALBackend::hal_main_loop_integration" << endl; -+ Q_UNUSED(ctx); -+ s_HALBackend->MainLoopIntegration(dbus_connection); - } -+#endif - --void HALBackend::slotResult(KIO::Job *job) -+void HALBackend::hal_device_added(LibHalContext *ctx, const char *udi) - { -- kdDebug() << "slotResult " << mount_jobs[job] << endl; -- if (job->error()) -- { -- KMessageBox::error(0, job->errorText()); -- } -- ResetProperties( mount_jobs[job].latin1() ); -- mount_jobs.remove(job); -+ kdDebug(1219) << "HALBackend::hal_device_added " << udi << endl; -+ Q_UNUSED(ctx); -+ s_HALBackend->AddDevice(udi); - } - --QString HALBackend::isInFstab(const Medium *medium) -+void HALBackend::hal_device_removed(LibHalContext *ctx, const char *udi) - { -- KMountPoint::List fstab = KMountPoint::possibleMountPoints(KMountPoint::NeedMountOptions|KMountPoint::NeedRealDeviceName); -- -- KMountPoint::List::iterator it = fstab.begin(); -- KMountPoint::List::iterator end = fstab.end(); -- -- for (; it!=end; ++it) -- { -- kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl; -- if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && (*it)->realDeviceName() == medium->deviceNode() ) ) -- { -- QStringList opts = (*it)->mountOptions(); -- if (opts.contains("user") || opts.contains("users")) -- return (*it)->mountPoint(); -- } -- } -- -- return QString::null; -+ kdDebug(1219) << "HALBackend::hal_device_removed " << udi << endl; -+ Q_UNUSED(ctx); -+ s_HALBackend->RemoveDevice(udi); - } - --QString HALBackend::mount(const Medium *medium) --{ -- if (medium->isMounted()) -- return QString(); // that was easy -- -- QString mountPoint = isInFstab(medium); -- if (!mountPoint.isNull()) -- { -- kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; -- KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint ); -- connect(job, SIGNAL( result (KIO::Job *)), -- SLOT( slotResult( KIO::Job *))); -- mount_jobs[job] = medium->id(); -- return QString(); // we won't report an error here -- } else if (medium->id().startsWith("/org/kde/") ) -- return i18n("Permissions denied"); -- -- QStringList soptions; -- -- kdDebug() << "mounting " << medium->id() << "..." << endl; -- -- QMap<QString,QString> valids = MediaManagerUtils::splitOptions(mountoptions(medium->id())); -- if (valids["flush"] == "true") -- soptions << "flush"; -- -- if (valids["uid"] == "true") -- { -- soptions << QString("uid=%1").arg(getuid()); -- } -- -- if (valids["ro"] == "true") -- soptions << "ro"; -- -- if (valids["atime"] != "true") -- soptions << "noatime"; -- -- if (valids["quiet"] == "true") -- soptions << "quiet"; -- -- if (valids["utf8"] == "true") -- soptions << "utf8"; -- -- if (valids["sync"] == "true") -- soptions << "sync"; -- -- QString mount_point = valids["mountpoint"]; -- if (mount_point.startsWith("/media/")) -- mount_point = mount_point.mid(7); -- -- if (valids.contains("shortname")) -- { -- soptions << QString("shortname=%1").arg(valids["shortname"]); -- } -- -- if (valids.contains("journaling")) -- { -- QString option = valids["journaling"]; -- if (option == "data") -- soptions << QString("data=journal"); -- else if (option == "writeback") -- soptions << QString("data=writeback"); -- else -- soptions << QString("data=ordered"); -- } -- -- const char **options = new const char*[soptions.size() + 1]; -- uint noptions = 0; -- for (QStringList::ConstIterator it = soptions.begin(); it != soptions.end(); ++it, ++noptions) -- options[noptions] = (*it).latin1(); -- options[noptions] = NULL; -- -- QString qerror = mount_priv(medium->id().latin1(), mount_point.utf8(), options, noptions, dbus_connection); -- if (!qerror.isEmpty()) { -- kdError() << "mounting " << medium->id() << " returned " << qerror << endl; -- return qerror; -- } -- -- medium->setHalMounted(true); -- ResetProperties(medium->id().latin1()); -- -- return QString(); --} -- --QString HALBackend::mount(const QString &_udi) -+void HALBackend::hal_device_property_modified(LibHalContext *ctx, const char *udi, -+ const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) - { -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- return i18n("No such medium: %1").arg(_udi); -- -- return mount(medium); -+ kdDebug(1219) << "HALBackend::hal_property_modified " << udi << " -- " << key << endl; -+ Q_UNUSED(ctx); -+ Q_UNUSED(is_removed); -+ Q_UNUSED(is_added); -+ s_HALBackend->ModifyDevice(udi, key); - } - --QString HALBackend::unmount(const QString &_udi) --{ -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- { // now we get fancy: if the udi is no volume, it _might_ be a device with only one -- // volume on it (think CDs) - so we're so nice to the caller to unmount that volume -- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, _udi.latin1()); -- if (halDrive) -- { -- int numVolumes; -- char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); -- if (numVolumes == 1) -- medium = m_mediaList.findById( volumes[0] ); -- } -- } -- -- if ( !medium ) -- return i18n("No such medium: %1").arg(_udi); -- -- if (!medium->isMounted()) -- return QString(); // that was easy -- -- QString mountPoint = isInFstab(medium); -- if (!mountPoint.isNull()) -- { -- kdDebug() << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl; -- KIO::Job *job = KIO::unmount( medium->mountPoint(), false ); -- connect(job, SIGNAL( result (KIO::Job *)), -- SLOT( slotResult( KIO::Job *))); -- mount_jobs[job] = medium->id(); -- return QString(); // we won't report an error here -- } -- -- DBusMessage *dmesg, *reply; -- DBusError error; -- const char *options[2]; -- -- const char *udi = medium->id().latin1(); -- kdDebug() << "unmounting " << udi << "..." << endl; -- -- dbus_error_init(&error); -- DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -- if (dbus_error_is_set(&error)) -- { -- dbus_error_free(&error); -- return false; -- } -- -- if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, -- "org.freedesktop.Hal.Device.Volume", -- "Unmount"))) { -- kdDebug() << "unmount failed for " << udi << ": could not create dbus message\n"; -- return i18n("Internal Error"); -- } -- -- options[0] = "force"; -- options[1] = 0; -- -- if (!dbus_message_append_args (dmesg, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, 0, -- DBUS_TYPE_INVALID)) -- { -- kdDebug() << "unmount failed for " << udi << ": could not append args to dbus message\n"; -- dbus_message_unref (dmesg); -- return i18n("Internal Error"); -- } -- -- dbus_error_init (&error); -- if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) -- { -- kdDebug() << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl; -- QString qerror = error.message; -- if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.Busy")) { -- qerror = QString("<qt>") + i18n("Device is Busy:"); -- QString cmdline = QString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint())); -- FILE *fuser = popen(cmdline.latin1(), "r"); -- uint counter = 0; -- if (fuser) { -- qerror += "<pre>"; -- QTextIStream is(fuser); -- QString tmp; -- while (!is.atEnd()) { -- tmp = is.readLine(); -- tmp = QStyleSheet::escape(tmp) + "\n"; -- -- qerror += tmp; -- if (counter++ > 20) -- { -- qerror += "..."; -- break; -- } -- } -- qerror += "</pre>"; -- (void)pclose( fuser ); -- } -- qerror += "</qt>"; -- } else if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.NotMounted")) { -- // this is faking. The error is that the device wasn't mounted by hal (but by the system) -- qerror = i18n("Permissions denied"); -- } -- -- dbus_message_unref (dmesg); -- dbus_error_free (&error); -- return qerror; -- } -- -- kdDebug() << "unmount queued for " << udi << endl; -- -- dbus_message_unref (dmesg); -- dbus_message_unref (reply); -- -- medium->setHalMounted(false); -- ResetProperties(udi); -- -- return QString(); -+void HALBackend::hal_device_condition(LibHalContext *ctx, const char *udi, -+ const char *condition_name, -+ #ifdef HAL_0_4 -+ DBusMessage *message -+ #else -+ const char* message -+ #endif -+ ) -+{ -+ kdDebug(1219) << "HALBackend::hal_device_condition " << udi << " -- " << condition_name << endl; -+ Q_UNUSED(ctx); -+ Q_UNUSED(message); -+ s_HALBackend->DeviceCondition(udi, condition_name); - } - - #include "halbackend.moc" -diff -urN kioslave/media/mediamanager/halbackend.h kioslave/media/mediamanager/halbackend.h ---- kioslave/media/mediamanager/halbackend.h Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/halbackend.h Mon Oct 10 17:04:01 2005 -@@ -45,9 +45,65 @@ - #include <libhal.h> - #include <libhal-storage.h> - --namespace KIO { -- class Job; --} -+/* The HAL API changed between 0.4 and 0.5 series. -+These defines enable backward compatibility */ -+#ifdef HAL_0_4 -+ // libhal-storage 0.4 API -+ #define LibHalStoragePolicy HalStoragePolicy -+ #define LibHalDrive HalDrive -+ #define LibHalVolume HalVolume -+ #define LibHalVolumeDiscType HalVolumeDiscType -+ #define libhal_storage_policy_free hal_storage_policy_free -+ #define libhal_storage_policy_new hal_storage_policy_new -+ #define libhal_drive_from_udi hal_drive_from_udi -+ #define libhal_drive_find_all_volumes hal_drive_find_all_volumes -+ #define libhal_drive_get_type hal_drive_get_type -+ #define libhal_drive_get_device_file hal_drive_get_device_file -+ #define libhal_drive_free hal_drive_free -+ #define libhal_drive_policy_compute_display_name hal_drive_policy_compute_display_name -+ #define libhal_drive_is_hotpluggable hal_drive_is_hotpluggable -+ #define libhal_drive_get_physical_device_udi hal_drive_get_physical_device_udi -+ #define libhal_volume_from_udi hal_volume_from_udi -+ #define libhal_volume_get_device_file hal_volume_get_device_file -+ #define libhal_volume_get_mount_point hal_volume_get_mount_point -+ #define libhal_volume_get_fstype hal_volume_get_fstype -+ #define libhal_volume_is_mounted hal_volume_is_mounted -+ #define libhal_volume_get_disc_type hal_volume_get_disc_type -+ #define libhal_volume_free hal_volume_free -+ #define libhal_volume_policy_compute_display_name hal_volume_policy_compute_display_name -+ #define libhal_volume_disc_has_data hal_volume_disc_has_data -+ #define libhal_volume_disc_has_audio hal_volume_disc_has_audio -+ #define libhal_volume_disc_is_blank hal_volume_disc_is_blank -+ #define libhal_volume_is_disc hal_volume_is_disc -+ #define libhal_volume_get_storage_device_udi hal_volume_get_storage_device_udi -+ #define LIBHAL_VOLUME_DISC_TYPE_CDROM HAL_VOLUME_DISC_TYPE_CDROM -+ #define LIBHAL_VOLUME_DISC_TYPE_CDR HAL_VOLUME_DISC_TYPE_CDR -+ #define LIBHAL_VOLUME_DISC_TYPE_CDRW HAL_VOLUME_DISC_TYPE_CDRW -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDROM HAL_VOLUME_DISC_TYPE_DVDROM -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDRAM HAL_VOLUME_DISC_TYPE_DVDRAM -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDR HAL_VOLUME_DISC_TYPE_DVDR -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDRW HAL_VOLUME_DISC_TYPE_DVDRW -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR HAL_VOLUME_DISC_TYPE_DVDPLUSR -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW HAL_VOLUME_DISC_TYPE_DVDPLUSRW -+ #define LIBHAL_DRIVE_TYPE_COMPACT_FLASH HAL_DRIVE_TYPE_COMPACT_FLASH -+ #define LIBHAL_DRIVE_TYPE_MEMORY_STICK HAL_DRIVE_TYPE_MEMORY_STICK -+ #define LIBHAL_DRIVE_TYPE_SMART_MEDIA HAL_DRIVE_TYPE_SMART_MEDIA -+ #define LIBHAL_DRIVE_TYPE_SD_MMC HAL_DRIVE_TYPE_SD_MMC -+ #define LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER HAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER -+ #define LIBHAL_DRIVE_TYPE_CAMERA HAL_DRIVE_TYPE_CAMERA -+ #define LIBHAL_DRIVE_TYPE_TAPE HAL_DRIVE_TYPE_TAPE -+ -+ // libhal 0.4 API -+ #define libhal_free_string hal_free_string -+ #define libhal_device_exists(ctx, udi, error) hal_device_exists(ctx, udi) -+ #define libhal_device_property_watch_all(ctx, error) hal_device_property_watch_all(ctx) -+ #define libhal_get_all_devices(ctx, num_devices, error) hal_get_all_devices(ctx, num_devices) -+ #define libhal_device_property_exists(ctx, udi, key, error) hal_device_property_exists(ctx, udi, key) -+ #define libhal_device_get_property_bool(ctx, udi, key, error) hal_device_get_property_bool(ctx, udi, key) -+ #define libhal_device_get_property_string(ctx, udi, key, error) hal_device_get_property_string(ctx, udi, key) -+ #define libhal_device_query_capability(ctx, udi, capability, error) hal_device_query_capability(ctx, udi, capability) -+#endif -+ - - /** - * A handy function to query a hal string -@@ -88,14 +144,6 @@ - */ - bool ListDevices(); - -- QStringList mountoptions(const QString &id); -- -- bool setMountoptions(const QString &id, const QStringList &options); -- -- QString mount(const QString &id); -- QString mount(const Medium *medium); -- QString unmount(const QString &id); -- - private: - /** - * Append a device in the media list. This function will check if the device -@@ -147,16 +195,20 @@ - - void setVolumeProperties(Medium* medium); - void setFloppyProperties(Medium* medium); -- bool setFstabProperties(Medium* medium); - void setCameraProperties(Medium* medium); - QString generateName(const QString &devNode); -- static QString isInFstab(const Medium *medium); -- --private slots: -- void slotResult(KIO::Job *job); - - /* Hal call-backs -- from gvm*/ - public: -+#ifdef HAL_0_4 -+ /** Invoked by libhal for integration with our mainloop. -+ * -+ * @param ctx LibHal context -+ * @param dbus_connection D-BUS connection to integrate -+ */ -+ static void hal_main_loop_integration(LibHalContext *ctx, DBusConnection *dbus_connection); -+#endif -+ - /** Invoked when a device is added to the Global Device List. - * - * @param ctx LibHal context -@@ -189,7 +241,11 @@ - */ - static void hal_device_condition(LibHalContext *ctx, const char *udi, - const char *condition_name, -+ #ifdef HAL_0_4 -+ DBusMessage *message -+ #else - const char* message -+ #endif - ); - - /* HAL and DBus structures */ -@@ -199,6 +255,13 @@ - */ - LibHalContext* m_halContext; - -+#ifdef HAL_0_4 -+ /** -+ * Structure defining the hal callback function for devices events -+ */ -+ LibHalFunctions m_halFunctions; -+#endif -+ - /** - * libhal-storage HAL policy, e.g. for icon names - */ -@@ -213,10 +276,6 @@ - * Object for the kded module - */ - QObject* m_parent; -- -- DBusConnection *dbus_connection; -- -- QMap<KIO::Job *, QString> mount_jobs; - }; - - #endif /* _HALBACKEND_H_ */ -diff -urN kioslave/media/mediamanager/linuxcdpolling.cpp kioslave/media/mediamanager/linuxcdpolling.cpp ---- kioslave/media/mediamanager/linuxcdpolling.cpp Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/linuxcdpolling.cpp Mon Oct 10 17:04:01 2005 -@@ -23,6 +23,7 @@ - - #include <qthread.h> - #include <qmutex.h> -+#include <qtimer.h> - #include <qfile.h> - - #include <kdebug.h> -@@ -188,7 +189,9 @@ - const QString &, bool, bool)), - this, SLOT(slotMediumStateChanged(const QString &)) ); - -- connect(&m_timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); -+ QTimer *timer = new QTimer(this); -+ connect(timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); -+ timer->start(500); - } - - LinuxCDPolling::~LinuxCDPolling() -@@ -226,7 +229,6 @@ - PollingThread *thread = new PollingThread(dev); - m_threads[id] = thread; - thread->start(); -- m_timer.start(500); - } - } - -@@ -266,7 +268,6 @@ - PollingThread *thread = new PollingThread(dev); - m_threads[id] = thread; - thread->start(); -- m_timer.start(500); - } - else if (m_threads.contains(id) && medium->isMounted()) - { -@@ -281,12 +282,6 @@ - void LinuxCDPolling::slotTimeout() - { - //kdDebug(1219) << "LinuxCDPolling::slotTimeout()" << endl; -- -- if (m_threads.isEmpty()) -- { -- m_timer.stop(); -- return; -- } - - QMap<QString, PollingThread*>::iterator it = m_threads.begin(); - QMap<QString, PollingThread*>::iterator end = m_threads.end(); -diff -urN kioslave/media/mediamanager/linuxcdpolling.h kioslave/media/mediamanager/linuxcdpolling.h ---- kioslave/media/mediamanager/linuxcdpolling.h Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/linuxcdpolling.h Mon Oct 10 17:04:01 2005 -@@ -24,7 +24,6 @@ - #include <qobject.h> - #include <qcstring.h> - #include <qmap.h> --#include <qtimer.h> - - class DiscType - { -@@ -80,7 +79,6 @@ - - QMap<QString, PollingThread*> m_threads; - QStringList m_excludeNotification; -- QTimer m_timer; - }; - - #endif -diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanager/mediamanager.cpp ---- kioslave/media/mediamanager/mediamanager.cpp Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/mediamanager.cpp Mon Oct 10 17:04:01 2005 -@@ -43,287 +43,201 @@ - MediaManager::MediaManager(const QCString &obj) - : KDEDModule(obj), m_dirNotify(m_mediaList) - { -- connect( &m_mediaList, SIGNAL(mediumAdded(const QString&, const QString&, bool)), -- SLOT(slotMediumAdded(const QString&, const QString&, bool)) ); -- connect( &m_mediaList, SIGNAL(mediumRemoved(const QString&, const QString&, bool)), -- SLOT(slotMediumRemoved(const QString&, const QString&, bool)) ); -- connect( &m_mediaList, -- SIGNAL(mediumStateChanged(const QString&, const QString&, bool, bool)), -- SLOT(slotMediumChanged(const QString&, const QString&, bool, bool)) ); -+ connect( &m_mediaList, SIGNAL(mediumAdded(const QString&, const QString&, bool)), -+ SLOT(slotMediumAdded(const QString&, const QString&, bool)) ); -+ connect( &m_mediaList, SIGNAL(mediumRemoved(const QString&, const QString&, bool)), -+ SLOT(slotMediumRemoved(const QString&, const QString&, bool)) ); -+ connect( &m_mediaList, -+ SIGNAL(mediumStateChanged(const QString&, const QString&, bool, bool)), -+ SLOT(slotMediumChanged(const QString&, const QString&, bool, bool)) ); - -- QTimer::singleShot( 10, this, SLOT( loadBackends() ) ); -+ QTimer::singleShot( 10, this, SLOT( loadBackends() ) ); - } - - MediaManager::~MediaManager() - { -- while ( !m_backends.isEmpty() ) -- { -- BackendBase *b = m_backends.first(); -- m_backends.remove( b ); -- delete b; -- } -+ while ( !m_backends.isEmpty() ) -+ { -+ BackendBase *b = m_backends.first(); -+ m_backends.remove( b ); -+ delete b; -+ } - } - - void MediaManager::loadBackends() - { - m_mediaList.blockSignals(true); - -- while ( !m_backends.isEmpty() ) -- { -- BackendBase *b = m_backends.first(); -- m_backends.remove( b ); -- delete b; -- } -- -- mp_removableBackend = 0L; -- m_halbackend = 0L; -- m_fstabbackend = 0L; -+ while ( !m_backends.isEmpty() ) -+ { -+ BackendBase *b = m_backends.first(); -+ m_backends.remove( b ); -+ delete b; -+ } -+ -+ mp_removableBackend = 0L; - - #ifdef COMPILE_HALBACKEND -- if ( MediaManagerSettings::self()->halBackendEnabled() ) -- { -- m_halbackend = new HALBackend(m_mediaList, this); -- if (m_halbackend->InitHal()) -- { -- m_backends.append( m_halbackend ); -- m_fstabbackend = new FstabBackend(m_mediaList, true); -- m_backends.append( m_fstabbackend ); -- // No need to load something else... -- m_mediaList.blockSignals(false); -- return; -- } -- else -- { -- delete m_halbackend; -- m_halbackend = 0; -- } -- } -+ if ( MediaManagerSettings::self()->halBackendEnabled() ) -+ { -+ HALBackend* hal_backend = new HALBackend(m_mediaList, this); -+ if (hal_backend->InitHal()) -+ { -+ m_backends.append( hal_backend ); -+ m_backends.append( new FstabBackend(m_mediaList, true) ); -+ // No need to load something else... -+ m_mediaList.blockSignals(false); -+ return; -+ } -+ else -+ { -+ delete hal_backend; -+ } -+ } - #endif // COMPILE_HALBACKEND - -- mp_removableBackend = new RemovableBackend(m_mediaList); -- m_backends.append( mp_removableBackend ); -+ mp_removableBackend = new RemovableBackend(m_mediaList); -+ m_backends.append( mp_removableBackend ); - - #ifdef COMPILE_LINUXCDPOLLING -- if ( MediaManagerSettings::self()->cdPollingEnabled() ) -- { -- m_backends.append( new LinuxCDPolling(m_mediaList) ); -- } -+ if ( MediaManagerSettings::self()->cdPollingEnabled() ) -+ { -+ m_backends.append( new LinuxCDPolling(m_mediaList) ); -+ } - #endif //COMPILE_LINUXCDPOLLING - -- m_fstabbackend = new FstabBackend(m_mediaList); -- m_backends.append( m_fstabbackend ); -- m_mediaList.blockSignals(false); -+ m_backends.append( new FstabBackend(m_mediaList) ); -+ m_mediaList.blockSignals(false); - } - - - QStringList MediaManager::fullList() - { -- QPtrList<Medium> list = m_mediaList.list(); -+ QPtrList<Medium> list = m_mediaList.list(); - -- QStringList result; -+ QStringList result; - -- QPtrList<Medium>::const_iterator it = list.begin(); -- QPtrList<Medium>::const_iterator end = list.end(); -- for (; it!=end; ++it) -- { -- result+= (*it)->properties(); -- result+= Medium::SEPARATOR; -- } -+ QPtrList<Medium>::const_iterator it = list.begin(); -+ QPtrList<Medium>::const_iterator end = list.end(); -+ for (; it!=end; ++it) -+ { -+ result+= (*it)->properties(); -+ result+= Medium::SEPARATOR; -+ } - -- return result; -+ return result; - } - - QStringList MediaManager::properties(const QString &name) - { -- const Medium *m = m_mediaList.findByName(name); -- -- if (!m) -- { -- KURL u(name); -- kdDebug() << "Media::prop " << name << " " << u.isValid() << endl; -- if (u.isValid()) -- { -- if (u.protocol() == "system") -- { -- QString path = u.path(); -- if (path.startsWith("/media/")) -- path = path.mid(strlen("/media/")); -- m = m_mediaList.findByName(path); -- kdDebug() << "findByName " << path << m << endl; -- } -- else if (u.protocol() == "media") -- { -- m = m_mediaList.findByName(u.filename()); -- kdDebug() << "findByName " << u.filename() << m << endl; -- } -- else if (u.protocol() == "file") -- { -- // look for the mount point -- QPtrList<Medium> list = m_mediaList.list(); -- QPtrList<Medium>::const_iterator it = list.begin(); -- QPtrList<Medium>::const_iterator end = list.end(); -- for (; it!=end; ++it) -- { -- kdDebug() << "comparing " << (*it)->mountPoint() << " " << u.path() << " " << (*it)->deviceNode() << endl; -- if ((*it)->mountPoint() == u.path() || (*it)->deviceNode() == u.path()) { -- m = *it; -- break; -- } -- } -- } -- } -- } -- -- if (m) -- return m->properties(); -- else -- return QStringList(); --} -+ const Medium *m = m_mediaList.findByName(name); - --QStringList MediaManager::mountoptions(const QString &name) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return QStringList(); -- return m_halbackend->mountoptions(name); --#else -- return QStringList(); --#endif --} -- --bool MediaManager::setMountoptions(const QString &name, const QStringList &options) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return false; -- return m_halbackend->setMountoptions(name, options); --#else -- return false; --#endif --} -- --QString MediaManager::mount(const QString &name) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return i18n("Feature only available with HAL"); -- return m_halbackend->mount(name); --#else -- if ( !m_fstabbackend ) // lying :) -- return i18n("Feature only available with HAL"); -- return m_fstabbackend->mount( name ); --#endif --} -- --QString MediaManager::unmount(const QString &name) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return i18n("Feature only available with HAL"); -- return m_halbackend->unmount(name); --#else -- if ( !m_fstabbackend ) // lying :) -- return i18n("Feature only available with HAL"); -- return m_fstabbackend->unmount( name ); --#endif -+ if (m!=0L) -+ { -+ return m->properties(); -+ } -+ else -+ { -+ return QStringList(); -+ } - } - - QString MediaManager::nameForLabel(const QString &label) - { -- const QPtrList<Medium> media = m_mediaList.list(); -+ const QPtrList<Medium> media = m_mediaList.list(); - -- QPtrList<Medium>::const_iterator it = media.begin(); -- QPtrList<Medium>::const_iterator end = media.end(); -- for (; it!=end; ++it) -- { -- const Medium *m = *it; -- -- if (m->prettyLabel()==label) -- { -- return m->name(); -- } -- } -+ QPtrList<Medium>::const_iterator it = media.begin(); -+ QPtrList<Medium>::const_iterator end = media.end(); -+ for (; it!=end; ++it) -+ { -+ const Medium *m = *it; -+ -+ if (m->prettyLabel()==label) -+ { -+ return m->name(); -+ } -+ } - -- return QString::null; -+ return QString::null; - } - - ASYNC MediaManager::setUserLabel(const QString &name, const QString &label) - { -- m_mediaList.setUserLabel(name, label); -+ m_mediaList.setUserLabel(name, label); - } - - ASYNC MediaManager::reloadBackends() - { -- MediaManagerSettings::self()->readConfig(); -- loadBackends(); -+ MediaManagerSettings::self()->readConfig(); -+ loadBackends(); - } - - bool MediaManager::removablePlug(const QString &devNode, const QString &label) - { -- if (mp_removableBackend) -- { -- return mp_removableBackend->plug(devNode, label); -- } -- return false; -+ if (mp_removableBackend) -+ { -+ return mp_removableBackend->plug(devNode, label); -+ } -+ return false; - } - - bool MediaManager::removableUnplug(const QString &devNode) - { -- if (mp_removableBackend) -- { -- return mp_removableBackend->unplug(devNode); -- } -- return false; -+ if (mp_removableBackend) -+ { -+ return mp_removableBackend->unplug(devNode); -+ } -+ return false; - } - - bool MediaManager::removableCamera(const QString &devNode) - { -- if (mp_removableBackend) -- { -- return mp_removableBackend->camera(devNode); -- } -- return false; -+ if (mp_removableBackend) -+ { -+ return mp_removableBackend->camera(devNode); -+ } -+ return false; - } - - - void MediaManager::slotMediumAdded(const QString &/*id*/, const QString &name, - bool allowNotification) - { -- kdDebug(1219) << "MediaManager::slotMediumAdded: " << name << endl; -+ kdDebug(1219) << "MediaManager::slotMediumAdded: " << name << endl; - -- KDirNotify_stub notifier("*", "*"); -- notifier.FilesAdded( KURL("media:/") ); -+ KDirNotify_stub notifier("*", "*"); -+ notifier.FilesAdded( KURL("media:/") ); - -- emit mediumAdded(name, allowNotification); -- emit mediumAdded(name); -+ emit mediumAdded(name, allowNotification); -+ emit mediumAdded(name); - } - - void MediaManager::slotMediumRemoved(const QString &/*id*/, const QString &name, - bool allowNotification) - { -- kdDebug(1219) << "MediaManager::slotMediumRemoved: " << name << endl; -+ kdDebug(1219) << "MediaManager::slotMediumRemoved: " << name << endl; - -- KDirNotify_stub notifier("*", "*"); -- notifier.FilesRemoved( KURL("media:/"+name) ); -+ KDirNotify_stub notifier("*", "*"); -+ notifier.FilesRemoved( KURL("media:/"+name) ); - -- emit mediumRemoved(name, allowNotification); -- emit mediumRemoved(name); -+ emit mediumRemoved(name, allowNotification); -+ emit mediumRemoved(name); - } - - void MediaManager::slotMediumChanged(const QString &/*id*/, const QString &name, - bool mounted, bool allowNotification) - { -- kdDebug(1219) << "MediaManager::slotMediumChanged: " << name << endl; -+ kdDebug(1219) << "MediaManager::slotMediumChanged: " << name << endl; - -- KDirNotify_stub notifier("*", "*"); -- if (!mounted) -- { -- notifier.FilesRemoved( KURL("media:/"+name) ); -- } -- notifier.FilesChanged( KURL("media:/"+name) ); -+ KDirNotify_stub notifier("*", "*"); -+ if (!mounted) -+ { -+ notifier.FilesRemoved( KURL("media:/"+name) ); -+ } -+ notifier.FilesChanged( KURL("media:/"+name) ); - -- emit mediumChanged(name, allowNotification); -- emit mediumChanged(name); -+ emit mediumChanged(name, allowNotification); -+ emit mediumChanged(name); - } - - -diff -urN kioslave/media/mediamanager/mediamanager.desktop kioslave/media/mediamanager/mediamanager.desktop ---- kioslave/media/mediamanager/mediamanager.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/mediamanager.desktop Tue May 23 13:33:34 2006 -@@ -16,13 +16,11 @@ - Name[es]=Administrador de recursos KDED - Name[et]=KDED andmekandjate haldur - Name[eu]=KDED media kudeatzailea --Name[fa]=مدیر رسانه KDED - Name[fi]=KDED-tallennusmedianhallinta - Name[fr]=Gestionnaire de médias KDED - Name[fy]=KDEDED-mediabehearder - Name[ga]=Bainisteoir Meán KDED - Name[gl]=Xestor de Meios de KDED --Name[he]=מנהל המדיה של KDED - Name[hi]=केडीईडी मीडिया प्रबंधक - Name[hr]=KDED upravitelj medija - Name[hu]=KDED médiakezelő -@@ -45,7 +43,6 @@ - Name[ru]=Управление подключаемыми устройствами - Name[rw]=Mugenga Igihuza KDED - Name[se]=KDED-mediagieđahalli --Name[sk]=KDED správca médií - Name[sl]=Upravitelj medijev KDED - Name[sr]=Менаџер медијума, KDED - Name[sr@Latn]=Menadžer medijuma, KDED -@@ -73,18 +70,16 @@ - Comment[es]=Monitoriza las actividades de los recursos y permite (des)montarlos (media:/) - Comment[et]=Hoiab silma peal andmekandjate aktiivsusel ja võimaldab neid ühendada/lahutada (media:/) - Comment[eu]=Montatzeak begiztatzen ditu (media:/) eta desmontatzen uzten du --Comment[fa]=حفظ رد فعالیتهای رسانه و اجازه سو ار(پیاده) کردن (media:/) - Comment[fi]=Pidä kirjaa tallennustapahtumista ja salli tallennusvälineen liittäminen/irrotus (devices:/) - Comment[fr]=Gardez une trace des montages et permettre le (dé)montage (media:/) - Comment[fy]=Hâld de media-aktiviteiten by en stien ta om media oan- en ôf te keppelje (media:/) - Comment[gl]=Seguimento das actividades dos meios e permite-lle (des)montar (media:/) --Comment[he]=מנטר אחר פעילויות מדיה, ומאפשר לחבר או לנתק התקנים (media:/) - Comment[hi]=मीडिया क्रियाओं की जानकारी रखे तथा (अन)माउन्ट करने दे (मीडिया:/) - Comment[hr]=Praćenje aktivnosti medija i omogućavanje pristupanja i napuštanja - Comment[hu]=Az adathordozók követése, csatlakoztatása és leválasztása (media:/) - Comment[is]=Fylgjast með breytingum á tækjum og bjóða upp á (af)tengingu (media:/) - Comment[it]=Tiene traccia delle attività dei supporti e permette di montarli o smontarli (device:/) --Comment[ja]=メディアの活動を追跡し、(media:/) をマウントしたりアンマウントします -+Comment[ja]=メディアの活動を捕捉し、マウントしたりアンマウントします。(media:/) - Comment[km]=តាមដានសកម្មភាពព័ត៌មាន និងអនុញ្ញាតឲ្យរៀបចំ (មិនរៀបចំ) (media:/) - Comment[lt]=Stebi laikmenose vykdomus veiksmus ir leidžia (iš)montuoti (media:/) - Comment[lv]=Seko datu nesēju aktivitātēm un ļauj montēt/nomontēt tos (media:/) -@@ -103,7 +98,6 @@ - Comment[ru]=Автоматическое подключение устройств (media:/) - Comment[rw]=Kugumana inzira y'ibikorwa by'ibitangazamakuru no kwemerera gushyiramo(gukuramo) (ibitangazamakuru:/) - Comment[se]=Gozit mii dáhpáhuvvá median ja diktá du gálgat ja čadnat daid (media:/) --Comment[sk]=Sledovanie pripojenia/odpojenia medií (media:/) - Comment[sl]=Nadzoruj dejanja medija in dovilo priklop/odklop (media:/) - Comment[sr]=Прати активност медијума и омогућава (де)монтирање (media:/) - Comment[sr@Latn]=Prati aktivnost medijuma i omogućava (de)montiranje (media:/) -@@ -122,4 +116,3 @@ - X-KDE-FactoryName=mediamanager - X-KDE-Kded-autoload=true - X-KDE-Kded-load-on-demand=true --X-KDE-Kded-phase=1 -diff -urN kioslave/media/mediamanager/mediamanager.h kioslave/media/mediamanager/mediamanager.h ---- kioslave/media/mediamanager/mediamanager.h Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/mediamanager.h Mon Oct 10 17:04:01 2005 -@@ -28,8 +28,6 @@ - #include "removablebackend.h" - #include "mediadirnotify.h" - --class HALBackend; --class FstabBackend; - - class MediaManager : public KDEDModule - { -@@ -42,12 +40,6 @@ - k_dcop: - QStringList fullList(); - QStringList properties(const QString &name); -- QStringList mountoptions(const QString &name); -- bool setMountoptions(const QString &name, const QStringList &options); -- -- QString mount(const QString &uid); -- QString unmount(const QString &uid); -- - QString nameForLabel(const QString &label); - ASYNC setUserLabel(const QString &name, const QString &label); - -@@ -82,9 +74,7 @@ - MediaList m_mediaList; - QValueList<BackendBase*> m_backends; - RemovableBackend *mp_removableBackend; -- HALBackend *m_halbackend; - MediaDirNotify m_dirNotify; -- FstabBackend *m_fstabbackend; - }; - - #endif -diff -urN kioslave/media/medianotifier/Makefile.in kioslave/media/medianotifier/Makefile.in ---- kioslave/media/medianotifier/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/medianotifier/Makefile.in Fri May 26 09:54:31 2006 -@@ -254,6 +254,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/medianotifier/medianotifier.cpp kioslave/media/medianotifier/medianotifier.cpp ---- kioslave/media/medianotifier/medianotifier.cpp Sun Oct 1 19:31:53 2006 -+++ kioslave/media/medianotifier/medianotifier.cpp Fri Mar 17 11:17:33 2006 -@@ -48,21 +48,13 @@ - - MediaNotifier::~MediaNotifier() - { -- disconnectDCOPSignal( "kded", "mediamanager", "mediumAdded(QString, bool)", -- "onMediumChange(QString, bool)" ); -- -- disconnectDCOPSignal( "kded", "mediamanager", "mediumChanged(QString, bool)", -- "onMediumChange(QString, bool)" ); - } - - void MediaNotifier::onMediumChange( const QString &name, bool allowNotification ) - { - kdDebug() << "MediaNotifier::onMediumChange( " << name << ", " - << allowNotification << ")" << endl; -- -- if ( !allowNotification ) -- return; -- -+ - // Update user activity timestamp, otherwise the notification dialog will be shown - // in the background due to focus stealing prevention. Entering a new media can - // be seen as a kind of user activity after all. It'd be better to update the timestamp -@@ -103,11 +95,11 @@ - { - QString mimetype = medium.mimetype(); - -- bool is_cdrom = mimetype.startsWith( "cd" ) || mimetype.startsWith( "dvd" ); -+ bool is_cdrom = mimetype.contains( "cd" ) || mimetype.contains( "dvd" ); - bool is_mounted = mimetype.endsWith( "_mounted" ); - - // We autorun only on CD/DVD or removable disks (USB, Firewire) -- if ( !( is_cdrom || is_mounted ) -+ if ( !( is_cdrom && is_mounted ) - && mimetype!="media/removable_mounted" ) - { - return false; -diff -urN kioslave/media/medianotifier/medianotifier.desktop kioslave/media/medianotifier/medianotifier.desktop ---- kioslave/media/medianotifier/medianotifier.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/medianotifier/medianotifier.desktop Mon May 22 20:12:42 2006 -@@ -18,12 +18,10 @@ - Name[es]=Demonio de notificaciones de medios - Name[et]=Andmekandjate märguannete deemon - Name[eu]=Euskarrien jakinarazpen daemon-a --Name[fa]=شبح اخطاردهنده رسانه - Name[fi]=Mediahuomautin - Name[fr]=Démon de notifications des média - Name[fy]=Medianotifikaasje-daemon - Name[gl]=Daemon Notificador de Medios --Name[he]=שירות הודעות מערכת - Name[hr]=Demon obavijesti o medijima - Name[hu]=Lemezfigyelő szolgáltatás - Name[is]=Miðils tilkynningarpúki -@@ -34,12 +32,10 @@ - Name[nb]=Medievarslingsnisse - Name[nds]=Medien-Narichtendämoon - Name[nl]=Medianotificatie-daemon --Name[nn]=Mediepåminningsnisse - Name[pl]=Usługa powiadamiania o nośnikach - Name[pt]=Servidor de Notificação de Dispositivos - Name[pt_BR]=Servidor de Notificação de Dispositivos - Name[ru]=Демон уведомлений от подключаемых устройств --Name[sk]=Notifikátor medií - Name[sl]=Demon za obveščanje o nosilcih - Name[sr]=Демон за обавештења о медијумима - Name[sr@Latn]=Demon za obaveštenja o medijumima -@@ -47,7 +43,6 @@ - Name[uk]=Даемон сповіщення про носії інформації - Name[vi]=Trình nền Thông báo Ổ lưu trữ - Name[zh_CN]=介质通知守护程序 --Name[zh_TW]=媒體通知伺服程式 - Comment=A media plugged notifier - Comment[af]='n Inpropbare media inkennissteller - Comment[bg]=Мултимедиен демон за уведомяване при поставяне/включване на ново мултимедийно устройство -@@ -61,7 +56,6 @@ - Comment[es]=Un notificador de medios empotrable - Comment[et]=Andmekandja ühendamisest märkuandev deemon - Comment[eu]=Euskarri konektatze jakinarazlea --Comment[fa]=یک اخطاردهنده وصلشده رسانه - Comment[fi]=Liitetyn median huomautin - Comment[fr]=Notification de connexion de média - Comment[fy]=Meidieling fan oankeppele media -@@ -70,7 +64,7 @@ - Comment[hu]=Lemezérzékelő - Comment[is]=Tilkynnari um tengda miðla - Comment[it]=Notifiche dei dispositivi attaccati --Comment[ja]=メディアの接続を通知します -+Comment[ja]=メディアの接続を通知する - Comment[lt]=Perspėjimo apie media prijungimą priedas - Comment[mk]=Известување за приклучен медиум - Comment[nb]=En medievarsler som programtillegg -@@ -82,7 +76,6 @@ - Comment[pt]=Um notificador ligado aos dispositivos - Comment[pt_BR]=um notificador para mídia que é espetada (plug) - Comment[ru]=Система обработки уведомлений от подключаемых устройств --Comment[sk]=Notifikátor pripojených médií - Comment[sl]=Obveščanje o vstavljenih/priklopljenih nosilcih - Comment[sr]=Обавештавач о укљученим медијима - Comment[sr@Latn]=Obaveštavač o uključenim medijima -diff -urN kioslave/media/medianotifier/notificationdialog.cpp kioslave/media/medianotifier/notificationdialog.cpp ---- kioslave/media/medianotifier/notificationdialog.cpp Sat Oct 7 16:23:12 2006 -+++ kioslave/media/medianotifier/notificationdialog.cpp Mon Oct 10 17:04:00 2005 -@@ -26,7 +26,6 @@ - #include <klistbox.h> - #include <qlabel.h> - #include <qcheckbox.h> --#include <qpushbutton.h> - - #include "actionlistboxitem.h" - #include "notificationdialogview.h" -@@ -71,8 +70,6 @@ - this, SLOT( delayedDestruct() ) ); - - m_actionWatcher->startScan(); -- QPushButton * btn = actionButton( Ok ); -- btn->setFocus(); - } - - NotificationDialog::~NotificationDialog() -diff -urN kioslave/media/mimetypes/Makefile.in kioslave/media/mimetypes/Makefile.in ---- kioslave/media/mimetypes/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/mimetypes/Makefile.in Fri May 26 09:54:31 2006 -@@ -211,6 +211,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/mimetypes/audiocd.desktop kioslave/media/mimetypes/audiocd.desktop ---- kioslave/media/mimetypes/audiocd.desktop Mon Oct 2 12:44:33 2006 -+++ kioslave/media/mimetypes/audiocd.desktop Mon May 22 20:12:42 2006 -@@ -11,7 +11,6 @@ - Comment[cs]=Zvukové CD - Comment[da]=Lyd-cd - Comment[el]=CD ήχου --Comment[fa]=دیسک فشرده صوتی - Comment[fi]=CD-äänilevy - Comment[fr]=CD audio - Comment[fy]=Audio-Kompaktskiif -@@ -25,7 +24,6 @@ - Comment[it]=CD audio - Comment[ja]=オーディオ CD - Comment[km]=ស៊ីឌីអូឌីយ៉ូ --Comment[mk]=Аудио ЦД - Comment[ms]=CD Audio - Comment[nb]=Lyd-CD - Comment[nds]=Audio-CD -@@ -33,7 +31,7 @@ - Comment[nn]=Lyd-CD - Comment[pa]=ਆਡੀਓ CD - Comment[pl]=Płyta CD Audio --Comment[pt]=CD de áudio -+Comment[pt]=CD áudio - Comment[pt_BR]=CD de Áudio - Comment[ro]=CD Audio - Comment[ru]=Аудио CD -diff -urN kioslave/media/mimetypes/blankcd.desktop kioslave/media/mimetypes/blankcd.desktop ---- kioslave/media/mimetypes/blankcd.desktop Mon Oct 2 12:44:33 2006 -+++ kioslave/media/mimetypes/blankcd.desktop Mon May 22 20:12:43 2006 -@@ -16,7 +16,6 @@ - Comment[es]=CD vacío - Comment[et]=Tühi CD - Comment[eu]=CD hutsik --Comment[fa]=دیسک فشرده خام - Comment[fi]=Tyhjä CD - Comment[fr]=CD vierge - Comment[fy]=Blanke Kompaktskiif -@@ -32,7 +31,6 @@ - Comment[km]=ស៊ីឌីទទេ - Comment[lt]=Tuščias CD - Comment[lv]=Tukšs CD --Comment[mk]=Празно ЦД - Comment[ms]=CD Kosong - Comment[nb]=Tom CD - Comment[nds]=Leddige CD -@@ -46,7 +44,6 @@ - Comment[ru]=Чистый CD - Comment[rw]=CD Itanditseho - Comment[se]=Guorus CD --Comment[sk]=Čisté CD - Comment[sl]=Prazen CD - Comment[sr]=Празан CD - Comment[sr@Latn]=Prazan CD -diff -urN kioslave/media/mimetypes/blankdvd.desktop kioslave/media/mimetypes/blankdvd.desktop ---- kioslave/media/mimetypes/blankdvd.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/blankdvd.desktop Mon May 22 20:12:42 2006 -@@ -16,7 +16,6 @@ - Comment[es]=DVD vacío - Comment[et]=Tühi DVD - Comment[eu]=DVD hutsik --Comment[fa]=DVD خام - Comment[fi]=Tyhjä DVD-levy - Comment[fr]=DVD vierge - Comment[fy]=Blanke Dûbelskiif -@@ -32,7 +31,6 @@ - Comment[km]=ឌីវីឌីទទេ - Comment[lt]=Tuščias DVD - Comment[lv]=Tukšs DVD --Comment[mk]=Празно DVD - Comment[ms]=DVD Kosong - Comment[nb]=Tom DVD - Comment[nds]=Leddige DVD -@@ -46,7 +44,6 @@ - Comment[ru]=Чистый DVD - Comment[rw]=DVD Itanditseho - Comment[se]=Guorus DVD --Comment[sk]=Čisté DVD - Comment[sl]=Prazen DVD - Comment[sr]=Празан DVD - Comment[sr@Latn]=Prazan DVD -diff -urN kioslave/media/mimetypes/camera_mounted.desktop kioslave/media/mimetypes/camera_mounted.desktop ---- kioslave/media/mimetypes/camera_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/camera_mounted.desktop Mon May 22 20:12:42 2006 -@@ -16,7 +16,6 @@ - Comment[es]=Cámara montada - Comment[et]=Ühendatud kaamera - Comment[eu]=Kamara muntatuta --Comment[fa]=دوربین سوارشده - Comment[fi]=Liitetty kamera - Comment[fr]=Appareil photo monté - Comment[fy]=Oankeppele kamera -@@ -41,7 +40,6 @@ - Comment[pt_BR]=Câmera montada - Comment[ru]=Подключённая камера - Comment[se]=Čatnon govvenapperáhtta --Comment[sk]=Pripojený digitálny fotoaparát - Comment[sl]=Priklopljen fotoaparat - Comment[sr]=Монтирана камера - Comment[sr@Latn]=Montirana kamera -diff -urN kioslave/media/mimetypes/camera_unmounted.desktop kioslave/media/mimetypes/camera_unmounted.desktop ---- kioslave/media/mimetypes/camera_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/camera_unmounted.desktop Mon May 22 20:12:42 2006 -@@ -16,7 +16,6 @@ - Comment[es]=Cámara desmontada - Comment[et]=Lahutatud kaamera - Comment[eu]=Kamara desmuntatua --Comment[fa]=دوربین پیادهشده - Comment[fi]=Irrotettu kamera - Comment[fr]=Appareil photo non monté - Comment[fy]=Ofkeppele kamera -@@ -41,7 +40,6 @@ - Comment[pt_BR]=Câmera desmontada - Comment[ru]=Неподключённая камера - Comment[se]=Gálgajuvvon govvenapperáhtta --Comment[sk]=Odpojený digitálny fotoaparát - Comment[sl]=Odklopljen fotoaparat - Comment[sr]=Демонтирана камера - Comment[sr@Latn]=Demontirana kamera -diff -urN kioslave/media/mimetypes/cdrom_mounted.desktop kioslave/media/mimetypes/cdrom_mounted.desktop ---- kioslave/media/mimetypes/cdrom_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/cdrom_mounted.desktop Mon May 22 20:12:43 2006 -@@ -21,7 +21,7 @@ - Comment[es]=CD-ROM montado - Comment[et]=Ühendatud CD-ROM - Comment[eu]=CD-ROM muntatua --Comment[fa]=CD-ROM سوارشده -+Comment[fa]=CD سوار شده - Comment[fi]=Liitetty CD-ROM - Comment[fr]=CD-ROM monté - Comment[fy]=Oankeppele Kompaktskiif -diff -urN kioslave/media/mimetypes/cdrom_unmounted.desktop kioslave/media/mimetypes/cdrom_unmounted.desktop ---- kioslave/media/mimetypes/cdrom_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/cdrom_unmounted.desktop Mon May 22 20:12:43 2006 -@@ -21,7 +21,7 @@ - Comment[es]=CD-ROM desmontado - Comment[et]=Lahutatud CD-ROM - Comment[eu]=CD-ROM desmuntatua --Comment[fa]=CD-ROM پیادهشده -+Comment[fa]= CD پیاده شده - Comment[fi]=Irrotettu CD-ROM - Comment[fr]=CD-ROM non monté - Comment[fy]=Ofkeppele Kompaktskiif -diff -urN kioslave/media/mimetypes/cdwriter_mounted.desktop kioslave/media/mimetypes/cdwriter_mounted.desktop ---- kioslave/media/mimetypes/cdwriter_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/cdwriter_mounted.desktop Mon May 22 20:12:42 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Escritor de CDs montado - Comment[et]=Ühendatud CD kirjutaja - Comment[eu]=CD erretzaile muntatua --Comment[fa]=CD Writer سوارشده -+Comment[fa]=CD Writer سوار شده - Comment[fi]=Liitetty CD-kirjoitin - Comment[fr]=Graveur de CD monté - Comment[fy]=Oankeppele Kompaktskiif -diff -urN kioslave/media/mimetypes/cdwriter_unmounted.desktop kioslave/media/mimetypes/cdwriter_unmounted.desktop ---- kioslave/media/mimetypes/cdwriter_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/cdwriter_unmounted.desktop Mon May 22 20:12:42 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Escritor de CDs desmontado - Comment[et]=Lahutatud CD kirjutaja - Comment[eu]=CD erretzaile desmuntatua --Comment[fa]=CD Writer پیادهشده -+Comment[fa]=CD Writer پیاده شده - Comment[fi]=Irrotettu CD-kirjoitin - Comment[fr]=Graveur de CD non monté - Comment[fy]=Ofkeppele Kompaktskiif -diff -urN kioslave/media/mimetypes/dvd_mounted.desktop kioslave/media/mimetypes/dvd_mounted.desktop ---- kioslave/media/mimetypes/dvd_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/dvd_mounted.desktop Mon May 22 20:12:42 2006 -@@ -21,7 +21,7 @@ - Comment[es]=DVD montado - Comment[et]=Ühendatud DVD - Comment[eu]=DVD muntatua --Comment[fa]=DVD سوارشده -+Comment[fa]=DVD سوار شده - Comment[fi]=Liitetty DVD-levy - Comment[fr]=DVD-ROM monté(s) - Comment[fy]=Oankeppele Dûbelskiif -diff -urN kioslave/media/mimetypes/dvd_unmounted.desktop kioslave/media/mimetypes/dvd_unmounted.desktop ---- kioslave/media/mimetypes/dvd_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/dvd_unmounted.desktop Tue May 23 13:33:34 2006 -@@ -21,7 +21,7 @@ - Comment[es]=DVD desmontado - Comment[et]=Lahutatud DVD - Comment[eu]=DVD desmuntatua --Comment[fa]=DVD پیادهشده -+Comment[fa]=DVD پیاده شده - Comment[fi]=Irrotettu DVD-levy - Comment[fr]=DVD-ROM non monté(s) - Comment[fy]=Ofkeppele Dûbelskiif -diff -urN kioslave/media/mimetypes/dvdvideo.desktop kioslave/media/mimetypes/dvdvideo.desktop ---- kioslave/media/mimetypes/dvdvideo.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/dvdvideo.desktop Mon May 22 20:12:43 2006 -@@ -16,7 +16,6 @@ - Comment[es]=Disco de video DVD - Comment[et]=DVD videoplaat - Comment[eu]=DVD bideo diska --Comment[fa]=دیسک ویدئویی DVD - Comment[fi]=DVD-videolevy - Comment[fr]=DVD vidéo - Comment[fy]=Dûbelskiif Fideoskiif -@@ -32,7 +31,6 @@ - Comment[km]=ថាសវីដេអូ ឌីវីឌី - Comment[lt]=DVD video diskas - Comment[lv]=DVD Video Disks --Comment[mk]=DVD Видеодиск - Comment[ms]=Cakera Video DVD - Comment[nb]=DVD-videoplate - Comment[nds]=DVD-Videodisk -@@ -40,13 +38,12 @@ - Comment[nn]=DVD-videoplate - Comment[pa]=DVD ਵੀਡਿਓ ਡਿਸਕ - Comment[pl]=Płyta DVD Video --Comment[pt]=Disco DVD de Vídeo -+Comment[pt]=Disco DVD Vídeo - Comment[pt_BR]=DVD de vídeo - Comment[ro]=Disc video DVD - Comment[ru]=DVD с видео - Comment[rw]=Disiki Videwo DVD - Comment[se]=DVD-videoskearru --Comment[sk]=DVD Video disk - Comment[sl]=DVD Video disk - Comment[sr]=DVD видео диск - Comment[sr@Latn]=DVD video disk -diff -urN kioslave/media/mimetypes/floppy5_mounted.desktop kioslave/media/mimetypes/floppy5_mounted.desktop ---- kioslave/media/mimetypes/floppy5_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/floppy5_mounted.desktop Mon May 22 20:12:42 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disquete 5¼" montado - Comment[et]=Ühendatud 5¼" flopi - Comment[eu]=5¼"ko diskete muntatua --Comment[fa]=فلاپی 5¼" سوارشده -+Comment[fa]=فلاپی 5¼"سوار شده - Comment[fi]=Liitetty 5¼"-levyke - Comment[fr]=Disquette 5¼" montée - Comment[fy]=Oankeppele 5¼" Skiif -diff -urN kioslave/media/mimetypes/floppy5_unmounted.desktop kioslave/media/mimetypes/floppy5_unmounted.desktop ---- kioslave/media/mimetypes/floppy5_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/floppy5_unmounted.desktop Tue May 23 13:33:35 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disquete 5¼" desmontado - Comment[et]=Lahutatud 5¼" flopi - Comment[eu]=5¼"ko diskete desmuntatua --Comment[fa]=فلاپی 5¼" پیادهشده -+Comment[fa]=فلاپی 5¼" پیاده شده - Comment[fi]=Irrotettu 5¼"-levyke - Comment[fr]=Disquette 5¼" non montée - Comment[fy]=Ofkeppele 5¼" Skiif -diff -urN kioslave/media/mimetypes/floppy_mounted.desktop kioslave/media/mimetypes/floppy_mounted.desktop ---- kioslave/media/mimetypes/floppy_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/floppy_mounted.desktop Mon May 22 20:12:43 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disquete montado - Comment[et]=Ühendatud flopi - Comment[eu]=Diskete muntatua --Comment[fa]=فلاپی سوارشده -+Comment[fa]=فلاپی سوار شده - Comment[fi]=Liitetty levyke - Comment[fr]=Disquette montée - Comment[fy]=Oankeppele Skiif -diff -urN kioslave/media/mimetypes/floppy_unmounted.desktop kioslave/media/mimetypes/floppy_unmounted.desktop ---- kioslave/media/mimetypes/floppy_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/floppy_unmounted.desktop Tue May 23 13:33:34 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disquete desmontado - Comment[et]=Lahutatud flopi - Comment[eu]=Diskete desmuntatua --Comment[fa]=فلاپی پیادهشده -+Comment[fa]=فلاپی پیاده شده - Comment[fi]=Irrotettu levyke - Comment[fr]=Disquette non montée - Comment[fy]=Ofkeppele Skiif -diff -urN kioslave/media/mimetypes/gphoto2camera.desktop kioslave/media/mimetypes/gphoto2camera.desktop ---- kioslave/media/mimetypes/gphoto2camera.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/gphoto2camera.desktop Mon May 22 20:12:43 2006 -@@ -18,7 +18,6 @@ - Comment[es]=Cámara - Comment[et]=Kaamera - Comment[eu]=Kamara --Comment[fa]=دوربین - Comment[fi]=Kamera - Comment[fr]=Nouvel appareil photo - Comment[fy]=Kamera -@@ -41,13 +40,12 @@ - Comment[nn]=Kamera - Comment[pa]=ਕੈਮਰਾ - Comment[pl]=Aparat fotograficzny --Comment[pt]=Máquina fotográfica -+Comment[pt]=Máquina Fotográfica - Comment[pt_BR]=Câmera - Comment[ro]=Aparat foto - Comment[ru]=Камера - Comment[rw]=Kamera - Comment[se]=Govvanaperáhtta --Comment[sk]=Digitálny fotoaparát - Comment[sl]=Fotoaparat - Comment[sr]=Камера - Comment[sr@Latn]=Kamera -diff -urN kioslave/media/mimetypes/hdd_mounted.desktop kioslave/media/mimetypes/hdd_mounted.desktop ---- kioslave/media/mimetypes/hdd_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/hdd_mounted.desktop Mon May 22 20:12:43 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Volumen de disco duro montado - Comment[et]=Ühendatud kõvaketta partitsioon - Comment[eu]=Diska gogorraren zatiketa muntatua --Comment[fa]=حجم دیسک سخت سوارشده - Comment[fi]=Liitetty kiintoleyosio - Comment[fr]=Partition de disque dur montée - Comment[fy]=Oankeppele Fêsteskiif folume -@@ -44,13 +43,12 @@ - Comment[nn]=Montert harddiskvolum - Comment[pa]=ਮਾਊਟ ਕੀਤਾ ਹਾਰਡ ਡਿਸਕ ਭਾਗ - Comment[pl]=Zamontowana partycja dysku twardego --Comment[pt]=Volume de disco rígido montado -+Comment[pt]=Volume de Disco Rígido Montado - Comment[pt_BR]=Volume do HD Montado - Comment[ro]=Volum de hard disc montat - Comment[ru]=Смонтированный раздел жёсткого диска - Comment[rw]=Ububiko Disiki Bwashyizwemo - Comment[se]=Čatnon garraskearrooassi --Comment[sk]=Pripojený oddiel pevného disku - Comment[sl]=Priklopljen pogon trdega diska - Comment[sr]=Монтирана партиција хард диска - Comment[sr@Latn]=Montirana particija hard diska -diff -urN kioslave/media/mimetypes/hdd_unmounted.desktop kioslave/media/mimetypes/hdd_unmounted.desktop ---- kioslave/media/mimetypes/hdd_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/hdd_unmounted.desktop Mon May 22 20:12:43 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Volumen de disco duro desmontado - Comment[et]=Lahutatud kõvaketta partitsioon - Comment[eu]=Diska gogorraren zatiketa desmuntatua --Comment[fa]=حجم دیسک سخت پیاده شده - Comment[fi]=Irrotettu kiintolevyosio - Comment[fr]=Partition de disque dur non montée - Comment[fy]=Ofkeppele Fêsteskiif folume -@@ -44,13 +43,12 @@ - Comment[nn]=Umontert harddiskvolum - Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ ਹਾਰਡ ਡਿਸਕ ਭਾਗ - Comment[pl]=Odmontowana partycja dysku twardego --Comment[pt]=Volume de disco rígido desmontado -+Comment[pt]=Volume de Disco Rígido Desmontado - Comment[pt_BR]=Volume do HD Desmontado - Comment[ro]=Volum de hard disc nemontat - Comment[ru]=Отмонтированный раздел жёсткого диска - Comment[rw]=Ububiko Disiki Bwakuwemo - Comment[se]=Gálgajuvvon garraskearrooassi --Comment[sk]=Odpojený oddiel pevného disku - Comment[sl]=Odklopljen pogon trdega diska - Comment[sr]=Демонтирана партиција хард диска - Comment[sr@Latn]=Demontirana particija hard diska -diff -urN kioslave/media/mimetypes/nfs_mounted.desktop kioslave/media/mimetypes/nfs_mounted.desktop ---- kioslave/media/mimetypes/nfs_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/nfs_mounted.desktop Tue May 23 13:33:34 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Recurso NFS montado - Comment[et]=Ühendatud NFS ressurss - Comment[eu]=NFS baliabide muntatua --Comment[fa]=مشترک NFS سوارشده - Comment[fi]=Liitetty NFS-jako - Comment[fr]=Ressource NFS montée - Comment[fy]=Oankeppele NFS-boarne -@@ -44,13 +43,12 @@ - Comment[nn]=Montert delt NFS-ressurs - Comment[pa]=ਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਝ - Comment[pl]=Zamontowany system plików NFS --Comment[pt]=Partilha de NFS montada -+Comment[pt]=Partilha de NFS Montada - Comment[pt_BR]=Volume NFS Montado - Comment[ro]=Partajare NFS montată - Comment[ru]=Смонтированный ресурс NFS - Comment[rw]=Umugabane NFS Washyizwemo - Comment[se]=Čatnon NFS-resursa --Comment[sk]=Pripojený zdroj NFS - Comment[sl]=Priklopljen vir NFS - Comment[sr]=Монтирано NFS дељење - Comment[sr@Latn]=Montirano NFS deljenje -diff -urN kioslave/media/mimetypes/nfs_unmounted.desktop kioslave/media/mimetypes/nfs_unmounted.desktop ---- kioslave/media/mimetypes/nfs_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/nfs_unmounted.desktop Tue May 23 13:33:35 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Recurso NFS desmontado - Comment[et]=Lahutatud NFS ressurss - Comment[eu]=NFS baliabide desmuntatua --Comment[fa]=مشترک NFS پیاده شده - Comment[fi]=Irrotettu NFS-jako - Comment[fr]=Ressource NFS non montée - Comment[fy]=Oankeppele NFS-boarne -@@ -44,13 +43,12 @@ - Comment[nn]=Umontert delt NFS-ressurs - Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਝ - Comment[pl]=Odmontowany system plików NFS --Comment[pt]=Partilha de NFS desmontada -+Comment[pt]=Partilha de NFS Desmontada - Comment[pt_BR]=Volume NFS Desmontado - Comment[ro]=Partajare NFS nemontată - Comment[ru]=Отмонтированный ресурс NFS - Comment[rw]=Umugabane NFS Wakuwemo - Comment[se]=Gálgajuvvon NFS-resursa --Comment[sk]=Odpojený zdroj NFS - Comment[sl]=Odklopljen vir NFS - Comment[sr]=Демонтирано NFS дељење - Comment[sr@Latn]=Demontirano NFS deljenje -diff -urN kioslave/media/mimetypes/removable_mounted.desktop kioslave/media/mimetypes/removable_mounted.desktop ---- kioslave/media/mimetypes/removable_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/removable_mounted.desktop Mon May 22 20:12:42 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Recurso extraíble montado - Comment[et]=Ühendatud eemaldatav andmekandja - Comment[eu]=Euskarri aldagarria muntatua --Comment[fa]=رسانه برداشتنی سوارشده - Comment[fi]=Liitetty irrotettava resurssi - Comment[fr]=Média amovible monté - Comment[fy]=Oankeppele ferwiderber medium -@@ -44,13 +43,12 @@ - Comment[nn]=Montert flyttbart medium - Comment[pa]=ਮਾਊਟ ਕੀਤੇ ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ - Comment[pl]=Zamontowany nośnik wymienny --Comment[pt]=Dispositivo amovível montado -+Comment[pt]=Dispositivo Amovível Montado - Comment[pt_BR]=Mídia Removível Montada - Comment[ro]=Mediu amovibil montat - Comment[ru]=Смонтированный внешний диск - Comment[rw]=Igitangazamakuru Kivanwamo Cyashyizwemo - Comment[se]=Čátnon sirdehahtti medium --Comment[sk]=Pripojené vyberateľné médium - Comment[sl]=Priklopljen odstranljiv medij - Comment[sr]=Монтиран уклоњиви медијум - Comment[sr@Latn]=Montiran uklonjivi medijum -diff -urN kioslave/media/mimetypes/removable_unmounted.desktop kioslave/media/mimetypes/removable_unmounted.desktop ---- kioslave/media/mimetypes/removable_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/removable_unmounted.desktop Mon May 22 20:12:42 2006 -@@ -19,7 +19,6 @@ - Comment[es]=Recurso extraíble desmontado - Comment[et]=Lahutatud eemaldatav andmekandja - Comment[eu]=Euskarri aldagarria desmuntatua --Comment[fa]=رسانه برداشتنی پیاده شده - Comment[fi]=Irrotettu irrotettava resurssi - Comment[fr]=Média amovible non monté - Comment[fy]=Ofkeppele ferwiderber medium -@@ -44,13 +43,12 @@ - Comment[nn]=Umontert flyttbart medium - Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ - Comment[pl]=Odmontowany nośnik wymienny --Comment[pt]=Dispositivo amovível desmontado -+Comment[pt]=Dispositivo Amovível Desmontado - Comment[pt_BR]=Mídia Removível Desmontada - Comment[ro]=Mediu amovibil nemontat - Comment[ru]=Отмонтированный внешний диск - Comment[rw]=Igitangazamakuru Kivanwamo Cyavanwemo - Comment[se]=Gálgaduvvon sirdehahtti medium --Comment[sk]=Odpojené vyberateľné médium - Comment[sl]=Odklopljen odstranljiv medij - Comment[sr]=Демонтиран уклоњиви медијум - Comment[sr@Latn]=Demontiran uklonjivi medijum -diff -urN kioslave/media/mimetypes/smb_mounted.desktop kioslave/media/mimetypes/smb_mounted.desktop ---- kioslave/media/mimetypes/smb_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/smb_mounted.desktop Tue May 23 13:33:34 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Recurso de Samba montado (Red de Microsoft) - Comment[et]=Ühendatud Samba (Microsoft Network) ressurss - Comment[eu]=Samba (Microsoft sarea) partekaketa muntatua --Comment[fa]=مشترک Samba (Microsoft Network) سوار شده -+Comment[fa]=اشتراک سامبای ویندوز سوار شده - Comment[fi]=Liitetty Samba-jako (Microsoft-verkko) - Comment[fr]=Partage Samba (réseau Microsoft) monté - Comment[fy]=Oankeppele Samba-netwurkboarne (Microsoft-netwurken) -diff -urN kioslave/media/mimetypes/smb_unmounted.desktop kioslave/media/mimetypes/smb_unmounted.desktop ---- kioslave/media/mimetypes/smb_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/smb_unmounted.desktop Tue May 23 13:33:34 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Recurso de Samba desmontado (Red de Microsoft) - Comment[et]=Lahutatud Samba (Microsoft Network) ressurss - Comment[eu]=Samba (Microsoft sarea) partekaketa desmuntatua --Comment[fa]=مشترک Samba (Microsoft Network) پیاده شده -+Comment[fa]=اشتراک سامبای ویندوز پیاده شده - Comment[fi]=Irrotettu Samba-jako (Microsoft-verkko) - Comment[fr]=Partage Samba (réseau Microsoft) non monté - Comment[fy]=Ofkeppele Samba-netwurkboarne (Microsoft-netwurken) -diff -urN kioslave/media/mimetypes/svcd.desktop kioslave/media/mimetypes/svcd.desktop ---- kioslave/media/mimetypes/svcd.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/svcd.desktop Mon May 22 20:12:43 2006 -@@ -7,7 +7,6 @@ - Comment[bn]=সুপার ভিডিও সিডি - Comment[ca]=CD Súper Vídeo - Comment[da]=Super Video-cd --Comment[fa]=دیسک فشرده ابرویدئو - Comment[fr]=Super CD vidéo - Comment[fy]=Super Fideo-kompaktskiif - Comment[gl]=Super Vídeo CD -@@ -17,7 +16,6 @@ - Comment[it]=Super video CD - Comment[ja]=スーパービデオ CD - Comment[km]=ស៊ីឌីវីដេអូគុណភាពខ្ពស់ --Comment[mk]=Супер видео ЦД - Comment[ms]=CD Supervideo - Comment[nb]=Super video CD - Comment[nds]=Super-Video-CD -diff -urN kioslave/media/mimetypes/vcd.desktop kioslave/media/mimetypes/vcd.desktop ---- kioslave/media/mimetypes/vcd.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/vcd.desktop Mon May 22 20:12:42 2006 -@@ -9,7 +9,6 @@ - Comment[ca]=CD Vídeo - Comment[da]=Video-cd - Comment[el]=Βίντεο CD --Comment[fa]=دیسک فشرده ویدئویی - Comment[fr]=CD vidéo - Comment[fy]=Fideo-kompaktskiif - Comment[ga]=Dlúthdhiosca Físe -@@ -19,7 +18,6 @@ - Comment[is]=Vídeó CD - Comment[ja]=ビデオ CD - Comment[km]=ស៊ីឌីវីដេអូ --Comment[mk]=Видео ЦД - Comment[ms]=CD Video - Comment[nds]=Video-CD - Comment[nl]=Video-cd -diff -urN kioslave/media/mimetypes/zip_mounted.desktop kioslave/media/mimetypes/zip_mounted.desktop ---- kioslave/media/mimetypes/zip_mounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/zip_mounted.desktop Tue May 23 13:33:35 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disco Zip montado - Comment[et]=Ühendatud Zip-ketas - Comment[eu]=Zip diska muntatua --Comment[fa]=دیسک فشرده سوارشده -+Comment[fa]=دیسک زیپ سوار شده - Comment[fi]=Liitetty Zip-levy - Comment[fr]=Disque Zip monté - Comment[fy]=Oankeppelee Zip-skiif -diff -urN kioslave/media/mimetypes/zip_unmounted.desktop kioslave/media/mimetypes/zip_unmounted.desktop ---- kioslave/media/mimetypes/zip_unmounted.desktop Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mimetypes/zip_unmounted.desktop Tue May 23 13:33:35 2006 -@@ -21,7 +21,7 @@ - Comment[es]=Disco Zip desmontado - Comment[et]=Lahutatud Zip-ketas - Comment[eu]=Zip diska desmuntatua --Comment[fa]=دیسک فشرده پیاده شده -+Comment[fa]= دیسک زیپ پیاده شده - Comment[fi]=Irrotettu Zip-levy - Comment[fr]=Disque Zip non monté - Comment[fy]=Ofkeppele Zip-skiif -@@ -33,7 +33,7 @@ - Comment[hu]=Leválasztott Zip-lemez - Comment[is]=Aftengdur Zip diskur - Comment[it]=Disco Zip non montato --Comment[ja]=マウントされていない Zip ディスク -+Comment[ja]=マウントされていないZipディスク - Comment[km]=ថាស Zip មិនបានរៀបចំ - Comment[lo]= ຫັງກາລີ - Comment[lt]=Išmontuotas Zip diskas -diff -urN kioslave/media/mounthelper/Makefile.in kioslave/media/mounthelper/Makefile.in ---- kioslave/media/mounthelper/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/mounthelper/Makefile.in Fri May 26 09:54:31 2006 -@@ -57,8 +57,8 @@ - #>+ 1 - kio_media_mounthelper_OBJECTS = kio_media_mounthelper.$(OBJEXT) - am__DEPENDENCIES_1 = --kio_media_mounthelper_DEPENDENCIES = \ -- ../libmediacommon/libmediacommon.la $(am__DEPENDENCIES_1) -+kio_media_mounthelper_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -+ ../libmediacommon/libmediacommon.la - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - am__depfiles_maybe = depfiles -@@ -236,6 +236,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -@@ -575,7 +576,7 @@ - AM_LDFLAGS = $(all_libraries) - kio_media_mounthelper_SOURCES = kio_media_mounthelper.cpp - kio_media_mounthelper_LDFLAGS = $(KDE_RPATH) $(all_libraries) --kio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) -+kio_media_mounthelper_LDADD = $(LIB_KIO) ../libmediacommon/libmediacommon.la - #>- METASOURCES = AUTO - #>- all: all-am - #>+ 1 -diff -urN kioslave/media/mounthelper/kio_media_mounthelper.cpp kioslave/media/mounthelper/kio_media_mounthelper.cpp ---- kioslave/media/mounthelper/kio_media_mounthelper.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/mounthelper/kio_media_mounthelper.cpp Fri Mar 17 11:17:33 2006 -@@ -27,7 +27,6 @@ - #include <dcopclient.h> - #include <dcopref.h> - #include <qtimer.h> --#include <stdlib.h> - #include <kdebug.h> - #include <kglobal.h> - #include <kprocess.h> -@@ -79,30 +78,31 @@ - - if (args->isSet("u")) - { -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "unmount", medium.id()); -- if (reply.isValid()) -- reply.get(m_errorStr); -- kdDebug() << "medium unmount " << m_errorStr << endl; -- if (m_errorStr.isNull()) -- ::exit(0); -- else -- error(); -+ KIO::Job * job = KIO::unmount( mount_point ); -+ -+ connect( job, SIGNAL( result( KIO::Job * ) ), -+ this, SLOT( slotResult( KIO::Job * ) ) ); - } - else if (args->isSet("s") || args->isSet("e")) - { -- invokeEject(device, true); -+ if (medium.isMounted()) -+ { -+ KIO::Job * job = KIO::unmount( mount_point ); -+ -+ m_device = device; -+ connect( job, SIGNAL( result( KIO::Job * ) ), -+ this, SLOT( slotResultSafe( KIO::Job * ) ) ); -+ } -+ else -+ { -+ invokeEject(device, true); -+ } - } - else - { -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "mount", medium.id()); -- if (reply.isValid()) -- reply.get(m_errorStr); -- if (m_errorStr.isNull()) -- ::exit(0); -- else -- error(); -+ KIO::Job* job = KIO::mount( false, 0, device, mount_point); -+ connect( job, SIGNAL( result( KIO::Job * ) ), -+ this, SLOT( slotResult( KIO::Job * ) ) ); - } - } - -@@ -173,12 +173,12 @@ - void MountHelper::error() - { - KMessageBox::error(0, m_errorStr); -- ::exit(1); -+ kapp->exit(1); - } - - void MountHelper::finished() - { -- ::exit(0); -+ kapp->quit(); - } - - static KCmdLineOptions options[] = -@@ -207,7 +207,7 @@ - - KStartupInfo::appStarted(); - app->dcopClient()->attach(); -- return app->exec(); -+ app->exec(); - } - - #include "kio_media_mounthelper.moc" -diff -urN kioslave/media/propsdlgplugin/Makefile.in kioslave/media/propsdlgplugin/Makefile.in ---- kioslave/media/propsdlgplugin/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/propsdlgplugin/Makefile.in Thu Jan 1 01:00:00 1970 -@@ -1,1063 +0,0 @@ --# Makefile.in generated by automake 1.9.6 from Makefile.am. --# KDE tags expanded automatically by am_edit - $Revision: 483858 $ --# @configure_input@ -- --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005 Free Software Foundation, Inc. --# This Makefile.in is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY, to the extent permitted by law; without --# even the implied warranty of MERCHANTABILITY or FITNESS FOR A --# PARTICULAR PURPOSE. -- --@SET_MAKE@ -- -- --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ --VPATH = @srcdir@ --pkgdatadir = $(datadir)/@PACKAGE@ --pkglibdir = $(libdir)/@PACKAGE@ --pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../../.. --am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ --install_sh_DATA = $(install_sh) -c -m 644 --install_sh_PROGRAM = $(install_sh) -c --install_sh_SCRIPT = $(install_sh) -c --INSTALL_HEADER = $(INSTALL_DATA) --transform = $(program_transform_name) --NORMAL_INSTALL = : --PRE_INSTALL = : --POST_INSTALL = : --NORMAL_UNINSTALL = : --PRE_UNINSTALL = : --POST_UNINSTALL = : --build_triplet = @build@ --host_triplet = @host@ --target_triplet = @target@ --subdir = kioslave/media/propsdlgplugin --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(kde_moduledir)" \ -- "$(DESTDIR)$(kde_servicesdir)" --kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(kde_module_LTLIBRARIES) --am__DEPENDENCIES_1 = --media_propsdlgplugin_la_DEPENDENCIES = \ -- ../libmediacommon/libmediacommon.la $(am__DEPENDENCIES_1) --am_media_propsdlgplugin_la_OBJECTS = propertiespage.lo \ -- propsdlgshareplugin.lo --#>- media_propsdlgplugin_la_OBJECTS = \ --#>- $(am_media_propsdlgplugin_la_OBJECTS) --#>+ 5 --media_propsdlgplugin_la_final_OBJECTS = media_propsdlgplugin_la.all_cpp.lo --media_propsdlgplugin_la_nofinal_OBJECTS = propertiespage.lo \ -- propsdlgshareplugin.lo propertiespagegui.lo --@KDE_USE_FINAL_FALSE@media_propsdlgplugin_la_OBJECTS = $(media_propsdlgplugin_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@media_propsdlgplugin_la_OBJECTS = $(media_propsdlgplugin_la_final_OBJECTS) --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --am__depfiles_maybe = depfiles --#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ --#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --#>+ 2 --CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ --#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ --#>- $(AM_CXXFLAGS) $(CXXFLAGS) --#>+ 3 --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --CXXLD = $(CXX) --#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ --#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --#>+ 2 --CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --SOURCES = $(media_propsdlgplugin_la_SOURCES) --DIST_SOURCES = $(media_propsdlgplugin_la_SOURCES) --kde_servicesDATA_INSTALL = $(INSTALL_DATA) --DATA = $(kde_services_DATA) --ETAGS = etags --CTAGS = ctags --#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) --#>+ 1 --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) --ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ --AMTAR = @AMTAR@ --AR = @AR@ --ARTSCCONFIG = @ARTSCCONFIG@ --ARTS_CFLAGS = @ARTS_CFLAGS@ --AUTOCONF = @AUTOCONF@ --AUTODIRS = @AUTODIRS@ --AUTOHEADER = @AUTOHEADER@ --AUTOMAKE = @AUTOMAKE@ --AWK = @AWK@ --CC = @CC@ --CCDEPMODE = @CCDEPMODE@ --CFLAGS = @CFLAGS@ --COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@ --COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@ --CONF_FILES = @CONF_FILES@ --CPP = @CPP@ --CPPFLAGS = @CPPFLAGS@ --CXX = @CXX@ --CXXCPP = @CXXCPP@ --CXXDEPMODE = @CXXDEPMODE@ --CXXFLAGS = @CXXFLAGS@ --CYGPATH_W = @CYGPATH_W@ --DBUSQT_INCS = @DBUSQT_INCS@ --DBUSQT_LIBS = @DBUSQT_LIBS@ --DBUS_CFLAGS = @DBUS_CFLAGS@ --DBUS_INCS = @DBUS_INCS@ --DBUS_LIBS = @DBUS_LIBS@ --DCOPIDL = @DCOPIDL@ --DCOPIDL2CPP = @DCOPIDL2CPP@ --DCOPIDLNG = @DCOPIDLNG@ --DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ --DEFS = @DEFS@ --DEPDIR = @DEPDIR@ --DOXYGEN = @DOXYGEN@ --DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ --DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ --DPMSINC = @DPMSINC@ --DPMSLIB = @DPMSLIB@ --ECHO = @ECHO@ --ECHO_C = @ECHO_C@ --ECHO_N = @ECHO_N@ --ECHO_T = @ECHO_T@ --EGREP = @EGREP@ --ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ --EXEEXT = @EXEEXT@ --EXR_FLAGS = @EXR_FLAGS@ --F77 = @F77@ --FFLAGS = @FFLAGS@ --FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ --GLINC = @GLINC@ --GLLIB = @GLLIB@ --GMSGFMT = @GMSGFMT@ --HALBACKEND = @HALBACKEND@ --HAL_CFLAGS = @HAL_CFLAGS@ --HAL_INCS = @HAL_INCS@ --HAL_LIBS = @HAL_LIBS@ --HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@ --HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@ --HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ --INSTALL_DATA = @INSTALL_DATA@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_SCRIPT = @INSTALL_SCRIPT@ --INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ --JAR = @JAR@ --JAVAC = @JAVAC@ --JAVAH = @JAVAH@ --JVMLIBS = @JVMLIBS@ --KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ --KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@ --KCONFIG_COMPILER = @KCONFIG_COMPILER@ --KDECONFIG = @KDECONFIG@ --KDE_BINDIR = @KDE_BINDIR@ --KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@ --KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ --KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ --KDE_HAVE_DOT = @KDE_HAVE_DOT@ --KDE_INCLUDES = @KDE_INCLUDES@ --KDE_LDFLAGS = @KDE_LDFLAGS@ --KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ --KDE_MT_LIBS = @KDE_MT_LIBS@ --KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ --KDE_PLUGIN = @KDE_PLUGIN@ --KDE_RPATH = @KDE_RPATH@ --KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ --KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ --KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ --KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ --KDE_USE_FPIE = @KDE_USE_FPIE@ --KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ --KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ --KDE_USE_PIE = @KDE_USE_PIE@ --KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ --KDM_PAM_SERVICE = @KDM_PAM_SERVICE@ --KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@ --KRB4_INCS = @KRB4_INCS@ --KRB4_LIBS = @KRB4_LIBS@ --KRB4_RPATH = @KRB4_RPATH@ --KRB5_INCS = @KRB5_INCS@ --KRB5_LIBS = @KRB5_LIBS@ --KRB5_RPATH = @KRB5_RPATH@ --KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@ --LDAP_INCS = @LDAP_INCS@ --LDAP_LIBS = @LDAP_LIBS@ --LDAP_RPATH = @LDAP_RPATH@ --LDFLAGS = @LDFLAGS@ --LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ --LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ --LIBALIB = @LIBALIB@ --LIBART_CFLAGS = @LIBART_CFLAGS@ --LIBART_LIBS = @LIBART_LIBS@ --LIBART_RPATH = @LIBART_RPATH@ --LIBBZ2 = @LIBBZ2@ --LIBCFG = @LIBCFG@ --LIBCOMPAT = @LIBCOMPAT@ --LIBCRYPT = @LIBCRYPT@ --LIBCURSES = @LIBCURSES@ --LIBDEVINFO = @LIBDEVINFO@ --LIBDL = @LIBDL@ --LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@ --LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@ --LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@ --LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@ --LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@ --LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@ --LIBGEN = @LIBGEN@ --LIBHOSTS = @LIBHOSTS@ --LIBJPEG = @LIBJPEG@ --LIBKSTAT = @LIBKSTAT@ --LIBMALLOC = @LIBMALLOC@ --LIBOBJS = @LIBOBJS@ --LIBODM = @LIBODM@ --LIBOSSAUDIO = @LIBOSSAUDIO@ --LIBPNG = @LIBPNG@ --LIBPOSIX4 = @LIBPOSIX4@ --LIBPTHREAD = @LIBPTHREAD@ --LIBRESOLV = @LIBRESOLV@ --LIBRPC = @LIBRPC@ --LIBS = @LIBS@ --LIBSENSORS = @LIBSENSORS@ --LIBSHADOW = @LIBSHADOW@ --LIBSM = @LIBSM@ --LIBSOCKET = @LIBSOCKET@ --LIBSSL = @LIBSSL@ --LIBTOOL = @LIBTOOL@ --LIBUCB = @LIBUCB@ --LIBUSBCONFIG = @LIBUSBCONFIG@ --LIBUTIL = @LIBUTIL@ --LIBXDMCP = @LIBXDMCP@ --LIBXFT_LIB = @LIBXFT_LIB@ --LIBZ = @LIBZ@ --LIB_ARTS = @LIB_ARTS@ --LIB_DNSSD = @LIB_DNSSD@ --LIB_EXR = @LIB_EXR@ --LIB_FONT_ENC = @LIB_FONT_ENC@ --LIB_KAB = @LIB_KAB@ --LIB_KABC = @LIB_KABC@ --LIB_KDECORE = @LIB_KDECORE@ --LIB_KDED = @LIB_KDED@ --LIB_KDEPIM = @LIB_KDEPIM@ --LIB_KDEPRINT = @LIB_KDEPRINT@ --LIB_KDEUI = @LIB_KDEUI@ --LIB_KDNSSD = @LIB_KDNSSD@ --LIB_KFILE = @LIB_KFILE@ --LIB_KFM = @LIB_KFM@ --LIB_KHTML = @LIB_KHTML@ --LIB_KIMPROXY = @LIB_KIMPROXY@ --LIB_KIO = @LIB_KIO@ --LIB_KJS = @LIB_KJS@ --LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ --LIB_KPARTS = @LIB_KPARTS@ --LIB_KSPELL = @LIB_KSPELL@ --LIB_KSYCOCA = @LIB_KSYCOCA@ --LIB_KUNITTEST = @LIB_KUNITTEST@ --LIB_KUTILS = @LIB_KUTILS@ --LIB_KVM = @LIB_KVM@ --LIB_LBER = @LIB_LBER@ --LIB_LIBS = @LIB_LIBS@ --LIB_POLL = @LIB_POLL@ --LIB_QPE = @LIB_QPE@ --LIB_QT = @LIB_QT@ --LIB_SMB = @LIB_SMB@ --LIB_TRU64_MACH = @LIB_TRU64_MACH@ --LIB_X11 = @LIB_X11@ --LIB_XCOMPOSITE = @LIB_XCOMPOSITE@ --LIB_XCURSOR = @LIB_XCURSOR@ --LIB_XEXT = @LIB_XEXT@ --LIB_XF86MISC = @LIB_XF86MISC@ --LIB_XFIXES = @LIB_XFIXES@ --LIB_XINERAMA = @LIB_XINERAMA@ --LIB_XRANDR = @LIB_XRANDR@ --LIB_XRENDER = @LIB_XRENDER@ --LIB_XSS = @LIB_XSS@ --LINUXCDPOLLING = @LINUXCDPOLLING@ --LN_S = @LN_S@ --LTLIBOBJS = @LTLIBOBJS@ --MAKEINFO = @MAKEINFO@ --MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ --MCOPIDL = @MCOPIDL@ --MD5SUM = @MD5SUM@ --MD5SUM_CUT = @MD5SUM_CUT@ --MEINPROC = @MEINPROC@ --MOC = @MOC@ --MSGFMT = @MSGFMT@ --NOOPT_CFLAGS = @NOOPT_CFLAGS@ --NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ --OBJEXT = @OBJEXT@ --PACKAGE = @PACKAGE@ --PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ --PACKAGE_NAME = @PACKAGE_NAME@ --PACKAGE_STRING = @PACKAGE_STRING@ --PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_VERSION = @PACKAGE_VERSION@ --PAMLIBS = @PAMLIBS@ --PASSWDLIBS = @PASSWDLIBS@ --PATH_SEPARATOR = @PATH_SEPARATOR@ --PERL = @PERL@ --PKG_CONFIG = @PKG_CONFIG@ --QTDOCDIR = @QTDOCDIR@ --QTE_NORTTI = @QTE_NORTTI@ --QT_INCLUDES = @QT_INCLUDES@ --QT_LDFLAGS = @QT_LDFLAGS@ --RANLIB = @RANLIB@ --RUN_KAPPFINDER = @RUN_KAPPFINDER@ --SASL2_LIBS = @SASL2_LIBS@ --SETUIDFLAGS = @SETUIDFLAGS@ --SET_MAKE = @SET_MAKE@ --SHELL = @SHELL@ --SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@ --SSL_INCLUDES = @SSL_INCLUDES@ --SSL_LDFLAGS = @SSL_LDFLAGS@ --STRIP = @STRIP@ --TOPSUBDIRS = @TOPSUBDIRS@ --UIC = @UIC@ --UIC_TR = @UIC_TR@ --UNAME = @UNAME@ --USB_CFLAGS = @USB_CFLAGS@ --USB_LIBS = @USB_LIBS@ --USER_INCLUDES = @USER_INCLUDES@ --USER_LDFLAGS = @USER_LDFLAGS@ --USE_EXCEPTIONS = @USE_EXCEPTIONS@ --USE_RTTI = @USE_RTTI@ --USE_THREADS = @USE_THREADS@ --VERSION = @VERSION@ --WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ --XGETTEXT = @XGETTEXT@ --XMLLINT = @XMLLINT@ --XTESTLIB = @XTESTLIB@ --X_EXTRA_LIBS = @X_EXTRA_LIBS@ --X_INCLUDES = @X_INCLUDES@ --X_LDFLAGS = @X_LDFLAGS@ --X_PRE_LIBS = @X_PRE_LIBS@ --X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ --ac_ct_CC = @ac_ct_CC@ --ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ --all_includes = @all_includes@ --all_libraries = @all_libraries@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ --am__include = @am__include@ --am__leading_dot = @am__leading_dot@ --am__quote = @am__quote@ --am__tar = @am__tar@ --am__untar = @am__untar@ --applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@ --applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@ --bindir = @bindir@ --build = @build@ --build_alias = @build_alias@ --build_cpu = @build_cpu@ --build_os = @build_os@ --build_vendor = @build_vendor@ --datadir = @datadir@ --doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ --doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ --drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ --drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ --exec_prefix = @exec_prefix@ --have_xcursor_FALSE = @have_xcursor_FALSE@ --have_xcursor_TRUE = @have_xcursor_TRUE@ --host = @host@ --host_alias = @host_alias@ --host_cpu = @host_cpu@ --host_os = @host_os@ --host_vendor = @host_vendor@ --include_ARTS_FALSE = @include_ARTS_FALSE@ --include_ARTS_TRUE = @include_ARTS_TRUE@ --include_BZIP2_FALSE = @include_BZIP2_FALSE@ --include_BZIP2_TRUE = @include_BZIP2_TRUE@ --include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@ --include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@ --include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@ --include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@ --include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@ --include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@ --include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@ --include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@ --include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@ --include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@ --include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@ --include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@ --include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@ --include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@ --include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@ --include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@ --include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@ --include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@ --include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@ --include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@ --include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@ --include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@ --include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@ --include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@ --include_kompmgr_FALSE = @include_kompmgr_FALSE@ --include_kompmgr_TRUE = @include_kompmgr_TRUE@ --include_ksysguardd_FALSE = @include_ksysguardd_FALSE@ --include_ksysguardd_TRUE = @include_ksysguardd_TRUE@ --include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@ --include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@ --include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@ --include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@ --include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@ --include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@ --include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@ --include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@ --include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@ --include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@ --include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@ --include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@ --include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@ --include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@ --include_media_halbackend_FALSE = @include_media_halbackend_FALSE@ --include_media_halbackend_TRUE = @include_media_halbackend_TRUE@ --include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@ --include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@ --include_x11_FALSE = @include_x11_FALSE@ --include_x11_TRUE = @include_x11_TRUE@ --includedir = @includedir@ --infodir = @infodir@ --install_sh = @install_sh@ --install_usbids_FALSE = @install_usbids_FALSE@ --install_usbids_TRUE = @install_usbids_TRUE@ --jni_includes = @jni_includes@ --kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@ --kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@ --kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@ --kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@ --kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@ --kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@ --kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@ --kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@ --kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@ --kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@ --kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@ --kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@ --kde_appsdir = @kde_appsdir@ --kde_bindir = @kde_bindir@ --kde_confdir = @kde_confdir@ --kde_datadir = @kde_datadir@ --kde_htmldir = @kde_htmldir@ --kde_icondir = @kde_icondir@ --kde_includes = @kde_includes@ --kde_kcfgdir = @kde_kcfgdir@ --kde_libraries = @kde_libraries@ --kde_libs_htmldir = @kde_libs_htmldir@ --kde_libs_prefix = @kde_libs_prefix@ --kde_locale = @kde_locale@ --kde_mimedir = @kde_mimedir@ --kde_moduledir = @kde_moduledir@ --kde_qtver = @kde_qtver@ --kde_servicesdir = @kde_servicesdir@ --kde_servicetypesdir = @kde_servicetypesdir@ --kde_sounddir = @kde_sounddir@ --kde_styledir = @kde_styledir@ --kde_templatesdir = @kde_templatesdir@ --kde_wallpaperdir = @kde_wallpaperdir@ --kde_widgetdir = @kde_widgetdir@ --kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@ --kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@ --kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@ --kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@ --kdeinitdir = @kdeinitdir@ --kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@ --kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@ --kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@ --kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@ --kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@ --kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@ --kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@ --kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@ --kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@ --kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@ --kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@ --kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@ --kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@ --kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@ --kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@ --kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@ --khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@ --khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@ --khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@ --khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@ --kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@ --kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@ --kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@ --kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@ --klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@ --klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@ --kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@ --kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@ --knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@ --knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@ --konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@ --konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@ --konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@ --konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@ --kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@ --kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@ --kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@ --kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@ --kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@ --kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@ --kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@ --kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@ --ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@ --ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@ --ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@ --ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@ --kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@ --kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@ --ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@ --ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@ --ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@ --ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@ --ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@ --ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@ --kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@ --kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@ --kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@ --kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@ --l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@ --l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@ --libdir = @libdir@ --libexecdir = @libexecdir@ --libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ --libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ --localstatedir = @localstatedir@ --mandir = @mandir@ --mkdir_p = @mkdir_p@ --nogroup = @nogroup@ --nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ --nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ --oldincludedir = @oldincludedir@ --pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ --pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ --prefix = @prefix@ --program_transform_name = @program_transform_name@ --qt_includes = @qt_includes@ --qt_libraries = @qt_libraries@ --sbindir = @sbindir@ --sharedstatedir = @sharedstatedir@ --supports_i8k_FALSE = @supports_i8k_FALSE@ --supports_i8k_TRUE = @supports_i8k_TRUE@ --sysconfdir = @sysconfdir@ --target = @target@ --target_alias = @target_alias@ --target_cpu = @target_cpu@ --target_os = @target_os@ --target_vendor = @target_vendor@ --unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ --unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ --x_includes = @x_includes@ --x_libraries = @x_libraries@ --xdg_appsdir = @xdg_appsdir@ --xdg_directorydir = @xdg_directorydir@ --xdg_menudir = @xdg_menudir@ --#>- METASOURCES = AUTO --kde_module_LTLIBRARIES = media_propsdlgplugin.la --media_propsdlgplugin_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) --media_propsdlgplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) --AM_CPPFLAGS = $(all_includes) --kde_services_DATA = media_propsdlgplugin.desktop --#>- media_propsdlgplugin_la_SOURCES = propertiespage.cpp propertiespagegui.ui propsdlgshareplugin.cpp --#>+ 1 --media_propsdlgplugin_la_SOURCES=propertiespage.cpp propsdlgshareplugin.cpp propertiespagegui.cpp --#>- all: all-am --#>+ 1 --all: docs-am all-am -- --.SUFFIXES: --.SUFFIXES: .cpp .lo .o .obj --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) --#>- @for dep in $?; do \ --#>- case '$(am__configure_deps)' in \ --#>- *$$dep*) \ --#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ --#>- && exit 0; \ --#>- exit 1;; \ --#>- esac; \ --#>- done; \ --#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ --#>- cd $(top_srcdir) && \ --#>- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile --#>+ 12 -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ -- cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile -- cd $(top_srcdir) && perl admin/am_edit kioslave/media/propsdlgplugin/Makefile.in --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) -- @$(NORMAL_INSTALL) -- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)" -- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ -- else :; fi; \ -- done -- --uninstall-kde_moduleLTLIBRARIES: -- @$(NORMAL_UNINSTALL) -- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ -- done -- --clean-kde_moduleLTLIBRARIES: -- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES) -- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --#>- media_propsdlgplugin.la: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) --#>+ 2 --@KDE_USE_CLOSURE_TRUE@media_propsdlgplugin.la: media_propsdlgplugin.la.closure $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) --@KDE_USE_CLOSURE_FALSE@media_propsdlgplugin.la: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(kde_moduledir) $(media_propsdlgplugin_la_LDFLAGS) $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_LIBADD) $(LIBS) -- --mostlyclean-compile: -- -rm -f *.$(OBJEXT) -- --distclean-compile: -- -rm -f *.tab.c -- --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/propertiespage.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/propsdlgshareplugin.Plo@am__quote@ -- --.cpp.o: --@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -- --.cpp.obj: --@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -- --.cpp.lo: --@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -- --mostlyclean-libtool: -- -rm -f *.lo -- --clean-libtool: -- -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: --install-kde_servicesDATA: $(kde_services_DATA) -- @$(NORMAL_INSTALL) -- test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)" -- @list='$(kde_services_DATA)'; for p in $$list; do \ -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \ -- $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \ -- done -- --uninstall-kde_servicesDATA: -- @$(NORMAL_UNINSTALL) -- @list='$(kde_services_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \ -- done -- --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- tags=; \ -- here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- tags=; \ -- here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(CTAGS_ARGS)$$tags$$unique" \ -- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -- $$tags $$unique -- --GTAGS: -- here=`$(am__cd) $(top_builddir) && pwd` \ -- && cd $(top_srcdir) \ -- && gtags -i $(GTAGS_ARGS) $$here -- --distclean-tags: -- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -- --distdir: $(DISTFILES) -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkdir_p) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ -- if test -d $$d/$$file; then \ -- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ -- fi; \ -- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ -- else \ -- test -f $(distdir)/$$file \ -- || cp -p $$d/$$file $(distdir)/$$file \ -- || exit 1; \ -- fi; \ -- done --check-am: all-am --check: check-am --all-am: Makefile $(LTLIBRARIES) $(DATA) --installdirs: -- for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \ -- test -z "$$dir" || $(mkdir_p) "$$dir"; \ -- done --install: install-am --install-exec: install-exec-am --install-data: install-data-am --uninstall: uninstall-am -- --install-am: all-am -- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -- --installcheck: installcheck-am --install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install --mostlyclean-generic: -- --clean-generic: -- --distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -- --maintainer-clean-generic: -- @echo "This command is intended for maintainers to use" -- @echo "it deletes files that may require special tools to rebuild." --#>- clean: clean-am --#>+ 1 --clean: kde-rpo-clean clean-am -- --#>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ --#>- mostlyclean-am --#>+ 2 --clean-am: clean-metasources clean-ui clean-closures clean-bcheck clean-final clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ -- mostlyclean-am -- --distclean: distclean-am -- -rm -rf ./$(DEPDIR) -- -rm -f Makefile --distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -- --dvi: dvi-am -- --dvi-am: -- --html: html-am -- --info: info-am -- --info-am: -- --#>- install-data-am: install-kde_moduleLTLIBRARIES \ --#>- install-kde_servicesDATA --#>+ 2 --install-data-am: \ -- install-kde_servicesDATA -- --#>- install-exec-am: --#>+ 1 --install-exec-am: install-kde_moduleLTLIBRARIES -- --install-info: install-info-am -- --install-man: -- --installcheck-am: -- --maintainer-clean: maintainer-clean-am -- -rm -rf ./$(DEPDIR) -- -rm -f Makefile --maintainer-clean-am: distclean-am maintainer-clean-generic -- --mostlyclean: mostlyclean-am -- --mostlyclean-am: mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool -- --pdf: pdf-am -- --pdf-am: -- --ps: ps-am -- --ps-am: -- --uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ -- uninstall-kde_servicesDATA -- --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-exec \ -- install-exec-am install-info install-info-am \ -- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \ -- install-man install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ -- uninstall-am uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ -- uninstall-kde_servicesDATA -- --# Tell versions [3.59,3.63) of GNU make to not export all variables. --# Otherwise a system limit (for SysV at least) may be exceeded. --.NOEXPORT: -- --#>+ 8 --media_propsdlgplugin.la.closure: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) -- @echo "int main() {return 0;}" > media_propsdlgplugin_la_closure.cpp -- @$(LTCXXCOMPILE) -c media_propsdlgplugin_la_closure.cpp -- $(CXXLINK) media_propsdlgplugin_la_closure.lo $(media_propsdlgplugin_la_LDFLAGS) $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_LIBADD) $(LIBS) -- @rm -f media_propsdlgplugin_la_closure.* media_propsdlgplugin.la.closure -- @echo "timestamp" > media_propsdlgplugin.la.closure -- -- --#>+ 3 --propsdlgshareplugin.moc: $(srcdir)/propsdlgshareplugin.h -- $(MOC) $(srcdir)/propsdlgshareplugin.h -o propsdlgshareplugin.moc -- --#>+ 2 --mocs: propsdlgshareplugin.moc -- --#>+ 3 --propertiespage.moc: $(srcdir)/propertiespage.h -- $(MOC) $(srcdir)/propertiespage.h -o propertiespage.moc -- --#>+ 2 --mocs: propertiespage.moc -- --#>+ 3 --clean-metasources: -- -rm -f propsdlgshareplugin.moc propertiespage.moc -- --#>+ 2 --KDE_DIST=propertiespagegui.ui Makefile.in propertiespage.h propsdlgshareplugin.h media_propsdlgplugin.desktop propertiespagegui.ui.h Makefile.am -- --#>+ 4 --clean-ui: -- -rm -f \ -- propertiespagegui.cpp propertiespagegui.h propertiespagegui.moc -- --#>+ 3 --clean-closures: -- -rm -f media_propsdlgplugin.la.closure -- --#>+ 2 --docs-am: -- --#>+ 15 --force-reedit: -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ -- cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile -- cd $(top_srcdir) && perl admin/am_edit kioslave/media/propsdlgplugin/Makefile.in -- -- --#>+ 21 --clean-bcheck: -- rm -f *.bchecktest.cc *.bchecktest.cc.class a.out -- --bcheck: bcheck-am -- --bcheck-am: -- @for i in ; do \ -- if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ -- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ -- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ -- echo "$$i"; \ -- if ! $(CXXCOMPILE) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ -- rm -f $$i.bchecktest.cc; exit 1; \ -- fi ; \ -- echo "" >> $$i.bchecktest.cc.class; \ -- perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ -- rm -f a.out; \ -- fi ; \ -- done -- -- --#>+ 11 --media_propsdlgplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/propertiespage.cpp $(srcdir)/propsdlgshareplugin.cpp propertiespagegui.cpp propsdlgshareplugin.moc propertiespagegui.moc propertiespage.moc -- @echo 'creating media_propsdlgplugin_la.all_cpp.cpp ...'; \ -- rm -f media_propsdlgplugin_la.all_cpp.files media_propsdlgplugin_la.all_cpp.final; \ -- echo "#define KDE_USE_FINAL 1" >> media_propsdlgplugin_la.all_cpp.final; \ -- for file in propertiespage.cpp propsdlgshareplugin.cpp propertiespagegui.cpp ; do \ -- echo "#include \"$$file\"" >> media_propsdlgplugin_la.all_cpp.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> media_propsdlgplugin_la.all_cpp.final; \ -- done; \ -- cat media_propsdlgplugin_la.all_cpp.final media_propsdlgplugin_la.all_cpp.files > media_propsdlgplugin_la.all_cpp.cpp; \ -- rm -f media_propsdlgplugin_la.all_cpp.final media_propsdlgplugin_la.all_cpp.files -- --#>+ 3 --clean-final: -- -rm -f media_propsdlgplugin_la.all_cpp.cpp -- --#>+ 3 --final: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_final_OBJECTS)" all-am -- --#>+ 3 --final-install: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_final_OBJECTS)" install-am -- --#>+ 3 --no-final: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_nofinal_OBJECTS)" all-am -- --#>+ 3 --no-final-install: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_nofinal_OBJECTS)" install-am -- --#>+ 3 --kde-rpo-clean: -- -rm -f *.rpo -- --#>+ 9 --nmcheck: --propsdlgshareplugin.o: propsdlgshareplugin.moc --nmcheck-am: nmcheck --propsdlgshareplugin.lo: propsdlgshareplugin.moc --propertiespage.lo: propertiespage.moc --$(srcdir)/propertiespage.cpp: propertiespagegui.h --$(srcdir)/propsdlgshareplugin.cpp: propertiespagegui.h --propertiespage.o: propertiespage.moc -- --#>+ 15 --propertiespagegui.cpp: $(srcdir)/propertiespagegui.ui propertiespagegui.h propertiespagegui.moc -- rm -f propertiespagegui.cpp -- echo '#include <kdialog.h>' > propertiespagegui.cpp -- echo '#include <klocale.h>' >> propertiespagegui.cpp -- $(UIC) -tr ${UIC_TR} -i propertiespagegui.h $(srcdir)/propertiespagegui.ui > propertiespagegui.cpp.temp ; ret=$$?; \ -- $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" propertiespagegui.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_propertiespagegui,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> propertiespagegui.cpp ;\ -- rm -f propertiespagegui.cpp.temp ;\ -- if test "$$ret" = 0; then echo '#include "propertiespagegui.moc"' >> propertiespagegui.cpp; else rm -f propertiespagegui.cpp ; exit $$ret ; fi -- --propertiespagegui.h: $(srcdir)/propertiespagegui.ui -- rm -rf propertiespagegui.h; -- $(UIC) $(srcdir)/propertiespagegui.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> propertiespagegui.h ; --propertiespagegui.moc: propertiespagegui.h -- $(MOC) propertiespagegui.h -o propertiespagegui.moc -diff -urN kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop ---- kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Thu Jan 1 01:00:00 1970 -@@ -1,73 +0,0 @@ --[Desktop Entry] --Encoding=UTF-8 --Type=Service --Name=Media Properties Page --Name[ca]=Pàgina de propietats de suport --Name[cs]=Stránka vlastností média --Name[da]=Medieegenskabsside --Name[de]=Eigenschaften von Medien --Name[el]=Σελίδα ιδιοτήτων μέσων --Name[es]=Página de propiedades de medios --Name[et]=Andmekandjate omadused --Name[fa]=صفحۀ ویژگیهای رسانه --Name[fi]=Mediaominaisuudet --Name[fr]=Page de propriétés du média --Name[he]=דף מאפייני מדיה --Name[hr]=Stranica svojstva medija --Name[hu]=Médiajellemzők lap --Name[is]=Eiginleikar miðils --Name[it]=Pagina delle proprietà dei dispositivi di archiviazione --Name[ja]=メディア属性ページ --Name[km]=ទំព័រលក្ខណៈសម្បត្តិមេឌៀ --Name[nb]=Side for medievarsling --Name[nds]=Medienegenschappen-Siet --Name[nl]=Pagina met media-eigenschappen --Name[nn]=Side for medieeigenskapar --Name[pl]=Strona właściwości nośnika --Name[pt]=Página de Propriedades de Suportes Físicos --Name[pt_BR]=Página de Propriedades de Suportes Físicos --Name[ru]=Свойства носителя --Name[sk]=Strana vlastností média --Name[sl]=Stran z lastnostmi nosilca --Name[sr]=Страна са својствима медијума --Name[sr@Latn]=Strana sa svojstvima medijuma --Name[sv]=Sida för mediaegenskaper --Name[uk]=Сторінка властивостей носіїв інформації --Name[vi]=Trang tài sản phương tiện --Name[zh_TW]=媒體內容頁 --Comment=Konqueror properties dialog plugin to configure mount behaviour --Comment[ca]=Diàleg de propietats de l'endollable Konqueror per a configurar el comportament de muntatge --Comment[cs]=Dialog nastavení chování připojení modulu pro Konqueror --Comment[da]=Konqueror plugin med egenskabsdialog til at indstille monteringsopførsel --Comment[de]=Konqueror-Modul zum Einstellen des Verhaltens beim Einbinden --Comment[el]=Πρόσθετο διαλόγου ιδιοτήτων του Konqueror για τη ρύθμιση της συμπεριφοράς προσάρτησης --Comment[es]=Plugin de diálogo de propiedades de Konqueror para configurar el comportamiento del montaje --Comment[et]=Konquerori seadistustedialoogi plugin andmekandjate ühendamise seadistamiseks --Comment[fa]=وصلۀ محاورۀ ویژگیهای Konqueror برای پیکربندی رفتار سوار کردن --Comment[fi]=Konquerorin ominaisuussovelma, joka tarkkailee liitospisteitä --Comment[fr]=Module de Konqueror pour configurer le comportement du montage --Comment[he]=תוסף חלון מאפיינים של Konqueror לקביעת אפשרויות חיבור --Comment[hr]=Konqueror dodatak dijaloga svojstava za konfiguriranje načina pristupanja --Comment[hu]=Konqueror beállítómodul a csatlakoztatási mód megadásához --Comment[is]=Konqueror eiginleikagluggi til að stilla tengihegðun --Comment[it]=Plugin della configurazione di Konqueror per configurare il montaggio --Comment[ja]=mountの挙動を設定する、Konqueror属性ダイアログ プラグイン --Comment[km]=កម្មវិធីជំនួយឲ្យមានប្រអប់លក្ខណៈសម្បត្តិ Konqueror ដើម្បីកំណត់រចនាសម្ព័ន្ធឥរិយាបថម៉ោន --Comment[nb]=Et programtillegg for å sette opp montering av enheter i Konqueror --Comment[nds]=Egenschappendialoog-Plugin för Konqueror för't Instellen vun't Inhangbedregen --Comment[nl]=Dialoogvenster voor Konqueror om het aankoppelgedrag in te stellen --Comment[nn]=Programtillegg for oppsett av montering i Konqueror --Comment[pl]=Wtyczka okna właściwości Konquerora do konfiguracji zachowania montowania --Comment[pt]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem --Comment[pt_BR]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem --Comment[ru]=Модуль свойств для Konqueror, отвечающий за поведение при подключении файловых систем --Comment[sk]=Modul Konqueror dialógu vlastností pre konfiguráciu správania pripojenia --Comment[sl]=Vstavek za Konqueror s katerim se nastavlja obnašanje priklopa medijev --Comment[sr]=Прикључак са својствима Konqueror-а за подешавање понашања при монтирању --Comment[sr@Latn]=Priključak sa svojstvima Konqueror-a za podešavanje ponašanja pri montiranju --Comment[sv]=Konqueror insticksprogram med egenskapsdialogruta för att anpassa monteringsbeteende --Comment[uk]=Втулок вікна властивостей Konqueror для налаштування поведінки монтування --Comment[vi]=bổ sung hộp thoại tài sản Konqueror để cấu hình ứng xử gắn kết --Comment[zh_TW]=Konqueror 內容對話框外掛程式，用於設定掛載的行為 --X-KDE-Library=media_propsdlgplugin --ServiceTypes=KPropsDlg/Plugin,media/audiocd,media/hdd_mounted,media/hdd_unmounted,media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/nfs_mounted,media/cdwriter_unmounted,media/nfs_unmounted,media/removable_mounted,media/dvd_mounted,media/removable_unmounted,media/dvd_unmounted,media/smb_mounted,media/dvdvideo,media/smb_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/floppy_mounted,media/zip_mounted,media/floppy_unmounted,media/zip_unmounted,media/camera_mounted,media/camera_unmounted -diff -urN kioslave/media/propsdlgplugin/propertiespage.cpp kioslave/media/propsdlgplugin/propertiespage.cpp ---- kioslave/media/propsdlgplugin/propertiespage.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespage.cpp Thu Jan 1 01:00:00 1970 -@@ -1,217 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program 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 General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ -- --#include <qcheckbox.h> --#include <qtooltip.h> --#include <qbuttongroup.h> --#include <qlineedit.h> --#include <qfileinfo.h> --#include <qlabel.h> --#include <qregexp.h> --#include <kpushbutton.h> --#include <kmessagebox.h> --#include <klocale.h> --#include <qcombobox.h> --#include <qtimer.h> --#include <kdebug.h> --#include "propertiespage.h" --#include <dcopref.h> -- --// keep in sync with .ui and kded module --const char *short_names[] = {"lower", "win95", "winnt", "mixed", 0 }; --const char *journales[] = {"data", "ordered", "writeback", 0 }; -- --PropertiesPage::PropertiesPage(QWidget* parent, const QString &_id) -- : PropertiesPageGUI(parent), id(_id) --{ -- kdDebug() << "props page " << id << endl; -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "mountoptions", id); -- -- QStringList list; -- -- if (reply.isValid()) -- list = reply; -- -- if (list.size()) { -- kdDebug() << "list " << list << endl; -- -- for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it) -- { -- QString key = (*it).left((*it).find('=')); -- QString value = (*it).mid((*it).find('=') + 1); -- kdDebug() << "key '" << key << "' value '" << value << "'\n"; -- options[key] = value; -- } -- -- if (!options.contains("ro")) -- option_ro->hide(); -- else -- option_ro->setChecked(options["ro"] == "true"); -- connect( option_ro, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("quiet")) -- option_quiet->hide(); -- else -- option_quiet->setChecked(options["quiet"] == "true"); -- connect( option_quiet, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("sync")) -- option_sync->hide(); -- else -- option_sync->setChecked(options["sync"] == "true"); -- connect( option_sync, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("atime")) -- option_atime->hide(); -- else -- option_atime->setChecked(options["atime"] == "true"); -- connect( option_atime, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("flush")) -- option_flush->hide(); -- else -- option_flush->setChecked(options["flush"] == "true"); -- connect( option_flush, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("utf8")) -- option_utf8->hide(); -- else -- option_utf8->setChecked(options["utf8"] == "true"); -- connect( option_utf8, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("uid")) -- option_uid->hide(); -- else -- option_uid->setChecked(options["uid"] == "true"); -- connect( option_uid, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("shortname")) -- { -- option_shortname->hide(); -- text_shortname->hide(); -- } -- else -- { -- for (int index = 0; short_names[index]; ++index) -- if (options["shortname"] == short_names[index]) -- { -- option_shortname->setCurrentItem(index); -- break; -- } -- connect( option_shortname, SIGNAL( activated(int) ), SIGNAL( changed() ) ); -- } -- -- if (!options.contains("journaling")) -- { -- text_journaling->hide(); -- option_journaling->hide(); -- } -- else -- { -- for (int index = 0; journales[index]; ++index) -- if (options["journaling"] == journales[index]) -- { -- option_journaling->setCurrentItem(index); -- break; -- } -- connect( option_journaling, SIGNAL( activated(int) ), SIGNAL( changed() ) ); -- } -- -- label_filesystem->setText(i18n("Filesystem: %1").arg(options["filesystem"])); -- option_mountpoint->setText(options["mountpoint"]); -- connect( option_mountpoint, SIGNAL( textChanged( const QString &) ), SIGNAL( changed() ) ); -- option_automount->setChecked(options["automount"] == "true"); -- connect( option_automount, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("journaling") && -- !options.contains("shortname") && -- !options.contains("uid") && -- !options.contains("utf8") && -- !options.contains("flush")) -- groupbox_specific->hide(); -- -- } else { -- -- groupbox_generic->setEnabled(false); -- groupbox_specific->setEnabled(false); -- label_filesystem->hide(); -- } --} -- --PropertiesPage::~PropertiesPage() --{ --} -- --bool PropertiesPage::save() --{ -- QStringList result; -- -- if (options.contains("ro")) -- result << QString("ro=%1").arg(option_ro->isChecked() ? "true" : "false"); -- -- if (options.contains("quiet")) -- result << QString("quiet=%1").arg(option_quiet->isChecked() ? "true" : "false"); -- -- if (options.contains("sync")) -- result << QString("sync=%1").arg(option_sync->isChecked() ? "true" : "false"); -- -- if (options.contains("atime")) -- result << QString("atime=%1").arg(option_atime->isChecked() ? "true" : "false"); -- -- if (options.contains("flush")) -- result << QString("flush=%1").arg(option_flush->isChecked() ? "true" : "false"); -- -- if (options.contains("utf8")) -- result << QString("utf8=%1").arg(option_utf8->isChecked() ? "true" : "false"); -- -- if (options.contains("uid")) -- result << QString("uid=%1").arg(option_uid->isChecked() ? "true" : "false"); -- -- if (options.contains("shortname")) -- result << QString("shortname=%1").arg(short_names[option_shortname->currentItem()]); -- -- if (options.contains("journaling")) -- result << QString("journaling=%1").arg(journales[option_journaling->currentItem()]); -- -- QString mp = option_mountpoint->text(); -- if (!mp.startsWith("/media/")) -- { -- KMessageBox::sorry(this, i18n("Mountpoint has to be below /media")); -- return false; -- } -- result << QString("mountpoint=%1").arg(mp); -- result << QString("automount=%1").arg(option_automount->isChecked() ? "true" : "false"); -- -- kdDebug() << result << endl; -- -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "setMountoptions", id, result); -- -- if (reply.isValid()) -- return (bool)reply; -- else { -- KMessageBox::sorry(this, -- i18n("Saving the changes failed")); -- -- return false; -- } --} -- --#include "propertiespage.moc" -diff -urN kioslave/media/propsdlgplugin/propertiespage.h kioslave/media/propsdlgplugin/propertiespage.h ---- kioslave/media/propsdlgplugin/propertiespage.h Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespage.h Thu Jan 1 01:00:00 1970 -@@ -1,46 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program 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 General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ -- --#ifndef PROPERTIESPAGE_H --#define PROPERTIESPAGE_H -- --#include "propertiespagegui.h" --#include <qmap.h> -- --class QCheckBox; --class Medium; -- --class PropertiesPage : public PropertiesPageGUI --{ -- Q_OBJECT -- --public: -- PropertiesPage(QWidget* parent, const QString &_id); -- virtual ~PropertiesPage(); -- -- bool save(); -- --protected: -- -- QMap<QString,QString> options; -- QString id; -- --}; -- --#endif -diff -urN kioslave/media/propsdlgplugin/propertiespagegui.ui kioslave/media/propsdlgplugin/propertiespagegui.ui ---- kioslave/media/propsdlgplugin/propertiespagegui.ui Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespagegui.ui Thu Jan 1 01:00:00 1970 -@@ -1,387 +0,0 @@ --<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> --<class>PropertiesPageGUI</class> --<widget class="QWidget"> -- <property name="name"> -- <cstring>PropertiesPageGUI</cstring> -- </property> -- <property name="geometry"> -- <rect> -- <x>0</x> -- <y>0</y> -- <width>527</width> -- <height>476</height> -- </rect> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <property name="margin"> -- <number>0</number> -- </property> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout17</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QGroupBox"> -- <property name="name"> -- <cstring>groupbox_generic</cstring> -- </property> -- <property name="title"> -- <string>Generic Mount Options</string> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout15</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_ro</cstring> -- </property> -- <property name="text"> -- <string>Read only</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Mount the file system read-only.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_quiet</cstring> -- </property> -- <property name="text"> -- <string>Quiet</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Attempts to chown or chmod files do not return errors, although they fail. Use with caution!</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_sync</cstring> -- </property> -- <property name="text"> -- <string>Synchronous</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>All I/O to the file system should be done synchronously.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_atime</cstring> -- </property> -- <property name="text"> -- <string>Access time updates</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Update inode access time for each access.</string> -- </property> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout14</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>textLabel3</cstring> -- </property> -- <property name="text"> -- <string>Mountpoint:</string> -- </property> -- <property name="buddy" stdset="0"> -- <cstring>option_mountpoint</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Under what directory this file system shall be mounted. Please note that there is no guarantee that the system will respect your wish. For one the directory has to be below /media - and it does not yet have to exist.</string> -- </property> -- </widget> -- <widget class="QLineEdit"> -- <property name="name"> -- <cstring>option_mountpoint</cstring> -- </property> -- <property name="text"> -- <string></string> -- </property> -- </widget> -- </hbox> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_automount</cstring> -- </property> -- <property name="text"> -- <string>Mount automatically</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Mount this file system automatically.</string> -- </property> -- </widget> -- </vbox> -- </widget> -- </vbox> -- </widget> -- <widget class="QGroupBox"> -- <property name="name"> -- <cstring>groupbox_specific</cstring> -- </property> -- <property name="title"> -- <string>Filesystem Specific Mount Options</string> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout11</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_flush</cstring> -- </property> -- <property name="text"> -- <string>Flushed IO</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Always flush all data to the hot plug devices immediately and don't cache it.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_utf8</cstring> -- </property> -- <property name="text"> -- <string>UTF-8 charset</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the console. It can be be enabled for the filesystem with this option.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_uid</cstring> -- </property> -- <property name="text"> -- <string>Mount as user</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Mount this file system as user.</string> -- </property> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout7</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>text_journaling</cstring> -- </property> -- <property name="text"> -- <string>Journaling:</string> -- </property> -- <property name="buddy" stdset="0"> -- <cstring>option_journaling</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> -- --<h3><b>All Data</b></h3> -- All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. -- --<h3><b>Ordered</b></h3> -- All data is forced directly out to the main file system prior to its metadata being committed to the journal. -- --<h3><b>Write Back</b></h3> -- Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery.</string> -- </property> -- </widget> -- <widget class="QComboBox"> -- <item> -- <property name="text"> -- <string>All Data</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Ordered</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Write Back</string> -- </property> -- </item> -- <property name="name"> -- <cstring>option_journaling</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> -- --<h3><b>All Data</b></h3> -- All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. -- --<h3><b>Ordered</b></h3> -- All data is forced directly out to the main file system prior to its metadata being committed to the journal. -- --<h3><b>Write Back</b></h3> -- Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery.</string> -- </property> -- </widget> -- </hbox> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout14</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>text_shortname</cstring> -- </property> -- <property name="text"> -- <string>Short names:</string> -- </property> -- <property name="buddy" stdset="0"> -- <cstring>option_shortname</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> -- --<h3><b>Lower</b></h3> --Force the short name to lower case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows 95</b></h3> --Force the short name to upper case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows NT</b></h3> --Display the shortname as is; store a long name when the short name is not all lower case or all upper case. -- --<h3><b>Mixed</b></h3> --Display the short name as is; store a long name when the short name is not all upper case.</string> -- </property> -- </widget> -- <widget class="QComboBox"> -- <item> -- <property name="text"> -- <string>Lower</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Windows 95</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Windows NT</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Mixed</string> -- </property> -- </item> -- <property name="name"> -- <cstring>option_shortname</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> -- --<h3><b>Lower</b></h3> --Force the short name to lower case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows 95</b></h3> --Force the short name to upper case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows NT</b></h3> --Display the shortname as is; store a long name when the short name is not all lower case or all upper case. -- --<h3><b>Mixed</b></h3> --Display the short name as is; store a long name when the short name is not all upper case.</string> -- </property> -- </widget> -- </hbox> -- </widget> -- </vbox> -- </widget> -- </vbox> -- </widget> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>label_filesystem</cstring> -- </property> -- <property name="text"> -- <string>Filesystem: iso9660</string> -- </property> -- </widget> -- <spacer> -- <property name="name"> -- <cstring>spacer1</cstring> -- </property> -- <property name="orientation"> -- <enum>Vertical</enum> -- </property> -- <property name="sizeType"> -- <enum>Expanding</enum> -- </property> -- <property name="sizeHint"> -- <size> -- <width>20</width> -- <height>20</height> -- </size> -- </property> -- </spacer> -- </vbox> -- </widget> -- </hbox> --</widget> --<connections> -- <connection> -- <sender>option_ro</sender> -- <signal>stateChanged(int)</signal> -- <receiver>PropertiesPageGUI</receiver> -- <slot>changedSlot()</slot> -- </connection> --</connections> --<variables> -- <variable>bool m_hasChanged;</variable> --</variables> --<signals> -- <signal>changed()</signal> --</signals> --<slots> -- <slot access="protected">changedSlot()</slot> --</slots> --<functions> -- <function returnType="bool">hasChanged()</function> --</functions> --<layoutdefaults spacing="6" margin="11"/> --</UI> -diff -urN kioslave/media/propsdlgplugin/propertiespagegui.ui.h kioslave/media/propsdlgplugin/propertiespagegui.ui.h ---- kioslave/media/propsdlgplugin/propertiespagegui.ui.h Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespagegui.ui.h Thu Jan 1 01:00:00 1970 -@@ -1,22 +0,0 @@ --/**************************************************************************** --** ui.h extension file, included from the uic-generated form implementation. --** --** If you wish to add, delete or rename functions or slots use --** Qt Designer which will update this file, preserving your code. Create an --** init() function in place of a constructor, and a destroy() function in --** place of a destructor. --*****************************************************************************/ -- -- --void PropertiesPageGUI::changedSlot() --{ -- m_hasChanged = true; -- emit changed(); --} -- --bool PropertiesPageGUI::hasChanged() --{ -- return m_hasChanged; --} -- -- -diff -urN kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp ---- kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp Thu Jan 1 01:00:00 1970 -@@ -1,100 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program 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 General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ --#include <qstring.h> --#include <qvbox.h> --#include <qlayout.h> --#include <qlabel.h> --#include <qtimer.h> -- --#include <kgenericfactory.h> --#include <kdebug.h> --#include <kpushbutton.h> --#include <kfileshare.h> --#include <kmessagebox.h> --#include <kprocess.h> --#include <kstandarddirs.h> --#include <kdialog.h> --#include <kglobal.h> --#include <dcopref.h> -- --#include "propertiespage.h" --#include "propsdlgshareplugin.h" --#include "../libmediacommon/medium.h" -- --typedef KGenericFactory<PropsDlgSharePlugin, KPropertiesDialog> PropsDlgSharePluginFactory; -- --K_EXPORT_COMPONENT_FACTORY( media_propsdlgplugin, -- PropsDlgSharePluginFactory("media_propsdlgplugin") ) -- --class PropsDlgSharePlugin::Private --{ -- public: -- PropertiesPage* page; --}; -- --PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg, -- const char *, const QStringList & ) -- : KPropsDlgPlugin(dlg), d(0) --{ -- if (properties->items().count() != 1) -- return; -- -- KFileItem *item = properties->items().first(); -- -- DCOPRef mediamanager("kded", "mediamanager"); -- kdDebug() << "properties " << item->url() << endl; -- DCOPReply reply = mediamanager.call( "properties", item->url().url() ); -- -- if ( !reply.isValid() ) -- return; -- -- QVBox* vbox = properties->addVBoxPage(i18n("&Mounting")); -- -- d = new Private(); -- -- d->page = new PropertiesPage(vbox, Medium::create(reply).id()); -- connect(d->page, SIGNAL(changed()), -- SLOT(slotChanged())); -- -- // QTimer::singleShot(100, this, SLOT(slotChanged())); -- --} -- --void PropsDlgSharePlugin::slotChanged() --{ -- kdDebug() << "slotChanged()\n"; -- setDirty(true); --} -- --PropsDlgSharePlugin::~PropsDlgSharePlugin() --{ -- delete d; --} -- --void PropsDlgSharePlugin::applyChanges() --{ -- kdDebug() << "applychanges\n"; -- if (!d->page->save()) { -- properties->abortApplying(); -- } --} -- -- --#include "propsdlgshareplugin.moc" -- -diff -urN kioslave/media/propsdlgplugin/propsdlgshareplugin.h kioslave/media/propsdlgplugin/propsdlgshareplugin.h ---- kioslave/media/propsdlgplugin/propsdlgshareplugin.h Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propsdlgshareplugin.h Thu Jan 1 01:00:00 1970 -@@ -1,44 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program 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 General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ -- --#ifndef KONQFILESHAREPLUGIN_H --#define KONQFILESHAREPLUGIN_H -- --#include <kpropertiesdialog.h> -- --class PropsDlgSharePlugin : public KPropsDlgPlugin --{ --Q_OBJECT --public: -- PropsDlgSharePlugin( KPropertiesDialog *dlg, const char *, const QStringList & ); -- virtual ~PropsDlgSharePlugin(); -- virtual void applyChanges(); -- --public slots: -- void slotChanged(); -- --private: -- class Private; -- Private *d; -- --}; -- --#endif -- -- -diff -urN kioslave/media/services/Makefile.in kioslave/media/services/Makefile.in ---- kioslave/media/services/Makefile.in Sat Oct 7 16:42:32 2006 -+++ kioslave/media/services/Makefile.in Fri May 26 09:54:31 2006 -@@ -211,6 +211,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/services/media_eject.desktop kioslave/media/services/media_eject.desktop ---- kioslave/media/services/media_eject.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/services/media_eject.desktop Mon May 22 20:12:42 2006 -@@ -24,7 +24,7 @@ - Name[es]=Expulsar - Name[et]=Väljastamine - Name[eu]=Egotzi --Name[fa]=پس زدن -+Name[fa]=اخراج - Name[fi]=Poista - Name[fr]=Éjecter - Name[fy]=Utsmytknop -diff -urN kioslave/media/services/media_safelyremove.desktop kioslave/media/services/media_safelyremove.desktop ---- kioslave/media/services/media_safelyremove.desktop Sun Oct 1 19:31:53 2006 -+++ kioslave/media/services/media_safelyremove.desktop Tue May 23 13:33:34 2006 -@@ -18,10 +18,8 @@ - Name[es]=Extracción segura - Name[et]=Eemalda turvaliselt - Name[eu]=Atera arriskurik gabe --Name[fa]=حذف امن - Name[fi]=Poista turvallisesti - Name[fr]=Enlever en toute sécurité --Name[fy]=Feilich verwiderje - Name[ga]=Bain Amach go Sábháilte - Name[gl]=Eliminar de Maneira Segura - Name[he]=שליפה בבטחה -@@ -46,7 +44,6 @@ - Name[ru]=Безопасно извлечь - Name[rw]=Gukuramo Neza - Name[se]=Dorvvošlaš eretváldin --Name[sk]=Bezpečne odpojiť - Name[sl]=Varno odstrani - Name[sr]=Безбедно уклони - Name[sr@Latn]=Bezbedno ukloni diff --git a/x11/kdebase4/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kdebase4/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp deleted file mode 100644 index 5a6937d40f75..000000000000 --- a/x11/kdebase4/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- kioslave/media/mediamanager/fstabbackend.cpp.orig Mon May 22 20:12:42 2006 -+++ kioslave/media/mediamanager/fstabbackend.cpp Fri Jun 16 08:56:20 2006 -@@ -111,6 +111,7 @@ - if ( mount->mountType() == "swap" - || mount->mountType() == "tmpfs" - || mount->mountType() == "sysfs" -+ || mount->mountType() == "fdescfs" - || mount->mountType() == "kernfs" - || mount->mountType() == "usbfs" - || mount->mountType().contains( "proc" ) diff --git a/x11/kdebase4/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp b/x11/kdebase4/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp index 00685d0fd8a2..e2580f9277c0 100644 --- a/x11/kdebase4/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp +++ b/x11/kdebase4/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp @@ -1,5 +1,5 @@ ---- kioslave/media/mediamanager/halbackend.cpp.orig Sun Oct 1 21:31:54 2006 -+++ kioslave/media/mediamanager/halbackend.cpp Fri Feb 9 22:01:27 2007 +--- kioslave/media/mediamanager/halbackend.cpp.orig Mon Jan 15 12:31:32 2007 ++++ kioslave/media/mediamanager/halbackend.cpp Sat Mar 3 18:00:49 2007 @@ -17,9 +17,14 @@ */ @@ -14,9 +14,9 @@ +#include <langinfo.h> +#endif - #include <qfile.h> - #include <klocale.h> -@@ -66,6 +71,10 @@ + #include <kapplication.h> + #include <qeventloop.h> +@@ -71,6 +76,10 @@ /* Close HAL connection */ if (m_halContext) { @@ -27,7 +27,7 @@ const QPtrList<Medium> medlist = m_mediaList.list(); QPtrListIterator<Medium> it (medlist); for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) -@@ -185,6 +194,10 @@ +@@ -184,6 +193,10 @@ libhal_free_string_array( halDeviceList ); @@ -38,9 +38,9 @@ return true; } -@@ -242,11 +255,11 @@ - Medium* medium = new Medium(udi, ""); - +@@ -251,11 +264,11 @@ + } + } QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi)); - kdDebug() << "automount " << options["automount"] << endl; + kdDebug(1219) << "automount " << options["automount"] << endl; @@ -50,9 +50,9 @@ - kdDebug() << "error " << error << endl; + kdDebug(1219) << "error " << error << endl; } - setVolumeProperties(medium); m_mediaList.addMedium(medium, allowNotification); -@@ -264,6 +277,11 @@ + +@@ -272,6 +285,11 @@ Medium* medium = new Medium(udi, ""); setFloppyProperties(medium); m_mediaList.addMedium(medium, allowNotification); @@ -64,7 +64,7 @@ return; } -@@ -285,12 +303,23 @@ +@@ -293,12 +311,23 @@ void HALBackend::RemoveDevice(const char *udi) { @@ -89,7 +89,7 @@ const char* mediumUdi = findMediumUdiFromUdi(udi); if (!mediumUdi) return; -@@ -326,7 +355,7 @@ +@@ -334,7 +363,7 @@ } const char* mediumUdi = findMediumUdiFromUdi(udi); @@ -98,7 +98,7 @@ if (!mediumUdi) return; -@@ -384,7 +413,7 @@ +@@ -392,7 +421,7 @@ { Medium m( *cmedium ); if ( setFstabProperties( &m ) ) { @@ -107,7 +107,7 @@ m_mediaList.changeMediumState(m, false); } return; -@@ -399,6 +428,7 @@ +@@ -407,6 +436,7 @@ setFloppyProperties(m); if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) setCameraProperties(m); @@ -115,7 +115,7 @@ m_mediaList.changeMediumState(*m, false); -@@ -469,28 +499,23 @@ +@@ -479,28 +509,23 @@ else mimeType = "media/dvd" + MOUNT_SUFFIX; @@ -155,7 +155,7 @@ } else { -@@ -575,7 +600,7 @@ +@@ -584,7 +609,7 @@ } } @@ -164,7 +164,7 @@ QString fstype = medium->fsType(); if ( fstype.isNull() ) fstype = "auto"; -@@ -762,7 +787,7 @@ +@@ -794,7 +819,7 @@ if (t.endsWith("=")) t = t.left(t.length() - 1); valids[t] = true; @@ -173,7 +173,7 @@ } libhal_free_string_array(array); QStringList result; -@@ -882,12 +908,20 @@ +@@ -915,12 +940,20 @@ result << "journaling=ordered"; } @@ -195,7 +195,7 @@ KConfig config("mediamanagerrc"); config.setGroup(name); -@@ -927,7 +959,7 @@ +@@ -960,7 +993,7 @@ if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, "org.freedesktop.Hal.Device.Volume", "Mount"))) { @@ -204,7 +204,7 @@ return i18n("Internal Error"); } -@@ -935,7 +967,7 @@ +@@ -968,7 +1001,7 @@ DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &poptions, noptions, DBUS_TYPE_INVALID)) { @@ -213,7 +213,7 @@ dbus_message_unref (dmesg); return i18n("Internal Error"); } -@@ -963,7 +995,7 @@ +@@ -996,7 +1029,7 @@ return qerror; } @@ -222,18 +222,25 @@ dbus_message_unref (dmesg); dbus_message_unref (reply); -@@ -974,15 +1006,33 @@ +@@ -1044,7 +1077,7 @@ void HALBackend::slotResult(KIO::Job *job) { - kdDebug() << "slotResult " << mount_jobs[job] << endl; + kdDebug(1219) << "slotResult " << mount_jobs[job] << endl; - if (job->error()) - { - KMessageBox::error(0, job->errorText()); + + struct mount_job_data *data = mount_jobs[job]; + QString& qerror = data->errorMessage; +@@ -1071,7 +1104,6 @@ + qerror = job->errorText(); } -- ResetProperties( mount_jobs[job].latin1() ); + +- ResetProperties( medium->id().latin1() ); mount_jobs.remove(job); + + /* Job completed. Notify the caller */ +@@ -1080,6 +1112,25 @@ + kapp->eventLoop()->exitLoop(); } +#ifdef Q_OS_FREEBSD @@ -247,7 +254,7 @@ + { + bool mounted = false; + const char *dev = (*it)->deviceNode().ascii(); -+ for (int n = mntNum-1; n >= 0 && !mounted; n--) ++ for (int n = mntNum-1; n >= 0 && !mounted; n--) + mounted = !strcmp(dev, mntBuf[n].f_mntfromname); + if ((*it)->isMounted() != mounted) + ResetProperties((*it)->id().latin1()); @@ -258,31 +265,32 @@ QString HALBackend::isInFstab(const Medium *medium) { KMountPoint::List fstab = KMountPoint::possibleMountPoints(KMountPoint::NeedMountOptions|KMountPoint::NeedRealDeviceName); -@@ -992,11 +1042,13 @@ - - for (; it!=end; ++it) - { -- kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl; -+ kdDebug(1219) << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl; - if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && (*it)->realDeviceName() == medium->deviceNode() ) ) +@@ -1092,12 +1143,14 @@ + QString reald = (*it)->realDeviceName(); + if ( reald.endsWith( "/" ) ) + reald = reald.left( reald.length() - 1 ); +- kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << reald << "- -" << (*it)->mountedFrom() << "-" << endl; ++ kdDebug(1219) << "isInFstab -" << medium->deviceNode() << "- -" << reald << "- -" << (*it)->mountedFrom() << "-" << endl; + if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && reald == medium->deviceNode() ) ) { +#ifndef Q_OS_FREEBSD QStringList opts = (*it)->mountOptions(); if (opts.contains("user") || opts.contains("users")) -+#endif return (*it)->mountPoint(); ++#endif } } -@@ -1012,7 +1064,7 @@ - QString mountPoint = isInFstab(medium); - if (!mountPoint.isNull()) - { + +@@ -1116,7 +1169,7 @@ + data.completed = false; + data.medium = medium; + - kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; + kdDebug(1219) << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint ); connect(job, SIGNAL( result (KIO::Job *)), SLOT( slotResult( KIO::Job *))); -@@ -1023,7 +1075,7 @@ +@@ -1134,7 +1187,7 @@ QStringList soptions; @@ -291,7 +299,7 @@ QMap<QString,QString> valids = MediaManagerUtils::splitOptions(mountoptions(medium->id())); if (valids["flush"] == "true") -@@ -1036,10 +1088,10 @@ +@@ -1147,10 +1200,10 @@ if (valids["ro"] == "true") soptions << "ro"; @@ -304,7 +312,7 @@ if (valids["quiet"] == "true") soptions << "quiet"; -@@ -1069,6 +1121,13 @@ +@@ -1180,6 +1233,13 @@ soptions << QString("data=ordered"); } @@ -318,7 +326,7 @@ const char **options = new const char*[soptions.size() + 1]; uint noptions = 0; for (QStringList::ConstIterator it = soptions.begin(); it != soptions.end(); ++it, ++noptions) -@@ -1081,9 +1140,6 @@ +@@ -1192,9 +1252,6 @@ return qerror; } @@ -328,16 +336,7 @@ return QString(); } -@@ -1121,7 +1177,7 @@ - QString mountPoint = isInFstab(medium); - if (!mountPoint.isNull()) - { -- kdDebug() << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl; -+ kdDebug(1219) << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl; - KIO::Job *job = KIO::unmount( medium->mountPoint(), false ); - connect(job, SIGNAL( result (KIO::Job *)), - SLOT( slotResult( KIO::Job *))); -@@ -1134,7 +1190,7 @@ +@@ -1255,7 +1312,7 @@ const char *options[2]; const char *udi = medium->id().latin1(); @@ -346,7 +345,7 @@ dbus_error_init(&error); DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -@@ -1147,7 +1203,7 @@ +@@ -1268,7 +1325,7 @@ if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, "org.freedesktop.Hal.Device.Volume", "Unmount"))) { @@ -355,7 +354,7 @@ return i18n("Internal Error"); } -@@ -1157,7 +1213,7 @@ +@@ -1278,7 +1335,7 @@ if (!dbus_message_append_args (dmesg, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, 0, DBUS_TYPE_INVALID)) { @@ -364,16 +363,16 @@ dbus_message_unref (dmesg); return i18n("Internal Error"); } -@@ -1165,7 +1221,7 @@ - dbus_error_init (&error); - if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) +@@ -1288,7 +1345,7 @@ { + QString qerror, reason; + - kdDebug() << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl; + kdDebug(1219) << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl; - QString qerror = error.message; - if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.Busy")) { - qerror = QString("<qt>") + i18n("Device is Busy:"); -@@ -1201,13 +1257,10 @@ + qerror = "<qt>"; + qerror += i18n("Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and " + "currently mounted at <b>%4</b> could not be unmounted. ").arg( +@@ -1318,13 +1375,10 @@ return qerror; } diff --git a/x11/kdebase4/files/extrapatch-kioslave_media_mediamanager-halbackend.h b/x11/kdebase4/files/extrapatch-kioslave_media_mediamanager-halbackend.h index df548eb39905..21672b565977 100644 --- a/x11/kdebase4/files/extrapatch-kioslave_media_mediamanager-halbackend.h +++ b/x11/kdebase4/files/extrapatch-kioslave_media_mediamanager-halbackend.h @@ -1,5 +1,5 @@ ---- kioslave/media/mediamanager/halbackend.h.orig Sun Jan 28 23:58:13 2007 -+++ kioslave/media/mediamanager/halbackend.h Thu Feb 1 02:51:48 2007 +--- kioslave/media/mediamanager/halbackend.h.orig Mon Jan 15 12:31:32 2007 ++++ kioslave/media/mediamanager/halbackend.h Wed Feb 21 15:01:12 2007 @@ -34,6 +34,9 @@ #include <qobject.h> #include <qstringlist.h> @@ -10,7 +10,7 @@ #include <config.h> -@@ -154,6 +157,9 @@ +@@ -156,6 +159,9 @@ private slots: void slotResult(KIO::Job *job); @@ -20,10 +20,10 @@ /* Hal call-backs -- from gvm*/ public: -@@ -217,6 +223,10 @@ - DBusConnection *dbus_connection; +@@ -233,6 +239,10 @@ + }; - QMap<KIO::Job *, QString> mount_jobs; + QMap<KIO::Job *, struct mount_job_data*> mount_jobs; +#ifdef Q_OS_FREEBSD + QTimer m_pollTimer; + QPtrList<Medium> m_pollMediaList; diff --git a/x11/kdebase4/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp b/x11/kdebase4/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp index 508019a14f3c..7d0fbfa81767 100644 --- a/x11/kdebase4/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp +++ b/x11/kdebase4/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp @@ -1,6 +1,6 @@ ---- kioslave/media/mounthelper/kio_media_mounthelper.cpp.orig Sat Jan 27 01:58:24 2007 -+++ kioslave/media/mounthelper/kio_media_mounthelper.cpp Sat Jan 27 02:35:28 2007 -@@ -77,7 +77,9 @@ +--- kioslave/media/mounthelper/kio_media_mounthelper.cpp.orig Mon Jan 15 12:31:31 2007 ++++ kioslave/media/mounthelper/kio_media_mounthelper.cpp Wed Feb 21 15:17:23 2007 +@@ -89,7 +89,9 @@ m_isCdrom = medium.mimeType().find("dvd")!=-1 || medium.mimeType().find("cd")!=-1; @@ -11,7 +11,7 @@ { DCOPRef mediamanager("kded", "mediamanager"); DCOPReply reply = mediamanager.call( "unmount", medium.id()); -@@ -85,13 +87,14 @@ +@@ -97,30 +99,14 @@ reply.get(m_errorStr); kdDebug() << "medium unmount " << m_errorStr << endl; if (m_errorStr.isNull()) @@ -26,6 +26,23 @@ - } - else if (args->isSet("s") || args->isSet("e")) - { +- /* +- * We want to call mediamanager unmount before invoking eject. That's +- * because unmount would provide an informative error message in case of +- * failure. However, there are cases when unmount would fail +- * (supermount, slackware, see bug#116209) but eject would succeed. +- * Thus if unmount fails, save unmount error message and invokeEject() +- * anyway. Only if both unmount and eject fail, notify the user by +- * displaying the saved error message (see ejectFinished()). +- */ +- if (medium.isMounted()) +- { +- DCOPRef mediamanager("kded", "mediamanager"); +- DCOPReply reply = mediamanager.call( "unmount", medium.id()); +- if (reply.isValid()) +- reply.get(m_errorStr); +- m_device = device; +- } - invokeEject(device, true); } else diff --git a/x11/kdebase4/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase4/files/patch-kdm-kfrontend-genkdmconf.c deleted file mode 100644 index e0179de4e074..000000000000 --- a/x11/kdebase4/files/patch-kdm-kfrontend-genkdmconf.c +++ /dev/null @@ -1,11 +0,0 @@ ---- kdm/kfrontend/genkdmconf.c.orig Mon Jun 5 14:34:06 2006 -+++ kdm/kfrontend/genkdmconf.c Mon Jun 5 14:35:52 2006 -@@ -1684,7 +1684,7 @@ - linkfile( ce ); - else { - tmpf = locate( "mktemp" ) ? -- "`mktemp`" : -+ "`mktemp /tmp/xsess-env-XXXXXX`" : - locate( "tempfile" ) ? - "`tempfile`" : - "$HOME/.xsession-env-$DISPLAY"; diff --git a/x11/kdebase4/files/patch-kwin-client.cpp b/x11/kdebase4/files/patch-kwin-client.cpp deleted file mode 100644 index d8e0f91db691..000000000000 --- a/x11/kdebase4/files/patch-kwin-client.cpp +++ /dev/null @@ -1,39 +0,0 @@ ---- kwin/client.cpp.orig Mon Oct 2 03:02:07 2006 -+++ kwin/client.cpp Mon Jan 8 10:54:19 2007 -@@ -477,17 +477,30 @@ - // calls it or when the decoration is created/destroyed - - if( Shape::version() >= 0x11 ) // 1.1, has input shape support -- { // there appears to be no way to find out if a window has input -- // shape set or not, so always set propagate the input shape -- // (it's the same like the bounding shape by default) -- XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, 0, 0, -+ { // There appears to be no way to find out if a window has input -+ // shape set or not, so always propagate the input shape -+ // (it's the same like the bounding shape by default). -+ // Also, build the shape using a helper window, not directly -+ // in the frame window, because the sequence set-shape-to-frame, -+ // remove-shape-of-client, add-input-shape-of-client has the problem -+ // that after the second step there's a hole in the input shape -+ // until the real shape of the client is added and that can make -+ // the window lose focus (which is a problem with mouse focus policies) -+ static Window helper_window = None; -+ if( helper_window == None ) -+ helper_window = XCreateSimpleWindow( qt_xdisplay(), qt_xrootwin(), -+ 0, 0, 1, 1, 0, 0, 0 ); -+ XResizeWindow( qt_xdisplay(), helper_window, width(), height()); -+ XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput, 0, 0, - frameId(), ShapeBounding, ShapeSet ); -- XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, -+ XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput, - clientPos().x(), clientPos().y(), - window(), ShapeBounding, ShapeSubtract ); -- XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, -+ XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput, - clientPos().x(), clientPos().y(), - window(), ShapeInput, ShapeUnion ); -+ XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, 0, 0, -+ helper_window, ShapeInput, ShapeSet ); - } - } - diff --git a/x11/kdebase4/pkg-plist b/x11/kdebase4/pkg-plist index 46ca7f96cbe8..bd60a8fa6ce8 100644 --- a/x11/kdebase4/pkg-plist +++ b/x11/kdebase4/pkg-plist @@ -440,6 +440,9 @@ lib/kde3/kicker.so lib/kde3/kickermenu_find.a lib/kde3/kickermenu_find.la lib/kde3/kickermenu_find.so +lib/kde3/kickermenu_kate.a +lib/kde3/kickermenu_kate.la +lib/kde3/kickermenu_kate.so lib/kde3/kickermenu_kdeprint.a lib/kde3/kickermenu_kdeprint.la lib/kde3/kickermenu_kdeprint.so @@ -1158,6 +1161,7 @@ share/apps/kappfinder/apps/Internet/mozilla.desktop share/apps/kappfinder/apps/Internet/netscape.desktop share/apps/kappfinder/apps/Internet/netscape6.desktop share/apps/kappfinder/apps/Internet/opera.desktop +share/apps/kappfinder/apps/Internet/wireshark.desktop share/apps/kappfinder/apps/Internet/xbiff.desktop share/apps/kappfinder/apps/Internet/xchat.desktop share/apps/kappfinder/apps/Internet/xfmail.desktop @@ -1628,6 +1632,7 @@ share/apps/kicker/icons/locolor/16x16/actions/modified.png share/apps/kicker/menuext/find.desktop share/apps/kicker/menuext/find/kfind.desktop share/apps/kicker/menuext/find/websearch.desktop +share/apps/kicker/menuext/katesessionmenu.desktop share/apps/kicker/menuext/konquerormenu.desktop share/apps/kicker/menuext/konsolemenu.desktop share/apps/kicker/menuext/prefmenu.desktop @@ -2081,7 +2086,7 @@ share/desktop-directories/kde-edutainment.directory share/desktop-directories/kde-games-arcade.directory share/desktop-directories/kde-games-board.directory share/desktop-directories/kde-games-card.directory -share/desktop-directories/kde-games-kidsgames.directory +share/desktop-directories/kde-games-kids.directory share/desktop-directories/kde-games-roguelikes.directory share/desktop-directories/kde-games-strategy.directory share/desktop-directories/kde-games.directory @@ -2420,6 +2425,7 @@ share/doc/HTML/en/khelpcenter/userguide/common share/doc/HTML/en/khelpcenter/userguide/control-center.docbook share/doc/HTML/en/khelpcenter/userguide/creating-graphics.docbook share/doc/HTML/en/khelpcenter/userguide/credits-and-license.docbook +share/doc/HTML/en/khelpcenter/userguide/customizing-desktop.docbook share/doc/HTML/en/khelpcenter/userguide/desktop.png share/doc/HTML/en/khelpcenter/userguide/email.docbook share/doc/HTML/en/khelpcenter/userguide/extragear-applications.docbook @@ -2480,6 +2486,7 @@ share/doc/HTML/en/khelpcenter/userguide/ripsettings.png share/doc/HTML/en/khelpcenter/userguide/screen-captures.docbook share/doc/HTML/en/khelpcenter/userguide/services.png share/doc/HTML/en/khelpcenter/userguide/shared-sessions.docbook +share/doc/HTML/en/khelpcenter/userguide/splash-screen.png share/doc/HTML/en/khelpcenter/userguide/standard-menu-entries.docbook share/doc/HTML/en/khelpcenter/userguide/switching-sessions.docbook share/doc/HTML/en/khelpcenter/userguide/the-filemanager.docbook @@ -2492,7 +2499,6 @@ share/doc/HTML/en/khelpcenter/userguide/where-next.docbook share/doc/HTML/en/khelpcenter/userguide/windows-how-to.docbook share/doc/HTML/en/khelpcenter/userguide/your-kde-account.docbook share/doc/HTML/en/khelpcenter/visualdict/common -share/doc/HTML/en/khelpcenter/visualdict/contextmenu.png share/doc/HTML/en/khelpcenter/visualdict/index.cache.bz2 share/doc/HTML/en/khelpcenter/visualdict/index.docbook share/doc/HTML/en/khelpcenter/visualdict/pict1.png @@ -2508,6 +2514,9 @@ share/doc/HTML/en/khelpcenter/visualdict/pict18.png share/doc/HTML/en/khelpcenter/visualdict/pict19.png share/doc/HTML/en/khelpcenter/visualdict/pict2.png share/doc/HTML/en/khelpcenter/visualdict/pict20.png +share/doc/HTML/en/khelpcenter/visualdict/pict21.png +share/doc/HTML/en/khelpcenter/visualdict/pict22.png +share/doc/HTML/en/khelpcenter/visualdict/pict23.png share/doc/HTML/en/khelpcenter/visualdict/pict3.png share/doc/HTML/en/khelpcenter/visualdict/pict4.png share/doc/HTML/en/khelpcenter/visualdict/pict5.png @@ -2649,6 +2658,7 @@ share/doc/HTML/en/knetattach/common share/doc/HTML/en/knetattach/index.cache.bz2 share/doc/HTML/en/knetattach/index.docbook share/doc/HTML/en/knetattach/screenshot.png +share/doc/HTML/en/knetattach/screenshot1.png share/doc/HTML/en/knetattach/screenshot2.png share/doc/HTML/en/knetattach/screenshot3.png share/doc/HTML/en/knetattach/screenshot4.png @@ -2742,7 +2752,6 @@ share/icons/crystalsvg/128x128/apps/licq.png share/icons/crystalsvg/128x128/apps/linuxconf.png share/icons/crystalsvg/128x128/apps/locale.png share/icons/crystalsvg/128x128/apps/looknfeel.png -share/icons/crystalsvg/128x128/apps/mozilla.png share/icons/crystalsvg/128x128/apps/multimedia.png share/icons/crystalsvg/128x128/apps/netscape.png share/icons/crystalsvg/128x128/apps/package.png @@ -2808,7 +2817,6 @@ share/icons/crystalsvg/16x16/apps/enhanced_browsing.png share/icons/crystalsvg/16x16/apps/evolution.png share/icons/crystalsvg/16x16/apps/fifteenpieces.png share/icons/crystalsvg/16x16/apps/filetypes.png -share/icons/crystalsvg/16x16/apps/firefox.png share/icons/crystalsvg/16x16/apps/fonts.png share/icons/crystalsvg/16x16/apps/gabber.png share/icons/crystalsvg/16x16/apps/gaim.png @@ -2862,9 +2870,6 @@ share/icons/crystalsvg/16x16/apps/looknfeel.png share/icons/crystalsvg/16x16/apps/lyx.png share/icons/crystalsvg/16x16/apps/mac.png share/icons/crystalsvg/16x16/apps/mathematica.png -share/icons/crystalsvg/16x16/apps/mozilla.png -share/icons/crystalsvg/16x16/apps/mozilla_m.png -share/icons/crystalsvg/16x16/apps/mozilla_mail.png share/icons/crystalsvg/16x16/apps/multimedia.png share/icons/crystalsvg/16x16/apps/nedit.png share/icons/crystalsvg/16x16/apps/netscape.png @@ -2911,7 +2916,6 @@ share/icons/crystalsvg/16x16/apps/stylesheet.png share/icons/crystalsvg/16x16/apps/systemtray.png share/icons/crystalsvg/16x16/apps/taskbar.png share/icons/crystalsvg/16x16/apps/terminal.png -share/icons/crystalsvg/16x16/apps/thunderbird.png share/icons/crystalsvg/16x16/apps/tux.png share/icons/crystalsvg/16x16/apps/usb.png share/icons/crystalsvg/16x16/apps/vnc.png @@ -3016,7 +3020,6 @@ share/icons/crystalsvg/32x32/apps/error.png share/icons/crystalsvg/32x32/apps/evolution.png share/icons/crystalsvg/32x32/apps/fifteenpieces.png share/icons/crystalsvg/32x32/apps/filetypes.png -share/icons/crystalsvg/32x32/apps/firefox.png share/icons/crystalsvg/32x32/apps/fonts.png share/icons/crystalsvg/32x32/apps/gabber.png share/icons/crystalsvg/32x32/apps/gaim.png @@ -3071,9 +3074,6 @@ share/icons/crystalsvg/32x32/apps/looknfeel.png share/icons/crystalsvg/32x32/apps/lyx.png share/icons/crystalsvg/32x32/apps/mac.png share/icons/crystalsvg/32x32/apps/mathematica.png -share/icons/crystalsvg/32x32/apps/mozilla.png -share/icons/crystalsvg/32x32/apps/mozilla_m.png -share/icons/crystalsvg/32x32/apps/mozilla_mail.png share/icons/crystalsvg/32x32/apps/multimedia.png share/icons/crystalsvg/32x32/apps/nedit.png share/icons/crystalsvg/32x32/apps/netscape.png @@ -3118,7 +3118,6 @@ share/icons/crystalsvg/32x32/apps/stylesheet.png share/icons/crystalsvg/32x32/apps/systemtray.png share/icons/crystalsvg/32x32/apps/taskbar.png share/icons/crystalsvg/32x32/apps/terminal.png -share/icons/crystalsvg/32x32/apps/thunderbird.png share/icons/crystalsvg/32x32/apps/tux.png share/icons/crystalsvg/32x32/apps/usb.png share/icons/crystalsvg/32x32/apps/vnc.png @@ -3177,7 +3176,6 @@ share/icons/crystalsvg/48x48/apps/enhanced_browsing.png share/icons/crystalsvg/48x48/apps/evolution.png share/icons/crystalsvg/48x48/apps/fifteenpieces.png share/icons/crystalsvg/48x48/apps/filetypes.png -share/icons/crystalsvg/48x48/apps/firefox.png share/icons/crystalsvg/48x48/apps/fonts.png share/icons/crystalsvg/48x48/apps/gabber.png share/icons/crystalsvg/48x48/apps/gaim.png @@ -3226,9 +3224,6 @@ share/icons/crystalsvg/48x48/apps/licq.png share/icons/crystalsvg/48x48/apps/linuxconf.png share/icons/crystalsvg/48x48/apps/locale.png share/icons/crystalsvg/48x48/apps/looknfeel.png -share/icons/crystalsvg/48x48/apps/mozilla.png -share/icons/crystalsvg/48x48/apps/mozilla_m.png -share/icons/crystalsvg/48x48/apps/mozilla_mail.png share/icons/crystalsvg/48x48/apps/multimedia.png share/icons/crystalsvg/48x48/apps/nedit.png share/icons/crystalsvg/48x48/apps/netscape.png @@ -3330,7 +3325,6 @@ share/icons/crystalsvg/64x64/apps/licq.png share/icons/crystalsvg/64x64/apps/linuxconf.png share/icons/crystalsvg/64x64/apps/locale.png share/icons/crystalsvg/64x64/apps/looknfeel.png -share/icons/crystalsvg/64x64/apps/mozilla.png share/icons/crystalsvg/64x64/apps/multimedia.png share/icons/crystalsvg/64x64/apps/nedit.png share/icons/crystalsvg/64x64/apps/netscape.png diff --git a/x11/kdelibs3-nocups/pkg-plist b/x11/kdelibs3-nocups/pkg-plist index 7b3cca85a878..d8f28edbf2fc 100644 --- a/x11/kdelibs3-nocups/pkg-plist +++ b/x11/kdelibs3-nocups/pkg-plist @@ -57,7 +57,6 @@ bin/makekdewidgets bin/meinproc bin/preparetips bin/start_kdeinit -etc/rc.d/kdelibs.sh etc/xdg/menus/kde-applications.menu include/arts/artskde.h include/arts/kartsdispatcher.h @@ -1192,6 +1191,7 @@ share/apps/katepart/scripts/script-indent-c-char.js share/apps/katepart/scripts/script-indent-c-newline.js share/apps/katepart/scripts/sort.js share/apps/katepart/syntax/abc.xml +share/apps/katepart/syntax/actionscript.xml share/apps/katepart/syntax/ada.xml share/apps/katepart/syntax/ahdl.xml share/apps/katepart/syntax/alert.xml diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index b83bb044e80c..9b19292a79d8 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdelibs PORTVERSION= ${KDE_VERSION} -PORTREVISION= 4 CATEGORIES= x11 kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -56,8 +55,7 @@ USE_OPENSSL= yes USE_QT_VER= 3 PREFIX= ${KDE_PREFIX} -USE_LDCONFIG= yes -LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 +USE_LDCONFIG= ${PREFIX}/lib/kde3 USE_AUTOTOOLS= libtool:15 CONFIGURE_TARGET=# empty @@ -102,11 +100,4 @@ post-configure: ${TOUCH} ${WRKSRC}/kio/kssl/ksslconfig.h.in ${TOUCH} ${WRKSRC}/kjs/global.h.in -post-install: - ${MKDIR} ${PREFIX}/etc/rc.d - ${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${FILESDIR}/kdelibs.sh \ - > ${PREFIX}/etc/rc.d/kdelibs.sh - ${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/kdelibs.sh - ${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/etc/rc.d/kdelibs.sh - .include <bsd.port.post.mk> diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo index 85c7caa7ecab..c4f0914142c7 100644 --- a/x11/kdelibs3/distinfo +++ b/x11/kdelibs3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdelibs-3.5.5.tar.bz2) = 2cba792e3b0a766431b837c8ef924117 -SHA256 (KDE/kdelibs-3.5.5.tar.bz2) = e487cdd56aa14eec3e100501a5e14658c6329fac30ea0ce812c860e3564c31e3 -SIZE (KDE/kdelibs-3.5.5.tar.bz2) = 15486690 +MD5 (KDE/kdelibs-3.5.6.tar.bz2) = e4d137879a66e92b895b3de5413a61d8 +SHA256 (KDE/kdelibs-3.5.6.tar.bz2) = 06766202c6ae21277b7879f363ed88fde8016586ec8c94deb59be260f2231b5c +SIZE (KDE/kdelibs-3.5.6.tar.bz2) = 15509460 diff --git a/x11/kdelibs3/files/kdelibs.sh b/x11/kdelibs3/files/kdelibs.sh deleted file mode 100644 index 24568777caf1..000000000000 --- a/x11/kdelibs3/files/kdelibs.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -PREFIX=%%PREFIX%% -ldconfig -m $PREFIX/lib/kde3 diff --git a/x11/kdelibs3/files/patch-cups-1.2.x-sockets b/x11/kdelibs3/files/patch-cups-1.2.x-sockets deleted file mode 100644 index ae126ad441f6..000000000000 --- a/x11/kdelibs3/files/patch-cups-1.2.x-sockets +++ /dev/null @@ -1,248 +0,0 @@ ---- kdeprint/cups/ipprequest.cpp -+++ kdeprint/cups/ipprequest.cpp -@@ -329,6 +329,10 @@ - dumpRequest(request_, true); - } - -+ /* No printers found */ -+ if ( request_ && request_->request.status.status_code == 0x406 ) -+ return true; -+ - if (!request_ || request_->state == IPP_ERROR || (request_->request.status.status_code & 0x0F00)) - return false; - ---- kdeprint/cups/kmcupsmanager.cpp -+++ kdeprint/cups/kmcupsmanager.cpp -@@ -61,7 +61,7 @@ - #define ppdi18n(s) i18n(QString::fromLocal8Bit(s).utf8()) - - void extractMaticData(QString& buf, const QString& filename); --QString printerURI(KMPrinter *p, bool useExistingURI = false); -+QString printerURI(KMPrinter *p, bool useExistingURI); - QString downloadDriver(KMPrinter *p); - - static int trials = 5; -@@ -218,7 +218,7 @@ - QString uri; - - req.setOperation(state); -- uri = printerURI(p); -+ uri = printerURI(p, true); - req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); - if (req.doRequest("/admin/")) - return true; ---- kdeprint/cups/cupsinfos.cpp 2006-10-26 19:31:11.000000000 +0300 -+++ kdeprint/cups/cupsinfos.cpp 2006-10-26 21:29:07.000000000 +0300 -@@ -21,6 +21,7 @@ - #include "kmfactory.h" - #include "kmtimer.h" - #include "messagewindow.h" -+#include "ipprequest.h" - - #include <kio/passdlg.h> - #include <kio/authinfo.h> -@@ -76,6 +77,11 @@ - return host_; - } - -+QString CupsInfos::ippAssembleURI(const QString& resource) const -+{ -+ return IppRequest::assembleURI(host(), port(), resource); -+} -+ - void CupsInfos::setHost(const QString& s) - { - host_ = s; ---- kdeprint/cups/cupsinfos.h 2006-10-26 19:31:11.000000000 +0300 -+++ kdeprint/cups/cupsinfos.h 2006-10-26 21:26:26.000000000 +0300 -@@ -34,6 +34,7 @@ - const QString& host() const; - QString hostaddr() const; - int port() const; -+ QString ippAssembleURI(const QString& resource) const; - const QString& login() const; - const QString& password() const; - const QString& realLogin() const; ---- kdeprint/cups/ipprequest.cpp 2006-10-26 19:31:11.000000000 +0300 -+++ kdeprint/cups/ipprequest.cpp 2006-10-26 21:33:09.000000000 +0300 -@@ -529,4 +529,48 @@ - attr = attr->next; - } - #endif -+ -+ - } -+ -+ -+QString IppRequest::assembleURI(const QString& host, int port, const QString& resource) -+{ -+ const char* hostname; -+ -+ // Replace UNIX socket address with "localhost". ipp URI specification -+ // does not allow UNIX socket addresses in the host portion -+ if (host[0] == '/' || host.isEmpty()) { -+ hostname = "localhost"; -+ port = 0; -+ } else { -+ hostname = host.local8Bit(); -+ } -+ -+ if (port < 0) -+ return QString::null; -+ -+#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2 -+ QCString uri(HTTP_MAX_URI); -+ -+ // Use URI assembling function provided by CUPS -+ if (httpAssembleURI(HTTP_URI_CODING_ALL, uri.data(), uri.size(), -+ "ipp", NULL, hostname, port, resource.local8Bit()) == HTTP_URI_OK) -+ return QString(uri); -+ else -+ return QString::null; -+ -+#else -+ // Use our own URI assembling function -+ if (port > 0) -+ return QString("ipp://%1:%2%3") -+ .arg(hostname) -+ .arg(port) -+ .arg(KURL::encode_string(resource)); -+ else -+ return QString("ipp://%1%2") -+ .arg(hostname) -+ .arg(KURL::encode_string(resource)); -+#endif -+} -+ ---- kdeprint/cups/ipprequest.h 2006-10-26 19:31:11.000000000 +0300 -+++ kdeprint/cups/ipprequest.h 2006-10-26 21:24:41.000000000 +0300 -@@ -86,6 +86,9 @@ - // debug function - void dump(int state); - -+ // URI assembling function [static] -+ static QString assembleURI(const QString& host, int port, const QString& resource); -+ - protected: - void addString_p(int group, int type, const QString& name, const QString& value); - void addStringList_p(int group, int type, const QString& name, const QStringList& values); ---- kdeprint/cups/kmcupsjobmanager.cpp 2006-10-26 21:45:23.000000000 +0300 -+++ kdeprint/cups/kmcupsjobmanager.cpp 2006-10-27 01:33:12.000000000 +0300 -@@ -92,7 +92,7 @@ - case KMJob::Move: - if (argstr.isEmpty()) return false; - req.setOperation(CUPS_MOVE_JOB); -- uri = QString::fromLatin1("ipp://%1:%2/printers/%3").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()).arg(argstr); -+ uri = CupsInfos::self()->ippAssembleURI(QString("/printers/%1").arg(argstr)); - req.addURI(IPP_TAG_OPERATION, "job-printer-uri", uri); - break; - default: -@@ -109,7 +109,6 @@ - bool KMCupsJobManager::listJobs(const QString& prname, KMJobManager::JobType type, int limit) - { - IppRequest req; -- QString uri("ipp://%1:%2/%3/%4"); - QStringList keys; - CupsInfos *infos = CupsInfos::self(); - -@@ -143,7 +142,8 @@ - */ - } - else -- req.addURI(IPP_TAG_OPERATION, "printer-uri", uri.arg(infos->host()).arg(infos->port()).arg(((mp&&mp->isClass())?"classes":"printers")).arg(prname)); -+ req.addURI(IPP_TAG_OPERATION, "printer-uri", -+ infos->ippAssembleURI(QString("/%1/%2").arg(((mp&&mp->isClass())?"classes":"printers")).arg(prname))); - - // other attributes - req.addKeyword(IPP_TAG_OPERATION, "requested-attributes", keys); ---- kdeprint/cups/kmcupsmanager.cpp 2006-10-26 19:31:11.000000000 +0300 -+++ kdeprint/cups/kmcupsmanager.cpp 2006-10-26 21:31:12.000000000 +0300 -@@ -138,7 +138,7 @@ - req.setOperation(CUPS_ADD_CLASS); - QStringList members = p->members(), uris; - QString s; -- s = QString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); -+ s = CupsInfos::self()->ippAssembleURI("/printers/"); - for (QStringList::ConstIterator it=members.begin(); it!=members.end(); ++it) - uris.append(s+(*it)); - req.addURI(IPP_TAG_PRINTER,"member-uris",uris); -@@ -1024,7 +1024,7 @@ - if (use && !p->uri().isEmpty()) - uri = p->uri().prettyURL(); - else -- uri = QString("ipp://%1/%3/%2").arg(CupsInfos::self()->hostaddr()).arg(p->printerName()).arg((p->isClass(false) ? "classes" : "printers")); -+ uri = CupsInfos::self()->ippAssembleURI(QString("/%2/%1").arg(p->printerName()).arg((p->isClass(false) ? "classes" : "printers"))); - return uri; - } - ---- kdeprint/cups/kmcupsuimanager.cpp 2006-10-26 19:31:11.000000000 +0300 -+++ kdeprint/cups/kmcupsuimanager.cpp 2006-10-26 21:34:02.000000000 +0300 -@@ -135,7 +135,7 @@ - QString uri; - - req.setOperation(CUPS_GET_DEVICES); -- uri = QString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); -+ uri = CupsInfos::self()->ippAssembleURI("/printers/"); - req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); - - if (req.doRequest("/")) ---- kdeprint/cups/kmwfax.cpp 2006-10-26 19:31:11.000000000 +0300 -+++ kdeprint/cups/kmwfax.cpp 2006-10-26 21:34:54.000000000 +0300 -@@ -48,7 +48,7 @@ - // initialize - IppRequest req; - req.setOperation(CUPS_GET_DEVICES); -- QString uri = QString::fromLatin1("ipp://%1:%2/printers/").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()); -+ QString uri = CupsInfos::self()->ippAssembleURI("/printers/"); - req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); - if (req.doRequest("/")) - { ---- kdeprint/cups/kmwippprinter.cpp 2006-10-26 19:31:11.000000000 +0300 -+++ kdeprint/cups/kmwippprinter.cpp 2006-10-26 21:41:20.000000000 +0300 -@@ -157,7 +157,7 @@ - req.setOperation(IPP_GET_PRINTER_ATTRIBUTES); - req.setHost(item->text(1)); - req.setPort(item->text(2).toInt()); -- uri = QString::fromLatin1("ipp://%1:%2/ipp").arg(item->text(1)).arg(item->text(2)); -+ uri = IppRequest::assembleURI(item->text(1), item->text(2).toInt(), "/ipp"); - req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); - keys.append("printer-name"); - keys.append("printer-state"); -@@ -176,7 +176,7 @@ - if (req.uri("printer-uri-supported",value)) - { - if (value[0] == '/') -- value.prepend(QString::fromLatin1("ipp://%1:%2").arg(item->text(1)).arg(item->text(2))); -+ value = IppRequest::assembleURI(item->text(1), item->text(2).toInt(), value); - m_uri->setText(value); - } - if (req.text("printer-make-and-model",value) && !value.isEmpty()) txt.append(i18n("<b>Model</b>: %1<br>").arg(value)); -@@ -203,7 +203,7 @@ - void KMWIppPrinter::slotIppReport() - { - IppRequest req; -- QString uri("ipp://%1:%2/ipp"); -+ QString uri; - QListViewItem *item = m_list->currentItem(); - - if (item) -@@ -211,7 +211,7 @@ - req.setOperation(IPP_GET_PRINTER_ATTRIBUTES); - req.setHost(item->text(1)); - req.setPort(item->text(2).toInt()); -- uri = uri.arg(item->text(1)).arg(item->text(2)); -+ uri = IppRequest::assembleURI(item->text(1), item->text(2).toInt(), "/ipp"); - req.addURI(IPP_TAG_OPERATION, "printer-uri", uri); - if (req.doRequest("/ipp/")) - { ---- kdeprint/cups/kmwippselect.cpp 2006-10-26 19:31:11.000000000 +0300 -+++ kdeprint/cups/kmwippselect.cpp 2006-10-26 21:32:34.000000000 +0300 -@@ -75,7 +75,7 @@ - IppRequest req; - QString uri; - req.setOperation(CUPS_GET_PRINTERS); -- uri = QString::fromLatin1("ipp://%1:%2/printers/").arg(url.host()).arg(url.port()); -+ uri = IppRequest::assembleURI(url.host(), url.port(), "/printers/"); - req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); - req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",QString::fromLatin1("printer-name")); - if (req.doRequest("/printers/")) diff --git a/x11/kdelibs3/files/patch-mimetypes_application-Makefile.in b/x11/kdelibs3/files/patch-mimetypes_application-Makefile.in index cfc259a470c7..27490412a187 100644 --- a/x11/kdelibs3/files/patch-mimetypes_application-Makefile.in +++ b/x11/kdelibs3/files/patch-mimetypes_application-Makefile.in @@ -1,6 +1,6 @@ ---- 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 @@ +--- mimetypes/application/Makefile.in.orig Wed Feb 21 14:03:14 2007 ++++ mimetypes/application/Makefile.in Wed Feb 21 14:03:30 2007 +@@ -533,7 +533,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 \ @@ -9,12 +9,12 @@ xsd.desktop relaxng.desktop \ vnd.oasis.opendocument.graphics-template.desktop \ vnd.oasis.opendocument.graphics.desktop \ -@@ -757,7 +757,7 @@ +@@ -765,7 +765,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 +-KDE_DIST=x-karbon.desktop vnd.rn-realmedia.desktop x-tbz.desktop x-gnumeric.desktop x-ruby.desktop pdf.desktop x-kontour.desktop x-sharedlib.desktop x-compress.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 x-lha.desktop Makefile.in x-bzip.desktop x-archive.desktop x-debian-package.desktop x-kformula.desktop x-kde-wallet.desktop uninstall.desktop x-rpm.desktop pgp.desktop msword.desktop x-sqlite2.desktop x-mswrite.desktop x-java.desktop x-pkcs12.desktop x-afm.desktop x-executable-script.desktop x-gzip.desktop vnd.sun.xml.base.desktop mathml+xml.desktop x-font-snf.desktop smil.desktop x-kcsrc.desktop x-msdos-program.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-trash.desktop x-shockwave-flash.desktop x-perl-module.desktop x-perl.desktop x-kchart.desktop xml-dtd.desktop x-cue.desktop x-font-ghostscript.desktop x-python.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 x-kword.desktop vnd.sun.xml.draw.template.desktop vnd.stardivision.math.desktop x-java-jnlp-file.desktop x-zoo.desktop x-core.desktop pkcs10.desktop x-designer.desktop mspowerpoint.desktop x-troff.desktop x-kpresenter.desktop x-krita.desktop vnd.palm.desktop vnd.sun.xml.writer.desktop postscript.desktop vnd.stardivision.chart.desktop x-desktop.desktop x-cpio.desktop x-sqlite3.desktop x-ace.desktop x-quattropro.desktop x-applixspread.desktop x-7z.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 vnd.stardivision.writer-global.desktop x-applixgraphics.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 octet-stream.desktop x-magicpoint.desktop x-rar-compressed.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-font-speedo.desktop x-linguist.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-sharedlib.desktop x-compress.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 x-lha.desktop Makefile.in x-bzip.desktop x-archive.desktop x-debian-package.desktop x-kformula.desktop x-kde-wallet.desktop uninstall.desktop x-rpm.desktop pgp.desktop msword.desktop x-sqlite2.desktop x-mswrite.desktop x-java.desktop x-pkcs12.desktop x-afm.desktop x-executable-script.desktop x-gzip.desktop vnd.sun.xml.base.desktop mathml+xml.desktop x-font-snf.desktop smil.desktop x-kcsrc.desktop x-msdos-program.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-trash.desktop x-shockwave-flash.desktop x-perl-module.desktop x-perl.desktop x-kchart.desktop xml-dtd.desktop x-cue.desktop x-font-ghostscript.desktop x-python.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 x-kword.desktop vnd.sun.xml.draw.template.desktop vnd.stardivision.math.desktop x-java-jnlp-file.desktop x-zoo.desktop x-core.desktop pkcs10.desktop x-designer.desktop mspowerpoint.desktop x-troff.desktop x-kpresenter.desktop x-krita.desktop vnd.palm.desktop vnd.sun.xml.writer.desktop postscript.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 vnd.stardivision.writer-global.desktop x-applixgraphics.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 octet-stream.desktop x-magicpoint.desktop x-rar-compressed.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-font-speedo.desktop x-linguist.desktop #>+ 2 docs-am: diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist index eb29486ed87e..90183447454b 100644 --- a/x11/kdelibs3/pkg-plist +++ b/x11/kdelibs3/pkg-plist @@ -60,7 +60,6 @@ bin/makekdewidgets bin/meinproc bin/preparetips bin/start_kdeinit -etc/rc.d/kdelibs.sh etc/xdg/menus/kde-applications.menu include/arts/artskde.h include/arts/kartsdispatcher.h @@ -1204,6 +1203,7 @@ share/apps/katepart/scripts/script-indent-c-char.js share/apps/katepart/scripts/script-indent-c-newline.js share/apps/katepart/scripts/sort.js share/apps/katepart/syntax/abc.xml +share/apps/katepart/syntax/actionscript.xml share/apps/katepart/syntax/ada.xml share/apps/katepart/syntax/ahdl.xml share/apps/katepart/syntax/alert.xml diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index b83bb044e80c..9b19292a79d8 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdelibs PORTVERSION= ${KDE_VERSION} -PORTREVISION= 4 CATEGORIES= x11 kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -56,8 +55,7 @@ USE_OPENSSL= yes USE_QT_VER= 3 PREFIX= ${KDE_PREFIX} -USE_LDCONFIG= yes -LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 +USE_LDCONFIG= ${PREFIX}/lib/kde3 USE_AUTOTOOLS= libtool:15 CONFIGURE_TARGET=# empty @@ -102,11 +100,4 @@ post-configure: ${TOUCH} ${WRKSRC}/kio/kssl/ksslconfig.h.in ${TOUCH} ${WRKSRC}/kjs/global.h.in -post-install: - ${MKDIR} ${PREFIX}/etc/rc.d - ${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${FILESDIR}/kdelibs.sh \ - > ${PREFIX}/etc/rc.d/kdelibs.sh - ${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/kdelibs.sh - ${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/etc/rc.d/kdelibs.sh - .include <bsd.port.post.mk> diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo index 85c7caa7ecab..c4f0914142c7 100644 --- a/x11/kdelibs4/distinfo +++ b/x11/kdelibs4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdelibs-3.5.5.tar.bz2) = 2cba792e3b0a766431b837c8ef924117 -SHA256 (KDE/kdelibs-3.5.5.tar.bz2) = e487cdd56aa14eec3e100501a5e14658c6329fac30ea0ce812c860e3564c31e3 -SIZE (KDE/kdelibs-3.5.5.tar.bz2) = 15486690 +MD5 (KDE/kdelibs-3.5.6.tar.bz2) = e4d137879a66e92b895b3de5413a61d8 +SHA256 (KDE/kdelibs-3.5.6.tar.bz2) = 06766202c6ae21277b7879f363ed88fde8016586ec8c94deb59be260f2231b5c +SIZE (KDE/kdelibs-3.5.6.tar.bz2) = 15509460 diff --git a/x11/kdelibs4/files/kdelibs.sh b/x11/kdelibs4/files/kdelibs.sh deleted file mode 100644 index 24568777caf1..000000000000 --- a/x11/kdelibs4/files/kdelibs.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -PREFIX=%%PREFIX%% -ldconfig -m $PREFIX/lib/kde3 diff --git a/x11/kdelibs4/files/patch-cups-1.2.x-sockets b/x11/kdelibs4/files/patch-cups-1.2.x-sockets deleted file mode 100644 index ae126ad441f6..000000000000 --- a/x11/kdelibs4/files/patch-cups-1.2.x-sockets +++ /dev/null @@ -1,248 +0,0 @@ ---- kdeprint/cups/ipprequest.cpp -+++ kdeprint/cups/ipprequest.cpp -@@ -329,6 +329,10 @@ - dumpRequest(request_, true); - } - -+ /* No printers found */ -+ if ( request_ && request_->request.status.status_code == 0x406 ) -+ return true; -+ - if (!request_ || request_->state == IPP_ERROR || (request_->request.status.status_code & 0x0F00)) - return false; - ---- kdeprint/cups/kmcupsmanager.cpp -+++ kdeprint/cups/kmcupsmanager.cpp -@@ -61,7 +61,7 @@ - #define ppdi18n(s) i18n(QString::fromLocal8Bit(s).utf8()) - - void extractMaticData(QString& buf, const QString& filename); --QString printerURI(KMPrinter *p, bool useExistingURI = false); -+QString printerURI(KMPrinter *p, bool useExistingURI); - QString downloadDriver(KMPrinter *p); - - static int trials = 5; -@@ -218,7 +218,7 @@ - QString uri; - - req.setOperation(state); -- uri = printerURI(p); -+ uri = printerURI(p, true); - req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); - if (req.doRequest("/admin/")) - return true; ---- kdeprint/cups/cupsinfos.cpp 2006-10-26 19:31:11.000000000 +0300 -+++ kdeprint/cups/cupsinfos.cpp 2006-10-26 21:29:07.000000000 +0300 -@@ -21,6 +21,7 @@ - #include "kmfactory.h" - #include "kmtimer.h" - #include "messagewindow.h" -+#include "ipprequest.h" - - #include <kio/passdlg.h> - #include <kio/authinfo.h> -@@ -76,6 +77,11 @@ - return host_; - } - -+QString CupsInfos::ippAssembleURI(const QString& resource) const -+{ -+ return IppRequest::assembleURI(host(), port(), resource); -+} -+ - void CupsInfos::setHost(const QString& s) - { - host_ = s; ---- kdeprint/cups/cupsinfos.h 2006-10-26 19:31:11.000000000 +0300 -+++ kdeprint/cups/cupsinfos.h 2006-10-26 21:26:26.000000000 +0300 -@@ -34,6 +34,7 @@ - const QString& host() const; - QString hostaddr() const; - int port() const; -+ QString ippAssembleURI(const QString& resource) const; - const QString& login() const; - const QString& password() const; - const QString& realLogin() const; ---- kdeprint/cups/ipprequest.cpp 2006-10-26 19:31:11.000000000 +0300 -+++ kdeprint/cups/ipprequest.cpp 2006-10-26 21:33:09.000000000 +0300 -@@ -529,4 +529,48 @@ - attr = attr->next; - } - #endif -+ -+ - } -+ -+ -+QString IppRequest::assembleURI(const QString& host, int port, const QString& resource) -+{ -+ const char* hostname; -+ -+ // Replace UNIX socket address with "localhost". ipp URI specification -+ // does not allow UNIX socket addresses in the host portion -+ if (host[0] == '/' || host.isEmpty()) { -+ hostname = "localhost"; -+ port = 0; -+ } else { -+ hostname = host.local8Bit(); -+ } -+ -+ if (port < 0) -+ return QString::null; -+ -+#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2 -+ QCString uri(HTTP_MAX_URI); -+ -+ // Use URI assembling function provided by CUPS -+ if (httpAssembleURI(HTTP_URI_CODING_ALL, uri.data(), uri.size(), -+ "ipp", NULL, hostname, port, resource.local8Bit()) == HTTP_URI_OK) -+ return QString(uri); -+ else -+ return QString::null; -+ -+#else -+ // Use our own URI assembling function -+ if (port > 0) -+ return QString("ipp://%1:%2%3") -+ .arg(hostname) -+ .arg(port) -+ .arg(KURL::encode_string(resource)); -+ else -+ return QString("ipp://%1%2") -+ .arg(hostname) -+ .arg(KURL::encode_string(resource)); -+#endif -+} -+ ---- kdeprint/cups/ipprequest.h 2006-10-26 19:31:11.000000000 +0300 -+++ kdeprint/cups/ipprequest.h 2006-10-26 21:24:41.000000000 +0300 -@@ -86,6 +86,9 @@ - // debug function - void dump(int state); - -+ // URI assembling function [static] -+ static QString assembleURI(const QString& host, int port, const QString& resource); -+ - protected: - void addString_p(int group, int type, const QString& name, const QString& value); - void addStringList_p(int group, int type, const QString& name, const QStringList& values); ---- kdeprint/cups/kmcupsjobmanager.cpp 2006-10-26 21:45:23.000000000 +0300 -+++ kdeprint/cups/kmcupsjobmanager.cpp 2006-10-27 01:33:12.000000000 +0300 -@@ -92,7 +92,7 @@ - case KMJob::Move: - if (argstr.isEmpty()) return false; - req.setOperation(CUPS_MOVE_JOB); -- uri = QString::fromLatin1("ipp://%1:%2/printers/%3").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()).arg(argstr); -+ uri = CupsInfos::self()->ippAssembleURI(QString("/printers/%1").arg(argstr)); - req.addURI(IPP_TAG_OPERATION, "job-printer-uri", uri); - break; - default: -@@ -109,7 +109,6 @@ - bool KMCupsJobManager::listJobs(const QString& prname, KMJobManager::JobType type, int limit) - { - IppRequest req; -- QString uri("ipp://%1:%2/%3/%4"); - QStringList keys; - CupsInfos *infos = CupsInfos::self(); - -@@ -143,7 +142,8 @@ - */ - } - else -- req.addURI(IPP_TAG_OPERATION, "printer-uri", uri.arg(infos->host()).arg(infos->port()).arg(((mp&&mp->isClass())?"classes":"printers")).arg(prname)); -+ req.addURI(IPP_TAG_OPERATION, "printer-uri", -+ infos->ippAssembleURI(QString("/%1/%2").arg(((mp&&mp->isClass())?"classes":"printers")).arg(prname))); - - // other attributes - req.addKeyword(IPP_TAG_OPERATION, "requested-attributes", keys); ---- kdeprint/cups/kmcupsmanager.cpp 2006-10-26 19:31:11.000000000 +0300 -+++ kdeprint/cups/kmcupsmanager.cpp 2006-10-26 21:31:12.000000000 +0300 -@@ -138,7 +138,7 @@ - req.setOperation(CUPS_ADD_CLASS); - QStringList members = p->members(), uris; - QString s; -- s = QString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); -+ s = CupsInfos::self()->ippAssembleURI("/printers/"); - for (QStringList::ConstIterator it=members.begin(); it!=members.end(); ++it) - uris.append(s+(*it)); - req.addURI(IPP_TAG_PRINTER,"member-uris",uris); -@@ -1024,7 +1024,7 @@ - if (use && !p->uri().isEmpty()) - uri = p->uri().prettyURL(); - else -- uri = QString("ipp://%1/%3/%2").arg(CupsInfos::self()->hostaddr()).arg(p->printerName()).arg((p->isClass(false) ? "classes" : "printers")); -+ uri = CupsInfos::self()->ippAssembleURI(QString("/%2/%1").arg(p->printerName()).arg((p->isClass(false) ? "classes" : "printers"))); - return uri; - } - ---- kdeprint/cups/kmcupsuimanager.cpp 2006-10-26 19:31:11.000000000 +0300 -+++ kdeprint/cups/kmcupsuimanager.cpp 2006-10-26 21:34:02.000000000 +0300 -@@ -135,7 +135,7 @@ - QString uri; - - req.setOperation(CUPS_GET_DEVICES); -- uri = QString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); -+ uri = CupsInfos::self()->ippAssembleURI("/printers/"); - req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); - - if (req.doRequest("/")) ---- kdeprint/cups/kmwfax.cpp 2006-10-26 19:31:11.000000000 +0300 -+++ kdeprint/cups/kmwfax.cpp 2006-10-26 21:34:54.000000000 +0300 -@@ -48,7 +48,7 @@ - // initialize - IppRequest req; - req.setOperation(CUPS_GET_DEVICES); -- QString uri = QString::fromLatin1("ipp://%1:%2/printers/").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()); -+ QString uri = CupsInfos::self()->ippAssembleURI("/printers/"); - req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); - if (req.doRequest("/")) - { ---- kdeprint/cups/kmwippprinter.cpp 2006-10-26 19:31:11.000000000 +0300 -+++ kdeprint/cups/kmwippprinter.cpp 2006-10-26 21:41:20.000000000 +0300 -@@ -157,7 +157,7 @@ - req.setOperation(IPP_GET_PRINTER_ATTRIBUTES); - req.setHost(item->text(1)); - req.setPort(item->text(2).toInt()); -- uri = QString::fromLatin1("ipp://%1:%2/ipp").arg(item->text(1)).arg(item->text(2)); -+ uri = IppRequest::assembleURI(item->text(1), item->text(2).toInt(), "/ipp"); - req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); - keys.append("printer-name"); - keys.append("printer-state"); -@@ -176,7 +176,7 @@ - if (req.uri("printer-uri-supported",value)) - { - if (value[0] == '/') -- value.prepend(QString::fromLatin1("ipp://%1:%2").arg(item->text(1)).arg(item->text(2))); -+ value = IppRequest::assembleURI(item->text(1), item->text(2).toInt(), value); - m_uri->setText(value); - } - if (req.text("printer-make-and-model",value) && !value.isEmpty()) txt.append(i18n("<b>Model</b>: %1<br>").arg(value)); -@@ -203,7 +203,7 @@ - void KMWIppPrinter::slotIppReport() - { - IppRequest req; -- QString uri("ipp://%1:%2/ipp"); -+ QString uri; - QListViewItem *item = m_list->currentItem(); - - if (item) -@@ -211,7 +211,7 @@ - req.setOperation(IPP_GET_PRINTER_ATTRIBUTES); - req.setHost(item->text(1)); - req.setPort(item->text(2).toInt()); -- uri = uri.arg(item->text(1)).arg(item->text(2)); -+ uri = IppRequest::assembleURI(item->text(1), item->text(2).toInt(), "/ipp"); - req.addURI(IPP_TAG_OPERATION, "printer-uri", uri); - if (req.doRequest("/ipp/")) - { ---- kdeprint/cups/kmwippselect.cpp 2006-10-26 19:31:11.000000000 +0300 -+++ kdeprint/cups/kmwippselect.cpp 2006-10-26 21:32:34.000000000 +0300 -@@ -75,7 +75,7 @@ - IppRequest req; - QString uri; - req.setOperation(CUPS_GET_PRINTERS); -- uri = QString::fromLatin1("ipp://%1:%2/printers/").arg(url.host()).arg(url.port()); -+ uri = IppRequest::assembleURI(url.host(), url.port(), "/printers/"); - req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); - req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",QString::fromLatin1("printer-name")); - if (req.doRequest("/printers/")) diff --git a/x11/kdelibs4/files/patch-mimetypes_application-Makefile.in b/x11/kdelibs4/files/patch-mimetypes_application-Makefile.in index cfc259a470c7..27490412a187 100644 --- a/x11/kdelibs4/files/patch-mimetypes_application-Makefile.in +++ b/x11/kdelibs4/files/patch-mimetypes_application-Makefile.in @@ -1,6 +1,6 @@ ---- 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 @@ +--- mimetypes/application/Makefile.in.orig Wed Feb 21 14:03:14 2007 ++++ mimetypes/application/Makefile.in Wed Feb 21 14:03:30 2007 +@@ -533,7 +533,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 \ @@ -9,12 +9,12 @@ xsd.desktop relaxng.desktop \ vnd.oasis.opendocument.graphics-template.desktop \ vnd.oasis.opendocument.graphics.desktop \ -@@ -757,7 +757,7 @@ +@@ -765,7 +765,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 +-KDE_DIST=x-karbon.desktop vnd.rn-realmedia.desktop x-tbz.desktop x-gnumeric.desktop x-ruby.desktop pdf.desktop x-kontour.desktop x-sharedlib.desktop x-compress.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 x-lha.desktop Makefile.in x-bzip.desktop x-archive.desktop x-debian-package.desktop x-kformula.desktop x-kde-wallet.desktop uninstall.desktop x-rpm.desktop pgp.desktop msword.desktop x-sqlite2.desktop x-mswrite.desktop x-java.desktop x-pkcs12.desktop x-afm.desktop x-executable-script.desktop x-gzip.desktop vnd.sun.xml.base.desktop mathml+xml.desktop x-font-snf.desktop smil.desktop x-kcsrc.desktop x-msdos-program.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-trash.desktop x-shockwave-flash.desktop x-perl-module.desktop x-perl.desktop x-kchart.desktop xml-dtd.desktop x-cue.desktop x-font-ghostscript.desktop x-python.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 x-kword.desktop vnd.sun.xml.draw.template.desktop vnd.stardivision.math.desktop x-java-jnlp-file.desktop x-zoo.desktop x-core.desktop pkcs10.desktop x-designer.desktop mspowerpoint.desktop x-troff.desktop x-kpresenter.desktop x-krita.desktop vnd.palm.desktop vnd.sun.xml.writer.desktop postscript.desktop vnd.stardivision.chart.desktop x-desktop.desktop x-cpio.desktop x-sqlite3.desktop x-ace.desktop x-quattropro.desktop x-applixspread.desktop x-7z.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 vnd.stardivision.writer-global.desktop x-applixgraphics.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 octet-stream.desktop x-magicpoint.desktop x-rar-compressed.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-font-speedo.desktop x-linguist.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-sharedlib.desktop x-compress.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 x-lha.desktop Makefile.in x-bzip.desktop x-archive.desktop x-debian-package.desktop x-kformula.desktop x-kde-wallet.desktop uninstall.desktop x-rpm.desktop pgp.desktop msword.desktop x-sqlite2.desktop x-mswrite.desktop x-java.desktop x-pkcs12.desktop x-afm.desktop x-executable-script.desktop x-gzip.desktop vnd.sun.xml.base.desktop mathml+xml.desktop x-font-snf.desktop smil.desktop x-kcsrc.desktop x-msdos-program.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-trash.desktop x-shockwave-flash.desktop x-perl-module.desktop x-perl.desktop x-kchart.desktop xml-dtd.desktop x-cue.desktop x-font-ghostscript.desktop x-python.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 x-kword.desktop vnd.sun.xml.draw.template.desktop vnd.stardivision.math.desktop x-java-jnlp-file.desktop x-zoo.desktop x-core.desktop pkcs10.desktop x-designer.desktop mspowerpoint.desktop x-troff.desktop x-kpresenter.desktop x-krita.desktop vnd.palm.desktop vnd.sun.xml.writer.desktop postscript.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 vnd.stardivision.writer-global.desktop x-applixgraphics.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 octet-stream.desktop x-magicpoint.desktop x-rar-compressed.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-font-speedo.desktop x-linguist.desktop #>+ 2 docs-am: diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist index eb29486ed87e..90183447454b 100644 --- a/x11/kdelibs4/pkg-plist +++ b/x11/kdelibs4/pkg-plist @@ -60,7 +60,6 @@ bin/makekdewidgets bin/meinproc bin/preparetips bin/start_kdeinit -etc/rc.d/kdelibs.sh etc/xdg/menus/kde-applications.menu include/arts/artskde.h include/arts/kartsdispatcher.h @@ -1204,6 +1203,7 @@ share/apps/katepart/scripts/script-indent-c-char.js share/apps/katepart/scripts/script-indent-c-newline.js share/apps/katepart/scripts/sort.js share/apps/katepart/syntax/abc.xml +share/apps/katepart/syntax/actionscript.xml share/apps/katepart/syntax/ada.xml share/apps/katepart/syntax/ahdl.xml share/apps/katepart/syntax/alert.xml diff --git a/x11/xscreensaver-kde/Makefile b/x11/xscreensaver-kde/Makefile index 0ef5ba1c64d9..4debbdac6d5c 100644 --- a/x11/xscreensaver-kde/Makefile +++ b/x11/xscreensaver-kde/Makefile @@ -27,7 +27,7 @@ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes WRKSRC= ${WRKDIR}/kdeartwork-${PORTVERSION} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/x11/xscreensaver-kde/distinfo b/x11/xscreensaver-kde/distinfo index b32d6fb7c8d5..232519e2f37e 100644 --- a/x11/xscreensaver-kde/distinfo +++ b/x11/xscreensaver-kde/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeartwork-3.5.5.tar.bz2) = 8d35156b506cf870eb9641f72a304c8c -SHA256 (KDE/kdeartwork-3.5.5.tar.bz2) = 4966c255dc4ca9781e61b55e3a77b990c77e7d527ed49781035a7177639137a1 -SIZE (KDE/kdeartwork-3.5.5.tar.bz2) = 16586027 +MD5 (KDE/kdeartwork-3.5.6.tar.bz2) = 4c817eab517fba30fce8f3b40a6f019d +SHA256 (KDE/kdeartwork-3.5.6.tar.bz2) = 4f7d5a7c3bdd53968a5f5af7f6daa2fbd57a11eeb2d670b16977087b2ff9aab2 +SIZE (KDE/kdeartwork-3.5.6.tar.bz2) = 16569318 |