summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hüttel <dilfridge@gentoo.org>2011-06-01 21:46:51 +0000
committerAndreas Hüttel <dilfridge@gentoo.org>2011-06-01 21:46:51 +0000
commita21b8312b9c801f1565e80dac08c4c7374c5f38a (patch)
treef385bad28f2716689a28e9a1131dfe7a4f21db7a /app-office/krita/files
parentRemove old (diff)
downloadhistorical-a21b8312b9c801f1565e80dac08c4c7374c5f38a.tar.gz
historical-a21b8312b9c801f1565e80dac08c4c7374c5f38a.tar.bz2
historical-a21b8312b9c801f1565e80dac08c4c7374c5f38a.zip
Remove old
Package-Manager: portage-2.1.9.49/cvs/Linux x86_64
Diffstat (limited to 'app-office/krita/files')
-rw-r--r--app-office/krita/files/krita-2.2.2-exiv2.patch42
-rw-r--r--app-office/krita/files/krita-2.2.2-xlibs.patch14
2 files changed, 0 insertions, 56 deletions
diff --git a/app-office/krita/files/krita-2.2.2-exiv2.patch b/app-office/krita/files/krita-2.2.2-exiv2.patch
deleted file mode 100644
index 0b29f8d187c6..000000000000
--- a/app-office/krita/files/krita-2.2.2-exiv2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/krita/ui/kisexiv2/kis_exif_io.cpp b/krita/ui/kisexiv2/kis_exif_io.cpp
-index 6eb7f30..c85da65 100644
---- a/krita/ui/kisexiv2/kis_exif_io.cpp
-+++ b/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();
diff --git a/app-office/krita/files/krita-2.2.2-xlibs.patch b/app-office/krita/files/krita-2.2.2-xlibs.patch
deleted file mode 100644
index 24b626905e79..000000000000
--- a/app-office/krita/files/krita-2.2.2-xlibs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN krita-2.2.2.vanilla/krita/ui/CMakeLists.txt krita-2.2.2/krita/ui/CMakeLists.txt
---- krita-2.2.2.vanilla/krita/ui/CMakeLists.txt 2010-08-21 07:38:52.000000000 +0200
-+++ krita-2.2.2/krita/ui/CMakeLists.txt 2010-11-03 23:43:28.000000000 +0100
-@@ -217,6 +217,10 @@
-
- target_link_libraries(kritaui LINK_INTERFACE_LIBRARIES kritaimage komain ${GL_INTERFACE_LIBRARIES} )
-
-+IF(Q_WS_X11)
-+ TARGET_LINK_LIBRARIES(kritaui ${X11_LIBRARIES})
-+ENDIF(Q_WS_X11)
-+
- set_target_properties(kritaui
- PROPERTIES VERSION ${GENERIC_KOFFICE_LIB_VERSION} SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION}
- )