Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=4795a7fe3660ef259f94c386315f05c18bc201e6
commit 4795a7fe3660ef259f94c386315f05c18bc201e6 Author: Melko <[email protected]> Date: Sun Jan 24 12:11:15 2016 +0100 digikam-4.14.0-4-x86_64 * rebuild against unknown diff --git a/source/kde-extra/digikam/FrugalBuild b/source/kde-extra/digikam/FrugalBuild index 9c1aa8e..e03a3a3 100644 --- a/source/kde-extra/digikam/FrugalBuild +++ b/source/kde-extra/digikam/FrugalBuild @@ -4,7 +4,7 @@ pkgname=digikam pkgver=4.14.0 -pkgrel=3 +pkgrel=4 pkgdesc="Digital photo management application for kde" _F_archive_grepv="\-[a-z]" _F_kde_dirname="stable/$pkgname" @@ -22,10 +22,12 @@ up2date="Flasttar $_F_kde_mirror/$_F_kde_dirname" options+=('scriptlet') source=($_F_kde_mirror/$_F_kde_dirname/$pkgname-${pkgver}.tar.bz2 \ lensfun-nested-extern-C.patch \ - enableC99.patch ) + enableC99.patch \ + jpeg9-fix-bool.patch) sha1sums=('08bbded5433e442dce8ac00eb301606ef0924e8c' \ 'efeb8ed0d3321f0ed2e9060e9d83890efedcb153' \ - 'a832767e456e18ce7717227d5faf7e87101df1e3') + 'a832767e456e18ce7717227d5faf7e87101df1e3' \ + '2e1ab951393cf6189a12dce9543dba195389d3ff') replaces=('libkface' 'libkgeomap' 'libmediawiki') #Temporary: fixed in KF5 #subpkgs=("${subpkgs[@]}" "libkface") diff --git a/source/kde-extra/digikam/jpeg9-fix-bool.patch b/source/kde-extra/digikam/jpeg9-fix-bool.patch new file mode 100644 index 0000000..536ad92 --- /dev/null +++ b/source/kde-extra/digikam/jpeg9-fix-bool.patch @@ -0,0 +1,76 @@ +diff -ur digikam-4.14.0/extra/kipi-plugins/common/libkipiplugins/tools/imageio/kpwriteimage.cpp digikam-4.14.0.new/extra/kipi-plugins/common/libkipiplugins/tools/imageio/kpwriteimage.cpp +--- digikam-4.14.0/extra/kipi-plugins/common/libkipiplugins/tools/imageio/kpwriteimage.cpp 2015-10-13 23:58:21.000000000 +0200 ++++ digikam-4.14.0.new/extra/kipi-plugins/common/libkipiplugins/tools/imageio/kpwriteimage.cpp 2016-01-23 20:54:06.872533187 +0100 +@@ -181,8 +181,8 @@ + cinfo.comp_info[2].v_samp_factor = 1; + + // bug #154273: use 99 compression level instead 100 to reduce output JPEG file size. +- jpeg_set_quality(&cinfo, 99, true); +- jpeg_start_compress(&cinfo, true); ++ jpeg_set_quality(&cinfo, 99, boolean(true)); ++ jpeg_start_compress(&cinfo, boolean(true)); + + // Write ICC color profile. + if (!d->iccProfile.isEmpty()) +diff -ur digikam-4.14.0/extra/kipi-plugins/jpeglossless/transform/jpegtransform.cpp digikam-4.14.0.new/extra/kipi-plugins/jpeglossless/transform/jpegtransform.cpp +--- digikam-4.14.0/extra/kipi-plugins/jpeglossless/transform/jpegtransform.cpp 2015-10-13 23:58:21.000000000 +0200 ++++ digikam-4.14.0.new/extra/kipi-plugins/jpeglossless/transform/jpegtransform.cpp 2016-01-23 21:02:55.646989704 +0100 +@@ -197,10 +197,10 @@ + JCOPY_OPTION copyoption = JCOPYOPT_ALL; + jpeg_transform_info transformoption; + +- transformoption.perfect = false; +- transformoption.force_grayscale = false; +- transformoption.trim = false; +- transformoption.crop = false; ++ transformoption.perfect = boolean(false); ++ transformoption.force_grayscale = boolean(false); ++ transformoption.trim = boolean(false); ++ transformoption.crop = boolean(false); + + struct jpeg_decompress_struct srcinfo; + struct jpeg_compress_struct dstinfo; +@@ -277,7 +277,7 @@ + kp_jpeg_qiodevice_src(&srcinfo, &input_file); + jcopy_markers_setup(&srcinfo, copyoption); + +- (void) jpeg_read_header(&srcinfo, true); ++ (void) jpeg_read_header(&srcinfo, boolean(true)); + + // First rotate - execute even if rotate is JXFORM_NONE to apply new EXIF settings + transformoption.transform = rotate; +@@ -296,10 +296,10 @@ + kp_jpeg_qiodevice_dest(&dstinfo, &output_file); + + // Do not write a JFIF header if previously the image did not contain it +- dstinfo.write_JFIF_header = false; ++ dstinfo.write_JFIF_header = boolean(false); + + // Start compressor (note no image data is actually written here) +- dstinfo.optimize_coding = true; ++ dstinfo.optimize_coding = boolean(true); + jpeg_write_coefficients(&dstinfo, dst_coef_arrays); + + // Copy to the output file any extra markers that we want to preserve +@@ -349,7 +349,7 @@ + kp_jpeg_qiodevice_src(&srcinfo, &input_file); + jcopy_markers_setup(&srcinfo, copyoption); + +- (void) jpeg_read_header(&srcinfo, true); ++ (void) jpeg_read_header(&srcinfo, boolean(true)); + + transformoption.transform=flip; + jtransform_request_workspace(&srcinfo, &transformoption); +@@ -366,10 +366,10 @@ + kp_jpeg_qiodevice_dest(&dstinfo, &output_file); + + // Do not write a JFIF header if previously the image did not contain it +- dstinfo.write_JFIF_header = false; ++ dstinfo.write_JFIF_header = boolean(false); + + // Start compressor (note no image data is actually written here) +- dstinfo.optimize_coding = true; ++ dstinfo.optimize_coding = boolean(true); + jpeg_write_coefficients(&dstinfo, dst_coef_arrays); + + // Copy to the output file any extra markers that we want to preserve _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
