archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2024-11-08 22:45:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

extra/calligra to 4.0.0-1

Browse source
This commit is contained in:
Kevin Mihelich 2024-08-27 18:49:59 +00:00
parent 47ddaf17b8
commit 9668cf9c01
9 changed files with 138 additions and 357 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
extra/calligra/.SRCINFO
View file

@ -1,76 +1,74 @@
pkgbase = calligra
pkgdesc = A set of applications for productivity and creative usage
pkgver = 3.2.1
pkgrel = 62
pkgver = 4.0.0
pkgrel = 1
url = https://www.calligra-suite.org/
arch = x86_64
license = FDL1.2
license = GPL2
license = LGPL
license = GPL-2.0-only
makedepends = boost
makedepends = eigen
makedepends = extra-cmake-modules
makedepends = kcalendarcore5
makedepends = kdesignerplugin
makedepends = kdoctools5
makedepends = libakonadi5
makedepends = kdoctools
makedepends = libetonyek
makedepends = libgit2
makedepends = libvisio
makedepends = libwpg
makedepends = libwps
makedepends = marble-common
makedepends = okular
makedepends = pstoedit
makedepends = qt6-webengine
makedepends = vc
depends = cauchy
depends = fontconfig
depends = freetype2
depends = gcc-libs
depends = glibc
depends = gsl
depends = imath
depends = kactivities5
depends = kcontacts5
depends = kcoreaddons5
depends = kdelibs4support
depends = kdiagram5
depends = kcmutils5
depends = kinit
depends = knotifyconfig5
depends = kross
depends = kwidgetsaddons5
depends = karchive
depends = kcolorscheme
depends = kcompletion
depends = kconfigwidgets
depends = kcoreaddons
depends = kdbusaddons
depends = kdiagram
depends = kcmutils
depends = kconfig
depends = kcrash
depends = kguiaddons
depends = ki18n
depends = kiconthemes
depends = kio
depends = kitemviews
depends = knotifications
depends = knotifyconfig
depends = kservice
depends = ktextwidgets
depends = kwidgetsaddons
depends = kwindowsystem
depends = kxmlgui
depends = libodfgen
depends = libspnav
depends = poppler-qt5
depends = qca-qt5
depends = qt5-base
optdepends = kirigami2: for Calligra Gemini
depends = librevenge
depends = openssl
depends = phonon-qt6
depends = qt6-base
depends = qt6-declarative
depends = qt6-svg
depends = qtkeychain-qt6
depends = sonnet
depends = zlib
optdepends = libetonyek: Apple Keynote import filter
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
source = https://download.kde.org/stable/calligra/3.2.1/calligra-3.2.1.tar.xz
source = https://download.kde.org/stable/calligra/3.2.1/calligra-3.2.1.tar.xz.sig
source = calligra-openexr3.patch
source = 068cd9ae.patch
source = 2ac46db5.patch
source = 62f51070.patch
source = libgit2-1.8.patch
source = https://invent.kde.org/office/calligra/-/commit/236bacbe.patch
source = https://invent.kde.org/office/calligra/-/commit/6b75bec7.patch
validpgpkeys = 05D00A8B73A686789E0A156858B9596C722EA3BD
validpgpkeys = 42A60D06F449E895F40F09C01638B8A616108B8A
sha256sums = b1f8a6eb8208543a2f908caa83d089075fcd1e530d00e19f5362b2f9cc371147
optdepends = qt6-webengine: Braindump web shape
source = https://download.kde.org/stable/calligra/calligra-4.0.0.tar.xz
source = https://download.kde.org/stable/calligra/calligra-4.0.0.tar.xz.sig
source = dependencies.patch
validpgpkeys = 39FFA93CAE9C6AFC212AD00202325448204E452A
sha256sums = e97cb1dc0720074d37d8ec11662f2628384595311c3dac6b29477d6634144119
sha256sums = SKIP
sha256sums = 96fbe4f06bf184e60ff653a1574f0f0523af5b4672ced2a501cd54642961dffe
sha256sums = 4516d15421209e5d8c8b5008140dbcb1eefa96b0e96e0da49b343e1799a8cefd
sha256sums = c88e6d7a1f67c1b5413b624aa67fca2841205fdf4201f6682f69bae737582922
sha256sums = 8a94e076c09887ff0741da3276ce4652063351b884c66d4c9ba0cde431dbb867
sha256sums = e79f1068a7c0bf9f4af63c379d3dc1e10bfa7f8c9953dfc172460cf14c9e7b55
sha256sums = 94ce2242774d18df21dd594f2d9dce752ffda0349b2c2c872dfe39cb73353aab
sha256sums = 0eb880b19f32fe4045831415fe5849e43db09be3f7550c4abfe21e4511dfb1a5
sha256sums = b14146c4e9574aed8d0266d6cb943b82c69fe252409b7e9d96c2e585333ecd03
pkgname = calligra

72
extra/calligra/068cd9ae.patch
View file

