Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (057c4e7cb5fcea5ee0a7ee7077f6cb002963ef9e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Bor Kraljič <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (057c4e7cb5fcea5ee0a7ee7077f6cb002963ef9e)
  • Date: Tue, 16 Aug 2011 04:46:33 -0500

GIT changes to devel-kde47 grimoire by Bor Kraljič <pyrobor AT ver.si>:

kde4-apps/darkroom/DEPENDS | 3
kde4-apps/darkroom/HISTORY | 3
kde4-apps/kile4/DEPENDS | 4
kde4-apps/kile4/HISTORY | 4
kde4-apps/kipi-plugins4/DEPENDS | 4
kde4-apps/kipi-plugins4/HISTORY | 3
kde4-apps/koffice2/DEPENDS | 2
kde4-apps/koffice2/HISTORY | 3
kde4-apps/kphotoalbum4/DEPENDS | 2
kde4-apps/kphotoalbum4/HISTORY | 4
kde4-apps/kphotoalbum4/PRE_BUILD | 3
kde4-apps/kphotoalbum4/fix-docbook-build.patch | 236
+++++++++++++++++++++++
kde4-apps/kphotoalbum4/fix-with-exiv2-0.21.patch | 47 ++++
kde4-apps/tellico2/DEPENDS | 2
kde4-apps/tellico2/DETAILS | 4
kde4-apps/tellico2/HISTORY | 4
kde4/kdeplasmoids4/DEPENDS | 2
kde4/kdeplasmoids4/HISTORY | 1
18 files changed, 321 insertions(+), 10 deletions(-)

New commits:
commit 057c4e7cb5fcea5ee0a7ee7077f6cb002963ef9e
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kphotoalbum4: kdegraphics4 -> libkdcraw4

commit 6ad74f71ef643ed4d7cdb3d671d1555e9eb37db2
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

darkroom: kdegraphics4 -> libkexiv24,libkdcraw4

commit 98614edee34a4025ba4cc091f9591a120e57779e
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

koffice2: kdegraphics4 -> libkdcraw4

commit 9364974624076d221c064dce1905c458ac5d7dc7
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kile4: kdegraphics4 -> okular

it compiles just fine without texlive -> optional_depends

commit 434f97079a0c0830b9133aa58551c4034d217e93
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kipi-plugins4: kdegraphics4 -> libkipi4,libkdcraw4,libkexiv24

commit 2f5a692dd0dbffae37ed7492db2f94a3fda6c556
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kdeplasmoids4: kdegraphics4 -> libkexiv24

commit e441cb8527612b083f832934ad321cde28d9f3f6
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

tellico2: kdegraphics4 -> libksane

commit d3fb8a928a7e2efb48e1f5dabe3a1e014f87084e
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

tellico2: updated spell to 2.3.3

diff --git a/kde4-apps/darkroom/DEPENDS b/kde4-apps/darkroom/DEPENDS
index 95de769..095c563 100755
--- a/kde4-apps/darkroom/DEPENDS
+++ b/kde4-apps/darkroom/DEPENDS
@@ -1,5 +1,6 @@
depends kdelibs4 &&
-depends kdegraphics4 &&
+depends libkexiv24 &&
+depends libkdcraw4 &&
depends JPEG &&
depends lcms &&
optional_depends opengtl "-DWITH_OpenCTL=ON" \
diff --git a/kde4-apps/darkroom/HISTORY b/kde4-apps/darkroom/HISTORY
index f777702..628948a 100644
--- a/kde4-apps/darkroom/HISTORY
+++ b/kde4-apps/darkroom/HISTORY
@@ -1,3 +1,6 @@
+2011-08-16 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: kdegraphics4 -> libkexiv24,libkdcraw4
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

diff --git a/kde4-apps/kile4/DEPENDS b/kde4-apps/kile4/DEPENDS
index 0de8e67..8b100f5 100755
--- a/kde4-apps/kile4/DEPENDS
+++ b/kde4-apps/kile4/DEPENDS
@@ -1,6 +1,6 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&

-depends texlive &&
+optional_depends texlive "" "" "compile with texlive support" &&

optional_depends gnuplot \
"" \
@@ -12,7 +12,7 @@ optional_depends xfig \
"" \
"for basic vector graphics" &&

-suggest_depends kdegraphics4 \
+suggest_depends okular \
"" \
"" \
"for PDF/DVI viewer"
diff --git a/kde4-apps/kile4/HISTORY b/kde4-apps/kile4/HISTORY
index 1663b35..e7bea74 100644
--- a/kde4-apps/kile4/HISTORY
+++ b/kde4-apps/kile4/HISTORY
@@ -1,3 +1,7 @@
+2011-08-16 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: kdegraphics4 -> okular
+ it compiles just fine without texlive -> optional_depends
+
2009-09-24 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DEPENDS: switch from tetex to texlive [auto]

diff --git a/kde4-apps/kipi-plugins4/DEPENDS b/kde4-apps/kipi-plugins4/DEPENDS
index 1d7e7be..a4b19bc 100755
--- a/kde4-apps/kipi-plugins4/DEPENDS
+++ b/kde4-apps/kipi-plugins4/DEPENDS
@@ -1,6 +1,8 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&
depends JPEG &&
-depends kdegraphics4 &&
+depends libkipi4 &&
+depends libkdcraw4 &&
+depends libkexiv24 &&
optional_depends libxslt "" "" "for HtmlExport plugin" &&
optional_depends libgphoto2 "" "" "for kameraklient plugin" &&
optional_depends libgpod "" "" "for iPod Export support" &&
diff --git a/kde4-apps/kipi-plugins4/HISTORY b/kde4-apps/kipi-plugins4/HISTORY
index 4e0c50e..3118e3d 100644
--- a/kde4-apps/kipi-plugins4/HISTORY
+++ b/kde4-apps/kipi-plugins4/HISTORY
@@ -1,3 +1,6 @@
+2011-08-16 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: kdegraphics4 -> libkipi4,libkdcraw4,libkexiv24
+
2011-02-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.9.0

diff --git a/kde4-apps/koffice2/DEPENDS b/kde4-apps/koffice2/DEPENDS
index 1e77a5d..8204514 100755
--- a/kde4-apps/koffice2/DEPENDS
+++ b/kde4-apps/koffice2/DEPENDS
@@ -17,7 +17,7 @@ optional_depends MYSQL '' '' 'import MySql to
Kexi' &&
optional_depends postgresql '' '' 'import Postgresql to Kexi' &&
optional_depends xbase '' '' 'import dbase to Kexi' &&
#Krita
-optional_depends kdegraphics4 '' '' 'process RAW photos' &&
+optional_depends libkcdraw4 '' '' 'process RAW photos' &&
optional_depends glew '' '' 'OpenGL shaders in Krita' &&
optional_depends gmm '' '' 'Krita panorama plugin' &&
optional_depends exiv2 '' '' 'decode photo tags' &&
diff --git a/kde4-apps/koffice2/HISTORY b/kde4-apps/koffice2/HISTORY
index 2ce18ec..fddec25 100644
--- a/kde4-apps/koffice2/HISTORY
+++ b/kde4-apps/koffice2/HISTORY
@@ -1,3 +1,6 @@
+2011-08-16 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: kdegraphics4 -> libkdcraw4
+
2011-02-17 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 2.3.1

diff --git a/kde4-apps/kphotoalbum4/DEPENDS b/kde4-apps/kphotoalbum4/DEPENDS
index 3255574..473be09 100755
--- a/kde4-apps/kphotoalbum4/DEPENDS
+++ b/kde4-apps/kphotoalbum4/DEPENDS
@@ -2,5 +2,5 @@ source $SECTION_DIRECTORY/KDE_DEPENDS &&
depends JPEG &&
depends -sub SQLITE qt4 &&
optional_depends exiv2 "" "" "to decode exif data"
-optional_depends kdegraphics4 "" "" "to process raw data" &&
+optional_depends libkdcraw4 "" "" "to process raw data" &&
optional_depends kipi-plugins4 "" "" "to support for Kipi plugins"
diff --git a/kde4-apps/kphotoalbum4/HISTORY b/kde4-apps/kphotoalbum4/HISTORY
index cde817a..17f8244 100644
--- a/kde4-apps/kphotoalbum4/HISTORY
+++ b/kde4-apps/kphotoalbum4/HISTORY
@@ -1,3 +1,7 @@
+2011-08-16 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: kdegraphics4 -> libkdcraw4
+ * fix-docbook-build.patch,fix-with-exiv2-0.21.patch: added for
compile problem from arch
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

diff --git a/kde4-apps/kphotoalbum4/PRE_BUILD
b/kde4-apps/kphotoalbum4/PRE_BUILD
new file mode 100755
index 0000000..054ca6e
--- /dev/null
+++ b/kde4-apps/kphotoalbum4/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/fix-with-exiv2-0.21.patch
&&
+patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/fix-docbook-build.patch
diff --git a/kde4-apps/kphotoalbum4/fix-docbook-build.patch
b/kde4-apps/kphotoalbum4/fix-docbook-build.patch
new file mode 100644
index 0000000..575a427
--- /dev/null
+++ b/kde4-apps/kphotoalbum4/fix-docbook-build.patch
@@ -0,0 +1,236 @@
+diff -up kphotoalbum-4.1.1/doc/index.docbook.docbook_fix
kphotoalbum-4.1.1/doc/index.docbook
+--- kphotoalbum-4.1.1/doc/index.docbook.docbook_fix 2009-11-15
15:16:29.000000000 -0600
++++ kphotoalbum-4.1.1/doc/index.docbook 2010-06-13 13:03:02.815174744
-0500
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant
V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
"dtd/kdex.dtd" [
+ <!ENTITY kphotoalbum "<application>KPhotoAlbum</application>">
+ <!ENTITY kappname "&kphotoalbum;">
+ <!ENTITY package "kdeextragear-2">
+@@ -41,12 +41,6 @@
+ <date>2004-08-06</date>
+ <releaseinfo>2.0</releaseinfo>
+
+- <keywordset>
+- <keyword>KDE</keyword>
+- <keyword>kdeextragear-2</keyword>
+- <keyword>KPhotoAlbum</keyword>
+- <keyword>Image Database</keyword>
+- </keywordset>
+ <abstract><para>
+ This is the user manual for &kphotoalbum;. If you are
+ not the type who likes reading documentation, but rather just want to try
+@@ -64,6 +58,12 @@ menu and select <guimenuitem>Run &kphoto
+ on long HTML document at <ulink
+ url="http://www.kphotoalbum.org/";>&kphotoalbum;'s Homepage</ulink></para>
+ </abstract>
++ <keywordset>
++ <keyword>KDE</keyword>
++ <keyword>kdeextragear-2</keyword>
++ <keyword>KPhotoAlbum</keyword>
++ <keyword>Image Database</keyword>
++ </keywordset>
+ </bookinfo>
+
+ &introduction;
+diff -up
kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook.docbook_fix
kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook
+---
kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook.docbook_fix
2009-11-15 15:17:07.000000000 -0600
++++
kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook
2010-06-13 13:10:06.145165665 -0500
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant
V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
"dtd/kdex.dtd" [
+ <!ENTITY kphotoalbum "<application
+ >KPhotoAlbum</application
+ >">
+@@ -65,16 +65,6 @@
+ <releaseinfo
+ >2.0</releaseinfo>
+
+- <keywordset>
+- <keyword
+->KDE</keyword>
+- <keyword
+->kdeextragear-2</keyword>
+- <keyword
+->KPhotoAlbum</keyword>
+- <keyword
+->Bilddatenbank</keyword>
+- </keywordset>
+ <abstract
+ ><para
+ >Dies ist das Benutzerhandbuch für &kphotoalbum;. Wenn Sie nicht gerne
Handbücher lesen, sondern lieber gleich Funktionen ausprobieren möchten,
haben Sie folgende Alternativen zu diesem Handbuch: <itemizedlist>
+@@ -102,6 +92,12 @@
+ >HTML</acronym
+ >-Dokument zum Herunterladen.</para>
+ </abstract>
++ <keywordset>
++ <keyword>KDE</keyword>
++ <keyword>kdeextragear-2</keyword>
++ <keyword>KPhotoAlbum</keyword>
++ <keyword>Bilddatenbank</keyword>
++ </keywordset>
+ </bookinfo>
+
+ &introduction;
+diff -up
kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook.docbook_fix
kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook
+---
kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook.docbook_fix
2009-11-15 15:17:20.000000000 -0600
++++
kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook
2010-06-13 13:11:18.860165964 -0500
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant
V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
"dtd/kdex.dtd" [
+ <!ENTITY kphotoalbum "<application
+ >KPhotoAlbum</application
+ >">
+@@ -65,16 +65,6 @@
+ <releaseinfo
+ >2.0</releaseinfo>
+
+- <keywordset>
+- <keyword
+->KDE</keyword>
+- <keyword
+->kdeextragear-2</keyword>
+- <keyword
+->KPhotoAlbum</keyword>
+- <keyword
+->Piltide andmebaas</keyword>
+- </keywordset>
+ <abstract
+ ><para
+ >See on &kphotoalbum;i käsiraamat. Kui sa ei armasta eriti käsiraamatuid
lugeda, vaid soovid lihtsalt proovida, mis mida teeb, siis on sinu ees lahti
mitu võimalust: <itemizedlist>
+@@ -100,6 +90,12 @@
+ >&kphotoalbum;i koduleheküljelt</ulink
+ >.</para>
+ </abstract>
++ <keywordset>
++ <keyword>KDE</keyword>
++ <keyword>kdeextragear-2</keyword>
++ <keyword>KPhotoAlbum</keyword>
++ <keyword>Piltide andmebaas</keyword>
++ </keywordset>
+ </bookinfo>
+
+ &introduction;
+diff -up
kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook.docbook_fix
kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook
+---
kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook.docbook_fix
2009-11-15 15:17:57.000000000 -0600
++++
kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook
2010-06-13 13:12:00.978165382 -0500
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant
V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
"dtd/kdex.dtd" [
+ <!ENTITY kphotoalbum "<application
+ >KPhotoAlbum</application
+ >">
+@@ -65,16 +65,6 @@
+ <releaseinfo
+ >2.0</releaseinfo>
+
+- <keywordset>
+- <keyword
+->KDE</keyword>
+- <keyword
+->kdeextragear-2</keyword>
+- <keyword
+->KPhotoAlbum</keyword>
+- <keyword
+->Banca dati immagini</keyword>
+- </keywordset>
+ <abstract
+ ><para
+ >Questo è il manuale utente di &kphotoalbum;. Se non sei il tipo a cui
piace leggere la documentazione, ma che preferisce provare a far funzionare
le cose, eccoti delle alternative: <itemizedlist>
+@@ -100,6 +90,12 @@
+ >homepage di &kphotoalbum;</ulink
+ ></para>
+ </abstract>
++ <keywordset>
++ <keyword>KDE</keyword>
++ <keyword>kdeextragear-2</keyword>
++ <keyword>KPhotoAlbum</keyword>
++ <keyword>Banca dati immagini</keyword>
++ </keywordset>
+ </bookinfo>
+
+ &introduction;
+diff -up
kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook.docbook_fix
kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook
+---
kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook.docbook_fix
2009-11-15 15:19:13.000000000 -0600
++++
kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook
2010-06-13 13:12:45.765165840 -0500
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant
V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
"dtd/kdex.dtd" [
+ <!ENTITY kphotoalbum "<application
+ >KPhotoAlbum</application
+ >">
+@@ -65,16 +65,6 @@
+ <releaseinfo
+ >2.0</releaseinfo>
+
+- <keywordset>
+- <keyword
+->KDE</keyword>
+- <keyword
+->kdeextragear-2</keyword>
+- <keyword
+->Kfotoalbum</keyword>
+- <keyword
+->Bilddatabas</keyword>
+- </keywordset>
+ <abstract
+ ><para
+ >Det här är användarmanualen för Kfotoalbum. Om du inte är den som gillar
att läsa dokumentation, utan istället bara vill försöka dig på saker och
ting, ges här några alternativ: <itemizedlist>
+@@ -100,6 +90,12 @@
+ >Kfotoalbums hemsida</ulink
+ ></para>
+ </abstract>
++ <keywordset>
++ <keyword>KDE</keyword>
++ <keyword>kdeextragear-2</keyword>
++ <keyword>Kfotoalbum</keyword>
++ <keyword>Bilddatabas</keyword>
++ </keywordset>
+ </bookinfo>
+
+ &introduction;
+diff -up
kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook.docbook_fix
kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook
+---
kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook.docbook_fix
2009-11-15 15:19:26.000000000 -0600
++++
kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook
2010-06-13 13:13:28.217166055 -0500
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant
V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
"dtd/kdex.dtd" [
+ <!ENTITY kphotoalbum "<application
+ >KPhotoAlbum</application
+ >">
+@@ -65,16 +65,6 @@
+ <releaseinfo
+ >2.0</releaseinfo>
+
+- <keywordset>
+- <keyword
+->KDE</keyword>
+- <keyword
+->kdeextragear-2</keyword>
+- <keyword
+->KPhotoAlbum</keyword>
+- <keyword
+->База даних зображень</keyword>
+- </keywordset>
+ <abstract
+ ><para
+ >Це інструкція користувача для &kphotoalbum;. Якщо ви не любитель або
любителька читання документації і надаєте перевагу самостійному вивченню
програми шляхом експериментів, ви можете піти одним з таких шляхів:
<itemizedlist>
+@@ -100,6 +90,12 @@
+ >домашній сторінці &kphotoalbum;</ulink
+ ></para>
+ </abstract>
++ <keywordset>
++ <keyword>KDE</keyword>
++ <keyword>kdeextragear-2</keyword>
++ <keyword>KPhotoAlbum</keyword>
++ <keyword>База даних зображень</keyword>
++ </keywordset>
+ </bookinfo>
+
+ &introduction;
diff --git a/kde4-apps/kphotoalbum4/fix-with-exiv2-0.21.patch
b/kde4-apps/kphotoalbum4/fix-with-exiv2-0.21.patch
new file mode 100644
index 0000000..65baf23
--- /dev/null
+++ b/kde4-apps/kphotoalbum4/fix-with-exiv2-0.21.patch
@@ -0,0 +1,47 @@
+--- kphotoalbum-4.1.1/Exif/Info.cpp.orig 2010/08/16 08:04:32
1164187
++++ kphotoalbum-4.1.1/Exif/Info.cpp 2011/01/09 06:50:40 1213128
+@@ -106,6 +106,28 @@
+ return res;
+
+ QList<const Exiv2::TagInfo*> tags;
++ std::ostringstream s;
++
++#if (EXIV2_TEST_VERSION(0,21,0))
++ const Exiv2::GroupInfo* gi = Exiv2::ExifTags::groupList();
++ while (gi->tagList_ != 0) {
++ Exiv2::TagListFct tl = gi->tagList_;
++ const Exiv2::TagInfo* ti = tl();
++
++ while (ti->tag_ != 0xFFFF) {
++ tags << ti;
++ ++ti;
++ }
++ ++gi;
++ }
++
++ for (QList<const Exiv2::TagInfo*>::iterator it = tags.begin(); it !=
tags.end(); ++it) {
++ while ( (*it)->tag_ != 0xffff ) {
++
res.insert(QString::fromLatin1(Exiv2::ExifKey(**it).key().c_str()));
++ ++(*it);
++ }
++ }
++#else
+ tags <<
+ Exiv2::ExifTags::ifdTagList() <<
+ Exiv2::ExifTags::exifTagList() <<
+@@ -121,7 +143,6 @@
+ // Now the ugly part -- exiv2 doesn't have any way to get a list of
+ // MakerNote tags in a reasonable form, so we have to parse it from
strings
+
+- std::ostringstream s;
+ for ( Exiv2::IfdId kind = Exiv2::canonIfdId; kind < Exiv2::lastIfdId;
+ kind = static_cast<Exiv2::IfdId>( kind + 1 ) ) {
+ #if EXIV2_TEST_VERSION(0,17,0)
+@@ -130,6 +151,7 @@
+ Exiv2::ExifTags::makerTaglist( s, kind );
+ #endif
+ }
++#endif
+
+ // IPTC tags use yet another format...
+ Exiv2::IptcDataSets::dataSetList( s );
diff --git a/kde4-apps/tellico2/DEPENDS b/kde4-apps/tellico2/DEPENDS
index 525fb8d..433152c 100755
--- a/kde4-apps/tellico2/DEPENDS
+++ b/kde4-apps/tellico2/DEPENDS
@@ -3,7 +3,7 @@ depends libxml2 &&
depends libxslt &&
optional_depends kdemultimedia4 '' '' 'for fetching CDDB information' &&
optional_depends kdepimlibs4 '' '' 'address book & calendar support' &&
-optional_depends kdegraphics4 '' '' 'scanning images' &&
+optional_depends libksane '' '' 'scanning images' &&
optional_depends libv4l '' '' 'barcode scanning' &&
optional_depends poppler '' '' 'reading PDF files' &&
optional_depends taglib '' '' 'for reading audio files'
diff --git a/kde4-apps/tellico2/DETAILS b/kde4-apps/tellico2/DETAILS
index d6fa7e4..75b2e23 100755
--- a/kde4-apps/tellico2/DETAILS
+++ b/kde4-apps/tellico2/DETAILS
@@ -1,7 +1,7 @@
SPELL=tellico2
SPELLX=tellico
- VERSION=2.3
-
SOURCE_HASH=sha512:49a66bf5bcc829f3e1ee81f58cf4af365cfa8ae8f5788e5edb8251d660b5d041e1916b734c941bb0015ee5ed4dd718aad8333669f4b071ff74d2b5eb95c27560
+ VERSION=2.3.3
+
SOURCE_HASH=sha512:4ed0ac922d1acb2b5933ad978df2989a69b4e14c7f95c103d8944a5e072869e6b14f07bb2544bea67d0840980f2c2001cbfd40486622fbbb22015b99e8aca04b
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
WEB_SITE=http://tellico-project.org
diff --git a/kde4-apps/tellico2/HISTORY b/kde4-apps/tellico2/HISTORY
index 0101b5e..77ed5eb 100644
--- a/kde4-apps/tellico2/HISTORY
+++ b/kde4-apps/tellico2/HISTORY
@@ -1,3 +1,7 @@
+2011-08-16 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 2.3.3
+ * DEPENDS: kdegraphics4 -> libksane
+
2010-08-09 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 2.3

diff --git a/kde4/kdeplasmoids4/DEPENDS b/kde4/kdeplasmoids4/DEPENDS
index d97b82a..96679cc 100755
--- a/kde4/kdeplasmoids4/DEPENDS
+++ b/kde4/kdeplasmoids4/DEPENDS
@@ -6,4 +6,4 @@ optional_depends eigen2 '' '' 'Mandelbrot wallpaper
plugin' &&
optional_depends qalculate '' '' 'calculator plasmoid' &&
optional_depends kdepimlibs4 '' '' 'PIM support' &&
optional_depends marble '' '' 'Marble plasmoid' &&
-optional_depends kdegraphics4 '' '' 'exiv2 photo support'
+optional_depends libkexiv24 '' '' 'exiv2 photo support'
diff --git a/kde4/kdeplasmoids4/HISTORY b/kde4/kdeplasmoids4/HISTORY
index 847f542..dc97018 100644
--- a/kde4/kdeplasmoids4/HISTORY
+++ b/kde4/kdeplasmoids4/HISTORY
@@ -1,5 +1,6 @@
2011-08-16 Bor Kraljič <pyrobor AT ver.si>
* DEPENDS: kdeedu4 -> marble
+ kdegraphics4 -> libkexiv24

2011-08-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 4.7.0



  • [SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (057c4e7cb5fcea5ee0a7ee7077f6cb002963ef9e), Bor Kraljič, 08/16/2011

Archive powered by MHonArc 2.6.24.

Top of Page