| Summary: | mimelnk/x-image-raw.desktop conflicts with kdegraphics-3.5.x | ||
|---|---|---|---|
| Product: | [Unmaintained] koffice | Reporter: | Rex Dieter <rdieter> |
| Component: | general | Assignee: | KOffice Bug Wranglers <koffice-bugs-null> |
| Status: | RESOLVED FIXED | ||
| Severity: | normal | CC: | andreas.bierfert, nicolasg |
| Priority: | NOR | ||
| Version: | unspecified | ||
| Target Milestone: | --- | ||
| Platform: | Fedora RPMs | ||
| OS: | Linux | ||
| Latest Commit: | Version Fixed In: | ||
| Sentry Crash Report: | |||
|
Description
Rex Dieter
2006-02-07 14:03:52 UTC
Yes, I agree with that. I thought steps had already been taken. I'm not sure what to do in the interim, though. SVN commit 506964 by goutte: Mimetypes should only be defined in kdelibs (Translations would need to be moved from kdegraphics. I am sorry for the inconveniences.) CCMAIL:kde-i18n@kde.org CCMAIL:kde-core-devel@kde.org CCBUG:121536 (Now KOffice and Digikam will have to choose what to do in their context.) M +1 -1 Makefile.am A x-raw.desktop branches/KDE/3.5/kdegraphics/kfile-plugins/raw/x-image-raw.desktop#506963 --- branches/KDE/3.5/kdelibs/mimetypes/image/Makefile.am #506963:506964 @@ -8,7 +8,7 @@ x-vnd.trolltech.qpicture.desktop x-vnd.adobe.photoshop.desktop \ x-xcursor.desktop pjpeg.desktop x-exr.desktop \ x-rgb.desktop x-dds.desktop x-djvu.desktop x-djvu-2.desktop x-hdr.desktop \ - fits.desktop + fits.desktop x-raw.desktop mimetypeimagedatadir = $(kde_mimedir)/image SVN commit 506965 by goutte: The image/x-raw mimetype definition has been moved to kdelibs/mimetypes/image (See revision 506964) CCBUG:121536 M +1 -4 Makefile.am D x-image-raw.desktop --- branches/KDE/3.5/kdegraphics/kfile-plugins/raw/Makefile.am #506964:506965 @@ -18,10 +18,7 @@ services_DATA = kfile_raw.desktop servicesdir = $(kde_servicesdir) -mimetypeimagedatadir = $(kde_mimedir)/image -mimetypeimagedata_DATA = x-image-raw.desktop - magicdir = $(kde_confdir)/magic magic_DATA = x-image-raw.magic -EXTRA_DIST = $(mimetypeimagedata_DATA) $(magic_DATA) +EXTRA_DIST = $(magic_DATA) SVN commit 506967 by goutte: image/x-raw is now defined in kdelibs CCBUG:121536 CCBUG:121242 M +1 -4 Makefile.am D x-image-raw.desktop --- trunk/KDE/kdegraphics/kfile-plugins/raw/Makefile.am #506966:506967 @@ -18,10 +18,7 @@ services_DATA = kfile_raw.desktop servicesdir = $(kde_servicesdir) -mimetypeimagedatadir = $(kde_mimedir)/image -mimetypeimagedata_DATA = x-image-raw.desktop - magicdir = $(kde_confdir)/magic magic_DATA = x-image-raw.magic -EXTRA_DIST = $(mimetypeimagedata_DATA) $(magic_DATA) +EXTRA_DIST = $(magic_DATA) SVN commit 512608 by goutte: - add file patterns from Krita - change the comment to show "Image" instead of "File" (as other relevant image mime types) CCMAIL:kde-i18n-doc@kde.org CCBUG:121536 CCBUG:121242 M +2 -2 x-raw.desktop --- branches/KDE/3.5/kdelibs/mimetypes/image/x-raw.desktop #512607:512608 @@ -3,8 +3,8 @@ Type=MimeType MimeType=image/x-raw Icon=image -Patterns=*.crw;*.CRW;*.cr2,*.CR2;*.nef;*.NEF;*.mrw;*.MRW; -Comment=RAW Camera File +Patterns=*.raw;*.RAW;*.dcr;*.DCR;*.dng;*.DNG;*.crw;*.CRW;*.cr2,*.CR2;*.nef;*.NEF;*.mrw;*.MRW; +Comment=RAW Camera Image Comment[br]=Restr kamera kriz Comment[ca]=Fitxer de càmera RAW Comment[cs]=RAW soubor z fotoaparátu SVN commit 512611 by goutte: As image/x-raw is now defined in KDE 3.5.2, install the mimetype only if KOffice is compiled with KDE < 3.5.2 (Also change the "Comment" to match the new "Comment" in kdelibs) CCMAIL:kde-i18n-doc@kde.org CCBUG:121536 (Please verify; not tested!) M +17 -2 configure.in.in M +0 -3 filters/krita/raw/Makefile.am D filters/krita/raw/x-raw.desktop M +5 -1 mimetypes/Makefile.am A mimetypes/kde352 (directory) A mimetypes/kde352/Makefile.am A mimetypes/kde352/x-raw.desktop branches/KDE/3.5/kdelibs/mimetypes/image/x-raw.desktop#512608 --- trunk/koffice/configure.in.in #512610:512611 @@ -168,6 +168,16 @@ need_kde34_compat="yes" ) +AC_COMPILE_IFELSE([ +#include <kdeversion.h> +#if ! ( KDE_IS_VERSION( 3, 5, 2 ) ) +#error KDE 3.5.2 +#endif +], + need_kde352_compat="no" +, + need_kde352_compat="yes" +) CXXFLAGS="$kdeversion_save_CXXFLAGS" LIBS="$kdeversion_safe_LIBS" AC_LANG_RESTORE @@ -180,8 +190,12 @@ else if test "$need_kde34_compat" = "yes"; then AC_MSG_RESULT([KDE 3.4.x]) - else - AC_MSG_RESULT([KDE CVS HEAD]) + else + if test "$need_kde352_compat" = "yes"; then + AC_MSG_RESULT([KDE 3.5.2]) + else + AC_MSG_RESULT([KDE CVS HEAD]) + fi fi fi fi @@ -189,6 +203,7 @@ AM_CONDITIONAL(need_kde32_compatibility, test "$need_kde32_compat" = "yes") AM_CONDITIONAL(need_kde33_compatibility, test "$need_kde33_compat" = "yes") AM_CONDITIONAL(need_kde34_compatibility, test "$need_kde34_compat" = "yes") +AM_CONDITIONAL(need_kde352_compatibility, test "$need_kde352_compat" = "yes") # Keep the old KDE 3.1 test, as long as it is still used AM_CONDITIONAL(need_kde31_compatibility, test "supported" = "no") --- trunk/koffice/filters/krita/raw/Makefile.am #512610:512611 @@ -30,7 +30,4 @@ KDE_CXXFLAGS = $(USE_EXCEPTIONS) -mimetypeimagedata_DATA = x-raw.desktop -mimetypeimagedatadir = $(kde_mimedir)/image -EXTRA_DIST = $(mimetypeimagedata_DATA) --- trunk/koffice/mimetypes/Makefile.am #512610:512611 @@ -2,4 +2,8 @@ KDE33MIMEDIR = kde33 endif -SUBDIRS = $(KDE33MIMEDIR) +if need_kde352_compatibility + KDE352MIMEDIR = kde352 +endif + +SUBDIRS = $(KDE33MIMEDIR) $(KDE352MIMEDIR) afaict, this is fixed (and has been for awhile) -> closing/fixed. |