Hello community, here is the log from the commit of package kdegraphics4 for openSUSE:Factory checked in at Thu Mar 5 01:24:44 CET 2009. -------- --- KDE/kdegraphics4/kdegraphics4.changes 2009-02-18 20:16:29.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdegraphics4/kdegraphics4.changes 2009-02-28 12:56:32.000000000 +0100 @@ -1,0 +2,11 @@ +Sat Feb 28 12:56:02 CET 2009 - dmueller@suse.de + +- build against libqca2 for encrypted document support in okular + +------------------------------------------------------------------- +Fri Feb 27 01:43:57 CET 2009 - dmueller@suse.de + +- update to 4.2.1 + * see http://kde.org/announcements/changelogs/changelog4_2_0to4_2_1.php + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdegraphics-4.2.0.tar.bz2 New: ---- kdegraphics-4.2.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegraphics4.spec ++++++ --- /var/tmp/diff_new_pack.w16778/_old 2009-03-05 01:22:35.000000000 +0100 +++ /var/tmp/diff_new_pack.w16778/_new 2009-03-05 01:22:35.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdegraphics4 (Version 4.2.0) +# spec file for package kdegraphics4 (Version 4.2.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: kdegraphics4 -BuildRequires: OpenEXR-devel fribidi-devel imlib-config imlib-devel kdebase4-workspace-devel net-snmp-devel +BuildRequires: OpenEXR-devel fribidi-devel imlib-config imlib-devel libkde4-devel net-snmp-devel BuildRequires: chmlib-devel libexiv2-devel libgphoto2-devel libqimageblitz-devel oxygen-icon-theme sane %if %suse_version > 1020 BuildRequires: libdjvulibre-devel texlive texlive-devel texlive-latex @@ -28,13 +28,13 @@ %if %suse_version > 1030 BuildRequires: libspectre-devel %endif -BuildRequires: libpoppler-qt4-devel libsoprano-devel +BuildRequires: libpoppler-qt4-devel libqca2-devel libsoprano-devel License: GPL v2 or later Group: Productivity/Graphics/Other Summary: kdegraphics base package Url: http://www.kde.org -Version: 4.2.0 -Release: 3 +Version: 4.2.1 +Release: 1 Source0: kdegraphics-%version.tar.bz2 Source1: _upstream Patch0: 4_2_BRANCH.diff @@ -343,6 +343,7 @@ %files -n kde4-kio_kamera -f filelists/kamera %defattr(-,root,root) %doc COPYING COPYING.DOC README +%doc %lang(en) %dir /usr/share/doc/kde/HTML/en/kcontrol %doc %lang(en) /usr/share/doc/kde/HTML/en/kcontrol/kamera %package -n kde4-kolourpaint @@ -560,6 +561,11 @@ %_kde_share_dir/services/ksane_scan_service.desktop %changelog +* Sat Feb 28 2009 dmueller@suse.de +- build against libqca2 for encrypted document support in okular +* Fri Feb 27 2009 dmueller@suse.de +- update to 4.2.1 + * see http://kde.org/announcements/changelogs/changelog4_2_0to4_2_1.php * Wed Feb 18 2009 dmueller@suse.de - update branch diff * Wed Feb 04 2009 stbinner@suse.de ++++++ 4_2_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.w16778/_old 2009-03-05 01:22:35.000000000 +0100 +++ /var/tmp/diff_new_pack.w16778/_new 2009-03-05 01:22:35.000000000 +0100 @@ -5,592 +5,3 @@ @@ -0,0 +1,2 @@ +current HEAD: 927996 +svn di between //tags/KDE/4.2.0/kdegraphics and //branches/KDE/4.2/kdegraphics ---- ksaneplugin/ksane_scan_service.desktop -+++ ksaneplugin/ksane_scan_service.desktop -@@ -30,6 +30,7 @@ - Name[kk]=KDE сканер қызметі - Name[km]=សេវាស្កេនរបស់ KDE - Name[ko]=KDE 스캔 서비스 -+Name[ku]=KDE Servîsa Venihêrînê - Name[lt]=KDE skanavimo tarnyba - Name[lv]=KDE skenēšanas serviss - Name[ms]=Perkhidmatan Imbas KDE ---- strigi-analyzer/dvi/kfile_dvi.desktop -+++ strigi-analyzer/dvi/kfile_dvi.desktop -@@ -27,6 +27,7 @@ - Name[kk]=DVI мәліметі - Name[km]=ព័ត៌មាន DVI - Name[ko]=DVI 정보 -+Name[ku]=Agahiyên DVI - Name[lt]=DVI informacija - Name[lv]=DVI informācija - Name[ms]=Maklumat DVI ---- strigi-analyzer/ps/gsthumbnail.desktop -+++ strigi-analyzer/ps/gsthumbnail.desktop -@@ -27,6 +27,7 @@ - Name[kk]=PostScript, PDF және DVI файлдары - Name[km]=ឯកសារ PostScript, PDF និង DVI - Name[ko]=포스트크스립트, PDF, DVI 파일 -+Name[ku]=Pelên PostScript, PDF û DVI - Name[lt]=Postscript, PDF ir DVI failai - Name[lv]=Postscript, PDF un DVI faili - Name[ms]=PostScript, PDF dan Fail DVI ---- strigi-analyzer/tiff/kfile_tiff.desktop -+++ strigi-analyzer/tiff/kfile_tiff.desktop -@@ -29,6 +29,7 @@ - Name[kk]=TIFF файлдың мета деректері - Name[km]=ព័ត៌មានមេតារបស់ឯកសារ TIFF - Name[ko]=TIFF 파일 메타 정보 -+Name[ku]=Agahiyên TIFF Pela Meta - Name[lt]=TIFF failo meta informacija - Name[lv]=TIFF faila meta informācija - Name[ms]=TIFF Maklumat Meta Fail TIFF ---- strigi-analyzer/raw/kfile_raw.desktop -+++ strigi-analyzer/raw/kfile_raw.desktop -@@ -26,6 +26,7 @@ - Name[kk]=Камераның RAW пішімдегі файлдары - Name[km]=ឯកសារចេញពីម៉ាស៊ីនថតរូប - Name[ko]=RAW 카메라 파일 -+Name[ku]=Pelên RAW Kamera - Name[lt]=RAW camera failas - Name[lv]=RAW fotogrāfiju faili - Name[nb]=RAW-kamerafiler ---- strigi-analyzer/dds/kfile_dds.desktop -+++ strigi-analyzer/dds/kfile_dds.desktop -@@ -25,6 +25,7 @@ - Name[kk]=DirectDraw бедерінің мәлметі - Name[km]=ព័ត៌មានផ្ទៃខាងក្រៅអំពី DirectDraw - Name[ko]=DirectDraw 표면 정보 -+Name[ku]=Agahiyên Rûerdê DirectDraw - Name[lt]=DirectDraw Surface informacija - Name[lv]=DirectDraw virsmas informācija - Name[ms]=Maklumat Permukaan LukisTerus ---- strigi-analyzer/pnm/kfile_pnm.desktop -+++ strigi-analyzer/pnm/kfile_pnm.desktop -@@ -26,6 +26,7 @@ - Name[kk]=PNM мәліметі - Name[km]=ព័ត៌មាន PNM - Name[ko]=PNM 정보 -+Name[ku]=Agahiyên PNM - Name[lt]=PNM informacija - Name[lv]=PNM informācija - Name[ms]=Maklumat PNM ---- strigi-analyzer/rgb/kfile_rgb.desktop -+++ strigi-analyzer/rgb/kfile_rgb.desktop -@@ -28,6 +28,7 @@ - Name[kk]=SGI кескіні (RGB) - Name[km]=រូបភាព SGI (RGB) - Name[ko]=SGI 그림 (RGB) -+Name[ku]=Wêneyên SGI (RGB) - Name[lt]=SGI paveiksliukas (RGB) - Name[lv]=SGI attēls (RGB) - Name[ms]=Imej SGI (RGB) ---- strigi-analyzer/xps/kfile_xps.desktop -+++ strigi-analyzer/xps/kfile_xps.desktop -@@ -19,6 +19,7 @@ - Name[ja]=XML 用紙仕様情報 - Name[km]=ព័ត៌មានការបញ្ជាក់ក្រដាស XML - Name[ko]=XML Paper 스펙 정보 -+Name[ku]=Agahiyên XML Taybetî Kirina Rûpelê - Name[lv]=XML papīra specifikācijas informācija - Name[nb]=Info om XML papirspesifikasjon - Name[nds]=Info över de XML-Papeerangaven ---- strigi-analyzer/exr/kfile_exr.desktop -+++ strigi-analyzer/exr/kfile_exr.desktop -@@ -26,6 +26,7 @@ - Name[kk]=EXR мәліметі - Name[km]=ព័ត៌មាន EXR - Name[ko]=EXR 정보 -+Name[ku]=Agahiyên EXR - Name[lt]=EXR informacija - Name[lv]=EXR informācija - Name[ms]=Maklumat EXR ---- svgpart/svgpart.desktop -+++ svgpart/svgpart.desktop -@@ -18,6 +18,7 @@ - Name[ja]=SVG コンポーネント - Name[km]=ផ្នែក Svg - Name[ko]=Svg 부분 -+Name[ku]=Beşa Svg - Name[lv]=Svg daļa - Name[nb]=Svg-del - Name[nds]=SVG-Komponent ---- libs/libkexiv2/libkexiv2/kexiv2.cpp -+++ libs/libkexiv2/libkexiv2/kexiv2.cpp -@@ -6,8 +6,8 @@ - * Date : 2006-09-15 - * Description : Exiv2 library interface for KDE - * -- * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com> -- * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de> -+ * Copyright (C) 2006-2009 by Gilles Caulier <caulier dot gilles at gmail dot com> -+ * Copyright (C) 2006-2009 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de> - * - * This program is free software; you can redistribute it - * and/or modify it under the terms of the GNU General -@@ -308,20 +308,22 @@ - // TIFF/EP Raw file based supported by Exiv2 0.18 are : DNG, NEF, PEF. - QString rawTiffBasedSupported("dng nef pef"); - QString rawTiffBasedNotSupported("3fr arw cr2 dcr erf k25 kdc mos orf raw sr2 srf"); -- if (rawTiffBasedNotSupported.contains(finfo.suffix().toUpper())) -+ QString ext = finfo.suffix().toLower(); -+ if (rawTiffBasedNotSupported.contains(ext)) - { -- kDebug(51003) << "'" << dinfo.filePath().toAscii().constData() -+ kDebug(51003) << "'" << finfo.fileName().toAscii().constData() - << "' is TIFF based RAW file not yet supported. Metadata not saved." << endl; - return false; - } - -- if (rawTiffBasedSupported.contains(finfo.suffix().toUpper()) && !d->writeRawFiles) -+ if (rawTiffBasedSupported.contains(finfo.suffix().toLower()) && !d->writeRawFiles) - { -- kDebug(51003) << "'" << dinfo.filePath().toAscii().constData() -+ kDebug(51003) << "'" << finfo.fileName().toAscii().constData() - << "' is TIFF based RAW file supported but writing mode is disabled. " - << "Metadata not saved." << endl; - return false; - } -+ kDebug(51003) << "File Extension: " << ext << " is supported for writing mode" << endl; - - try - { -@@ -336,8 +338,7 @@ - // Image Comments --------------------------------- - - mode = image->checkMode(Exiv2::mdComment); -- if (!d->imageComments.empty() && -- (mode == Exiv2::amWrite || mode == Exiv2::amReadWrite)) -+ if (mode == Exiv2::amWrite || mode == Exiv2::amReadWrite) - { - image->setComment(d->imageComments); - } -@@ -345,8 +346,7 @@ - // Exif metadata ---------------------------------- - - mode = image->checkMode(Exiv2::mdExif); -- if (!d->exifMetadata.empty() && -- (mode == Exiv2::amWrite || mode == Exiv2::amReadWrite)) -+ if (mode == Exiv2::amWrite || mode == Exiv2::amReadWrite) - { - if (image->mimeType() == "image/tiff") - { -@@ -390,8 +390,7 @@ - // Iptc metadata ---------------------------------- - - mode = image->checkMode(Exiv2::mdIptc); -- if (!d->iptcMetadata.empty() && -- (mode == Exiv2::amWrite || mode == Exiv2::amReadWrite)) -+ if (mode == Exiv2::amWrite || mode == Exiv2::amReadWrite) - { - image->setIptcData(d->iptcMetadata); - } -@@ -401,8 +400,7 @@ - // Xmp metadata ----------------------------------- - - mode = image->checkMode(Exiv2::mdXmp); -- if (!d->xmpMetadata.empty() && -- (mode == Exiv2::amWrite || mode == Exiv2::amReadWrite)) -+ if (mode == Exiv2::amWrite || mode == Exiv2::amReadWrite) - { - image->setXmpData(d->xmpMetadata); - } ---- libs/libkexiv2/README -+++ libs/libkexiv2/README -@@ -20,7 +20,7 @@ - -- DEPENDENCIES ------------------------------------------------------- - - CMake >= 2.4.x http://www.cmake.org --libqt >= 4.2.x http://www.trolltech.com -+libqt >= 4.2.x http://www.qtsoftware.com - libkde >= 4.0.x http://www.kde.org - libexiv2 >= 0.13 (0.18 recommended) http://www.exiv2.org - ---- libs/libkdcraw/libraw/libraw/libraw_version.h -+++ libs/libkdcraw/libraw/libraw/libraw_version.h -@@ -26,7 +26,7 @@ - - #define LIBRAW_MAJOR_VERSION 0 - #define LIBRAW_MINOR_VERSION 6 --#define LIBRAW_PATCH_VERSION 9 -+#define LIBRAW_PATCH_VERSION 13 - #define LIBRAW_VERSION_TAIL Release - - #define _LIBRAW_VERSION_MAKE(a,b,c,d) #a"."#b"."#c"-"#d ---- libs/libkdcraw/libraw/src/libraw_cxx.cpp -+++ libs/libkdcraw/libraw/src/libraw_cxx.cpp -@@ -1108,6 +1108,7 @@ - "Fuji IS-1", - "Hasselblad CFV", - "Hasselblad H3D", -+"Hasselblad V96C", - "Imacon Ixpress 16-megapixel", - "Imacon Ixpress 22-megapixel", - "Imacon Ixpress 39-megapixel", -@@ -1301,7 +1302,7 @@ - "RoverShot 3320af", - "Samsung GX-1S", - "Samsung GX-10", --"Samsung S85", -+"Samsung S85 (hacked)", - "Sarnoff 4096x5440", - "Sigma SD9", - "Sigma SD10", ---- libs/libkdcraw/libraw/internal/defines.h -+++ libs/libkdcraw/libraw/internal/defines.h -@@ -1,6 +1,6 @@ - /* - GENERATED FILE, DO NOT EDIT -- Generated from dcraw/dcraw.c at Fri Jan 16 12:04:06 2009 -+ Generated from dcraw/dcraw.c at Fri Feb 13 11:06:49 2009 - Look into original file (probably http://cybercom.net/~dcoffin/dcraw/dcraw.c) - for copyright information. - */ -@@ -8,7 +8,7 @@ - #line 27 "dcraw/dcraw.c" - #define NO_JPEG - #line 32 "dcraw/dcraw.c" --#define VERSION "8.90" -+#define VERSION "8.91" - - #define _GNU_SOURCE - #define _USE_MATH_DEFINES ---- libs/libkdcraw/libraw/internal/dcraw_common.cpp -+++ libs/libkdcraw/libraw/internal/dcraw_common.cpp -@@ -1,6 +1,6 @@ - /* - GENERATED FILE, DO NOT EDIT -- Generated from dcraw/dcraw.c at Fri Jan 16 12:04:06 2009 -+ Generated from dcraw/dcraw.c at Fri Feb 13 11:06:49 2009 - Look into original file (probably http://cybercom.net/~dcoffin/dcraw/dcraw.c) - for copyright information. - */ -@@ -4526,6 +4526,10 @@ - FORC4 cam_mul[c ^ (c < 2)] = get2(); - color_flags.cam_mul_state = LIBRAW_COLORSTATE_LOADED; - break; -+ case 29459: -+ FORC4 cam_mul[c ^ (c >> 1)] = get2(); -+color_flags.cam_mul_state = LIBRAW_COLORSTATE_LOADED; -+ break; - case 33405: /* Model2 */ - fgets (model2, 64, ifp); - break; -@@ -4648,6 +4652,9 @@ - color_flags.cam_mul_state = LIBRAW_COLORSTATE_LOADED; } - free (cbuf); - break; -+ case 50458: -+ if (!make[0]) strcpy (make, "Hasselblad"); -+ break; - case 50459: /* Hasselblad tag */ - i = order; - j = ftell(ifp); -@@ -4943,7 +4950,8 @@ - void CLASS parse_external_jpeg() - { - char *file, *ext, *jname, *jfile, *jext; --#line 5973 "dcraw/dcraw.c" -+ FILE *save=ifp; -+ - ext = strrchr (ifname, '.'); - file = strrchr (ifname, '/'); - if (!file) file = strrchr (ifname, '\\'); -@@ -4988,7 +4996,7 @@ - #endif - } - free (jname); --#line 6020 "dcraw/dcraw.c" -+ ifp = save; - } - - /* -@@ -5335,10 +5343,10 @@ - end = ftell(ifp) + size; - if (!memcmp(tag,"RIFF",4) || !memcmp(tag,"LIST",4)) { - get4(); -- while (ftell(ifp) < end) -+ while (ftell(ifp)+7 < end) - parse_riff(); - } else if (!memcmp(tag,"nctg",4)) { -- while (ftell(ifp) < end) { -+ while (ftell(ifp)+7 < end) { - i = get2(); - size = get2(); - if ((i+1) >> 1 == 10 && size == 20) -@@ -5429,7 +5437,7 @@ - data_offset = (INT64) get4() + 8; - data_offset += (INT64) get4() << 32; - } --#line 6565 "dcraw/dcraw.c" -+#line 6568 "dcraw/dcraw.c" - void CLASS adobe_coeff (const char *p_make, const char *p_model) - { - static const struct { -@@ -6778,6 +6786,11 @@ - top_margin = 4; - left_margin = 7; - filters = 0x61616161; -+ } else if (raw_width == 4090) { -+ strcpy (model, "V96C"); -+ height -= (top_margin = 6); -+ width -= (left_margin = 3) + 7; -+ filters = 0x61616161; - } - } else if (!strcmp(make,"Sinar")) { - if (!memcmp(head,"8BPS",4)) { -@@ -7273,7 +7286,7 @@ - if (strcmp (input, "embed")) - hInProfile = cmsOpenProfileFromFile (input, "r"); - else if (profile_length) { --#line 8416 "dcraw/dcraw.c" -+#line 8424 "dcraw/dcraw.c" - hInProfile = cmsOpenProfileFromMem (imgdata.color.profile, profile_length); - } else - { -@@ -7423,7 +7436,7 @@ - - #endif - memset(histogram,0,sizeof(int)*LIBRAW_HISTOGRAM_SIZE*4); --#line 8568 "dcraw/dcraw.c" -+#line 8576 "dcraw/dcraw.c" - for (img=image[0], row=0; row < height; row++) - for (col=0; col < width; col++, img+=4) { - if (!raw_color) { -@@ -7564,7 +7577,7 @@ - } - - --#line 8733 "dcraw/dcraw.c" -+#line 8741 "dcraw/dcraw.c" - void CLASS tiff_set (ushort *ntag, - ushort tag, ushort type, int count, int val) - { ---- libs/libkdcraw/libraw/internal/foveon.cpp -+++ libs/libkdcraw/libraw/internal/foveon.cpp -@@ -1,6 +1,6 @@ - /* - GENERATED FILE, DO NOT EDIT -- Generated from dcraw/dcraw.c at Fri Jan 16 12:04:06 2009 -+ Generated from dcraw/dcraw.c at Fri Feb 13 11:06:49 2009 - Look into original file (probably http://cybercom.net/~dcoffin/dcraw/dcraw.c) - for copyright information. - */ -@@ -692,7 +692,7 @@ - #undef image - - /* RESTRICTED code ends here */ --#line 6463 "dcraw/dcraw.c" -+#line 6466 "dcraw/dcraw.c" - char * CLASS foveon_gets (int offset, char *str, int len) - { - int i; ---- libs/libkdcraw/NEWS -+++ libs/libkdcraw/NEWS -@@ -1,5 +1,12 @@ -+0.4.1 - Released with KDE 4.2.1 -+------------------------------------------------------------------------ -+- Updated to libraw 0.6.13: Bugfixes in RIFF reading code. -+- Updated to libraw 0.6.12: Hasselblad V96C support. -+ - 0.4.0 - Released with KDE 4.2.0 - ------------------------------------------------------------------------ -+- Updated to libraw 0.6.11: Fixed serious bug in loading metadata from external JPG file. -+- Updated to libraw 0.6.10: Support for loading White Balance data from Sony ARW files edited with Sony IDC software. - - Updated to libraw 0.6.9 : Better support for Samsung S85. - Fixed possible integer overflow in wavelet denoising code. - - Updated to libraw 0.6.8 : changes in QuickTake 100 files processing. ---- libs/libkdcraw/CMakeLists.txt -+++ libs/libkdcraw/CMakeLists.txt -@@ -16,11 +16,12 @@ - # 0.2.0 => 5.0.0 (released with KDE 4.1.0) - # 0.3.0 => 6.0.0 (released with KDE 4.1.2) - # 0.4.0 => 7.0.0 (using libRaw-Released with KDE 4.2.0) -+# 0.4.1 => 7.0.0 (Released with KDE 4.2.1) - - # Library API version - SET(DCRAW_LIB_MAJOR_VERSION "0") - SET(DCRAW_LIB_MINOR_VERSION "4") --SET(DCRAW_LIB_PATCH_VERSION "0") -+SET(DCRAW_LIB_PATCH_VERSION "1") - - # Suffix to add at end of version string. Usual values are: - # "-svn" : alpha code unstable from svn. Do not use in production ---- libs/libkdcraw/README -+++ libs/libkdcraw/README -@@ -18,7 +18,7 @@ - -- DEPENDENCIES ------------------------------------------------------- - - CMake >= 2.4.x http://www.cmake.org --libqt >= 4.2.x http://www.trolltech.com -+libqt >= 4.2.x http://www.qtsoftware.com - libkde >= 4.0.x http://www.kde.org - liblcms >= 1.14.x (used by libraw) http://www.littlecms.com - libjpeg >= 6b (used by libraw) http://www.ijg.org ---- libs/libkipi/kipiplugin.desktop -+++ libs/libkipi/kipiplugin.desktop -@@ -33,6 +33,7 @@ - Comment[ja]=Kipi プラグイン - Comment[km]=កម្មវិធីជំនួយ KIPI - Comment[ko]=KIPI 플러그인 -+Comment[ku]=Pêveka KIPI - Comment[lt]=KIPI priedas - Comment[lv]=KIPI spraudnis - Comment[nds]=En KIPI-Moduul ---- libs/libkipi/README -+++ libs/libkipi/README -@@ -16,7 +16,7 @@ - -- DEPENDENCIES ------------------------------------------------------- - - CMake >= 2.4.x http://www.cmake.org --libqt >= 4.2.x http://www.trolltech.com -+libqt >= 4.2.x http://www.qtsoftware.com - libkde >= 4.0.x http://www.kde.org - - -- INSTALL ------------------------------------------------------------ ---- libs/libksane/README -+++ libs/libksane/README -@@ -17,7 +17,7 @@ - -- DEPENDENCIES ------------------------------------------------------- - - CMake >= 2.4.x http://www.cmake.org --libqt >= 4.2.x http://www.trolltech.com -+libqt >= 4.2.x http://www.qtsoftware.com - libkde >= 4.0.x http://www.kde.org - libsane >= 1.0.18 http://www.sane-project.org - ---- gwenview/app/gwenview.desktop -+++ gwenview/app/gwenview.desktop -@@ -34,6 +34,7 @@ - GenericName[kk]=Кескінді қарау аспабы - GenericName[km]=កម្មវិធីមើលរូបភាព - GenericName[ko]=그림 뷰어 -+GenericName[ku]=Nîşanderê Wêneyan - GenericName[lt]=Paveikslėlių žiūriklis - GenericName[lv]=Attēlu skatītājs - GenericName[ms]=Paparan Imej -@@ -86,6 +87,7 @@ - Comment[kk]=Қарапайым кескінді қарау аспабы - Comment[km]=កម្មវិធីមើលរូបភាពធម្មតា - Comment[ko]=간단한 그림 뷰어 -+Comment[ku]=Nîşanderê wêneyan yê hêsanî - Comment[lt]=Paprasta paveikslėlių žiūryklė - Comment[lv]=Vienkāršs attēlu skatītājs - Comment[nb]=En enkel bildeviser ---- gwenview/app/slideshow.desktop -+++ gwenview/app/slideshow.desktop -@@ -21,6 +21,7 @@ - Name[ja]=スライドショーを開始 - Name[km]=ចាប់ផ្ដើមបញ្ចាំងស្លាយ - Name[ko]=슬라이드 쇼 시작 -+Name[ku]=NîşandanaSlayt Bide Destpêkirin - Name[lt]=Pradėti slaidrių peržiūrą - Name[lv]=Sākt slīdrādi - Name[nds]=En Diaschau starten ---- gwenview/app/mainwindow.cpp -+++ gwenview/app/mainwindow.cpp -@@ -571,6 +571,7 @@ - QModelIndex index = mDirModel->indexForUrl(mUrlToSelect); - if (index.isValid()) { - mThumbnailView->setCurrentIndex(index); -+ mThumbnailView->scrollTo(index, QAbstractItemView::PositionAtCenter); - mUrlToSelect = KUrl(); - } - } ---- gwenview/app/gvcore.cpp -+++ gwenview/app/gvcore.cpp -@@ -54,6 +54,46 @@ - struct GvCorePrivate { - QWidget* mParent; - SortedDirModel* mDirModel; -+ -+ bool showSaveAsDialog(const KUrl& url, KUrl* outUrl, QByteArray* format) { -+ KFileDialog dialog(url, QString(), mParent); -+ dialog.setOperationMode(KFileDialog::Saving); -+ dialog.setMimeFilter( -+ KImageIO::mimeTypes(KImageIO::Writing), // List -+ MimeTypeUtils::urlMimeType(url) // Default -+ ); -+ -+ // Show dialog -+ do { -+ if (!dialog.exec()) { -+ return false; -+ } -+ -+ const QString mimeType = dialog.currentMimeFilter(); -+ if (mimeType.isEmpty()) { -+ KMessageBox::sorry( -+ mParent, -+ i18nc("@info", -+ "No image format selected.") -+ ); -+ continue; -+ } -+ -+ const QStringList typeList = KImageIO::typeForMime(mimeType); -+ if (typeList.count() > 0) { -+ *format = typeList[0].toAscii(); -+ break; -+ } -+ KMessageBox::sorry( -+ mParent, -+ i18nc("@info", -+ "Gwenview cannot save images as %1.", mimeType) -+ ); -+ } while (true); -+ -+ *outUrl = dialog.selectedUrl(); -+ return true; -+ } - }; - - -@@ -214,42 +254,11 @@ - - - void GvCore::saveAs(const KUrl& url) { -- KFileDialog dialog(url, QString(), d->mParent); -- dialog.setOperationMode(KFileDialog::Saving); -- dialog.setMimeFilter( -- KImageIO::mimeTypes(KImageIO::Writing), // List -- MimeTypeUtils::urlMimeType(url) // Default -- ); -- -- // Show dialog - QByteArray format; -- do { -- if (!dialog.exec()) { -- return; -- } -- -- const QString mimeType = dialog.currentMimeFilter(); -- if (mimeType.isEmpty()) { -- KMessageBox::sorry( -- d->mParent, -- i18nc("@info", -- "No image format selected.") -- ); -- continue; -- } -- -- const QStringList typeList = KImageIO::typeForMime(mimeType); -- if (typeList.count() > 0) { -- format = typeList[0].toAscii(); -- break; -- } -- KMessageBox::sorry( -- d->mParent, -- i18nc("@info", -- "Gwenview cannot save images as %1.", mimeType) -- ); -- } while (true); -- const KUrl saveAsUrl = dialog.selectedUrl(); -+ KUrl saveAsUrl; -+ if (!d->showSaveAsDialog(url, &saveAsUrl, &format)) { -+ return; -+ } - - // Check for overwrite - if (KIO::NetAccess::exists(saveAsUrl, KIO::NetAccess::DestinationSide, d->mParent)) { -Files gwenview/tests/1frame.gif (.../tags/KDE/4.2.0/kdegraphics) (revision 0) and gwenview/tests/1frame.gif (.../branches/KDE/4.2/kdegraphics) (revision 927999) differ ++++++ kdegraphics-4.2.0.tar.bz2 -> kdegraphics-4.2.1.tar.bz2 ++++++ ++++ 1788 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org