diff options
| -rw-r--r-- | .SRCINFO | 218 | ||||
| -rw-r--r-- | 068cd9ae.patch | 72 | ||||
| -rw-r--r-- | 2ac46db5.patch | 22 | ||||
| -rw-r--r-- | 62f51070.patch | 50 | ||||
| -rw-r--r-- | PKGBUILD | 271 | ||||
| -rw-r--r-- | calligra-openexr3.patch | 89 | ||||
| -rw-r--r-- | calligra.install | 12 |
7 files changed, 341 insertions, 393 deletions
@@ -1,173 +1,67 @@ pkgbase = calligra-git - pkgver = r99991.d6cbb49 - pkgrel = 1 - url = http://www.calligra-suite.org/ - arch = i686 + pkgdesc = A set of applications for productivity and creative usage + pkgver = 3.3.89_r102357.g20eec562 + pkgrel = 3 + url = https://www.calligra-suite.org/ arch = x86_64 - groups = calligra-git license = FDL1.2 license = GPL2 license = LGPL - makedepends = khtml - makedepends = kross - makedepends = kreport-git - makedepends = kproperty-git - makedepends = kdiagram-git - makedepends = okular-frameworks-git - makedepends = kxmlgui - makedepends = qt5-webkit - makedepends = kdelibs4support - makedepends = poppler - makedepends = qca-qt5 - makedepends = libvisio - makedepends = libetonyek - makedepends = kactivities - makedepends = kio - makedepends = ilmbase - makedepends = lcms2 - makedepends = kxmlgui - makedepends = marble - makedepends = kcalcore - makedepends = akonadi-contacts - makedepends = knotifyconfig - makedepends = okular-frameworks-git - makedepends = poppler-qt5 - makedepends = qt5-quick1 - makedepends = libodfgen - makedepends = threadweaver + makedepends = git makedepends = boost makedepends = eigen - source = calligra::git+git://anongit.kde.org/calligra - md5sums = SKIP - -pkgname = calligra-devtools-git - pkgdesc = Calligra developer tools - depends = calligra-libs-git - depends = calligra-words-git - depends = calligra-sheets-git + makedepends = extra-cmake-modules-git + makedepends = kcalendarcore5 + makedepends = kdesignerplugin-git + makedepends = kdoctools5 + makedepends = libakonadi5 + makedepends = libetonyek + makedepends = libgit2 + makedepends = libvisio + makedepends = libwpg + makedepends = libwps + makedepends = marble-common-git + makedepends = pstoedit + makedepends = vc + depends = cauchy + depends = gcc-libs + depends = glibc + depends = gsl + depends = imath + depends = kactivities5 + depends = kcoreaddons5 + depends = kdiagram5 + depends = kcmutils5 + depends = kinit + depends = knotifyconfig5 + depends = kross + depends = kwidgetsaddons5 + depends = libodfgen + depends = libspnav depends = poppler-qt5 - depends = kdelibs4support - conflicts = calligra-devtools - replaces = calligra-devtools - -pkgname = calligra-extras-git - pkgdesc = Calligra suite extras - install = calligra.install - depends = calligra-libs-git - depends = calligra-words-git - depends = okular-frameworks-git - conflicts = calligra-tools - conflicts = koffice-templates - conflicts = calligra-templats - conflicts = calligra-extras - replaces = calligra-tools - replaces = koffice-templates - replaces = calligra-templats - replaces = calligra-extras - -pkgname = calligra-filters-git - pkgdesc = Filters for the Calligra office suite - install = calligra.install - depends = kdelibs4support - depends = poppler depends = qca-qt5 - depends = khtml - depends = libodfgen - optdepends = libvisio: Microsoft Visio import filter + depends = qt5-base + optdepends = kirigami2-git: for Calligra Gemini optdepends = libetonyek: Apple Keynote import filter - conflicts = koffice-filters - conflicts = calligra-filters - replaces = koffice-filters - replaces = calligra-filters - -pkgname = calligra-libs-git - pkgdesc = Libraries for the Calligra office suite - depends = kactivities - depends = qca-qt5 - depends = ilmbase - conflicts = koffice-interfaces - conflicts = koffice-libs - conflicts = koffice-pics - conflicts = koffice-servicetypes - conflicts = calligra-interfaces - conflicts = calligra-pics - conflicts = calligra-servicetypes - conflicts = calligra-libs - replaces = koffice-interfaces - replaces = koffice-libs - replaces = koffice-pics - replaces = koffice-servicetypes - replaces = calligra-interfaces - replaces = calligra-pics - replaces = calligra-servicetypes - replaces = calligra-libs - -pkgname = calligra-plan-git - pkgdesc = Calligra Project Management Component - install = calligra.install - depends = calligra-words-git - depends = kcalcore - depends = kreport-git - depends = akonadi-contact - depends = khtml - depends = kdiagram-git - depends = kdelibs4support - conflicts = koffice-kplato - conflicts = calligra-kplato - conflicts = calligra-plan - replaces = koffice-kplato - replaces = calligra-kplato - replaces = calligra-plan - -pkgname = calligra-plugins-git - pkgdesc = Plugins for the Calligra office suite - install = calligra.install - depends = calligra-libs-git - depends = calligra-filters-git - depends = kio - depends = kdiagram-git - depends = ilmbase - depends = lcms2 - depends = libspnav - optdepends = marble: map shape for Calligra - conflicts = koffice-plugins - conflicts = koffice-kchart - conflicts = calligra-plugins - replaces = koffice-plugins - replaces = koffice-kchart - replaces = koffice-kformula - replaces = calligra-plugins - -pkgname = calligra-sheets-git - pkgdesc = Write spreadsheet documents - install = calligra.install - depends = calligra-libs-git - depends = gsl - depends = kdelibs4support - depends = knotifyconfig - optdepends = calligra-filters-git: import/export filters - optdepends = calligra-plugins: extra calligra plugins - optdepends = calligra-extras: extra calligra tools - conflicts = koffice-kspread - conflicts = koffice-kspread-doc - conflicts = calligra-tables-doc - conflicts = calligra-tables - conflicts = calligra-sheets - replaces = koffice-kspread - replaces = koffice-kspread-doc - replaces = calligra-tables-doc - replaces = calligra-tables - replaces = calligra-sheets - -pkgname = calligra-words-git - pkgdesc = Word Processor - install = calligra.install - depends = calligra-plugins-git - depends = okular-frameworks-git - depends = kxmlgui - optdepends = calligra-extras: extra calligra tools - conflicts = koffice-kword - conflicts = calligra-words - replaces = koffice-kword - replaces = calligra-words + optdepends = libgit2: Calligra Gemini git plugin + optdepends = libvisio: Microsoft Visio import filter + optdepends = libwpg: Corel WordPerfect Graphics image importer + optdepends = libwps: Microsoft Works file word processor format import + optdepends = poppler: PDF to SVG filter + optdepends = pstoedit: EPS to SVG filter + optdepends = qt5-quickcontrols: for Calligra Gemini + optdepends = qt5-webengine: for Calligra Gemini + provides = calligra + conflicts = calligra + source = git+https://github.com/KDE/calligra.git + source = calligra-openexr3.patch + source = 068cd9ae.patch + source = 2ac46db5.patch + source = 62f51070.patch + sha256sums = SKIP + sha256sums = 96fbe4f06bf184e60ff653a1574f0f0523af5b4672ced2a501cd54642961dffe + sha256sums = 4516d15421209e5d8c8b5008140dbcb1eefa96b0e96e0da49b343e1799a8cefd + sha256sums = c88e6d7a1f67c1b5413b624aa67fca2841205fdf4201f6682f69bae737582922 + sha256sums = 8a94e076c09887ff0741da3276ce4652063351b884c66d4c9ba0cde431dbb867 +pkgname = calligra-git diff --git a/068cd9ae.patch b/068cd9ae.patch new file mode 100644 index 000000000000..d85beebfb7a3 --- /dev/null +++ b/068cd9ae.patch @@ -0,0 +1,72 @@ +From 068cd9aec11052733e393976142516d2190e4564 Mon Sep 17 00:00:00 2001 +From: Pierre Ducroquet <pinaraf@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(); + + /** diff --git a/2ac46db5.patch b/2ac46db5.patch new file mode 100644 index 000000000000..a29f22f26aad --- /dev/null +++ b/2ac46db5.patch @@ -0,0 +1,22 @@ +From 2ac46db52c6ad401f67ae5b5fcd859a5872f0311 Mon Sep 17 00:00:00 2001 +From: Pierre Ducroquet <pinaraf@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) + + ############ + ############# diff --git a/62f51070.patch b/62f51070.patch new file mode 100644 index 000000000000..4ac67ccc719a --- /dev/null +++ b/62f51070.patch @@ -0,0 +1,50 @@ +From 62f510702ef9c34ac50f8d8601a4290ab558464c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?= <omerusta@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 @@ -1,230 +1,63 @@ -pkgbase=calligra-git -pkgname=( -# 'calligra-braindump-git' - 'calligra-devtools-git' - 'calligra-extras-git' - 'calligra-filters-git' -# 'calligra-flow-git' -# 'calligra-handbook-git' -# 'calligra-karbon-git' - 'calligra-libs-git' - 'calligra-plan-git' - 'calligra-plugins-git' - 'calligra-sheets-git' -# 'calligra-stage-git' - 'calligra-words-git' -# 'calligra-gemini-git' -) -pkgver=r99991.d6cbb49 -pkgrel=1 -arch=('i686' 'x86_64') -license=('FDL1.2' 'GPL2' 'LGPL') -url='http://www.calligra-suite.org/' -makedepends=('khtml' 'kross' 'kreport-git' 'kproperty-git' 'kdiagram-git' 'okular-frameworks-git' 'kxmlgui' 'qt5-webkit' - 'kdelibs4support' 'poppler' 'qca-qt5' 'libvisio' 'libetonyek' 'kactivities' 'kio' 'ilmbase' 'lcms2' 'kxmlgui' - 'marble' 'kcalcore' 'akonadi-contacts' 'knotifyconfig' 'okular-frameworks-git' 'poppler-qt5' 'qt5-quick1' 'libodfgen' 'threadweaver' 'boost' 'eigen') -groups=('calligra-git') -source=('calligra::git+git://anongit.kde.org/calligra') -md5sums=('SKIP') +# Merged with official ABS calligra PKGBUILD by João, 2021/05/30 (all respective contributors apply herein) +# Maintainer: João Figueiredo & chaotic-aur <islandc0der@chaotic.cx> +# Maintainer: Solomon Choina <shlomochoina@gmail.com + +pkgname=calligra-git +pkgdesc="A set of applications for productivity and creative usage" +pkgver=3.3.89_r102357.g20eec562 +pkgrel=3 +arch=($CARCH) +url='https://www.calligra-suite.org/' +license=(FDL1.2 GPL2 LGPL) +depends=(cauchy gcc-libs glibc gsl imath kactivities5 kcoreaddons5 kdiagram5 kcmutils5 kinit knotifyconfig5 kross kwidgetsaddons5 libodfgen libspnav poppler-qt5 qca-qt5 qt5-base) +makedepends=(git boost eigen extra-cmake-modules-git kcalendarcore5 kdesignerplugin-git kdoctools5 libakonadi5 libetonyek libgit2 libvisio libwpg libwps marble-common-git pstoedit vc) +optdepends=('kirigami2-git: for Calligra Gemini' + 'libetonyek: Apple Keynote import filter' + 'libgit2: Calligra Gemini git plugin' + 'libvisio: Microsoft Visio import filter' + 'libwpg: Corel WordPerfect Graphics image importer' + 'libwps: Microsoft Works file word processor format import' + 'poppler: PDF to SVG filter' + 'pstoedit: EPS to SVG filter' + 'qt5-quickcontrols: for Calligra Gemini' + 'qt5-webengine: for Calligra Gemini') +conflicts=(${pkgname%-git}) +provides=(${pkgname%-git}) +source=("git+https://github.com/KDE/${pkgname%-git}.git" + calligra-openexr3.patch + 068cd9ae.patch + 2ac46db5.patch + 62f51070.patch) +sha256sums=('SKIP' + '96fbe4f06bf184e60ff653a1574f0f0523af5b4672ced2a501cd54642961dffe' + '4516d15421209e5d8c8b5008140dbcb1eefa96b0e96e0da49b343e1799a8cefd' + 'c88e6d7a1f67c1b5413b624aa67fca2841205fdf4201f6682f69bae737582922' + '8a94e076c09887ff0741da3276ce4652063351b884c66d4c9ba0cde431dbb867') -pkgver() { - cd calligra - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" -} prepare() { - if [[ -d ${srcdir}/build ]]; then - msg "Cleaning the previous build directory..." - rm -rf ${srcdir}/build - fi - mkdir ${srcdir}/build -} - -build() { - - if [[ "${CARCH}" == "i686" ]]; then - CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4" - CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4" - else - CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4" - CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4" - fi - - cd ${srcdir}/build - cmake ../calligra -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DLIB_INSTALL_DIR=lib \ - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DBUILD_TESTING=OFF -Wno-dev - make -} - -package_calligra-filters-git() { - pkgdesc="Filters for the Calligra office suite" - depends=('kdelibs4support' 'poppler' 'qca-qt5' 'khtml' 'libodfgen') - optdepends=('libvisio: Microsoft Visio import filter' - 'libetonyek: Apple Keynote import filter') - conflicts=('koffice-filters' 'calligra-filters') - replaces=('koffice-filters' 'calligra-filters') - install=calligra.install - - cd build/filters - make DESTDIR="${pkgdir}" install -} - -package_calligra-libs-git() { - pkgdesc="Libraries for the Calligra office suite" - depends=('kactivities' 'qca-qt5' 'ilmbase') - conflicts=('koffice-interfaces' 'koffice-libs' 'koffice-pics' - 'koffice-servicetypes' 'calligra-interfaces' - 'calligra-pics' 'calligra-servicetypes' 'calligra-libs') - replaces=('koffice-interfaces' 'koffice-libs' 'koffice-pics' - 'koffice-servicetypes' 'calligra-interfaces' - 'calligra-pics' 'calligra-servicetypes' 'calligra-libs') - - for d in interfaces libs pics servicetypes; do - cd "${srcdir}"/build/${d} - make DESTDIR="${pkgdir}" install - done -} - -package_calligra-plugins-git() { - pkgdesc="Plugins for the Calligra office suite" - depends=('calligra-libs-git' 'calligra-filters-git' 'kio' 'kdiagram-git' 'ilmbase' 'lcms2' 'libspnav') - optdepends=('marble: map shape for Calligra') - conflicts=('koffice-plugins' 'koffice-kchart' 'calligra-plugins') - replaces=('koffice-plugins' 'koffice-kchart' 'koffice-kformula' 'calligra-plugins') - install=calligra.install - - cd build/plugins - make DESTDIR="${pkgdir}" install -} - -package_calligra-karbon-git() { - pkgdesc="Create scalable vector drawings" - depends=('calligra-libs-git' 'kxmlgui') - optdepends=('calligra-filters-git: import/export filters' - 'calligra-extras: extra calligra tools') - conflicts=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc' 'calligra-karbon') - replaces=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc' 'calligra-karbon') - install=calligra.install - - cd build/karbon - make DESTDIR="${pkgdir}" install -} - -package_calligra-plan-git() { - pkgdesc="Calligra Project Management Component" - depends=('calligra-words-git' 'kcalcore' 'kreport-git' 'akonadi-contact' 'khtml' 'kdiagram-git' 'kdelibs4support') - conflicts=('koffice-kplato' 'calligra-kplato' 'calligra-plan') - replaces=('koffice-kplato' 'calligra-kplato' 'calligra-plan') - install=calligra.install - - cd build/plan - make DESTDIR="${pkgdir}" install -} - -package_calligra-stage-git() { - pkgdesc="Write presentation documents" - depends=('calligra-plugins-git' 'qt5-webkit' 'kio') - conflicts=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc' 'calligra-stage') - replaces=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc' 'calligra-stage') - install=calligra.install - - cd build/stage - make DESTDIR="${pkgdir}" install + 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 } -package_calligra-sheets-git() { - pkgdesc="Write spreadsheet documents" - depends=('calligra-libs-git' 'gsl' 'kdelibs4support' 'knotifyconfig') - optdepends=('calligra-filters-git: import/export filters' - 'calligra-plugins: extra calligra plugins' - 'calligra-extras: extra calligra tools') - conflicts=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables' 'calligra-sheets') - replaces=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables' 'calligra-sheets') - install=calligra.install - - cd build/sheets - make DESTDIR="${pkgdir}" install -} - -package_calligra-words-git() { - pkgdesc="Word Processor" - depends=('calligra-plugins-git' 'okular-frameworks-git' 'kxmlgui') - optdepends=('calligra-extras: extra calligra tools') - conflicts=('koffice-kword' 'calligra-words') - replaces=('koffice-kword' 'calligra-words') - install=calligra.install - - cd build/words - make DESTDIR="${pkgdir}" install -} - -# package_calligra-handbook-git() { -# pkgdesc="Documentation for Calligra" -# conflicts=('koffice-handbook' 'calligra-handbook') -# replaces=('koffice-handbook' 'calligra-handbook') -# options=('docs') -# -# cd build/doc/calligra -# make DESTDIR="${pkgdir}" install -# } - -package_calligra-braindump-git() { - pkgdesc="Notes and idea gathering" - depends=('calligra-libs-git' 'kxmlgui' 'qt5-webkit') - conflicts=('calligra-braindump') - replaces=('calligra-braindump') - install=calligra.install - - cd build/braindump - make DESTDIR="${pkgdir}" install +pkgver() { + cd ${pkgname%-git} + _ver="$(grep -m1 'set(CALLIGRA_VERSION_STRING' CMakeLists.txt | cut -d '"' -f2 | tr - .)" + echo "${_ver}_r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)" } -# package_calligra-flow-git() { -# pkgdesc="Flowchart & Diagram Editing" -# depends=('calligra-words-git') -# optdepends=('calligra-karbon: to export the charts in various formats') -# conflicts=('calligra-flow-doc' 'calligra-flow') -# replaces=('calligra-flow-doc' 'calligra-flow') -# install=calligra.install -# -# cd build/flow -# make DESTDIR="${pkgdir}" install -# } - -package_calligra-extras-git() { - pkgdesc="Calligra suite extras" - depends=('calligra-libs-git' 'calligra-words-git' 'okular-frameworks-git') - conflicts=('calligra-tools' 'koffice-templates' 'calligra-templats' 'calligra-extras') - replaces=('calligra-tools' 'koffice-templates' 'calligra-templats' 'calligra-extras') - install=calligra.install - - cd build/extras - make DESTDIR="${pkgdir}" install - - cd ../data - make DESTDIR="${pkgdir}" install +build() { + cmake -B build -S ${pkgname%-git} \ + -DQT_MAJOR_VERSION=6 \ + -DBUILD_TESTING=OFF + cmake --build build } -package_calligra-devtools-git() { - pkgdesc="Calligra developer tools" - depends=('calligra-libs-git' 'calligra-words-git' 'calligra-sheets-git' 'poppler-qt5' 'kdelibs4support') - conflicts=('calligra-devtools') - replaces=('calligra-devtools') - cd build/devtools - make DESTDIR="${pkgdir}" install -} +package() { + DESTDIR="$pkgdir" cmake --install build -package_calligra-gemini-git() { - pkgdesc="QML interface for Calligra Words and Stage" - depends=('calligra-words-git' 'calligra-stage-git' 'kxmlgui' 'qt5-quick1') - install=calligra.install - conflicts=('calligra-gemini') - replaces=('calligra-gemini') - cd build/qtquick - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/gemini - make DESTDIR="${pkgdir}" install +# Remove utterly broken thumbnailers + rm "$pkgdir"/usr/lib/qt/plugins/calligra*thumbnail.so } diff --git a/calligra-openexr3.patch b/calligra-openexr3.patch new file mode 100644 index 000000000000..98d8bf7fa307 --- /dev/null +++ b/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() diff --git a/calligra.install b/calligra.install deleted file mode 100644 index 3f06b8deb57f..000000000000 --- a/calligra.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} |