summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-office/calligra/Manifest2
-rw-r--r--app-office/calligra/calligra-2.6.92.ebuild (renamed from app-office/calligra/calligra-2.6.91.ebuild)4
-rw-r--r--kde-base/nepomuk-core/files/libav_fix.patch2
3 files changed, 4 insertions, 4 deletions
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 65574ff4bb5..2b73f487b35 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1 +1 @@
-DIST calligra-2.6.91.tar.bz2 167905669 SHA256 960544994b90dd83f35da39562a70abec60476a51f365378ddb440106aef09bb SHA512 6b90af78a2fc8dd5459261333a8d3eeb5e6fdb2180be631cf1ed7a183906e0b594cfa4f8a0102cd589fd117f3f321eb8e8414939e87b97f084df5e066d79af0b WHIRLPOOL 49d65d53661734559ffa4154fe52f485d2763c4a5309466e4af3ce32f1758ad4457cddd740cd6cf10b8b2a1f2b6f67fbf75a401a747f51ea8b855c99c6cea0b4
+DIST calligra-2.6.92.tar.xz 124683872 SHA256 61792664d149bab5e53c23bd02a2966ad66b993fc401ec430ce6eec0b8faa87f SHA512 b0cef0f6011fb7e86f77870775709fe3da678ab86859b11332697212c88ddd25a900c7dc0c733baf24e54e9152b304ee658ba9be0843ea30d3f6e1a60264471d WHIRLPOOL d958d4ac4165426d84d3124382877fdec93f3711cc9ff13ede39ce75112d95517747d3bf6314ebe0dcf88a71d8cf52153929986635fece5c64b4ffb1f13aa4f1
diff --git a/app-office/calligra/calligra-2.6.91.ebuild b/app-office/calligra/calligra-2.6.92.ebuild
index 89eee3297b9..b3ee3af0b07 100644
--- a/app-office/calligra/calligra-2.6.91.ebuild
+++ b/app-office/calligra/calligra-2.6.92.ebuild
@@ -23,10 +23,10 @@ HOMEPAGE="http://www.calligra.org/"
case ${PV} in
2.[456789].[789]?)
# beta or rc releases
- SRC_URI="mirror://kde/unstable/${P}/${P}.tar.bz2" ;;
+ SRC_URI="mirror://kde/unstable/${P}/${P}.tar.xz" ;;
2.[456789].?)
# stable releases
- SRC_URI="mirror://kde/stable/${P}/${P}.tar.bz2" ;;
+ SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;;
2.[456789].9999)
# stable branch live ebuild
SRC_URI="" ;;
diff --git a/kde-base/nepomuk-core/files/libav_fix.patch b/kde-base/nepomuk-core/files/libav_fix.patch
index 209be5321d5..7cedbfae706 100644
--- a/kde-base/nepomuk-core/files/libav_fix.patch
+++ b/kde-base/nepomuk-core/files/libav_fix.patch
@@ -6,7 +6,7 @@ diff -Naur a/services/fileindexer/indexer/ffmpegextractor.cpp b/services/fileind
int aspectRatio = codec->sample_aspect_ratio.num;
- int frameRate = stream->r_frame_rate.num;
-+ int frameRate = stream->avg_frame_rate.num;
++ float frameRate = stream->avg_frame_rate.num;
if( codec->sample_aspect_ratio.den )
aspectRatio /= codec->sample_aspect_ratio.den;