@ -1,72 +0,0 @@
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();
/**

22
extra/calligra/2ac46db5.patch
View file

@ -1,22 +0,0 @@
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)
############
#############

50
extra/calligra/62f51070.patch
View file

@ -1,50 +0,0 @@
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

113
extra/calligra/PKGBUILD
View file

@ -8,100 +8,87 @@
pkgname=calligra
pkgdesc='A set of applications for productivity and creative usage'
pkgver=3.2.1
pkgrel=62
pkgver=4.0.0
pkgrel=1
arch=(x86_64)
url='https://www.calligra-suite.org/'
license=(FDL1.2 GPL2 LGPL)
license=(GPL-2.0-only)
depends=(cauchy
fontconfig
freetype2
gcc-libs
glibc
gsl
imath
kactivities5
kcontacts5
kcoreaddons5
kdelibs4support
kdiagram5
kcmutils5
kinit
knotifyconfig5
kross
kwidgetsaddons5
karchive
kcolorscheme
kcompletion
kconfigwidgets
kcoreaddons
kdbusaddons
kdiagram
kcmutils
kconfig
kcrash
kguiaddons
ki18n
kiconthemes
kio
kitemviews
knotifications
knotifyconfig
kservice
ktextwidgets
kwidgetsaddons
kwindowsystem
kxmlgui
libodfgen
libspnav
poppler-qt5
qca-qt5
qt5-base)
librevenge
openssl
phonon-qt6
qt6-base
qt6-declarative
qt6-svg
qtkeychain-qt6
sonnet
zlib)
makedepends=(boost
eigen
extra-cmake-modules
kcalendarcore5
kdesignerplugin
kdoctools5
libakonadi5
kdoctools
libetonyek
libgit2
libvisio
libwpg
libwps
marble-common
pstoedit)
optdepends=('kirigami2: for Calligra Gemini'
'libetonyek: Apple Keynote import filter'
'libgit2: Calligra Gemini git plugin'
okular
pstoedit
qt6-webengine)
optdepends=('libetonyek: Apple Keynote import filter'
'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')
source=(https://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz{,.sig}
calligra-openexr3.patch
068cd9ae.patch
2ac46db5.patch
62f51070.patch
libgit2-1.8.patch
https://invent.kde.org/office/calligra/-/commit/236bacbe.patch
https://invent.kde.org/office/calligra/-/commit/6b75bec7.patch)
sha256sums=('b1f8a6eb8208543a2f908caa83d089075fcd1e530d00e19f5362b2f9cc371147'
'qt6-webengine: Braindump web shape')
source=(https://download.kde.org/stable/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
dependencies.patch)
sha256sums=('e97cb1dc0720074d37d8ec11662f2628384595311c3dac6b29477d6634144119'
'SKIP'
'96fbe4f06bf184e60ff653a1574f0f0523af5b4672ced2a501cd54642961dffe'
'4516d15421209e5d8c8b5008140dbcb1eefa96b0e96e0da49b343e1799a8cefd'
'c88e6d7a1f67c1b5413b624aa67fca2841205fdf4201f6682f69bae737582922'
'8a94e076c09887ff0741da3276ce4652063351b884c66d4c9ba0cde431dbb867'
'e79f1068a7c0bf9f4af63c379d3dc1e10bfa7f8c9953dfc172460cf14c9e7b55'
'94ce2242774d18df21dd594f2d9dce752ffda0349b2c2c872dfe39cb73353aab'
'0eb880b19f32fe4045831415fe5849e43db09be3f7550c4abfe21e4511dfb1a5')
validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD # Boudewijn Rempt <foundation@krita.org>
42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen <danders@get2net.dk>
'b14146c4e9574aed8d0266d6cb943b82c69fe252409b7e9d96c2e585333ecd03')
validpgpkeys=(39FFA93CAE9C6AFC212AD00202325448204E452A) # Carl Schwan <carl@carlschwan.eu>
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
patch -d $pkgname-$pkgver -p1 < 236bacbe.patch # Fix build with poppler 22.03.0
patch -d $pkgname-$pkgver -p1 < 6b75bec7.patch # Fix build with poppler 22.04.0
patch -d $pkgname-$pkgver -p1 < libgit2-1.8.patch # Fix build with libgit2 1.8
patch -d $pkgname-$pkgver -p1 < dependencies.patch
}
build() {
cmake -B build -S $pkgname-$pkgver \
-DCMAKE_CXX_STANDARD=20 \
-DRELEASE_BUILD=ON \
-DPRODUCTSET=DESKTOP \
-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
# Install service menus to KF6 path
install -d "$pkgdir"/usr/share/kio
mv "$pkgdir"/usr/share/{kservices5/ServiceMenus/calligra,kio/servicemenus}
rm -r "$pkgdir"/usr/share/kservices5/ServiceMenus
}

89
extra/calligra/calligra-openexr3.patch
View file

@ -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()

12
extra/calligra/dependencies.patch Normal file
View file

@ -0,0 +1,12 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb56ef6584d..8aafdbff288 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -153,7 +153,6 @@ find_package(KF6 ${REQUIRED_KF6_VERSION} REQUIRED
KIO
Notifications
NotifyConfig
- Parts
Sonnet
TextWidgets
WidgetsAddons

30
extra/calligra/keys/pgp/39FFA93CAE9C6AFC212AD00202325448204E452A.asc Normal file
View file

@ -0,0 +1,30 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
mQENBGMzNyoBCADRKOQGIpxiw09LGTfRyUGOQzu2+YoWarwkVAOVxF4zcs6q/X0t
/vStaXRA5N9ayutzLT203F5yhHLVyoGjxd/PDkYVgfEIOmEZx0+3qb32BY7iTWqL
UdzuWuHAtPm/EwocbpDlecz4lFH4H82kn1a1IUQaPJUO3R+FhbFUYTWNL2FQdh6U
4UxuCoEZ/A8WQn5+KT7D0JDCw3FHH5ADvdkp8c6Fx4bxxNnoNuHD7LQwMbxVy7Kl
W4SSAMW2n3x9jARVXMjBMUn3GfFXSRVn/K7OdN87JLeGfnvyxg5TZsYqtZTy80OR
Jg7d9uRqLTYTOS3yrApwrAk9bF9SEvtVvjMdABEBAAG0IENhcmwgU2Nod2FuIDxj
YXJsQGNhcmxzY2h3YW4uZXU+iQFRBBMBCAA7FiEEOf+pPK6cavwhKtACAjJUSCBO
RSoFAmMzNyoCGwMFCwkIBwICIgIGFQoJCAsCBBYCAwECHgcCF4AACgkQAjJUSCBO
RSoN3wf/RKuupl3cz33/4UU44ZT5J/IhUli9cX+pKzYHBeQF7VOrX7wRmgFIQnt2
g+XgwauMnIgVwvobc5os0yg7OV4btsr+/9UEb4nIULmDiZ1Ui5I0CQ9X5U7ANfrV
U/agj0EHV1WcBRpr8oLTI8Vrmt7niClEh0a3DN1k+T5kBB3O995bVPki9jyohJg3
QO1HAhsqGxdryv3+MdU23BWedNR5pb7WKB7xMh0s8f/nodSNS1JqJgX/9Qz6qFT7
Z9PEOc7AeP0Ga6Ih8i+E2zZVxSV0Hm2No/nNrKuiAxzXJR94cg2O+roRjXYKFG+K
wH9EwG8U5YBL6pXVxbzG9hZq4uOw9rkBDQRjMzcqAQgAthy1slWWjx+e09FFYKmT
WFTEUowZndpZ0KgeihRpOlz7s1O6BrbDw0xF0UiBRkBQDg9SIoH5WZPy2P9fWdf8
xC6a2I+IMzaxDHfDgh9coRmY3I8a1QO/3x2grvxw0ptmoKVA7mWavQuqWhIDpSVo
EW+BYcYbIPk3rAAAVpEBcRou9nhnLLYFh2Qn0ZkZo+AUlQeJp+iZtjkZiqyFl3iK
a+sHouiVv9qaU0tpfAyh1SCkTQGVs2UDWWj+pR1UDPyQ9Z4232u1FC8eEf5l0rEr
QEnK8awOng6EPOPSXB9kq38lTbKZKctcJEWcPILq8+uPOmQFfLYSEIEXns4lnH3+
DQARAQABiQE2BBgBCAAgFiEEOf+pPK6cavwhKtACAjJUSCBORSoFAmMzNyoCGwwA
CgkQAjJUSCBORSr1UggAoVfxzjeSqRfknWk/kyU/vnHFAomrvSqavs1yVTcFBZNf
6hnfqpanwiVT8MvzHs6mBjn2csM/dFN7DNRQSx+qj1pZ8445Jldos1jsU57fNycX
oBv7CX53rVqrc3JKpXNtLBZ1EmYt/7u/h74emK4LREaKo+pTnkejnFSnixNabsrE
96YDXBmC7G6bFbitYcjjXueraXDMbmHdIXBk6XR2GFpxJjVDF8pIRek1loyrOJzk
OihwebES/mY/9ZPOvc6JOEncIK9dfHO9011G1zad1FEZnb7hrIgcE6vvRuDP7oRj
fnEBp9W5UczbiQO4kEGY5IHW6sJzvViZqkFoHcg9+g==
=YZSa
-----END PGP PUBLIC KEY BLOCK-----

13
extra/calligra/libgit2-1.8.patch
View file

@ -1,13 +0,0 @@
diff --git a/gemini/cloud/git/gitcontroller.cpp b/gemini/cloud/git/gitcontroller.cpp
index 9f65fd183a4..86473c0ea6a 100644
--- a/gemini/cloud/git/gitcontroller.cpp
+++ b/gemini/cloud/git/gitcontroller.cpp
@@ -404,7 +404,7 @@ void GitOpsThread::performPull()
git_commit_create(&commit_id, repository, "HEAD", d->signature, d->signature,
NULL, message.ptr,
- tree, 2, (const git_commit **) parents);
+ tree, 2, (git_commit * const *) parents);
git_tree_free(tree);
}
git_index_free(index);