summaryrefslogtreecommitdiff
path: root/source/kde
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2022-05-01 23:17:58 +0000
committerEric Hameleers <alien@slackware.com>2022-05-02 06:59:47 +0200
commitfad84f0c7eabe4dcb52f921090b9a8dc258ad175 (patch)
tree886cc712f43e44d9fcb4277508b5a53a3651ada4 /source/kde
parent9b4be22e71a5affdb921f8ab706fbd12b27c40e0 (diff)
downloadcurrent-fad84f0c7eabe4dcb52f921090b9a8dc258ad175.tar.gz
Sun May 1 23:17:58 UTC 202220220501231758
kde/calligra-3.2.1-x86_64-16.txz: Rebuilt. Recompiled against openexr-3.1.5. Thanks to Heinz Wiesinger for the link to the patch. kde/kimageformats-5.93.0-x86_64-2.txz: Rebuilt. Recompiled against openexr-3.1.5. kde/kio-extras-22.04.0-x86_64-2.txz: Rebuilt. Recompiled against Imath-3.1.5 and openexr-3.1.5. kde/kjots-20220430_da83a5f-x86_64-1.txz: Upgraded. kde/krita-5.0.6-x86_64-2.txz: Rebuilt. Recompiled against Imath-3.1.5 and openexr-3.1.5. kde/umbrello-22.04.0-x86_64-2.txz: Rebuilt. Recompiled against kdevelop-22.04.0. l/Imath-3.1.5-x86_64-1.txz: Added. This library was split out from OpenEXR. l/SDL2-2.0.22-x86_64-2.txz: Rebuilt. Recompiled with -DSDL_STATIC=OFF. Thanks to jkh2cpu. l/freetype-2.12.1-x86_64-1.txz: Upgraded. l/gegl-0.4.36-x86_64-2.txz: Rebuilt. Recompiled against openexr-3.1.5. l/gst-plugins-bad-free-1.20.1-x86_64-2.txz: Rebuilt. Recompiled against Imath-3.1.5 and openexr-3.1.5. l/imagemagick-7.1.0_32-x86_64-1.txz: Upgraded. Compiled against Imath-3.1.5 and openexr-3.1.5. l/opencv-4.5.5-x86_64-2.txz: Rebuilt. Recompiled against openexr-3.1.5. l/openexr-3.1.5-x86_64-1.txz: Upgraded. Shared library .so-version bump. Compiled against Imath-3.1.5. l/speech-dispatcher-0.11.1-x86_64-1.txz: Upgraded. n/cifs-utils-6.15-x86_64-1.txz: Upgraded. n/mutt-2.2.4-x86_64-1.txz: Upgraded. x/bitmap-1.1.0-x86_64-1.txz: Upgraded. xap/gimp-2.10.30-x86_64-3.txz: Rebuilt. Recompiled against Imath-3.1.5 and openexr-3.1.5.
Diffstat (limited to 'source/kde')
-rw-r--r--source/kde/kde/build/calligra2
-rw-r--r--source/kde/kde/build/kimageformats2
-rw-r--r--source/kde/kde/build/kio-extras2
-rw-r--r--source/kde/kde/build/krita2
-rw-r--r--source/kde/kde/build/umbrello2
-rw-r--r--source/kde/kde/patch/calligra.patch1
-rw-r--r--source/kde/kde/patch/calligra/calligra-openexr3.patch89
7 files changed, 95 insertions, 5 deletions
diff --git a/source/kde/kde/build/calligra b/source/kde/kde/build/calligra
index 60d3b2f4..b6a7d89c 100644
--- a/source/kde/kde/build/calligra
+++ b/source/kde/kde/build/calligra
@@ -1 +1 @@
-15
+16
diff --git a/source/kde/kde/build/kimageformats b/source/kde/kde/build/kimageformats
index d00491fd..0cfbf088 100644
--- a/source/kde/kde/build/kimageformats
+++ b/source/kde/kde/build/kimageformats
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/kio-extras b/source/kde/kde/build/kio-extras
index d00491fd..0cfbf088 100644
--- a/source/kde/kde/build/kio-extras
+++ b/source/kde/kde/build/kio-extras
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita
index d00491fd..0cfbf088 100644
--- a/source/kde/kde/build/krita
+++ b/source/kde/kde/build/krita
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/umbrello b/source/kde/kde/build/umbrello
index d00491fd..0cfbf088 100644
--- a/source/kde/kde/build/umbrello
+++ b/source/kde/kde/build/umbrello
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/patch/calligra.patch b/source/kde/kde/patch/calligra.patch
index 380aaa94..fb91a817 100644
--- a/source/kde/kde/patch/calligra.patch
+++ b/source/kde/kde/patch/calligra.patch
@@ -2,3 +2,4 @@
cat $CWD/patch/calligra/calligragemini_fix_blank_page_without_libgit2.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
cat $CWD/patch/calligra/0053-Partial-update-of-Commit-62f51070-to-make-it-compile.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
cat $CWD/patch/calligra/calligra-gcc11.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+cat $CWD/patch/calligra-openexr3.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/calligra/calligra-openexr3.patch b/source/kde/kde/patch/calligra/calligra-openexr3.patch
new file mode 100644
index 00000000..98d8bf7f
--- /dev/null
+++ b/source/kde/kde/patch/calligra/calligra-openexr3.patch
@@ -0,0 +1,89 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8955357ff97..ea56c84bb11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,8 +363,13 @@ endif ()
+ ## Check for OpenEXR
+ ##
+
+-macro_optional_find_package(OpenEXR)
+-macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
++macro_optional_find_package(Imath 3.0 CONFIG QUIET)
++if(TARGET Imath::Imath)
++ set(OPENEXR_LIBRARIES Imath::Imath)
++else()
++ macro_optional_find_package(OpenEXR)
++endif()
++macro_bool_to_01(OpenEXR_FOUND HAVE_OPENEXR)
+
+ ##
+ ## Test for GNU Scientific Library
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index a039251e2ad..6eb6a8e70b6 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ${PIGMENT_INCLUDES} ${Boost_INCLUDE_DIR})
+
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+ include_directories(${OPENEXR_INCLUDE_DIR})
+ set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+ add_definitions(${OPENEXR_DEFINITIONS})
+diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengines/lcms2/CMakeLists.txt
+index 77807ff9702..920adbeaf87 100644
+--- a/plugins/colorengines/lcms2/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/CMakeLists.txt
+@@ -31,7 +31,7 @@ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}/colorprofiles
+ )
+
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/gray_f16
+ ${CMAKE_CURRENT_SOURCE_DIR}/colorspaces/rgb_f16
+@@ -41,7 +41,7 @@ endif ()
+
+ set(FILE_OPENEXR_SOURCES)
+ set(LINK_OPENEXR_LIB)
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+ include_directories(${OPENEXR_INCLUDE_DIR})
+ set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
+ add_definitions(${OPENEXR_DEFINITIONS})
+@@ -80,7 +80,7 @@ set ( lcmsengine_SRCS
+ LcmsEnginePlugin.cpp
+ )
+
+-if (HAVE_LCMS24 AND OPENEXR_FOUND)
++if (HAVE_LCMS24 AND OpenEXR_FOUND)
+ set ( lcmsengine_SRCS
+ ${lcmsengine_SRCS}
+ colorspaces/gray_f16/GrayF16ColorSpace.cpp
+diff --git a/plugins/colorengines/lcms2/tests/CMakeLists.txt b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+index 2540acc834c..77bd0b3fe4a 100644
+--- a/plugins/colorengines/lcms2/tests/CMakeLists.txt
++++ b/plugins/colorengines/lcms2/tests/CMakeLists.txt
+@@ -12,7 +12,7 @@ include_directories( ../colorspaces/cmyk_u16
+ ../colorprofiles
+ ..
+ )
+-if(OPENEXR_FOUND)
++if(OpenEXR_FOUND)
+ include_directories(${OPENEXR_INCLUDE_DIR})
+ endif()
+ include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} )
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4a77c4be50b..89636205c2b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -341,6 +341,7 @@ endif ()
+ macro_optional_find_package(Imath 3.0 CONFIG QUIET)
+ if(TARGET Imath::Imath)
+ set(OPENEXR_LIBRARIES Imath::Imath)
++ set(OpenEXR_FOUND TRUE)
+ else()
+ macro_optional_find_package(OpenEXR)
+ endif()