summaryrefslogtreecommitdiffstats
path: root/source/kde
diff options
context:
space:
mode:
Diffstat (limited to 'source/kde')
-rw-r--r--source/kde/kde/build/calligra2
-rw-r--r--source/kde/kde/build/cantor2
-rw-r--r--source/kde/kde/build/kfilemetadata2
-rw-r--r--source/kde/kde/build/kile2
-rw-r--r--source/kde/kde/build/kitinerary2
-rw-r--r--source/kde/kde/build/krita2
-rw-r--r--source/kde/kde/build/okular2
-rw-r--r--source/kde/kde/patch/calligra.patch1
-rw-r--r--source/kde/kde/patch/calligra/0053-Partial-update-of-Commit-62f51070-to-make-it-compile.patch86
-rw-r--r--source/kde/kde/patch/kitinerary.patch2
-rw-r--r--source/kde/kde/patch/kitinerary/e99d101e2bd4c32566e238ce1340a93781e19eee.patch53
11 files changed, 149 insertions, 7 deletions
diff --git a/source/kde/kde/build/calligra b/source/kde/kde/build/calligra
index ec635144f..f599e28b8 100644
--- a/source/kde/kde/build/calligra
+++ b/source/kde/kde/build/calligra
@@ -1 +1 @@
-9
+10
diff --git a/source/kde/kde/build/cantor b/source/kde/kde/build/cantor
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/cantor
+++ b/source/kde/kde/build/cantor
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/kfilemetadata b/source/kde/kde/build/kfilemetadata
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/kfilemetadata
+++ b/source/kde/kde/build/kfilemetadata
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/kile b/source/kde/kde/build/kile
index ec635144f..f599e28b8 100644
--- a/source/kde/kde/build/kile
+++ b/source/kde/kde/build/kile
@@ -1 +1 @@
-9
+10
diff --git a/source/kde/kde/build/kitinerary b/source/kde/kde/build/kitinerary
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/kitinerary
+++ b/source/kde/kde/build/kitinerary
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/krita
+++ b/source/kde/kde/build/krita
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/okular b/source/kde/kde/build/okular
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/okular
+++ b/source/kde/kde/build/okular
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/patch/calligra.patch b/source/kde/kde/patch/calligra.patch
index 583d2efc9..8e93a639c 100644
--- a/source/kde/kde/patch/calligra.patch
+++ b/source/kde/kde/patch/calligra.patch
@@ -1,2 +1,3 @@
# Fix blank page in calligragemini
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 ; }
diff --git a/source/kde/kde/patch/calligra/0053-Partial-update-of-Commit-62f51070-to-make-it-compile.patch b/source/kde/kde/patch/calligra/0053-Partial-update-of-Commit-62f51070-to-make-it-compile.patch
new file mode 100644
index 000000000..46f6dd044
--- /dev/null
+++ b/source/kde/kde/patch/calligra/0053-Partial-update-of-Commit-62f51070-to-make-it-compile.patch
@@ -0,0 +1,86 @@
+From c7636fb343c848000300a9429410b74d17a4d54d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?= <omerusta@gmail.com>
+Date: Tue, 8 Jun 2021 05:13:23 +0000
+Subject: [PATCH 53/54] Partial update of Commit 62f51070 to make it
+ compileable again
+
+Cmake to 3.16
+Fix Fontconfig's FOUND variable
+Fix Fontconfig's include_dirs variable
+Use Correct Target to link FontConfig and Freetype
+---
+ CMakeLists.txt | 14 +++++---------
+ libs/text/CMakeLists.txt | 4 ++--
+ 2 files changed, 7 insertions(+), 11 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1ce210ebe01..71272ffef2d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 3.16)
+
+ project(calligra)
+
+@@ -168,6 +168,8 @@ calligra_set_productset(${PRODUCTSET})
+ ## Look for ECM, Qt, KF5 ##
+ ###########################
+ ##########################
++set(REQUIRED_KF5_VERSION "5.7.0")
++set(REQUIRED_QT_VERSION "5.3.0")
+
+ find_package(ECM 5.19 REQUIRED NO_MODULE)
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+@@ -199,9 +201,6 @@ include(MacroOptionalFindPackage)
+ include(MacroEnsureVersion)
+ include(MacroDesktopToJson)
+
+-
+-set(REQUIRED_KF5_VERSION "5.7.0")
+-
+ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
+ COMPONENTS
+ Archive
+@@ -251,9 +250,6 @@ if(${KF5_VERSION} VERSION_LESS "5.16.0")
+ set(CALLIGRA_OLD_PLUGIN_METADATA TRUE)
+ endif()
+
+-
+-set(REQUIRED_QT_VERSION "5.3.0")
+-
+ find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED
+ COMPONENTS
+ Core
+@@ -641,8 +637,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()
+
+
+--
+2.31.1
+
diff --git a/source/kde/kde/patch/kitinerary.patch b/source/kde/kde/patch/kitinerary.patch
new file mode 100644
index 000000000..0ecbe2e43
--- /dev/null
+++ b/source/kde/kde/patch/kitinerary.patch
@@ -0,0 +1,2 @@
+# Fix for recent poppler:
+cat $CWD/patch/kitinerary/e99d101e2bd4c32566e238ce1340a93781e19eee.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/kitinerary/e99d101e2bd4c32566e238ce1340a93781e19eee.patch b/source/kde/kde/patch/kitinerary/e99d101e2bd4c32566e238ce1340a93781e19eee.patch
new file mode 100644
index 000000000..1bc9dc377
--- /dev/null
+++ b/source/kde/kde/patch/kitinerary/e99d101e2bd4c32566e238ce1340a93781e19eee.patch
@@ -0,0 +1,53 @@
+From e99d101e2bd4c32566e238ce1340a93781e19eee Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos@foutrelis.com>
+Date: Mon, 2 Aug 2021 01:01:31 +0300
+Subject: [PATCH] Fix build with poppler 21.8.0
+
+parseDateString() now takes "const GooString *" as the date argument in
+order to support unicode date strings. Adjust parsePdfDateTime() to use
+the same string type (instead of "const char *") when compiling against
+poppler 21.8.0.
+
+https://gitlab.freedesktop.org/poppler/poppler/-/merge_requests/880
+---
+ src/lib/pdf/pdfdocument.cpp | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/pdf/pdfdocument.cpp b/src/lib/pdf/pdfdocument.cpp
+index 8f0f4cd..0eabf45 100644
+--- a/src/lib/pdf/pdfdocument.cpp
++++ b/src/lib/pdf/pdfdocument.cpp
+@@ -201,7 +201,11 @@ int PdfDocument::fileSize() const
+ }
+
+ #ifdef HAVE_POPPLER
++#if KPOPPLER_VERSION >= QT_VERSION_CHECK(21, 8, 0)
++static QDateTime parsePdfDateTime(const GooString *str)
++#else
+ static QDateTime parsePdfDateTime(const char *str)
++#endif
+ {
+ int year, month, day, hour, min, sec, tzHours, tzMins;
+ char tz;
+@@ -233,7 +237,9 @@ QDateTime PdfDocument::creationTime() const
+ if (!dt) {
+ return {};
+ }
+-#if KPOPPLER_VERSION >= QT_VERSION_CHECK(0, 72, 0)
++#if KPOPPLER_VERSION >= QT_VERSION_CHECK(21, 8, 0)
++ return parsePdfDateTime(dt.get());
++#elif KPOPPLER_VERSION >= QT_VERSION_CHECK(0, 72, 0)
+ return parsePdfDateTime(dt->c_str());
+ #else
+ return parsePdfDateTime(dt->getCString());
+@@ -250,7 +256,9 @@ QDateTime PdfDocument::modificationTime() const
+ if (!dt) {
+ return {};
+ }
+-#if KPOPPLER_VERSION >= QT_VERSION_CHECK(0, 72, 0)
++#if KPOPPLER_VERSION >= QT_VERSION_CHECK(21, 8, 0)
++ return parsePdfDateTime(dt.get());
++#elif KPOPPLER_VERSION >= QT_VERSION_CHECK(0, 72, 0)
+ return parsePdfDateTime(dt->c_str());
+ #else
+ return parsePdfDateTime(dt->getCString());
generated by cgit v1.2.3 (git 2.26.2) at 2024-04-30 19:25:01 +0000