[prev in list] [next in list] [prev in thread] [next in thread]
List: koffice
Subject: [Bug 121536] mimelnk/x-image-raw.desktop conflicts with
From: Nicolas Goutte <nicolasg () snafu ! de>
Date: 2006-02-23 2:20:31
Message-ID: 20060223022031.16173.qmail () ktown ! kde ! org
[Download RAW message or body]
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
http://bugs.kde.org/show_bug.cgi?id=121536
------- Additional Comments From nicolasg snafu de 2006-02-23 03:20 -------
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)
____________________________________
koffice mailing list
koffice@kde.org
To unsubscribe please visit:
https://mail.kde.org/mailman/listinfo/koffice
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic