haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 20:20:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Calligra: fix locale

Browse Source
This commit is contained in:
Gerasim Troeglazov
2020-12-29 22:45:08 +10:00
parent cf7f9fb766
commit 79154df78e
2 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app-office/calligra/calligra-3.2.1.recipe
View File

@@ -6,9 +6,9 @@ HOMEPAGE="https://www.calligra.org/"
COPYRIGHT="2010-2020 KDE Organisation"
LICENSE="GNU LGPL v2
GNU GPL v2"
REVISION="1"
SOURCE_URI="https://github.com/KDE/calligra/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="3a60cf6c86084a7fbcc7614e5dccb79e2141e547ff6ed31f6e1441c139f997a0"
REVISION="2"
SOURCE_URI="https://download.kde.org/stable/calligra/$portVersion/calligra-$portVersion.tar.xz"
CHECKSUM_SHA256="b1f8a6eb8208543a2f908caa83d089075fcd1e530d00e19f5362b2f9cc371147"
SOURCE_FILENAME="calligra-$portVersion.tar.gz"
PATCHES="calligra-$portVersion.patchset"
ADDITIONAL_FILES="
@@ -152,7 +152,7 @@ REQUIRES_okular_plugins="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
extra_cmake_modules$secondaryArchSuffix >= 5.65
extra_cmake_modules$secondaryArchSuffix >= 5.77
devel:eigen$secondaryArchSuffix
devel:libboost_system$secondaryArchSuffix
devel:libetonyek_0.1$secondaryArchSuffix
@@ -221,7 +221,7 @@ BUILD_REQUIRES="
devel:libpoppler$secondaryArchSuffix >= 87
devel:libpoppler_qt5$secondaryArchSuffix >= 1.19
devel:libqca$secondaryArchSuffix >= 2
devel:libQt5Core$secondaryArchSuffix >= 5.14
devel:libQt5Core$secondaryArchSuffix >= 5.15
devel:libQt5WebKitWidgets$secondaryArchSuffix
devel:librevenge_0.0$secondaryArchSuffix
devel:libvisio_0.1$secondaryArchSuffix

28
app-office/calligra/patches/calligra-3.2.1.patchset
View File

@@ -1,11 +1,11 @@
From 7308b46e19879b7b5e80a1de78c580ac08aa0a5b Mon Sep 17 00:00:00 2001
From 7317abc82caa3aceab44b75a93173c71e7f94359 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 4 May 2020 15:43:23 +1000
Subject: Fix build for Haiku
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a302e49..0089ef2 100644
index deca38e..10d3b43 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -347,6 +347,12 @@ add_definitions(
@@ -171,5 +171,27 @@ index 3007f91..9a42e4f 100644
#include <QVBoxLayout>
#include <QPainter>
--
2.26.0
2.28.0
From 2a3dcdabc66733e3b1e0d46120fe6b6f00f0cc0c Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 29 Dec 2020 22:44:06 +1000
Subject: Disable doctools for Haiku
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10d3b43..23b6370 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1158,6 +1158,6 @@ find_package(KF5I18n CONFIG REQUIRED)
ki18n_install(po)
find_package(KF5DocTools CONFIG)
- if(KF5DocTools_FOUND)
+ if(KF5DocTools_FOUND AND NOT HAIKU)
kdoctools_install(po)
endif()
--
2.28.0