[arch-commits] Commit in calligra/repos/extra-x86_64 (10 files)
Antonio Rojas
arojas at gemini.archlinux.org
Wed Feb 2 19:53:21 UTC 2022
Date: Wednesday, February 2, 2022 @ 19:53:20
Author: arojas
Revision: 435840
archrelease: copy trunk to extra-x86_64
Added:
calligra/repos/extra-x86_64/068cd9ae.patch
(from rev 435839, calligra/trunk/068cd9ae.patch)
calligra/repos/extra-x86_64/2ac46db5.patch
(from rev 435839, calligra/trunk/2ac46db5.patch)
calligra/repos/extra-x86_64/62f51070.patch
(from rev 435839, calligra/trunk/62f51070.patch)
calligra/repos/extra-x86_64/PKGBUILD
(from rev 435839, calligra/trunk/PKGBUILD)
calligra/repos/extra-x86_64/calligra-openexr3.patch
(from rev 435839, calligra/trunk/calligra-openexr3.patch)
Deleted:
calligra/repos/extra-x86_64/068cd9ae.patch
calligra/repos/extra-x86_64/2ac46db5.patch
calligra/repos/extra-x86_64/62f51070.patch
calligra/repos/extra-x86_64/PKGBUILD
calligra/repos/extra-x86_64/calligra-openexr3.patch
-------------------------+
068cd9ae.patch | 144 ++++++++++++++++++-------------------
2ac46db5.patch | 44 +++++------
62f51070.patch | 100 ++++++++++++-------------
PKGBUILD | 121 +++++++++++++++----------------
calligra-openexr3.patch | 178 +++++++++++++++++++++++-----------------------
5 files changed, 294 insertions(+), 293 deletions(-)
Deleted: 068cd9ae.patch
===================================================================
--- 068cd9ae.patch 2022-02-02 19:53:04 UTC (rev 435839)
+++ 068cd9ae.patch 2022-02-02 19:53:20 UTC (rev 435840)
@@ -1,72 +0,0 @@
-From 068cd9aec11052733e393976142516d2190e4564 Mon Sep 17 00:00:00 2001
-From: Pierre Ducroquet <pinaraf at pinaraf.info>
-Date: Sun, 28 Feb 2021 23:23:02 +0100
-Subject: [PATCH] Fix some more warnings
-
-diff --git a/filters/words/msword-odf/wv2/src/styles.cpp b/filters/words/msword-odf/wv2/src/styles.cpp
-index f47c3dd8d51..d2c96e3d92b 100644
---- a/filters/words/msword-odf/wv2/src/styles.cpp
-+++ b/filters/words/msword-odf/wv2/src/styles.cpp
-@@ -42,7 +42,6 @@ STD::STD()
- }
-
- STD::STD( U16 baseSize, U16 totalSize, OLEStreamReader* stream, bool preservePos )
--throw(InvalidFormatException)
- {
- clearInternal();
- if (!read( baseSize, totalSize, stream, preservePos )) {
-@@ -112,7 +111,6 @@ STD& STD::operator=( const STD& rhs )
- }
-
- bool STD::read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos )
--throw(InvalidFormatException)
- {
- U16 shifterU16;
- S32 startOffset=stream->tell(); // address where the STD starts
-@@ -938,7 +936,7 @@ void Style::mergeUpechpx( const Style* parentStyle, WordVersion version )
- }
-
-
--StyleSheet::StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf ) throw(InvalidFormatException)
-+StyleSheet::StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf )
- : m_udsNum(0)
- {
- WordVersion version = Word8;
-diff --git a/filters/words/msword-odf/wv2/src/styles.h b/filters/words/msword-odf/wv2/src/styles.h
-index ba02def6845..41c8278dd21 100644
---- a/filters/words/msword-odf/wv2/src/styles.h
-+++ b/filters/words/msword-odf/wv2/src/styles.h
-@@ -58,8 +58,9 @@ struct STD
- STD();
- /**
- * Simply calls read(...)
-+ * @throw InvalidFormatException
- */
-- STD( U16 stdfSize, U16 totalSize, OLEStreamReader* stream, bool preservePos = false ) throw(InvalidFormatException);
-+ STD( U16 stdfSize, U16 totalSize, OLEStreamReader* stream, bool preservePos = false );
- /**
- * Attention: This struct allocates memory on the heap
- */
-@@ -74,8 +75,9 @@ struct STD
- * false the state of stream will be changed!
- *
- * @return true - success, false - failed
-+ * @throw InvalidFormatException
- */
-- bool read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos = false ) throw(InvalidFormatException);
-+ bool read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos = false );
-
- /**
- * Same as reading :)
-@@ -365,7 +367,10 @@ class WV2_EXPORT Style
- class WV2_EXPORT StyleSheet
- {
- public:
-- StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf ) throw(InvalidFormatException);
-+ /**
-+ * @throw InvalidFormatException
-+ */
-+ StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf );
- ~StyleSheet();
-
- /**
Copied: calligra/repos/extra-x86_64/068cd9ae.patch (from rev 435839, calligra/trunk/068cd9ae.patch)
===================================================================
--- 068cd9ae.patch (rev 0)
+++ 068cd9ae.patch 2022-02-02 19:53:20 UTC (rev 435840)
@@ -0,0 +1,72 @@
+From 068cd9aec11052733e393976142516d2190e4564 Mon Sep 17 00:00:00 2001
+From: Pierre Ducroquet <pinaraf at pinaraf.info>
+Date: Sun, 28 Feb 2021 23:23:02 +0100
+Subject: [PATCH] Fix some more warnings
+
+diff --git a/filters/words/msword-odf/wv2/src/styles.cpp b/filters/words/msword-odf/wv2/src/styles.cpp
+index f47c3dd8d51..d2c96e3d92b 100644
+--- a/filters/words/msword-odf/wv2/src/styles.cpp
++++ b/filters/words/msword-odf/wv2/src/styles.cpp
+@@ -42,7 +42,6 @@ STD::STD()
+ }
+
+ STD::STD( U16 baseSize, U16 totalSize, OLEStreamReader* stream, bool preservePos )
+-throw(InvalidFormatException)
+ {
+ clearInternal();
+ if (!read( baseSize, totalSize, stream, preservePos )) {
+@@ -112,7 +111,6 @@ STD& STD::operator=( const STD& rhs )
+ }
+
+ bool STD::read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos )
+-throw(InvalidFormatException)
+ {
+ U16 shifterU16;
+ S32 startOffset=stream->tell(); // address where the STD starts
+@@ -938,7 +936,7 @@ void Style::mergeUpechpx( const Style* parentStyle, WordVersion version )
+ }
+
+
+-StyleSheet::StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf ) throw(InvalidFormatException)
++StyleSheet::StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf )
+ : m_udsNum(0)
+ {
+ WordVersion version = Word8;
+diff --git a/filters/words/msword-odf/wv2/src/styles.h b/filters/words/msword-odf/wv2/src/styles.h
+index ba02def6845..41c8278dd21 100644
+--- a/filters/words/msword-odf/wv2/src/styles.h
++++ b/filters/words/msword-odf/wv2/src/styles.h
+@@ -58,8 +58,9 @@ struct STD
+ STD();
+ /**
+ * Simply calls read(...)
++ * @throw InvalidFormatException
+ */
+- STD( U16 stdfSize, U16 totalSize, OLEStreamReader* stream, bool preservePos = false ) throw(InvalidFormatException);
++ STD( U16 stdfSize, U16 totalSize, OLEStreamReader* stream, bool preservePos = false );
+ /**
+ * Attention: This struct allocates memory on the heap
+ */
+@@ -74,8 +75,9 @@ struct STD
+ * false the state of stream will be changed!
+ *
+ * @return true - success, false - failed
++ * @throw InvalidFormatException
+ */
+- bool read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos = false ) throw(InvalidFormatException);
++ bool read( const U16 cbStd, const U16 stdfSize, OLEStreamReader* stream, bool preservePos = false );
+
+ /**
+ * Same as reading :)
+@@ -365,7 +367,10 @@ class WV2_EXPORT Style
+ class WV2_EXPORT StyleSheet
+ {
+ public:
+- StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf ) throw(InvalidFormatException);
++ /**
++ * @throw InvalidFormatException
++ */
++ StyleSheet( OLEStreamReader* tableStream, U32 fcStshf, U32 lcbStshf );
+ ~StyleSheet();
+
+ /**
Deleted: 2ac46db5.patch
===================================================================
--- 2ac46db5.patch 2022-02-02 19:53:04 UTC (rev 435839)
+++ 2ac46db5.patch 2022-02-02 19:53:20 UTC (rev 435840)
@@ -1,22 +0,0 @@
-From 2ac46db52c6ad401f67ae5b5fcd859a5872f0311 Mon Sep 17 00:00:00 2001
-From: Pierre Ducroquet <pinaraf at pinaraf.info>
-Date: Sat, 1 May 2021 15:08:57 +0200
-Subject: [PATCH] Small CMake modernization
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fe6502493ed..b237f68fcb6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -105,11 +90,7 @@ endif()
- message(STATUS "Release build: ${RELEASE_BUILD}")
-
- # use CPP-11
--if (CMAKE_VERSION VERSION_LESS "3.1")
-- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
--else ()
-- set (CMAKE_CXX_STANDARD 11)
--endif ()
-+set (CMAKE_CXX_STANDARD 11)
-
- ############
- #############
Copied: calligra/repos/extra-x86_64/2ac46db5.patch (from rev 435839, calligra/trunk/2ac46db5.patch)
===================================================================
--- 2ac46db5.patch (rev 0)
+++ 2ac46db5.patch 2022-02-02 19:53:20 UTC (rev 435840)
@@ -0,0 +1,22 @@
+From 2ac46db52c6ad401f67ae5b5fcd859a5872f0311 Mon Sep 17 00:00:00 2001
+From: Pierre Ducroquet <pinaraf at pinaraf.info>
+Date: Sat, 1 May 2021 15:08:57 +0200
+Subject: [PATCH] Small CMake modernization
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fe6502493ed..b237f68fcb6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -105,11 +90,7 @@ endif()
+ message(STATUS "Release build: ${RELEASE_BUILD}")
+
+ # use CPP-11
+-if (CMAKE_VERSION VERSION_LESS "3.1")
+- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+-else ()
+- set (CMAKE_CXX_STANDARD 11)
+-endif ()
++set (CMAKE_CXX_STANDARD 11)
+
+ ############
+ #############
Deleted: 62f51070.patch
===================================================================
--- 62f51070.patch 2022-02-02 19:53:04 UTC (rev 435839)
+++ 62f51070.patch 2022-02-02 19:53:20 UTC (rev 435840)
@@ -1,50 +0,0 @@
-From 62f510702ef9c34ac50f8d8601a4290ab558464c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?= <omerusta at gmail.com>
-Date: Sun, 6 Jun 2021 08:41:05 +0000
-Subject: [PATCH] Update Cmake and deps, Fix Freetype and FontConfig Linkage
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b237f68fcb6..cdcc02f0236 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -89,9 +89,6 @@ if(NOT DEFINED RELEASE_BUILD)
- endif()
- message(STATUS "Release build: ${RELEASE_BUILD}")
-
--# use CPP-11
--set (CMAKE_CXX_STANDARD 11)
--
- ############
- #############
- ## Options ##
-@@ -599,8 +593,8 @@ if(NOT WIN32 AND NOT APPLE)
- )
- endif()
-
--if(NOT FONTCONFIG_FOUND OR NOT FREETYPE_FOUND)
-- set(FONTCONFIG_INCLUDE_DIR "")
-+if(NOT Fontconfig_FOUND OR NOT FREETYPE_FOUND)
-+ set(Fontconfig_INCLUDE_DIRS "")
- set(FREETYPE_INCLUDE_DIRS "")
- else()
- add_definitions( -DSHOULD_BUILD_FONT_CONVERSION )
-diff --git a/libs/text/CMakeLists.txt b/libs/text/CMakeLists.txt
-index 16d7e066fa2..429afe79704 100644
---- a/libs/text/CMakeLists.txt
-+++ b/libs/text/CMakeLists.txt
-@@ -152,11 +152,11 @@ if( SHOULD_BUILD_FEATURE_RDF )
- endif()
-
- if( FONTCONFIG_FOUND )
-- target_link_libraries(kotext PRIVATE ${FONTCONFIG_LIBRARIES})
-+ target_link_libraries(kotext PRIVATE Fontconfig::Fontconfig)
- endif()
-
- if( FREETYPE_FOUND )
-- target_link_libraries(kotext PRIVATE ${FREETYPE_LIBRARIES})
-+ target_link_libraries(kotext PRIVATE Freetype::Freetype)
- endif()
-
-
---
-GitLab
Copied: calligra/repos/extra-x86_64/62f51070.patch (from rev 435839, calligra/trunk/62f51070.patch)
===================================================================
--- 62f51070.patch (rev 0)
+++ 62f51070.patch 2022-02-02 19:53:20 UTC (rev 435840)
@@ -0,0 +1,50 @@
+From 62f510702ef9c34ac50f8d8601a4290ab558464c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?= <omerusta at gmail.com>
+Date: Sun, 6 Jun 2021 08:41:05 +0000
+Subject: [PATCH] Update Cmake and deps, Fix Freetype and FontConfig Linkage
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b237f68fcb6..cdcc02f0236 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -89,9 +89,6 @@ if(NOT DEFINED RELEASE_BUILD)
+ endif()
+ message(STATUS "Release build: ${RELEASE_BUILD}")
+
+-# use CPP-11
+-set (CMAKE_CXX_STANDARD 11)
+-
+ ############
+ #############
+ ## Options ##
+@@ -599,8 +593,8 @@ if(NOT WIN32 AND NOT APPLE)
+ )
+ endif()
+
+-if(NOT FONTCONFIG_FOUND OR NOT FREETYPE_FOUND)
+- set(FONTCONFIG_INCLUDE_DIR "")
++if(NOT Fontconfig_FOUND OR NOT FREETYPE_FOUND)
++ set(Fontconfig_INCLUDE_DIRS "")
+ set(FREETYPE_INCLUDE_DIRS "")
+ else()
+ add_definitions( -DSHOULD_BUILD_FONT_CONVERSION )
+diff --git a/libs/text/CMakeLists.txt b/libs/text/CMakeLists.txt
+index 16d7e066fa2..429afe79704 100644
+--- a/libs/text/CMakeLists.txt
++++ b/libs/text/CMakeLists.txt
+@@ -152,11 +152,11 @@ if( SHOULD_BUILD_FEATURE_RDF )
+ endif()
+
+ if( FONTCONFIG_FOUND )
+- target_link_libraries(kotext PRIVATE ${FONTCONFIG_LIBRARIES})
++ target_link_libraries(kotext PRIVATE Fontconfig::Fontconfig)
+ endif()
+
+ if( FREETYPE_FOUND )
+- target_link_libraries(kotext PRIVATE ${FREETYPE_LIBRARIES})
++ target_link_libraries(kotext PRIVATE Freetype::Freetype)
+ endif()
+
+
+--
+GitLab
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-02-02 19:53:04 UTC (rev 435839)
+++ PKGBUILD 2022-02-02 19:53:20 UTC (rev 435840)
@@ -1,60 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=calligra
-pkgdesc='A set of applications for productivity and creative usage'
-pkgver=3.2.1
-pkgrel=28
-arch=(x86_64)
-url='https://www.calligra-suite.org/'
-license=(FDL1.2 GPL2 LGPL)
-depends=(kcmutils knotifyconfig kross kactivities kdiagram libspnav kdelibs4support
- gsl imath kcontacts qca-qt5 poppler-qt5 libodfgen khtml kinit cauchy)
-makedepends=(extra-cmake-modules kdoctools kdesignerplugin libwpg okular eigen marble-common
- boost pstoedit libvisio libetonyek libwps vc libgit2 kcalendarcore akonadi)
-optdepends=('libwpg: Corel WordPerfect Graphics image importer'
- 'libwps: Microsoft Works file word processor format import'
- 'libvisio: Microsoft Visio import filter'
- 'libetonyek: Apple Keynote import filter'
- 'pstoedit: EPS to SVG filter'
- 'poppler: PDF to SVG filter'
- 'libgit2: Calligra Gemini git plugin'
- 'kirigami2: for Calligra Gemini'
- 'qt5-quickcontrols: for Calligra Gemini'
- 'qt5-webengine: for Calligra Gemini')
-source=(https://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz{,.sig}
- calligra-openexr3.patch
- 068cd9ae.patch
- 2ac46db5.patch
- 62f51070.patch)
-sha256sums=('b1f8a6eb8208543a2f908caa83d089075fcd1e530d00e19f5362b2f9cc371147'
- 'SKIP'
- '96fbe4f06bf184e60ff653a1574f0f0523af5b4672ced2a501cd54642961dffe'
- '4516d15421209e5d8c8b5008140dbcb1eefa96b0e96e0da49b343e1799a8cefd'
- 'c88e6d7a1f67c1b5413b624aa67fca2841205fdf4201f6682f69bae737582922'
- '8a94e076c09887ff0741da3276ce4652063351b884c66d4c9ba0cde431dbb867')
-validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD # Boudewijn Rempt <foundation at krita.org>
- 42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen <danders at get2net.dk>
-
-prepare() {
- patch -d $pkgname-$pkgver -p1 < calligra-openexr3.patch # Fix build with OpenEXR 3
- patch -d $pkgname-$pkgver -p1 < 068cd9ae.patch # Remove dynamic exception specifications
- patch -d $pkgname-$pkgver -p1 < 2ac46db5.patch # Prerequisite for the following patch
- patch -d $pkgname-$pkgver -p1 < 62f51070.patch # Fix fontconfig linking
-}
-
-build() {
- cmake -B build -S $pkgname-$pkgver \
- -DCMAKE_CXX_STANDARD=17 \
- -DBUILD_TESTING=OFF
- cmake --build build
-}
-
-package() {
- DESTDIR="$pkgdir" cmake --install build
-
-# Remove utterly broken thumbnailers
- rm "$pkgdir"/usr/lib/qt/plugins/calligra*thumbnail.so
-}
Copied: calligra/repos/extra-x86_64/PKGBUILD (from rev 435839, calligra/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-02-02 19:53:20 UTC (rev 435840)
@@ -0,0 +1,61 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Ronald van Haren <ronald.archlinux.org>
+
+pkgname=calligra
+pkgdesc='A set of applications for productivity and creative usage'
+pkgver=3.2.1
+pkgrel=29
+arch=(x86_64)
+url='https://www.calligra-suite.org/'
+license=(FDL1.2 GPL2 LGPL)
+depends=(kcmutils knotifyconfig kross kactivities kdiagram libspnav kdelibs4support
+ gsl imath kcontacts qca-qt5 poppler-qt5 libodfgen khtml kinit cauchy)
+makedepends=(extra-cmake-modules kdoctools kdesignerplugin libwpg okular eigen marble-common
+ boost pstoedit libvisio libetonyek libwps vc libgit2 kcalendarcore akonadi)
+optdepends=('libwpg: Corel WordPerfect Graphics image importer'
+ 'libwps: Microsoft Works file word processor format import'
+ 'libvisio: Microsoft Visio import filter'
+ 'libetonyek: Apple Keynote import filter'
+ 'pstoedit: EPS to SVG filter'
+ 'poppler: PDF to SVG filter'
+ 'libgit2: Calligra Gemini git plugin'
+ 'kirigami2: for Calligra Gemini'
+ 'qt5-quickcontrols: for Calligra Gemini'
+ 'qt5-webengine: for Calligra Gemini')
+source=(https://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz{,.sig}
+ calligra-openexr3.patch
+ 068cd9ae.patch
+ 2ac46db5.patch
+ 62f51070.patch)
+sha256sums=('b1f8a6eb8208543a2f908caa83d089075fcd1e530d00e19f5362b2f9cc371147'
+ 'SKIP'
+ '96fbe4f06bf184e60ff653a1574f0f0523af5b4672ced2a501cd54642961dffe'
+ '4516d15421209e5d8c8b5008140dbcb1eefa96b0e96e0da49b343e1799a8cefd'
+ 'c88e6d7a1f67c1b5413b624aa67fca2841205fdf4201f6682f69bae737582922'
+ '8a94e076c09887ff0741da3276ce4652063351b884c66d4c9ba0cde431dbb867')
+validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD # Boudewijn Rempt <foundation at krita.org>
+ 42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen <danders at get2net.dk>
+options=(debug)
+
+prepare() {
+ patch -d $pkgname-$pkgver -p1 < calligra-openexr3.patch # Fix build with OpenEXR 3
+ patch -d $pkgname-$pkgver -p1 < 068cd9ae.patch # Remove dynamic exception specifications
+ patch -d $pkgname-$pkgver -p1 < 2ac46db5.patch # Prerequisite for the following patch
+ patch -d $pkgname-$pkgver -p1 < 62f51070.patch # Fix fontconfig linking
+}
+
+build() {
+ cmake -B build -S $pkgname-$pkgver \
+ -DCMAKE_CXX_STANDARD=17 \
+ -DBUILD_TESTING=OFF
+ cmake --build build
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+
+# Remove utterly broken thumbnailers
+ rm "$pkgdir"/usr/lib/qt/plugins/calligra*thumbnail.so
+}
Deleted: calligra-openexr3.patch
===================================================================
--- calligra-openexr3.patch 2022-02-02 19:53:04 UTC (rev 435839)
+++ calligra-openexr3.patch 2022-02-02 19:53:20 UTC (rev 435840)
@@ -1,89 +0,0 @@
-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()
Copied: calligra/repos/extra-x86_64/calligra-openexr3.patch (from rev 435839, calligra/trunk/calligra-openexr3.patch)
===================================================================
--- calligra-openexr3.patch (rev 0)
+++ calligra-openexr3.patch 2022-02-02 19:53:20 UTC (rev 435840)
@@ -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()
More information about the arch-commits
mailing list