From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Mar 30 07:30:02 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 67DD11065675 for ; Tue, 30 Mar 2010 07:30:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 27B8F8FC12 for ; Tue, 30 Mar 2010 07:30:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o2U7U2Ig035250 for ; Tue, 30 Mar 2010 07:30:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o2U7U1HQ035248; Tue, 30 Mar 2010 07:30:02 GMT (envelope-from gnats) Resent-Date: Tue, 30 Mar 2010 07:30:02 GMT Resent-Message-Id: <201003300730.o2U7U1HQ035248@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Andrei Lavreniyuk Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8E1871065672 for ; Tue, 30 Mar 2010 07:22:23 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 7C70B8FC18 for ; Tue, 30 Mar 2010 07:22:23 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o2U7MNpD039390 for ; Tue, 30 Mar 2010 07:22:23 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o2U7MNnP039389; Tue, 30 Mar 2010 07:22:23 GMT (envelope-from nobody) Message-Id: <201003300722.o2U7MNnP039389@www.freebsd.org> Date: Tue, 30 Mar 2010 07:22:23 GMT From: Andrei Lavreniyuk To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/145192: [UPDATE] graphics/digikam-kde4 to version 1.2.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Mar 2010 07:30:02 -0000 >Number: 145192 >Category: ports >Synopsis: [UPDATE] graphics/digikam-kde4 to version 1.2.0 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Mar 30 07:30:01 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Andrei Lavreniyuk >Release: FreeBSD 8.0-STABLE >Organization: Technica-03, Inc. >Environment: FreeBSD datacenter.technica-03.local 8.0-STABLE FreeBSD 8.0-STABLE #0: Thu Mar 25 12:32:37 EET 2010 root@datacenter.technica-03.local:/usr/obj/usr/src/sys/SMP64 amd64 >Description: digiKam 1.2.0 - Release date: 2010-03-28 NEW FEATURES: AlbumGUI : All Album tree views are ported to pure Qt4 model/view implementation. ImageEditor : Brightness/Contrast/gamma tool is multithreaded and use a zoomable preview widget. ImageEditor : Color Balance tool is multithreaded and use a zoomable preview widget. ImageEditor : Hue/Saturation/Lightness tool is multithreaded and use a zoomable preview widget. ImageEditor : Auto Color Correction tool is multithreaded and use a zoomable preview widget. ImageEditor : Channel Mixer tool is multithreaded and use a zoomable preview widget. ImageEditor : Black and White tool is multithreaded and use a zoomable preview widget. ImageEditor : White Balance tool is multithreaded and use a zoomable preview widget. ImageEditor : Adjust Curves tool is multithreaded and use a zoomable preview widget. ImageEditor : Adjust Levels tool is multithreaded and use a zoomable preview widget. ImageEditor : Complete rewrite of the FilmGrain tool. FilmGrain tool use now YCrCb color space to add noise. Graininess size can be adjusted with an option to set-up photographic distribution of noise. Different amounts of noise can be added to highlights, shadows and midtones. BatchQueueManager : New tool to fix Brightness/Contrast/gamma. BatchQueueManager : New tool to adjust Color Balance. BatchQueueManager : New tool to fix Hue/Saturation/Lightness. BatchQueueManager : New tool to convert images color space. BatchQueueManager : New tool to mix color channel. BatchQueueManager : New tool to convert to Black and White. BatchQueueManager : New tool to adjust White Balance. BatchQueueManager : New tool to adjust Curves. BatchQueueManager : New tool to blur images. BatchQueueManager : New tool to add Film Grain to images. BatchQueueManager : New tool to apply Local Contrast (LDR tone mapping). BatchQueueManager : New tool to add/remove vignetting. BatchQueueManager : New tool to invert image colors. BatchQueueManager : New tool to convert color bits depth. BatchQueueManager : New tool to add border around images. BatchQueueManager : Rotate tool support Free Rotation adjustments. BatchQueueManager : It's now possible to Stop and restart a processed queue. BUGFIXES FROM KDE BUGZILLA (alias B.K.O | http://bugs.kde.org): 001 ==> 223936 : Moving photos between albums is slow. 002 ==> 224698 : digiKam fails to rotate pefs via orientation tag. 003 ==> 224021 : Zoom shortcuts inconsistent between editor and preview. 004 ==> 225160 : digiKam built with QT4 ver 4.5.3 does not display pictures in album view. 005 ==> 225397 : Tip refers to "Print Wizard", it is now "Print Assistant". 006 ==> 225555 : Crash when deleting tag. 007 ==> 207244 : Image disappears when enlarging. 008 ==> 221155 : Add collection fails on similarly named directories (seems that check is not strict enough). 009 ==> 225731 : digiKam no preview icon for movie. 010 ==> 222698 : digiKam 1.0.0 crashes when editing tags by drag-and-drop. 011 ==> 225328 : Creating new album during import fails. 012 ==> 216633 : Additional aspect ratios in crop tool. 013 ==> 151406 : Filters in 'Enhance' dropdown menu lack mouse-over preview mode. 014 ==> 225698 : When I export my Album to a Html Gallery then Digikam crashed at the End. 015 ==> 225787 : Scroll wheel doesn't work while moving images. 016 ==> 226081 : Trying to delete tags crashes digiKam. 017 ==> 226118 : IPTC metadata tag delimiter is no longer stored (since 0.10). 018 ==> 226235 : digiKam fails after upgrade - no albums - rh tag & captions bar frozen. 019 ==> 225272 : digiKam destroy some exif data. 020 ==> 226584 : digiKam crashes in the starting phase. 021 ==> 226537 : hovering doesn't show sub-tags. 022 ==> 225827 : Gpswidget inactive on default selected photo. 023 ==> 226381 : Copy/Paste of images in Albums view selects wrong image. 024 ==> 224999 : Thumbnails blury after upgrade to 1.0.0 from 0.10. 025 ==> 226789 : Metadata settings only EXIF. 026 ==> 185266 : digiKam shows unknown icon when moving images to other directory. 027 ==> 226872 : Tag tree not expanded with "Tags already assigned" button. 028 ==> 226858 : digiKam 1.2 My Tags window always blank. 029 ==> 226568 : digiKam 1.1 crashes when renaming tag. 030 ==> 226515 : My tags on Caption/Tags becomes empty after removing a single tag. 031 ==> 227244 : Images on local disk not shown in middle pane. 032 ==> 226853 : No images shown after upgrading from previous version. 033 ==> 226932 : Batch Color Space Conversion Tool. 034 ==> 207338 : Batch queue manager does not cancel processing. 035 ==> 215657 : Raw import tool does not use general digiKam settings. 036 ==> 226846 : Issues with color management and color profiles. 037 ==> 227498 : digiKam no longer shows any fotos. opengl image viewer works. showFoto works. 038 ==> 226537 : hovering doesn't show sub-tags. 039 ==> 227550 : Tags already assigned looks messy. 040 ==> 226962 : Applying tags to images requires extra work. 041 ==> 226238 : Histogram never get completed in image editor after any change in the image. 042 ==> 227545 : Toggle Auto/Parents does not work as expected. 043 ==> 219772 : Opening the application causes crash. 044 ==> 226382 : Curves Adjust dialog broken: No Histogram and no effect when changing the line. 045 ==> 227555 : Preview image in digiKam is not displayed after saveas in editor. 046 ==> 225728 : Adding vignette should not increase brightness in the center. 047 ==> 227992 : Search field should not lost focus if nothing was found. 048 ==> 228326 : Crash trying to create a new tag. 049 ==> 227905 : ISO Album dates for 2009 2010 sort wrong. 050 ==> 225443 : Fileview preview panning shortcut back to old. 051 ==> 224094 : Modifying file (caption, keywords, EXIF) takes a very long time and 100 % CPU. 052 ==> 228378 : Tag filtering is bugged. 053 ==> 227668 : Not enough space to show alle tags. 054 ==> 227640 : No Pictures visible in Collections. 055 ==> 227075 : digikam3 database is not imported. 056 ==> 225927 : Add white-balance to the batch base tools. 057 ==> 225718 : Crash when having two tags with the same name in one folder. 058 ==> 221918 : Wrong thumbnails after save as. 059 ==> 226586 : digiKam 1.2 crashes after My Tags window goes blank. 060 ==> 226885 : Not displayed thumbnails failed load kio_digikamalbums. 061 ==> 226363 : Root album is not expansed after upgrade to model view port. 062 ==> 224080 : Selected image thumbnails should be automatically added to the list of images for processing in Batch Queue Manager. 063 ==> 225722 : Selection in editor should not darken image. 064 ==> 228802 : Copy paste doesn't work. 065 ==> 227064 : digiKam 1.1.0: crash on image download. 066 ==> 228807 : Dancing thumbs in album view. 067 ==> 214303 : Position of preview type buttons is inconsistent across different tools. 068 ==> 163286 : Accurate histogram preview required. 069 ==> 229287 : Crash in digiKam when renaming with directory. 070 ==> 148540 : Improvements of adding noise tool. 071 ==> 229340 : digiKam Crashes When Saving PNG Files. 072 ==> 229664 : Curves Widget not working anymore in BWSepia Plugin. 073 ==> 229574 : Moving tags doesn't update the "tag counter" next to the tag name. 074 ==> 229690 : No picture on thumb bar icon. 075 ==> 229793 : Drop image file in digiKam. 076 ==> 228483 : digiKam 1.1.0 with system libjpeg-8 breaks image rotation. 077 ==> 187431 : Gui too big for eeepc. 078 ==> 230008 : digiKam Nikon fetching pictures. 079 ==> 229470 : digiKam fails to start with QCursor: Cannot create bitmap cursor; invalid bitmap(s). 080 ==> 221992 : "local contrast" settings make no difference. 081 ==> 230003 : Zoombar slider adjustments below 100% are hard to archieve [patch]. 082 ==> 228810 : Need to roll over again on a thumb to correct the rating. 083 ==> 210259 : Scan crashed on multi-layer TIFFs. 084 ==> 229344 : digiKam starting up - loading kipi-plugins. 085 ==> 229578 : Metadata is not correctly updated when just assigning tags. 086 ==> 230323 : ShowFoto and digiKam opening Olympus E-P2 ORF file will crash. 087 ==> 229108 : digiKam doesn't display all images after and upgrade. 088 ==> 201591 : Restart queue in Batch queue manager. 089 ==> 223003 : Cancelling duplicate search doesn't remove waiting cursor. 090 ==> 230358 : Selected album does not match containing items. 091 ==> 231048 : Monochrome tool shows plain grey preview. 092 ==> 222774 : Many (but not all) tags have been lost after multiple albums facility added. 093 ==> 226504 : When moving assigned tag in the keywords hierachy it becomes unassigned. 094 ==> 220415 : Clicking the + in the Album tree expands and just collapses subdirs again. 095 ==> 207881 : Album order differs in import dialog. 096 ==> 231361 : digiKam crash when trying to open NIKON NEF format photos from camera. 097 ==> 230573 : digiKam crash with import from DSL Nikon D90. 098 ==> 196470 : Update files with metadata from DB. 099 ==> 224052 : Pressing Delete repeatedly is not cached. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN digikam-kde4.bak/Makefile digikam-kde4/Makefile --- digikam-kde4.bak/Makefile 2010-03-29 20:43:49.000000000 +0300 +++ digikam-kde4/Makefile 2010-03-30 09:40:48.000000000 +0300 @@ -6,8 +6,7 @@ # PORTNAME= digikam -DISTVERSION= 1.1.0 -PORTREVISION= 2 +DISTVERSION= 1.2.0 PORTEPOCH= 1 CATEGORIES= graphics kde MASTER_SITES= SF diff -ruN digikam-kde4.bak/distinfo digikam-kde4/distinfo --- digikam-kde4.bak/distinfo 2010-03-29 20:43:59.000000000 +0300 +++ digikam-kde4/distinfo 2010-03-30 09:40:55.000000000 +0300 @@ -1,3 +1,3 @@ -MD5 (digikam-1.1.0.tar.bz2) = 94a536e7387325c7b73ab2ac7b0a9a62 -SHA256 (digikam-1.1.0.tar.bz2) = 6d26921e83bdb85342a0455df919f33bc2f23533c96e9293e80cd79ff92bfa8f -SIZE (digikam-1.1.0.tar.bz2) = 15385611 +MD5 (digikam-1.2.0.tar.bz2) = 8f68022008cf1650924cc8688f176572 +SHA256 (digikam-1.2.0.tar.bz2) = 930539b5bb53af345f4bef3d06c7121c22af3dbd7ae7b338fa3d173a6a631206 +SIZE (digikam-1.2.0.tar.bz2) = 13970098 diff -ruN digikam-kde4.bak/files/patch-CMakeLists.txt digikam-kde4/files/patch-CMakeLists.txt --- digikam-kde4.bak/files/patch-CMakeLists.txt 2010-01-06 09:11:30.000000000 +0200 +++ digikam-kde4/files/patch-CMakeLists.txt 2010-03-30 09:42:46.000000000 +0300 @@ -1,13 +1,19 @@ ---- CMakeLists.txt.orig 2009-11-30 11:15:26.000000000 -0600 -+++ CMakeLists.txt 2009-11-30 11:16:54.000000000 -0600 -@@ -64,35 +64,51 @@ +--- CMakeLists.txt.orig 2010-03-29 01:26:06.000000000 +0300 ++++ CMakeLists.txt 2010-03-30 09:42:27.978741828 +0300 +@@ -116,9 +116,6 @@ FIND_PACKAGE(PNG) FIND_PACKAGE(TIFF) FIND_PACKAGE(Jasper) -FIND_PACKAGE(Kdcraw) -FIND_PACKAGE(Kexiv2) -FIND_PACKAGE(Kipi) -- + + # Extract version of libjpeg so that we can use the appropriate dir + # See bug #227313, #228483 +@@ -132,31 +129,51 @@ + SET(DIGIKAM_LIBJPEG_DIR libjpeg-80) + ENDIF ("${jpeglib_version}" LESS 80) + -# Check KDcraw version installed to compile fine. -IF(NOT WIN32) - FIND_PACKAGE(PkgConfig) diff -ruN digikam-kde4.bak/files/patch-fuzzysearchview.cpp digikam-kde4/files/patch-fuzzysearchview.cpp --- digikam-kde4.bak/files/patch-fuzzysearchview.cpp 1970-01-01 03:00:00.000000000 +0300 +++ digikam-kde4/files/patch-fuzzysearchview.cpp 2010-03-30 10:04:01.000000000 +0300 @@ -0,0 +1,20 @@ +--- utilities/fuzzysearch/fuzzysearchview.cpp.orig 2010-03-29 01:20:16.000000000 +0300 ++++ utilities/fuzzysearch/fuzzysearchview.cpp 2010-03-30 10:02:03.000000000 +0300 +@@ -26,7 +26,7 @@ + + // Qt includes + +-#include ++#include + #include + #include + #include +@@ -36,6 +36,8 @@ + #include + #include + #include ++#include ++#include + + // KDE includes + diff -ruN digikam-kde4.bak/files/patch-libs__dimg__loaders__pngloader.cpp digikam-kde4/files/patch-libs__dimg__loaders__pngloader.cpp --- digikam-kde4.bak/files/patch-libs__dimg__loaders__pngloader.cpp 2010-03-29 17:54:31.000000000 +0300 +++ digikam-kde4/files/patch-libs__dimg__loaders__pngloader.cpp 1970-01-01 03:00:00.000000000 +0300 @@ -1,51 +0,0 @@ ---- ./libs/dimg/loaders/pngloader.cpp.orig 2010-01-31 23:21:36.000000000 +1000 -+++ ./libs/dimg/loaders/pngloader.cpp 2010-02-04 11:16:41.771939164 +1000 -@@ -105,7 +105,11 @@ - unsigned char buf[PNG_BYTES_TO_CHECK]; - - size_t membersRead = fread(buf, 1, PNG_BYTES_TO_CHECK, f); -+#if PNG_LIBPNG_VER >= 10400 -+ if ((membersRead != PNG_BYTES_TO_CHECK) || png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK)) -+#else - if ((membersRead != PNG_BYTES_TO_CHECK) || !png_check_sig(buf, PNG_BYTES_TO_CHECK)) -+#endif - { - kDebug() << "Not a PNG image file."; - fclose(f); -@@ -165,7 +169,11 @@ - CleanupData *cleanupData = new CleanupData; - cleanupData->setFile(f); - -+#if PNG_LIBPNG_VER >= 10400 -+ if (setjmp(png_jmpbuf(png_ptr))) -+#else - if (setjmp(png_ptr->jmpbuf)) -+#endif - { - kDebug() << "Internal libPNG error during reading file. Process aborted!"; - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); -@@ -322,7 +330,11 @@ - #ifdef ENABLE_DEBUG_MESSAGES - kDebug() << "PNG in PNG_COLOR_TYPE_GRAY"; - #endif -+#if PNG_LIBPNG_VER >= 10400 -+ png_set_expand_gray_1_2_4_to_8(png_ptr); -+#else - png_set_gray_1_2_4_to_8(png_ptr); -+#endif - png_set_gray_to_rgb(png_ptr); - - if (QSysInfo::ByteOrder == QSysInfo::LittleEndian) // Intel -@@ -627,7 +639,11 @@ - CleanupData *cleanupData = new CleanupData; - cleanupData->setFile(f); - -- if (setjmp(png_ptr->jmpbuf)) -+#if PNG_LIBPNG_VER >= 10400 -+ if (setjmp(png_jmpbuf(png_ptr))) -+#else -+ if (setjmp(png_ptr->jmpbuf)) -+#endif - { - kDebug() << "Internal libPNG error during writing file. Process aborted!"; - png_destroy_write_struct(&png_ptr, (png_infopp) & info_ptr); diff -ruN digikam-kde4.bak/files/patch-libs_threadimageio_thumbnailbasic.cpp digikam-kde4/files/patch-libs_threadimageio_thumbnailbasic.cpp --- digikam-kde4.bak/files/patch-libs_threadimageio_thumbnailbasic.cpp 2010-03-29 17:54:31.000000000 +0300 +++ digikam-kde4/files/patch-libs_threadimageio_thumbnailbasic.cpp 1970-01-01 03:00:00.000000000 +0300 @@ -1,20 +0,0 @@ ---- libs/threadimageio/thumbnailbasic.cpp.orig 2010-01-31 15:21:53.000000000 +0200 -+++ libs/threadimageio/thumbnailbasic.cpp 2010-03-29 10:40:10.024395457 +0300 -@@ -137,7 +137,7 @@ - unsigned char buf[PNG_BYTES_TO_CHECK]; - - size_t itemsRead = fread(buf, 1, PNG_BYTES_TO_CHECK, f); -- if (itemsRead != 1 || !png_check_sig(buf, PNG_BYTES_TO_CHECK)) -+ if (itemsRead != 1 || png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK)) - { - fclose(f); - return qimage; -@@ -232,7 +232,7 @@ - { - png_set_gray_to_rgb(png_ptr); - if (png_get_bit_depth(png_ptr, info_ptr) < 8) -- png_set_gray_1_2_4_to_8(png_ptr); -+ png_set_expand_gray_1_2_4_to_8(png_ptr); - } - - int sizeOfUint = sizeof(unsigned int); >Release-Note: >Audit-Trail: >Unformatted: