KOffice: superceded by Calligra long time ago. Removing.

This commit is contained in:
Evgeny Egorochkin 2013-05-07 09:27:23 +03:00
parent 008308168f
commit eb4c9efb50
4 changed files with 0 additions and 153 deletions

View file

@ -1,44 +0,0 @@
{ stdenv, fetchurl, lib, cmake, qt4, perl, lcms, exiv2, libxml2, libxslt, boost, glew
, shared_mime_info, popplerQt4, gsl, gmm, wv2, libwpd, libwpg, giflib, libgsf
, fftw, pkgconfig, openjpeg , kdelibs, kdepimlibs, automoc4, phonon
, qimageblitz, qca2, eigen, soprano , kdegraphics}:
stdenv.mkDerivation rec {
name = "koffice-2.2.2";
src = fetchurl {
url = "mirror://kde/stable/${name}/${name}.tar.bz2";
sha256 = "1jzdq7av4vbfkx987yz54431q3bwrsd7wzyinl9wsznx83v61c75";
};
patchFlags = "-p0";
patches =
let
urlBase = "http://kexi-project.org/download/patches/2.2.2/";
in
[
(fetchurl {
url = "${urlBase}support-large-memo-values-for-msaccess-2.2.2.patch";
sha256 = "1jn6na8c0vdf87p0yv9bcff0kd1jmcxndxmm3s0878l5pak9m8rd";
})
(fetchurl {
url = "${urlBase}fix-crash-on-closing-sqlite-connection-2.2.2.patch";
sha256 = "11h4rxdrv5vakym5786vr4bysi4627m53qqvk1vhxf3rkawvcafj";
})
./wpd.patch
./krita-exiv-0.21.diff
];
buildInputs = [ cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew
shared_mime_info popplerQt4 gsl gmm wv2 libwpd libwpg giflib libgsf
stdenv.gcc.libc fftw pkgconfig kdelibs kdepimlibs automoc4 phonon
qimageblitz qca2 eigen openjpeg soprano kdegraphics ];
meta = {
description = "KDE integrated Office Suite";
license = "GPL";
homepage = http://www.koffice.org;
maintainers = with stdenv.lib.maintainers; [ sander urkud ];
# doesn't build, seems dead and superseded by calligra
#inherit (kdelibs.meta) platforms;
};
}

View file

@ -1,81 +0,0 @@
commit 7f6b2f2b9b2be1e4f257582a04b194c69f705bc7
Author: Casper Boemann <cbr@boemann.dk>
Date: Sat Dec 4 10:44:02 2010 +0000
------------------------------------------------------------------------
r1203267 | rempt | 2010-12-03 14:20:03 +0100 (Fri, 03 Dec 2010) | 1 line
Changed paths:
M /trunk/koffice/krita/ui/kis_aboutdata.h
correct url for animtim
------------------------------------------------------------------------
r1203281 | uzak | 2010-12-03 14:43:32 +0100 (Fri, 03 Dec 2010) | 2 lines
Changed paths:
M /trunk/koffice/filters/kpresenter/powerpoint/pptstyle.cpp
PPT: Fine tuned processing of the TextCFException structure for MS Office 2007.
------------------------------------------------------------------------
r1203296 | danders | 2010-12-03 15:44:01 +0100 (Fri, 03 Dec 2010) | 3 lines
Changed paths:
M /trunk/koffice/kplato/libs/kernel/kptaccount.cpp
Fix data loss on xml load.
BUG: 258685
------------------------------------------------------------------------
r1203344 | bero | 2010-12-03 18:08:24 +0100 (Fri, 03 Dec 2010) | 2 lines
Changed paths:
M /trunk/koffice/krita/ui/kisexiv2/kis_exif_io.cpp
Fix build with exiv2 0.21
svn path=/branches/work/koffice-essen/; revision=1203491
diff krita/ui/kisexiv2/kis_exif_io.cpp krita/ui/kisexiv2/kis_exif_io.cpp
index 6eb7f30..c85da65 100644
--- krita/ui/kisexiv2/kis_exif_io.cpp
+++ krita/ui/kisexiv2/kis_exif_io.cpp
@@ -406,7 +406,11 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp
v = kmdIntOrderedArrayToExifArray(entry.value());
} else if (exivKey == "Exif.Image.Artist") { // load as dc:creator
KisMetaData::Value creator = entry.value().asArray()[0];
+#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
v = kmdValueToExivValue(creator, Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
+#else
+ v = kmdValueToExivValue(creator, exifKey.defaultTypeId());
+#endif
} else if (exivKey == "Exif.Photo.OECF") {
v = kmdOECFStructureToExifOECF(entry.value());
} else if (exivKey == "Exif.Photo.DeviceSettingDescription") {
@@ -419,13 +423,25 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp
Q_ASSERT(entry.value().type() == KisMetaData::Value::LangArray);
QMap<QString, KisMetaData::Value> langArr = entry.value().asLangArray();
if (langArr.contains("x-default")) {
+#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
v = kmdValueToExivValue(langArr.value("x-default"), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
+#else
+ v = kmdValueToExivValue(langArr.value("x-default"), exifKey.defaultTypeId());
+#endif
} else if (langArr.size() > 0) {
+#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
v = kmdValueToExivValue(langArr.begin().value(), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
+#else
+ v = kmdValueToExivValue(langArr.begin().value(), exifKey.defaultTypeId());
+#endif
}
} else {
dbgFile << exifKey.tag();
+#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
v = kmdValueToExivValue(entry.value(), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
+#else
+ v = kmdValueToExivValue(entry.value(), exifKey.defaultTypeId());
+#endif
}
if (v && v->typeId() != Exiv2::invalidTypeId) {
dbgFile << "Saving key" << exivKey; // << " of KMD value" << entry.value();

View file

@ -1,24 +0,0 @@
diff cmake/modules/FindWPD.cmake cmake/modules/FindWPD.cmake
index 9bd788c..927785a 100644
--- cmake/modules/FindWPD.cmake
+++ cmake/modules/FindWPD.cmake
@@ -19,14 +19,17 @@ if (WPD_INCLUDE_DIR AND WPD_LIBRARIES)
else (WPD_INCLUDE_DIR AND WPD_LIBRARIES)
if(NOT WIN32)
INCLUDE(FindPkgConfig)
- pkg_check_modules(WPD libwpd-0.8)
+ pkg_check_modules(PKG_WPD libwpd-0.8)
endif(NOT WIN32)
FIND_PATH(WPD_INCLUDE_DIR libwpd/libwpd.h
- ${WPD_INCLUDE_DIR}
+ ${PKG_WPD_INCLUDE_DIRS}
/usr/include/libwpd-0.8
)
+ FIND_LIBRARY(WPD_LIBRARIES wpd-0.8
+ ${PKG_WPD_LIBRARY_DIRS}
+ )
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(WPD DEFAULT_MSG WPD_INCLUDE_DIR WPD_LIBRARIES )

View file

@ -8637,10 +8637,6 @@ let
kipi_plugins = callPackage ../applications/graphics/kipi-plugins { };
koffice = callPackage ../applications/office/koffice {
boost = boost149;
};
konq_plugins = callPackage ../applications/networking/browsers/konq-plugins { };
konversation = callPackage ../applications/networking/irc/konversation { };