Date: Tuesday, July 20, 2021 @ 18:42:53 Author: arojas Revision: 420208
archrelease: copy trunk to extra-x86_64 Added: calligra/repos/extra-x86_64/62f51070.patch (from rev 420207, calligra/trunk/62f51070.patch) calligra/repos/extra-x86_64/PKGBUILD (from rev 420207, calligra/trunk/PKGBUILD) calligra/repos/extra-x86_64/calligra-openexr3.patch (from rev 420207, calligra/trunk/calligra-openexr3.patch) Deleted: calligra/repos/extra-x86_64/62f51070.patch calligra/repos/extra-x86_64/PKGBUILD calligra/repos/extra-x86_64/calligra-openexr3.patch -------------------------+ 62f51070.patch | 80 +++++++++++------------ PKGBUILD | 106 +++++++++++++++---------------- calligra-openexr3.patch | 154 +++++++++++++++++++++++----------------------- 3 files changed, 170 insertions(+), 170 deletions(-) Deleted: 62f51070.patch =================================================================== --- 62f51070.patch 2021-07-20 18:42:41 UTC (rev 420207) +++ 62f51070.patch 2021-07-20 18:42:53 UTC (rev 420208) @@ -1,40 +0,0 @@ -From 62f510702ef9c34ac50f8d8601a4290ab558464c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?= <omeru...@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 -@@ -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 420207, calligra/trunk/62f51070.patch) =================================================================== --- 62f51070.patch (rev 0) +++ 62f51070.patch 2021-07-20 18:42:53 UTC (rev 420208) @@ -0,0 +1,40 @@ +From 62f510702ef9c34ac50f8d8601a4290ab558464c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?= <omeru...@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 +@@ -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 2021-07-20 18:42:41 UTC (rev 420207) +++ PKGBUILD 2021-07-20 18:42:53 UTC (rev 420208) @@ -1,53 +0,0 @@ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Maintainer: Antonio Rojas <aro...@archlinux.org> -# Contributor: Andrea Scarpino <and...@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=16 -arch=(x86_64) -url='https://www.calligra-suite.org/' -license=(FDL1.2 GPL2 LGPL) -depends=(kcmutils knotifyconfig kross kactivities kdiagram libspnav kdelibs4support - gsl openexr kcontacts qca-qt5 poppler-qt5 libodfgen khtml cauchy) -makedepends=(extra-cmake-modules kdoctools kdesignerplugin kinit 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 - 62f51070.patch) -sha256sums=('b1f8a6eb8208543a2f908caa83d089075fcd1e530d00e19f5362b2f9cc371147' - 'SKIP' - '0dec106deff4cff342021da4ca4e9759f0bbe5707ea2d4ee8536eaf863409cec' - '9e2a0797ce0667212ec07a3056435a4550e07371ff1f6eefdf65dc3642d24165') -validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD # Boudewijn Rempt <foundat...@krita.org> - 42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen <dand...@get2net.dk> - -prepare() { - patch -d $pkgname-$pkgver -p1 < calligra-openexr3.patch # Fix build with OpenEXR 3 - patch -d $pkgname-$pkgver -p1 < 62f51070.patch # Fix fontconfig linking -} - -build() { - cmake -B build -S $pkgname-$pkgver \ - -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 420207, calligra/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-07-20 18:42:53 UTC (rev 420208) @@ -0,0 +1,53 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Contributor: Andrea Scarpino <and...@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=17 +arch=(x86_64) +url='https://www.calligra-suite.org/' +license=(FDL1.2 GPL2 LGPL) +depends=(kcmutils knotifyconfig kross kactivities kdiagram libspnav kdelibs4support + gsl openexr 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 + 62f51070.patch) +sha256sums=('b1f8a6eb8208543a2f908caa83d089075fcd1e530d00e19f5362b2f9cc371147' + 'SKIP' + '0dec106deff4cff342021da4ca4e9759f0bbe5707ea2d4ee8536eaf863409cec' + '9e2a0797ce0667212ec07a3056435a4550e07371ff1f6eefdf65dc3642d24165') +validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD # Boudewijn Rempt <foundat...@krita.org> + 42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen <dand...@get2net.dk> + +prepare() { + patch -d $pkgname-$pkgver -p1 < calligra-openexr3.patch # Fix build with OpenEXR 3 + patch -d $pkgname-$pkgver -p1 < 62f51070.patch # Fix fontconfig linking +} + +build() { + cmake -B build -S $pkgname-$pkgver \ + -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 2021-07-20 18:42:41 UTC (rev 420207) +++ calligra-openexr3.patch 2021-07-20 18:42:53 UTC (rev 420208) @@ -1,77 +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(OpenEXR 3.0 CONFIG QUIET) -+if(TARGET OpenEXR::OpenEXR) -+ set(OPENEXR_LIBRARIES OpenEXR::OpenEXR) -+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} ) Copied: calligra/repos/extra-x86_64/calligra-openexr3.patch (from rev 420207, calligra/trunk/calligra-openexr3.patch) =================================================================== --- calligra-openexr3.patch (rev 0) +++ calligra-openexr3.patch 2021-07-20 18:42:53 UTC (rev 420208) @@ -0,0 +1,77 @@ +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(OpenEXR 3.0 CONFIG QUIET) ++if(TARGET OpenEXR::OpenEXR) ++ set(OPENEXR_LIBRARIES OpenEXR::OpenEXR) ++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} )