* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/, app-office/calligra/files/
@ 2015-08-19 15:21 Johannes Huber
0 siblings, 0 replies; 19+ messages in thread
From: Johannes Huber @ 2015-08-19 15:21 UTC (permalink / raw
To: gentoo-commits
commit: 8659a2124a109741fa611d39f5329e4f59b04840
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 19 15:23:12 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 15:23:22 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8659a212
app-office/calligra: Version bump
Thanks for contributions by Alex Xu (Hello71) <alex_y_xu <AT> yahoo.ca>, Jon
<j.scruggs <AT> gmail.com>, Tamas Jantvik <tsjk@hotmail.com>.
Gentoo-Bug: 543068
Gentoo-Bug: 549940
Reported-by: Alexandre <alexandre.guimaraes <AT> campus.ul.pt>
Package-Manager: portage-2.2.20.1
app-office/calligra/Manifest | 1 +
...{calligra-9999.ebuild => calligra-2.9.6.ebuild} | 80 ++++++++++------------
app-office/calligra/calligra-9999.ebuild | 77 ++++++++++-----------
.../files/calligra-2.9.6-ghns-linking.patch | 11 +++
.../calligra/files/calligra-2.9.6-version.patch | 24 +++++++
app-office/calligra/metadata.xml | 1 +
6 files changed, 110 insertions(+), 84 deletions(-)
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 1ac7860..39ae24a 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,2 +1,3 @@
DIST calligra-2.8.5.tar.xz 138928992 SHA256 92b8828ec64b46124b29a03bae13c143e3ed771adf3186fa938c765e5eac2fbd SHA512 09e32b7ce2415daae2ac3c1871fc1bc270210cbf5bc774f622922f8adb20e639db3dfb16c2974404b4395b30f8367a7ddd0016363a8b3e46fa24ff3fde1e4c14 WHIRLPOOL b4cc14353b7f9a457510a745b711283481f969e10ffee2847253b123ba2ea03f61d8abfdda2bcdb463c6bba8f2d8634e1536259f5be3d44778104bc8f28f79fe
DIST calligra-2.8.7.tar.xz 138966248 SHA256 af6b8b74ea077e5bbfa398e3ae96866b9a3ccfbc10224e9f341e59643be80eb5 SHA512 e09fcbb6708d73db3b31027c4393a138fbf5c47d1b777dd4a3b94f6e668d67ac963cfadb320350c63f1b2d1173edc67dc2100704899176c196865fb4d2ce7442 WHIRLPOOL ce082f04cfb7947219e317ba9a4a6ce436a3aa0784f1cad6206f3febd072f177961111ccbb89227d3c8dede1eafc647409b26f1f4fb304b1d482db0fe8c758b9
+DIST calligra-2.9.6.tar.xz 194239580 SHA256 78564137133e2f45065085df66ce2ab31478517c10163a06ba690a2d3a98a184 SHA512 d51b20c3d53a09ced3347b117de6827c5c29e31b198eff8bc136f0d6f604991371c6c4705d0ff3c6bcc64c017f0a14139d4b0529b02973909d80a25223e59f07 WHIRLPOOL 848884f830e0b8b2c6b8ed73d11222598295ca56ed4db826f4a9c3d3be42d5a65f5e50879a4fed68d6ae004962b799e23d6978a0943ff6b8900728b62dec43c0
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-2.9.6.ebuild
similarity index 77%
copy from app-office/calligra/calligra-9999.ebuild
copy to app-office/calligra/calligra-2.9.6.ebuild
index bce7b6d..4031e5b 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-2.9.6.ebuild
@@ -11,7 +11,6 @@ EAPI=5
CHECKREQS_DISK_BUILD="4G"
KDE_HANDBOOK="optional"
KDE_LINGUAS_LIVE_OVERRIDE="true"
-KDE_MINIMAL="4.13.1"
OPENGL_REQUIRED="optional"
inherit check-reqs kde4-base versionator
@@ -40,13 +39,13 @@ if [[ ${KDE_BUILD_TYPE} == release ]] ; then
KEYWORDS="~amd64 ~arm ~x86"
fi
-IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +glib +gsf gsl
-import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms marble mysql +okular
-openexr +pdf postgres spacenav sybase test tiff +threads +truetype vc xbase
-+xml"
+IUSE="attica color-management +crypt +eigen +exif fftw +fontconfig freetds
++glew +glib +gsf gsl import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms
+marble mysql +okular openexr +pdf postgres spacenav sybase test tiff +threads
++truetype vc xbase +xml"
-# please do not sort here, order is same as in CMakeLists.txt
-CAL_FTS="words stage sheets author karbon krita kexi flow plan braindump"
+# Don't use Active, it's broken on desktops.
+CAL_FTS="author braindump flow gemini karbon kexi krita plan sheets stage words"
for cal_ft in ${CAL_FTS}; do
IUSE+=" calligra_features_${cal_ft}"
done
@@ -54,7 +53,8 @@ unset cal_ft
REQUIRED_USE="
calligra_features_author? ( calligra_features_words )
- calligra_features_krita? ( eigen exif lcms )
+ calligra_features_gemini? ( opengl )
+ calligra_features_krita? ( eigen exif lcms opengl )
calligra_features_plan? ( kdepim )
calligra_features_sheets? ( eigen )
vc? ( calligra_features_krita )
@@ -62,28 +62,17 @@ REQUIRED_USE="
"
RDEPEND="
- !app-office/karbon
- !app-office/kexi
- !app-office/koffice-data
- !app-office/koffice-l10n
- !app-office/koffice-libs
- !app-office/koffice-meta
- !app-office/kplato
- !app-office/kpresenter
- !app-office/krita
- !app-office/kspread
- !app-office/kword
$(add_kdeapps_dep knewstuff)
dev-lang/perl
dev-libs/boost
dev-qt/qtcore:4[exceptions]
media-libs/libpng:0
sys-libs/zlib
- >=dev-qt/qtgui-4.8.1-r1:4
virtual/libiconv
attica? ( dev-libs/libattica )
+ color-management? ( media-libs/opencolorio )
crypt? ( app-crypt/qca:2[qt4(+)] )
- eigen? ( dev-cpp/eigen:2 )
+ eigen? ( dev-cpp/eigen:3 )
exif? ( media-gfx/exiv2:= )
fftw? ( sci-libs/fftw:3.0 )
fontconfig? ( media-libs/fontconfig )
@@ -97,6 +86,7 @@ RDEPEND="
app-text/libwpd:*
app-text/libwpg:*
app-text/libwps
+ dev-libs/librevenge
media-libs/libvisio
)
jpeg? ( virtual/jpeg:0 )
@@ -124,14 +114,14 @@ RDEPEND="
dev-db/postgresql:*
dev-libs/libpqxx
)
- spacenav? ( dev-libs/libspnav )
+ spacenav? ( dev-libs/libspnav )
sybase? ( dev-db/freetds )
tiff? ( media-libs/tiff:0 )
truetype? ( media-libs/freetype:2 )
vc? ( dev-libs/vc )
xbase? ( dev-db/xbase )
calligra_features_kexi? (
- >=dev-db/sqlite-3.7.9:3[extensions(+)]
+ >=dev-db/sqlite-3.8.7:3[extensions(+)]
dev-libs/icu:=
)
calligra_features_krita? (
@@ -141,13 +131,20 @@ RDEPEND="
)
calligra_features_words? ( dev-libs/libxslt )
"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ x11-misc/shared-mime-info
+"
-[[ ${PV} == 9999 ]] && LANGVERSION="2.4" || LANGVERSION="$(get_version_component_range 1-2)"
+[[ ${PV} == 9999 ]] && LANGVERSION="2.9" || LANGVERSION="$(get_version_component_range 1-2)"
PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
-RESTRICT=test
# bug 394273
+RESTRICT=test
+
+PATCHES=(
+ "${FILESDIR}/${P}-version.patch"
+ "${FILESDIR}/${P}-ghns-linking.patch"
+)
pkg_pretend() {
check-reqs_pkg_pretend
@@ -159,19 +156,23 @@ pkg_setup() {
}
src_configure() {
- local cal_ft
+ local cal_ft myproducts
+
+ # applications
+ for cal_ft in ${CAL_FTS}; do
+ use calligra_features_${cal_ft} && myproducts+=( ${cal_ft^^} )
+ done
+
+ local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
# first write out things we want to hard-enable
- local mycmakeargs=(
- "-DWITH_PNG=ON"
- "-DWITH_ZLIB=ON"
+ mycmakeargs+=(
"-DGHNS=ON"
"-DWITH_Iconv=ON" # available on all supported arches and many more
)
# default disablers
mycmakeargs+=(
- "-DBUILD_active=OFF" # we dont support active gui, maybe arm could
"-DCREATIVEONLY=OFF"
"-DPACKAGERS_BUILD=OFF"
"-DWITH_Soprano=OFF"
@@ -180,8 +181,9 @@ src_configure() {
# regular options
mycmakeargs+=(
$(cmake-utils_use_with attica LibAttica)
+ $(cmake-utils_use_with color-management OCIO)
$(cmake-utils_use_with crypt QCA2)
- $(cmake-utils_use_with eigen Eigen2)
+ $(cmake-utils_use_with eigen Eigen3)
$(cmake-utils_use_with exif Exiv2)
$(cmake-utils_use_with fftw FFTW3)
$(cmake-utils_use_with fontconfig Fontconfig)
@@ -190,6 +192,7 @@ src_configure() {
$(cmake-utils_use_with gsl GSL)
$(cmake-utils_use_with import-filter LibEtonyek)
$(cmake-utils_use_with import-filter LibOdfGen)
+ $(cmake-utils_use_with import-filter LibRevenge)
$(cmake-utils_use_with import-filter LibVisio)
$(cmake-utils_use_with import-filter LibWpd)
$(cmake-utils_use_with import-filter LibWpg)
@@ -200,15 +203,14 @@ src_configure() {
$(cmake-utils_use_with kde KActivities)
$(cmake-utils_use_with kdepim KdepimLibs)
$(cmake-utils_use_with lcms LCMS2)
- $(cmake-utils_use_with marble Marble)
+ $(cmake-utils_use_with marble CalligraMarble)
$(cmake-utils_use_with mysql MySQL)
$(cmake-utils_use_with okular Okular)
$(cmake-utils_use_with openexr OpenEXR)
- $(cmake-utils_use_with opengl GLEW)
- $(cmake-utils_use_with opengl OpenGL)
+ $(cmake-utils_use opengl USEOPENGL)
$(cmake-utils_use_with pdf Poppler)
$(cmake-utils_use_with pdf Pstoedit)
- $(cmake-utils_use_with postgres PostgreSQL)
+ $(cmake-utils_use_with postgres CalligraPostgreSQL)
$(cmake-utils_use_build postgres pqxx)
$(cmake-utils_use_with spacenav Spnav)
$(cmake-utils_use_with sybase FreeTDS)
@@ -219,13 +221,7 @@ src_configure() {
$(cmake-utils_use_with xbase XBase)
)
- # applications
- for cal_ft in ${CAL_FTS}; do
- mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
- done
mycmakeargs+=( $(cmake-utils_use_build test cstester) )
- # filters
-
kde4-base_src_configure
}
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index bce7b6d..97cea47 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -11,7 +11,6 @@ EAPI=5
CHECKREQS_DISK_BUILD="4G"
KDE_HANDBOOK="optional"
KDE_LINGUAS_LIVE_OVERRIDE="true"
-KDE_MINIMAL="4.13.1"
OPENGL_REQUIRED="optional"
inherit check-reqs kde4-base versionator
@@ -40,13 +39,13 @@ if [[ ${KDE_BUILD_TYPE} == release ]] ; then
KEYWORDS="~amd64 ~arm ~x86"
fi
-IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +glib +gsf gsl
-import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms marble mysql +okular
-openexr +pdf postgres spacenav sybase test tiff +threads +truetype vc xbase
-+xml"
+IUSE="attica color-management +crypt +eigen +exif fftw +fontconfig freetds
++glew +glib +gsf gsl import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms
+marble mysql +okular openexr +pdf postgres spacenav sybase test tiff +threads
++truetype vc xbase +xml"
-# please do not sort here, order is same as in CMakeLists.txt
-CAL_FTS="words stage sheets author karbon krita kexi flow plan braindump"
+# Don't use Active, it's broken on desktops.
+CAL_FTS="author braindump flow gemini karbon kexi krita plan sheets stage words"
for cal_ft in ${CAL_FTS}; do
IUSE+=" calligra_features_${cal_ft}"
done
@@ -54,7 +53,8 @@ unset cal_ft
REQUIRED_USE="
calligra_features_author? ( calligra_features_words )
- calligra_features_krita? ( eigen exif lcms )
+ calligra_features_gemini? ( opengl )
+ calligra_features_krita? ( eigen exif lcms opengl )
calligra_features_plan? ( kdepim )
calligra_features_sheets? ( eigen )
vc? ( calligra_features_krita )
@@ -62,28 +62,17 @@ REQUIRED_USE="
"
RDEPEND="
- !app-office/karbon
- !app-office/kexi
- !app-office/koffice-data
- !app-office/koffice-l10n
- !app-office/koffice-libs
- !app-office/koffice-meta
- !app-office/kplato
- !app-office/kpresenter
- !app-office/krita
- !app-office/kspread
- !app-office/kword
$(add_kdeapps_dep knewstuff)
dev-lang/perl
dev-libs/boost
dev-qt/qtcore:4[exceptions]
media-libs/libpng:0
sys-libs/zlib
- >=dev-qt/qtgui-4.8.1-r1:4
virtual/libiconv
attica? ( dev-libs/libattica )
+ color-management? ( media-libs/opencolorio )
crypt? ( app-crypt/qca:2[qt4(+)] )
- eigen? ( dev-cpp/eigen:2 )
+ eigen? ( dev-cpp/eigen:3 )
exif? ( media-gfx/exiv2:= )
fftw? ( sci-libs/fftw:3.0 )
fontconfig? ( media-libs/fontconfig )
@@ -97,6 +86,7 @@ RDEPEND="
app-text/libwpd:*
app-text/libwpg:*
app-text/libwps
+ dev-libs/librevenge
media-libs/libvisio
)
jpeg? ( virtual/jpeg:0 )
@@ -124,14 +114,14 @@ RDEPEND="
dev-db/postgresql:*
dev-libs/libpqxx
)
- spacenav? ( dev-libs/libspnav )
+ spacenav? ( dev-libs/libspnav )
sybase? ( dev-db/freetds )
tiff? ( media-libs/tiff:0 )
truetype? ( media-libs/freetype:2 )
vc? ( dev-libs/vc )
xbase? ( dev-db/xbase )
calligra_features_kexi? (
- >=dev-db/sqlite-3.7.9:3[extensions(+)]
+ >=dev-db/sqlite-3.8.7:3[extensions(+)]
dev-libs/icu:=
)
calligra_features_krita? (
@@ -141,13 +131,17 @@ RDEPEND="
)
calligra_features_words? ( dev-libs/libxslt )
"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ x11-misc/shared-mime-info
+"
-[[ ${PV} == 9999 ]] && LANGVERSION="2.4" || LANGVERSION="$(get_version_component_range 1-2)"
+[[ ${PV} == 9999 ]] && LANGVERSION="2.9" || LANGVERSION="$(get_version_component_range 1-2)"
PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
-RESTRICT=test
# bug 394273
+RESTRICT=test
+
+PATCHES=( "${FILESDIR}/${PN}-2.9.6-ghns-linking.patch" )
pkg_pretend() {
check-reqs_pkg_pretend
@@ -159,19 +153,23 @@ pkg_setup() {
}
src_configure() {
- local cal_ft
+ local cal_ft myproducts
+
+ # applications
+ for cal_ft in ${CAL_FTS}; do
+ use calligra_features_${cal_ft} && myproducts+=( ${cal_ft^^} )
+ done
+
+ local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
# first write out things we want to hard-enable
- local mycmakeargs=(
- "-DWITH_PNG=ON"
- "-DWITH_ZLIB=ON"
+ mycmakeargs+=(
"-DGHNS=ON"
"-DWITH_Iconv=ON" # available on all supported arches and many more
)
# default disablers
mycmakeargs+=(
- "-DBUILD_active=OFF" # we dont support active gui, maybe arm could
"-DCREATIVEONLY=OFF"
"-DPACKAGERS_BUILD=OFF"
"-DWITH_Soprano=OFF"
@@ -180,8 +178,9 @@ src_configure() {
# regular options
mycmakeargs+=(
$(cmake-utils_use_with attica LibAttica)
+ $(cmake-utils_use_with color-management OCIO)
$(cmake-utils_use_with crypt QCA2)
- $(cmake-utils_use_with eigen Eigen2)
+ $(cmake-utils_use_with eigen Eigen3)
$(cmake-utils_use_with exif Exiv2)
$(cmake-utils_use_with fftw FFTW3)
$(cmake-utils_use_with fontconfig Fontconfig)
@@ -190,6 +189,7 @@ src_configure() {
$(cmake-utils_use_with gsl GSL)
$(cmake-utils_use_with import-filter LibEtonyek)
$(cmake-utils_use_with import-filter LibOdfGen)
+ $(cmake-utils_use_with import-filter LibRevenge)
$(cmake-utils_use_with import-filter LibVisio)
$(cmake-utils_use_with import-filter LibWpd)
$(cmake-utils_use_with import-filter LibWpg)
@@ -200,15 +200,14 @@ src_configure() {
$(cmake-utils_use_with kde KActivities)
$(cmake-utils_use_with kdepim KdepimLibs)
$(cmake-utils_use_with lcms LCMS2)
- $(cmake-utils_use_with marble Marble)
+ $(cmake-utils_use_with marble CalligraMarble)
$(cmake-utils_use_with mysql MySQL)
$(cmake-utils_use_with okular Okular)
$(cmake-utils_use_with openexr OpenEXR)
- $(cmake-utils_use_with opengl GLEW)
- $(cmake-utils_use_with opengl OpenGL)
+ $(cmake-utils_use opengl USEOPENGL)
$(cmake-utils_use_with pdf Poppler)
$(cmake-utils_use_with pdf Pstoedit)
- $(cmake-utils_use_with postgres PostgreSQL)
+ $(cmake-utils_use_with postgres CalligraPostgreSQL)
$(cmake-utils_use_build postgres pqxx)
$(cmake-utils_use_with spacenav Spnav)
$(cmake-utils_use_with sybase FreeTDS)
@@ -219,13 +218,7 @@ src_configure() {
$(cmake-utils_use_with xbase XBase)
)
- # applications
- for cal_ft in ${CAL_FTS}; do
- mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
- done
mycmakeargs+=( $(cmake-utils_use_build test cstester) )
- # filters
-
kde4-base_src_configure
}
diff --git a/app-office/calligra/files/calligra-2.9.6-ghns-linking.patch b/app-office/calligra/files/calligra-2.9.6-ghns-linking.patch
new file mode 100644
index 0000000..b150972
--- /dev/null
+++ b/app-office/calligra/files/calligra-2.9.6-ghns-linking.patch
@@ -0,0 +1,11 @@
+--- calligra-2.9.6/libs/widgets/CMakeLists.txt.orig 2015-08-09 21:35:06.673116594 +0200
++++ calligra-2.9.6/libs/widgets/CMakeLists.txt 2015-08-09 21:47:31.458881310 +0200
+@@ -102,7 +102,7 @@
+ target_link_libraries(kowidgets kotext pigmentcms kowidgetutils ${KDE4_KIO_LIBS})
+
+ if(GHNS)
+- target_link_libraries(kowidgets {KDE4_KNEWSTUFF3_LIBS})
++ target_link_libraries(kowidgets ${KDE4_KNEWSTUFF3_LIBS})
+ endif ()
+
+ target_link_libraries(kowidgets LINK_INTERFACE_LIBRARIES kotext pigmentcms kowidgetutils ${KDE4_KDEUI_LIBS})
diff --git a/app-office/calligra/files/calligra-2.9.6-version.patch b/app-office/calligra/files/calligra-2.9.6-version.patch
new file mode 100644
index 0000000..277d65f
--- /dev/null
+++ b/app-office/calligra/files/calligra-2.9.6-version.patch
@@ -0,0 +1,24 @@
+From: Boudewijn Rempt <boud@valdyas.org>
+Date: Thu, 09 Jul 2015 06:14:05 +0000
+Subject: Update to 2.9.6
+X-Git-Url: http://quickgit.kde.org/?p=calligra.git&a=commitdiff&h=8d47cbdc81bbc3853837c6fc342d5b2dc77c3c0a
+---
+Update to 2.9.6
+---
+
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -27,10 +27,10 @@
+
+ # define common versions of Calligra applications, used to generate calligraversion.h
+ # update these version for every release:
+-set(CALLIGRA_VERSION_STRING "2.9.5")
++set(CALLIGRA_VERSION_STRING "2.9.6")
+ set(CALLIGRA_VERSION_MAJOR 2)
+ set(CALLIGRA_STABLE_VERSION_MINOR 9)
+-set(CALLIGRA_VERSION_RELEASE 5) # 89 for Alpha, increase for next test releases, set 0 for first Stable, etc.
++set(CALLIGRA_VERSION_RELEASE 6) # 89 for Alpha, increase for next test releases, set 0 for first Stable, etc.
+ #set(CALLIGRA_ALPHA 1) # uncomment only for Pre-Alpha and Alpha
+ #set(CALLIGRA_BETA 1) # uncomment only for Beta
+ #set(CALLIGRA_RC 1) # uncomment only for RC
diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index e0edfb2..e2a729d 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -5,6 +5,7 @@
<herd>openoffice</herd>
<use>
<flag name="attica">Get hot stuff with <pkg>dev-libs/libattica</pkg></flag>
+ <flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag>
<flag name="eigen">Enable <pkg>dev-cpp/eigen</pkg> mathematical templates support</flag>
<flag name="glew">Enable <pkg>media-libs/glew</pkg> opengl extension library support</flag>
<flag name="glib">Enable support for C library routines from <pkg>dev-libs/glib</pkg></flag>
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/, app-office/calligra/files/
@ 2016-12-23 8:51 Johannes Huber
0 siblings, 0 replies; 19+ messages in thread
From: Johannes Huber @ 2016-12-23 8:51 UTC (permalink / raw
To: gentoo-commits
commit: c4f7e87f3823e24991136f7570359fb99b4c9adb
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 23 08:47:31 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 08:47:45 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4f7e87f
app-office/calligra: Version bump 3.0.0
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-office/calligra/Manifest | 1 +
app-office/calligra/calligra-3.0.0.ebuild | 232 +++++++++++++++++++++
.../files/calligra-3.0.0-no-arch-detection.patch | 17 ++
app-office/calligra/metadata.xml | 1 +
4 files changed, 251 insertions(+)
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 22a983d..ddc8d3e 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1 +1,2 @@
DIST calligra-2.9.11.tar.xz 196039892 SHA256 b18d2d0f87bc92753ec8b1eb780a596770a49141e3e60d811da51e752e54ea09 SHA512 69fbb38dbc3d59a744ed1fae5361f61bde15da298d28942f226d3d99d399a95f5ee67cca755996290c65943aa9babf6367c44f0d0199dacce22a9879346f82f8 WHIRLPOOL 973a17eb639ddfaa5a913b064c90957935ded7fe3fdb5237c27112b6686b3dbe3e411c168f920947ef98c4a3d951842220f849565503fac67ebe75784f339e74
+DIST calligra-3.0.0.tar.gz 131474815 SHA256 79490a61e876767cb10c9605f48104c3d8b91f76a607424d14ec4c73c0eff0b2 SHA512 8bf93e1fd2b6d152c046c36c1386610d6607dd7846fd86a1d33bcf1d6bee9623c71b5eeb676ac272c8d8fc3843ce2681af2ba00e97a47e759b293aa58e73d5ca WHIRLPOOL 3ffdc9c0ddc868c2e6632c47cbd9028c0212b293ec9317627757403873f2d84978d0e5a04675bf1d864f583ad40d0543657721d6b1ac3b4c80f8526f78c47e78
diff --git a/app-office/calligra/calligra-3.0.0.ebuild b/app-office/calligra/calligra-3.0.0.ebuild
new file mode 100644
index 00000000..9d1016c
--- /dev/null
+++ b/app-office/calligra/calligra-3.0.0.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+CHECKREQS_DISK_BUILD="4G"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit check-reqs kde5 versionator
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="http://www.calligra.org/"
+
+case ${PV} in
+ 3.[0123456789].[789]?)
+ # beta or rc releases
+ SRC_URI="mirror://kde/unstable/${P}/${P}.tar.gz" ;;
+ 3.[0123456789].?)
+ # stable releases
+ SRC_URI="mirror://kde/stable/${P}/${P}.tar.gz"
+esac
+
+LICENSE="GPL-2"
+
+[[ ${KDE_BUILD_TYPE} == release ]] && \
+KEYWORDS="~amd64 ~x86"
+
+CAL_FTS=( karbon plan sheets words )
+CAL_EXP_FTS=( braindump stage )
+
+IUSE="activities +crypt +eigen +fontconfig gsl import-filter +lcms pim marble okular
+ openexr +pdf spacenav +truetype vc +xml X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})
+ $(printf 'calligra_experimental_features_%s ' ${CAL_EXP_FTS[@]})"
+
+REQUIRED_USE="calligra_features_sheets? ( eigen )"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0
+COMMON_DEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kemoticons)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kross)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep sonnet)
+ $(add_frameworks_dep threadweaver)
+ $(add_qt_dep designer)
+ $(add_qt_dep qtconcurrent)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtsvg)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ dev-lang/perl
+ dev-libs/boost
+ media-libs/libpng:0
+ sys-libs/zlib
+ virtual/libiconv
+ activities? ( $(add_frameworks_dep kactivities) )
+ crypt? ( app-crypt/qca:2[qt5] )
+ eigen? ( dev-cpp/eigen:3 )
+ fontconfig? ( media-libs/fontconfig )
+ gsl? ( sci-libs/gsl )
+ import-filter? (
+ $(add_frameworks_dep khtml)
+ app-text/libetonyek
+ app-text/libodfgen
+ app-text/libwpd:*
+ app-text/libwpg:*
+ >=app-text/libwps-0.4
+ dev-libs/librevenge
+ media-libs/libvisio
+ )
+ lcms? ( media-libs/lcms:2 )
+ marble? ( $(add_kdeapps_dep marble) )
+ openexr? ( media-libs/openexr )
+ pdf? ( app-text/poppler:=[qt5] )
+ spacenav? ( dev-libs/libspnav )
+ truetype? ( media-libs/freetype:2 )
+ X? (
+ $(add_qt_dep qtx11extras)
+ x11-libs/libX11
+ )
+ calligra_experimental_features_braindump? ( $(add_qt_dep qtwebkit) )
+ calligra_experimental_features_stage? (
+ $(add_qt_dep qtwebkit)
+ okular? ( $(add_kdeapps_dep okular) )
+ )
+ calligra_features_plan? (
+ $(add_qt_dep qtcore '' '' '5=')
+ dev-libs/kdiagram:5
+ dev-libs/kproperty:5
+ dev-libs/kreport:5
+ pim? (
+ $(add_kdeapps_dep akonadi)
+ $(add_kdeapps_dep akonadi-contacts)
+ $(add_kdeapps_dep kcalcore)
+ $(add_kdeapps_dep kcontacts)
+ )
+ )
+ calligra_features_words? (
+ dev-libs/libxslt
+ okular? ( $(add_kdeapps_dep okular) )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ sys-devel/gettext
+ x11-misc/shared-mime-info
+ vc? ( >=dev-libs/vc-1.1.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+ calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
+ !app-office/calligra:4
+"
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-no-arch-detection.patch" )
+
+pkg_pretend() {
+ check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+ kde5_pkg_setup
+ check-reqs_pkg_setup
+}
+
+src_prepare() {
+ kde5_src_prepare
+
+ # Unconditionally disable deprecated deps (required by QtQuick1)
+ punt_bogus_dep Qt5 Declarative
+ punt_bogus_dep Qt5 OpenGL
+
+ if ! use calligra_experimental_features_stage && \
+ ! use calligra_experimental_features_braindump; then
+ punt_bogus_dep Qt5 WebKitWidgets
+ punt_bogus_dep Qt5 WebKit
+ fi
+
+ # Hack around the excessive use of CMake macros
+ if use okular && ! use calligra_features_words; then
+ sed -i -e "/add_subdirectory( *okularodtgenerator *)/ s/^/#DONT/" \
+ extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT"
+ fi
+
+ if use okular && ! use calligra_experimental_features_stage; then
+ sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \
+ extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP"
+ fi
+}
+
+src_configure() {
+ local cal_ft myproducts experimental=OFF
+
+ # applications
+ for cal_ft in ${CAL_FTS[@]}; do
+ if use calligra_features_${cal_ft} ; then
+ myproducts+=( "${cal_ft^^}" )
+ fi
+ done
+ # experimental/unmaintained applications
+ for cal_ft in ${CAL_EXP_FTS[@]}; do
+ if use calligra_experimental_features_${cal_ft} ; then
+ experimental=ON
+ myproducts+=( "${cal_ft^^}" )
+ fi
+ done
+
+ local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
+
+ mycmakeargs+=(
+ -DPACKAGERS_BUILD=OFF
+ -DBUILD_UNMAINTAINED=${experimental}
+ -DWITH_Iconv=ON
+ -DWITH_Qca-qt5=$(usex crypt)
+ -DWITH_Eigen3=$(usex eigen)
+ -DWITH_Fontconfig=$(usex fontconfig)
+ -DWITH_GSL=$(usex gsl)
+ -DWITH_LibEtonyek=$(usex import-filter)
+ -DWITH_LibOdfGen=$(usex import-filter)
+ -DWITH_LibRevenge=$(usex import-filter)
+ -DWITH_LibVisio=$(usex import-filter)
+ -DWITH_LibWpd=$(usex import-filter)
+ -DWITH_LibWpg=$(usex import-filter)
+ -DWITH_LibWps=$(usex import-filter)
+ $(cmake-utils_use_find_package pim KF5Akonadi)
+ $(cmake-utils_use_find_package pim KF5AkonadiContact)
+ $(cmake-utils_use_find_package pim KF5CalendarCore)
+ $(cmake-utils_use_find_package pim KF5Contacts)
+ -DWITH_LCMS2=$(usex lcms)
+ $(cmake-utils_use_find_package marble Marble)
+ -DWITH_Okular5=$(usex okular)
+ -DWITH_OpenEXR=$(usex openexr)
+ -DWITH_Poppler=$(usex pdf)
+ $(cmake-utils_use_find_package spacenav Spnav)
+ -ENABLE_CSTESTER_TESTING=$(usex test)
+ -DWITH_Freetype=$(usex truetype)
+ -DWITH_Vc=$(usex vc)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Libgit2=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Libqgit2=ON
+ )
+
+ kde5_src_configure
+}
diff --git a/app-office/calligra/files/calligra-3.0.0-no-arch-detection.patch b/app-office/calligra/files/calligra-3.0.0-no-arch-detection.patch
new file mode 100644
index 00000000..1c544e9
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.0.0-no-arch-detection.patch
@@ -0,0 +1,17 @@
+Avoid automagic CXXFLAG detection courtesy of dev-libs/vc.
+
+Gentoo-bug: 584118
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -617,10 +617,6 @@
+ endif()
+ endmacro()
+
+- if (NOT PACKAGERS_BUILD)
+- # Optimize the whole Calligra for current architecture
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}")
+- endif ()
+ endif()
+ set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} )
+
diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 70bc199..f29d053 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -10,6 +10,7 @@
<name>Gentoo Office project</name>
</maintainer>
<use>
+ <flag name="activities">Enable kactivities support</flag>
<flag name="attica">Get hot stuff with <pkg>dev-libs/libattica</pkg></flag>
<flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag>
<flag name="eigen">Enable <pkg>dev-cpp/eigen</pkg> mathematical templates support</flag>
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/, app-office/calligra/files/
@ 2016-12-30 0:26 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2016-12-30 0:26 UTC (permalink / raw
To: gentoo-commits
commit: 040f3e11669ec6f7154588421cff00c1d6990578
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 02:35:38 2016 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 30 00:24:36 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=040f3e11
app-office/calligra: Fix configure, remove file collisions, crash fixes
Gentoo-bug: 603584, 603772
Package-Manager: portage-2.3.0
app-office/calligra/calligra-3.0.0-r1.ebuild | 248 +++++++++++++++++++++
.../files/calligra-3.0.0-optionaldeps.patch | 20 ++
.../calligra/files/calligra-3.0.0-plan-crash.patch | 199 +++++++++++++++++
.../files/calligra-3.0.0-words-crash.patch | 75 +++++++
4 files changed, 542 insertions(+)
diff --git a/app-office/calligra/calligra-3.0.0-r1.ebuild b/app-office/calligra/calligra-3.0.0-r1.ebuild
new file mode 100644
index 00000000..a7247a7
--- /dev/null
+++ b/app-office/calligra/calligra-3.0.0-r1.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+CHECKREQS_DISK_BUILD="4G"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit check-reqs kde5 versionator
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="http://www.calligra.org/"
+
+case ${PV} in
+ 3.[0123456789].[789]?)
+ # beta or rc releases
+ SRC_URI="mirror://kde/unstable/${P}/${P}.tar.gz" ;;
+ 3.[0123456789].?)
+ # stable releases
+ SRC_URI="mirror://kde/stable/${P}/${P}.tar.gz"
+esac
+
+LICENSE="GPL-2"
+
+[[ ${KDE_BUILD_TYPE} == release ]] && \
+KEYWORDS="~amd64 ~x86"
+
+CAL_FTS=( karbon plan sheets words )
+CAL_EXP_FTS=( braindump stage )
+
+IUSE="activities +crypt +eigen +fontconfig gsl import-filter +lcms pim marble okular
+ openexr +pdf spacenav +truetype vc +xml X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})
+ $(printf 'calligra_experimental_features_%s ' ${CAL_EXP_FTS[@]})"
+
+REQUIRED_USE="calligra_features_sheets? ( eigen )"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0
+COMMON_DEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kemoticons)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kross)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep sonnet)
+ $(add_frameworks_dep threadweaver)
+ $(add_qt_dep designer)
+ $(add_qt_dep qtconcurrent)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtsvg)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ dev-lang/perl
+ dev-libs/boost
+ media-libs/libpng:0
+ sys-libs/zlib
+ virtual/libiconv
+ activities? ( $(add_frameworks_dep kactivities) )
+ crypt? ( app-crypt/qca:2[qt5] )
+ eigen? ( dev-cpp/eigen:3 )
+ fontconfig? ( media-libs/fontconfig )
+ gsl? ( sci-libs/gsl )
+ import-filter? (
+ $(add_frameworks_dep khtml)
+ app-text/libetonyek
+ app-text/libodfgen
+ app-text/libwpd:*
+ app-text/libwpg:*
+ >=app-text/libwps-0.4
+ dev-libs/librevenge
+ media-libs/libvisio
+ )
+ lcms? ( media-libs/lcms:2 )
+ marble? ( $(add_kdeapps_dep marble) )
+ openexr? ( media-libs/openexr )
+ pdf? ( app-text/poppler:=[qt5] )
+ spacenav? ( dev-libs/libspnav )
+ truetype? ( media-libs/freetype:2 )
+ X? (
+ $(add_qt_dep qtx11extras)
+ x11-libs/libX11
+ )
+ calligra_experimental_features_braindump? ( $(add_qt_dep qtwebkit) )
+ calligra_experimental_features_stage? (
+ $(add_qt_dep qtwebkit)
+ okular? ( $(add_kdeapps_dep okular) )
+ )
+ calligra_features_plan? (
+ $(add_frameworks_dep khtml)
+ $(add_qt_dep qtcore '' '' '5=')
+ dev-libs/kdiagram:5
+ dev-libs/kproperty:5
+ dev-libs/kreport:5
+ pim? (
+ $(add_kdeapps_dep akonadi)
+ $(add_kdeapps_dep akonadi-contacts)
+ $(add_kdeapps_dep kcalcore)
+ $(add_kdeapps_dep kcontacts)
+ )
+ )
+ calligra_features_words? (
+ dev-libs/libxslt
+ okular? ( $(add_kdeapps_dep okular) )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ sys-devel/gettext
+ x11-misc/shared-mime-info
+ vc? ( >=dev-libs/vc-1.1.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+ calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
+ !app-office/calligra:4
+"
+RESTRICT+=" test"
+
+PATCHES=(
+ "${FILESDIR}/${P}-no-arch-detection.patch"
+ "${FILESDIR}/${P}-optionaldeps.patch"
+ "${FILESDIR}/${P}-words-crash.patch"
+ "${FILESDIR}/${P}-plan-crash.patch"
+)
+
+pkg_pretend() {
+ check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+ kde5_pkg_setup
+ check-reqs_pkg_setup
+}
+
+src_prepare() {
+ kde5_src_prepare
+
+ # Unconditionally disable deprecated deps (required by QtQuick1)
+ punt_bogus_dep Qt5 Declarative
+ punt_bogus_dep Qt5 OpenGL
+
+ if ! use calligra_experimental_features_stage && \
+ ! use calligra_experimental_features_braindump; then
+ punt_bogus_dep Qt5 WebKitWidgets
+ punt_bogus_dep Qt5 WebKit
+ fi
+
+ # Hack around the excessive use of CMake macros
+ if use okular && ! use calligra_features_words; then
+ sed -i -e "/add_subdirectory( *okularodtgenerator *)/ s/^/#DONT/" \
+ extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT"
+ fi
+
+ if use okular && ! use calligra_experimental_features_stage; then
+ sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \
+ extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP"
+ fi
+
+ rm -f po/*/*kexi*po || die
+ rm -f po/*/*krita*po || die
+}
+
+src_configure() {
+ local cal_ft myproducts experimental=OFF
+
+ # applications
+ for cal_ft in ${CAL_FTS[@]}; do
+ if use calligra_features_${cal_ft} ; then
+ myproducts+=( "${cal_ft^^}" )
+ fi
+ done
+ # experimental/unmaintained applications
+ for cal_ft in ${CAL_EXP_FTS[@]}; do
+ if use calligra_experimental_features_${cal_ft} ; then
+ experimental=ON
+ myproducts+=( "${cal_ft^^}" )
+ fi
+ done
+
+ local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
+
+ if [[ ${KDE_BUILD_TYPE} == release ]] ; then
+ mycmakeargs+=(
+ -DRELEASE_BUILD=ON
+ -DBUILD_UNMAINTAINED=${experimental}
+ )
+ fi
+
+ mycmakeargs+=(
+ -DPACKAGERS_BUILD=OFF
+ -DWITH_Iconv=ON
+ $(cmake-utils_use_find_package activities KF5Activities)
+ -DWITH_Qca-qt5=$(usex crypt)
+ -DWITH_Eigen3=$(usex eigen)
+ -DWITH_Fontconfig=$(usex fontconfig)
+ -DWITH_GSL=$(usex gsl)
+ -DWITH_LibEtonyek=$(usex import-filter)
+ -DWITH_LibOdfGen=$(usex import-filter)
+ -DWITH_LibRevenge=$(usex import-filter)
+ -DWITH_LibVisio=$(usex import-filter)
+ -DWITH_LibWpd=$(usex import-filter)
+ -DWITH_LibWpg=$(usex import-filter)
+ -DWITH_LibWps=$(usex import-filter)
+ $(cmake-utils_use_find_package pim KF5Akonadi)
+ $(cmake-utils_use_find_package pim KF5AkonadiContact)
+ $(cmake-utils_use_find_package pim KF5CalendarCore)
+ $(cmake-utils_use_find_package pim KF5Contacts)
+ -DWITH_LCMS2=$(usex lcms)
+ $(cmake-utils_use_find_package marble Marble)
+ -DWITH_Okular5=$(usex okular)
+ -DWITH_OpenEXR=$(usex openexr)
+ -DWITH_Poppler=$(usex pdf)
+ $(cmake-utils_use_find_package spacenav Spnav)
+ -ENABLE_CSTESTER_TESTING=$(usex test)
+ -DWITH_Freetype=$(usex truetype)
+ -DWITH_Vc=$(usex vc)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Libgit2=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Libqgit2=ON
+ )
+
+ kde5_src_configure
+}
diff --git a/app-office/calligra/files/calligra-3.0.0-optionaldeps.patch b/app-office/calligra/files/calligra-3.0.0-optionaldeps.patch
new file mode 100644
index 00000000..a36edee
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.0.0-optionaldeps.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0394af4..e11d998 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -223,11 +223,10 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
+ Notifications
+ KCMUtils
+ )
+-find_package(KF5 ${REQUIRED_KF5_VERSION} QUIET
+- OPTIONAL_COMPONENTS
+- Activities
+- KHtml
+-)
++
++find_package(KF5Activities)
++find_package(KF5KHtml)
++
+ set_package_properties(KF5Activities PROPERTIES
+ TYPE OPTIONAL
+ )
diff --git a/app-office/calligra/files/calligra-3.0.0-plan-crash.patch b/app-office/calligra/files/calligra-3.0.0-plan-crash.patch
new file mode 100644
index 00000000..3e1073f
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.0.0-plan-crash.patch
@@ -0,0 +1,199 @@
+From dd2cb16ab43d21ee25ba6ebfb36cd68ec9879c4f Mon Sep 17 00:00:00 2001
+From: Dag Andersen <danders@get2net.dk>
+Date: Mon, 12 Dec 2016 10:07:38 +0100
+Subject: Plan: Fix crash on close
+
+Due to accessing project node during delete
+
+BUG: 373527
+FIXED-IN: 3.0.0
+---
+ plan/libs/kernel/kptnode.cpp | 14 ++++++++++++--
+ plan/libs/kernel/kptnode.h | 5 ++++-
+ plan/libs/kernel/kptproject.cpp | 11 ++++++++++-
+ plan/libs/kernel/kptresource.cpp | 20 ++++++++++++++++----
+ plan/libs/kernel/kptresource.h | 7 ++++++-
+ 5 files changed, 48 insertions(+), 9 deletions(-)
+
+diff --git a/plan/libs/kernel/kptnode.cpp b/plan/libs/kernel/kptnode.cpp
+index d8b0e6b..e55f9ca 100644
+--- a/plan/libs/kernel/kptnode.cpp
++++ b/plan/libs/kernel/kptnode.cpp
+@@ -40,7 +40,8 @@ namespace KPlato
+ Node::Node(Node *parent)
+ : QObject( 0 ), // We don't use qobjects parent
+ m_nodes(), m_dependChildNodes(), m_dependParentNodes(),
+- m_estimate( 0 )
++ m_estimate( 0 ),
++ m_blockChanged(false)
+ {
+ //debugPlan<<"("<<this<<")";
+ m_parent = parent;
+@@ -53,7 +54,8 @@ Node::Node(const Node &node, Node *parent)
+ m_nodes(),
+ m_dependChildNodes(),
+ m_dependParentNodes(),
+- m_estimate( 0 )
++ m_estimate( 0 ),
++ m_blockChanged(false)
+ {
+ //debugPlan<<"("<<this<<")";
+ m_parent = parent;
+@@ -1225,7 +1227,15 @@ void Node::setRunningAccount(Account *acc)
+ changed();
+ }
+
++void Node::blockChanged(bool on)
++{
++ m_blockChanged = on;
++}
++
+ void Node::changed(Node *node, int property) {
++ if (m_blockChanged) {
++ return;
++ }
+ switch ( property) {
+ case Type:
+ case StartupCost:
+diff --git a/plan/libs/kernel/kptnode.h b/plan/libs/kernel/kptnode.h
+index cfcbd3e..4c98acc 100644
+--- a/plan/libs/kernel/kptnode.h
++++ b/plan/libs/kernel/kptnode.h
+@@ -528,6 +528,8 @@ public:
+ virtual void emitDocumentRemoved( Node *node, Document *doc, int idx );
+ virtual void emitDocumentChanged( Node *node, Document *doc, int idx );
+
++ void blockChanged(bool on = true);
++
+ public:
+ // These shouldn't be available to other than those who inherits
+ /// Calculate the critical path
+@@ -673,7 +675,8 @@ protected:
+ ResourceRequestCollection m_requests;
+
+ private:
+- void init();
++ void init();
++ bool m_blockChanged;
+ };
+
+ //////////////////////////////// Estimate ////////////////////////////////
+diff --git a/plan/libs/kernel/kptproject.cpp b/plan/libs/kernel/kptproject.cpp
+index 30cd450..d2fafb5 100644
+--- a/plan/libs/kernel/kptproject.cpp
++++ b/plan/libs/kernel/kptproject.cpp
+@@ -94,7 +94,16 @@ void Project::deref()
+ Project::~Project()
+ {
+ debugPlan;
+- disconnect(); // NOTE: may be a problem if somebody uses the destroyd() signal
++ disconnect();
++ for(Node *n : nodeIdDict) {
++ n->blockChanged();
++ }
++ for (Resource *r : resourceIdDict) {
++ r->blockChanged();
++ }
++ for (ResourceGroup *g : resourceGroupIdDict) {
++ g->blockChanged();
++ }
+ delete m_standardWorktime;
+ while ( !m_resourceGroups.isEmpty() )
+ delete m_resourceGroups.takeFirst();
+diff --git a/plan/libs/kernel/kptresource.cpp b/plan/libs/kernel/kptresource.cpp
+index 8a3d55e..b32d4e7 100644
+--- a/plan/libs/kernel/kptresource.cpp
++++ b/plan/libs/kernel/kptresource.cpp
+@@ -44,7 +44,8 @@ namespace KPlato
+ {
+
+ ResourceGroup::ResourceGroup()
+- : QObject( 0 )
++ : QObject( 0 ),
++ m_blockChanged(false)
+ {
+ m_project = 0;
+ m_type = Type_Work;
+@@ -80,8 +81,13 @@ void ResourceGroup::copy( const ResourceGroup *group )
+ m_name = group->m_name;
+ }
+
++void ResourceGroup::blockChanged(bool on)
++{
++ m_blockChanged = on;
++}
++
+ void ResourceGroup::changed() {
+- if ( m_project ) {
++ if (m_project && !m_blockChanged) {
+ m_project->changed( this );
+ }
+ }
+@@ -319,7 +325,8 @@ Resource::Resource()
+ m_project(0),
+ m_parent( 0 ),
+ m_autoAllocate( false ),
+- m_currentSchedule( 0 )
++ m_currentSchedule( 0 ),
++ m_blockChanged(false)
+ {
+ m_type = Type_Work;
+ m_units = 100; // %
+@@ -409,9 +416,14 @@ void Resource::copy(Resource *resource) {
+ //m_externalNames = resource->m_externalNames;
+ }
+
++void Resource::blockChanged(bool on)
++{
++ m_blockChanged = on;
++}
++
+ void Resource::changed()
+ {
+- if ( m_project ) {
++ if (m_project && !m_blockChanged) {
+ m_project->changed( this );
+ }
+ }
+diff --git a/plan/libs/kernel/kptresource.h b/plan/libs/kernel/kptresource.h
+index 10f6b92..fba020a 100644
+--- a/plan/libs/kernel/kptresource.h
++++ b/plan/libs/kernel/kptresource.h
+@@ -177,6 +177,8 @@ public:
+ DateTime startTime( long id ) const;
+ DateTime endTime( long id ) const;
+
++ void blockChanged(bool on = true);
++
+ #ifndef NDEBUG
+
+ void printDebug( const QString& ident );
+@@ -199,7 +201,7 @@ private:
+ Type m_type;
+
+ QList<ResourceGroupRequest*> m_requests;
+-
++ bool m_blockChanged;
+ };
+
+ /**
+@@ -492,6 +494,8 @@ public:
+ /// Set the @p account
+ void setAccount( Account *account );
+
++ void blockChanged(bool on = true);
++
+ // for xml loading code
+
+ class WorkInfoCache
+@@ -564,6 +568,7 @@ private:
+
+ // return this if resource has no calendar and is a material resource
+ Calendar m_materialCalendar;
++ bool m_blockChanged;
+
+ #ifndef NDEBUG
+ public:
+--
+cgit v0.11.2
+
diff --git a/app-office/calligra/files/calligra-3.0.0-words-crash.patch b/app-office/calligra/files/calligra-3.0.0-words-crash.patch
new file mode 100644
index 00000000..4fe9283
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.0.0-words-crash.patch
@@ -0,0 +1,75 @@
+From 2d86293939bafd80bc320849ffcc7544350fc2bf Mon Sep 17 00:00:00 2001
+From: Dag Andersen <danders@get2net.dk>
+Date: Fri, 9 Dec 2016 11:19:36 +0100
+Subject: Words: Fix crash when adding connected text frame
+
+Summary:
+KWFrameConnectSelector crashes you activate existsingRadio button but do not select a frameset.
+This patch selects a frameset if none is selected.
+
+Reviewers: boemann
+
+Reviewed By: boemann
+
+Tags: #kexi, #calligra:_3.0
+
+Differential Revision: https://phabricator.kde.org/D3632
+---
+ words/part/dialogs/KWFrameConnectSelector.cpp | 14 ++++++++++++++
+ words/part/dialogs/KWFrameConnectSelector.h | 1 +
+ 2 files changed, 15 insertions(+)
+
+diff --git a/words/part/dialogs/KWFrameConnectSelector.cpp b/words/part/dialogs/KWFrameConnectSelector.cpp
+index 566dfe2..590d3b7 100644
+--- a/words/part/dialogs/KWFrameConnectSelector.cpp
++++ b/words/part/dialogs/KWFrameConnectSelector.cpp
+@@ -21,6 +21,7 @@
+ #include "KWDocument.h"
+ #include "frames/KWTextFrameSet.h"
+ #include "Words.h"
++#include "WordsDebug.h"
+
+ KWFrameConnectSelector::KWFrameConnectSelector(FrameConfigSharedState *state)
+ : m_state(state),
+@@ -30,6 +31,8 @@ KWFrameConnectSelector::KWFrameConnectSelector(FrameConfigSharedState *state)
+
+ connect(widget.framesList, SIGNAL(itemClicked(QTreeWidgetItem*,int)),
+ this, SLOT(frameSetSelected()));
++ connect(widget.existingRadio, SIGNAL(clicked(bool)),
++ this, SLOT(existingRadioClicked(bool)));
+ connect(widget.frameSetName, SIGNAL(textChanged(QString)),
+ this, SLOT(nameChanged(QString)));
+ }
+@@ -50,6 +53,17 @@ bool KWFrameConnectSelector::canOpen(KoShape *shape)
+ return true;
+ }
+
++void KWFrameConnectSelector::existingRadioClicked(bool on)
++{
++ // make sure there is a selcted frameset
++ if (on && !widget.framesList->currentItem() && widget.framesList->model()->rowCount() > 0) {
++ QModelIndex curr = widget.framesList->model()->index(0, 0);
++ widget.framesList->setCurrentIndex(curr);
++ widget.framesList->selectionModel()->select(curr, QItemSelectionModel::Select);
++ }
++ debugWords<<Q_FUNC_INFO<<on<<widget.framesList->currentItem();
++}
++
+ void KWFrameConnectSelector::frameSetSelected()
+ {
+ widget.existingRadio->setChecked(true);
+diff --git a/words/part/dialogs/KWFrameConnectSelector.h b/words/part/dialogs/KWFrameConnectSelector.h
+index 74d3f0d..75ec1613 100644
+--- a/words/part/dialogs/KWFrameConnectSelector.h
++++ b/words/part/dialogs/KWFrameConnectSelector.h
+@@ -50,6 +50,7 @@ public:
+ }
+
+ private Q_SLOTS:
++ void existingRadioClicked(bool on);
+ void frameSetSelected();
+ void nameChanged(const QString &text);
+
+--
+cgit v0.11.2
+
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/, app-office/calligra/files/
@ 2017-01-04 9:50 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2017-01-04 9:50 UTC (permalink / raw
To: gentoo-commits
commit: 8efe316886bfb5d29b0d4e44677a0538b0601487
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 3 23:45:25 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 4 09:50:26 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8efe3168
app-office/calligra: Drop old
Package-Manager: portage-2.3.0
app-office/calligra/Manifest | 1 -
app-office/calligra/calligra-3.0.0-r1.ebuild | 248 ---------------------
.../calligra/files/calligra-3.0.0-plan-crash.patch | 199 -----------------
.../files/calligra-3.0.0-words-crash.patch | 75 -------
4 files changed, 523 deletions(-)
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index bf287c4..94b1450 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,3 +1,2 @@
DIST calligra-2.9.11.tar.xz 196039892 SHA256 b18d2d0f87bc92753ec8b1eb780a596770a49141e3e60d811da51e752e54ea09 SHA512 69fbb38dbc3d59a744ed1fae5361f61bde15da298d28942f226d3d99d399a95f5ee67cca755996290c65943aa9babf6367c44f0d0199dacce22a9879346f82f8 WHIRLPOOL 973a17eb639ddfaa5a913b064c90957935ded7fe3fdb5237c27112b6686b3dbe3e411c168f920947ef98c4a3d951842220f849565503fac67ebe75784f339e74
DIST calligra-3.0.0.1.tar.xz 61111072 SHA256 dedc51efc42f7dda37514d450cb772d9db37a658e0abbcf0f513712a04c1f011 SHA512 826495dfa843f51ecb1139ca8d6d19f6a3fd49e4ca186b4c6a5d1498cdecbfb38461a871153bf8b9944e729725e50918434849acc78c375591636d06ef5d5f6a WHIRLPOOL 085be69fbc32fe54b567e81727aaed7bf613d8c6f2fc9d6eaaac3348e5a4e116278b6da86be953d7d17ea8854dc94021c11c81eb29d8c9a68c517b31457d2242
-DIST calligra-3.0.0.tar.gz 131474815 SHA256 79490a61e876767cb10c9605f48104c3d8b91f76a607424d14ec4c73c0eff0b2 SHA512 8bf93e1fd2b6d152c046c36c1386610d6607dd7846fd86a1d33bcf1d6bee9623c71b5eeb676ac272c8d8fc3843ce2681af2ba00e97a47e759b293aa58e73d5ca WHIRLPOOL 3ffdc9c0ddc868c2e6632c47cbd9028c0212b293ec9317627757403873f2d84978d0e5a04675bf1d864f583ad40d0543657721d6b1ac3b4c80f8526f78c47e78
diff --git a/app-office/calligra/calligra-3.0.0-r1.ebuild b/app-office/calligra/calligra-3.0.0-r1.ebuild
deleted file mode 100644
index a7247a7..00000000
--- a/app-office/calligra/calligra-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="4G"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit check-reqs kde5 versionator
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="http://www.calligra.org/"
-
-case ${PV} in
- 3.[0123456789].[789]?)
- # beta or rc releases
- SRC_URI="mirror://kde/unstable/${P}/${P}.tar.gz" ;;
- 3.[0123456789].?)
- # stable releases
- SRC_URI="mirror://kde/stable/${P}/${P}.tar.gz"
-esac
-
-LICENSE="GPL-2"
-
-[[ ${KDE_BUILD_TYPE} == release ]] && \
-KEYWORDS="~amd64 ~x86"
-
-CAL_FTS=( karbon plan sheets words )
-CAL_EXP_FTS=( braindump stage )
-
-IUSE="activities +crypt +eigen +fontconfig gsl import-filter +lcms pim marble okular
- openexr +pdf spacenav +truetype vc +xml X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})
- $(printf 'calligra_experimental_features_%s ' ${CAL_EXP_FTS[@]})"
-
-REQUIRED_USE="calligra_features_sheets? ( eigen )"
-
-# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
-# Required for the matlab/octave formula tool
-# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0
-COMMON_DEPEND="
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kcmutils)
- $(add_frameworks_dep kcodecs)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdelibs4support)
- $(add_frameworks_dep kemoticons)
- $(add_frameworks_dep kglobalaccel)
- $(add_frameworks_dep kguiaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kitemmodels)
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep knotifyconfig)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep kross)
- $(add_frameworks_dep ktexteditor)
- $(add_frameworks_dep ktextwidgets)
- $(add_frameworks_dep kwallet)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep sonnet)
- $(add_frameworks_dep threadweaver)
- $(add_qt_dep designer)
- $(add_qt_dep qtconcurrent)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtdeclarative)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtscript)
- $(add_qt_dep qtsvg)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- dev-lang/perl
- dev-libs/boost
- media-libs/libpng:0
- sys-libs/zlib
- virtual/libiconv
- activities? ( $(add_frameworks_dep kactivities) )
- crypt? ( app-crypt/qca:2[qt5] )
- eigen? ( dev-cpp/eigen:3 )
- fontconfig? ( media-libs/fontconfig )
- gsl? ( sci-libs/gsl )
- import-filter? (
- $(add_frameworks_dep khtml)
- app-text/libetonyek
- app-text/libodfgen
- app-text/libwpd:*
- app-text/libwpg:*
- >=app-text/libwps-0.4
- dev-libs/librevenge
- media-libs/libvisio
- )
- lcms? ( media-libs/lcms:2 )
- marble? ( $(add_kdeapps_dep marble) )
- openexr? ( media-libs/openexr )
- pdf? ( app-text/poppler:=[qt5] )
- spacenav? ( dev-libs/libspnav )
- truetype? ( media-libs/freetype:2 )
- X? (
- $(add_qt_dep qtx11extras)
- x11-libs/libX11
- )
- calligra_experimental_features_braindump? ( $(add_qt_dep qtwebkit) )
- calligra_experimental_features_stage? (
- $(add_qt_dep qtwebkit)
- okular? ( $(add_kdeapps_dep okular) )
- )
- calligra_features_plan? (
- $(add_frameworks_dep khtml)
- $(add_qt_dep qtcore '' '' '5=')
- dev-libs/kdiagram:5
- dev-libs/kproperty:5
- dev-libs/kreport:5
- pim? (
- $(add_kdeapps_dep akonadi)
- $(add_kdeapps_dep akonadi-contacts)
- $(add_kdeapps_dep kcalcore)
- $(add_kdeapps_dep kcontacts)
- )
- )
- calligra_features_words? (
- dev-libs/libxslt
- okular? ( $(add_kdeapps_dep okular) )
- )
-"
-DEPEND="${COMMON_DEPEND}
- sys-devel/gettext
- x11-misc/shared-mime-info
- vc? ( >=dev-libs/vc-1.1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
- calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
- !app-office/calligra:4
-"
-RESTRICT+=" test"
-
-PATCHES=(
- "${FILESDIR}/${P}-no-arch-detection.patch"
- "${FILESDIR}/${P}-optionaldeps.patch"
- "${FILESDIR}/${P}-words-crash.patch"
- "${FILESDIR}/${P}-plan-crash.patch"
-)
-
-pkg_pretend() {
- check-reqs_pkg_pretend
-}
-
-pkg_setup() {
- kde5_pkg_setup
- check-reqs_pkg_setup
-}
-
-src_prepare() {
- kde5_src_prepare
-
- # Unconditionally disable deprecated deps (required by QtQuick1)
- punt_bogus_dep Qt5 Declarative
- punt_bogus_dep Qt5 OpenGL
-
- if ! use calligra_experimental_features_stage && \
- ! use calligra_experimental_features_braindump; then
- punt_bogus_dep Qt5 WebKitWidgets
- punt_bogus_dep Qt5 WebKit
- fi
-
- # Hack around the excessive use of CMake macros
- if use okular && ! use calligra_features_words; then
- sed -i -e "/add_subdirectory( *okularodtgenerator *)/ s/^/#DONT/" \
- extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT"
- fi
-
- if use okular && ! use calligra_experimental_features_stage; then
- sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \
- extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP"
- fi
-
- rm -f po/*/*kexi*po || die
- rm -f po/*/*krita*po || die
-}
-
-src_configure() {
- local cal_ft myproducts experimental=OFF
-
- # applications
- for cal_ft in ${CAL_FTS[@]}; do
- if use calligra_features_${cal_ft} ; then
- myproducts+=( "${cal_ft^^}" )
- fi
- done
- # experimental/unmaintained applications
- for cal_ft in ${CAL_EXP_FTS[@]}; do
- if use calligra_experimental_features_${cal_ft} ; then
- experimental=ON
- myproducts+=( "${cal_ft^^}" )
- fi
- done
-
- local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
-
- if [[ ${KDE_BUILD_TYPE} == release ]] ; then
- mycmakeargs+=(
- -DRELEASE_BUILD=ON
- -DBUILD_UNMAINTAINED=${experimental}
- )
- fi
-
- mycmakeargs+=(
- -DPACKAGERS_BUILD=OFF
- -DWITH_Iconv=ON
- $(cmake-utils_use_find_package activities KF5Activities)
- -DWITH_Qca-qt5=$(usex crypt)
- -DWITH_Eigen3=$(usex eigen)
- -DWITH_Fontconfig=$(usex fontconfig)
- -DWITH_GSL=$(usex gsl)
- -DWITH_LibEtonyek=$(usex import-filter)
- -DWITH_LibOdfGen=$(usex import-filter)
- -DWITH_LibRevenge=$(usex import-filter)
- -DWITH_LibVisio=$(usex import-filter)
- -DWITH_LibWpd=$(usex import-filter)
- -DWITH_LibWpg=$(usex import-filter)
- -DWITH_LibWps=$(usex import-filter)
- $(cmake-utils_use_find_package pim KF5Akonadi)
- $(cmake-utils_use_find_package pim KF5AkonadiContact)
- $(cmake-utils_use_find_package pim KF5CalendarCore)
- $(cmake-utils_use_find_package pim KF5Contacts)
- -DWITH_LCMS2=$(usex lcms)
- $(cmake-utils_use_find_package marble Marble)
- -DWITH_Okular5=$(usex okular)
- -DWITH_OpenEXR=$(usex openexr)
- -DWITH_Poppler=$(usex pdf)
- $(cmake-utils_use_find_package spacenav Spnav)
- -ENABLE_CSTESTER_TESTING=$(usex test)
- -DWITH_Freetype=$(usex truetype)
- -DWITH_Vc=$(usex vc)
- -DCMAKE_DISABLE_FIND_PACKAGE_Libgit2=ON
- -DCMAKE_DISABLE_FIND_PACKAGE_Libqgit2=ON
- )
-
- kde5_src_configure
-}
diff --git a/app-office/calligra/files/calligra-3.0.0-plan-crash.patch b/app-office/calligra/files/calligra-3.0.0-plan-crash.patch
deleted file mode 100644
index 3e1073f..00000000
--- a/app-office/calligra/files/calligra-3.0.0-plan-crash.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-From dd2cb16ab43d21ee25ba6ebfb36cd68ec9879c4f Mon Sep 17 00:00:00 2001
-From: Dag Andersen <danders@get2net.dk>
-Date: Mon, 12 Dec 2016 10:07:38 +0100
-Subject: Plan: Fix crash on close
-
-Due to accessing project node during delete
-
-BUG: 373527
-FIXED-IN: 3.0.0
----
- plan/libs/kernel/kptnode.cpp | 14 ++++++++++++--
- plan/libs/kernel/kptnode.h | 5 ++++-
- plan/libs/kernel/kptproject.cpp | 11 ++++++++++-
- plan/libs/kernel/kptresource.cpp | 20 ++++++++++++++++----
- plan/libs/kernel/kptresource.h | 7 ++++++-
- 5 files changed, 48 insertions(+), 9 deletions(-)
-
-diff --git a/plan/libs/kernel/kptnode.cpp b/plan/libs/kernel/kptnode.cpp
-index d8b0e6b..e55f9ca 100644
---- a/plan/libs/kernel/kptnode.cpp
-+++ b/plan/libs/kernel/kptnode.cpp
-@@ -40,7 +40,8 @@ namespace KPlato
- Node::Node(Node *parent)
- : QObject( 0 ), // We don't use qobjects parent
- m_nodes(), m_dependChildNodes(), m_dependParentNodes(),
-- m_estimate( 0 )
-+ m_estimate( 0 ),
-+ m_blockChanged(false)
- {
- //debugPlan<<"("<<this<<")";
- m_parent = parent;
-@@ -53,7 +54,8 @@ Node::Node(const Node &node, Node *parent)
- m_nodes(),
- m_dependChildNodes(),
- m_dependParentNodes(),
-- m_estimate( 0 )
-+ m_estimate( 0 ),
-+ m_blockChanged(false)
- {
- //debugPlan<<"("<<this<<")";
- m_parent = parent;
-@@ -1225,7 +1227,15 @@ void Node::setRunningAccount(Account *acc)
- changed();
- }
-
-+void Node::blockChanged(bool on)
-+{
-+ m_blockChanged = on;
-+}
-+
- void Node::changed(Node *node, int property) {
-+ if (m_blockChanged) {
-+ return;
-+ }
- switch ( property) {
- case Type:
- case StartupCost:
-diff --git a/plan/libs/kernel/kptnode.h b/plan/libs/kernel/kptnode.h
-index cfcbd3e..4c98acc 100644
---- a/plan/libs/kernel/kptnode.h
-+++ b/plan/libs/kernel/kptnode.h
-@@ -528,6 +528,8 @@ public:
- virtual void emitDocumentRemoved( Node *node, Document *doc, int idx );
- virtual void emitDocumentChanged( Node *node, Document *doc, int idx );
-
-+ void blockChanged(bool on = true);
-+
- public:
- // These shouldn't be available to other than those who inherits
- /// Calculate the critical path
-@@ -673,7 +675,8 @@ protected:
- ResourceRequestCollection m_requests;
-
- private:
-- void init();
-+ void init();
-+ bool m_blockChanged;
- };
-
- //////////////////////////////// Estimate ////////////////////////////////
-diff --git a/plan/libs/kernel/kptproject.cpp b/plan/libs/kernel/kptproject.cpp
-index 30cd450..d2fafb5 100644
---- a/plan/libs/kernel/kptproject.cpp
-+++ b/plan/libs/kernel/kptproject.cpp
-@@ -94,7 +94,16 @@ void Project::deref()
- Project::~Project()
- {
- debugPlan;
-- disconnect(); // NOTE: may be a problem if somebody uses the destroyd() signal
-+ disconnect();
-+ for(Node *n : nodeIdDict) {
-+ n->blockChanged();
-+ }
-+ for (Resource *r : resourceIdDict) {
-+ r->blockChanged();
-+ }
-+ for (ResourceGroup *g : resourceGroupIdDict) {
-+ g->blockChanged();
-+ }
- delete m_standardWorktime;
- while ( !m_resourceGroups.isEmpty() )
- delete m_resourceGroups.takeFirst();
-diff --git a/plan/libs/kernel/kptresource.cpp b/plan/libs/kernel/kptresource.cpp
-index 8a3d55e..b32d4e7 100644
---- a/plan/libs/kernel/kptresource.cpp
-+++ b/plan/libs/kernel/kptresource.cpp
-@@ -44,7 +44,8 @@ namespace KPlato
- {
-
- ResourceGroup::ResourceGroup()
-- : QObject( 0 )
-+ : QObject( 0 ),
-+ m_blockChanged(false)
- {
- m_project = 0;
- m_type = Type_Work;
-@@ -80,8 +81,13 @@ void ResourceGroup::copy( const ResourceGroup *group )
- m_name = group->m_name;
- }
-
-+void ResourceGroup::blockChanged(bool on)
-+{
-+ m_blockChanged = on;
-+}
-+
- void ResourceGroup::changed() {
-- if ( m_project ) {
-+ if (m_project && !m_blockChanged) {
- m_project->changed( this );
- }
- }
-@@ -319,7 +325,8 @@ Resource::Resource()
- m_project(0),
- m_parent( 0 ),
- m_autoAllocate( false ),
-- m_currentSchedule( 0 )
-+ m_currentSchedule( 0 ),
-+ m_blockChanged(false)
- {
- m_type = Type_Work;
- m_units = 100; // %
-@@ -409,9 +416,14 @@ void Resource::copy(Resource *resource) {
- //m_externalNames = resource->m_externalNames;
- }
-
-+void Resource::blockChanged(bool on)
-+{
-+ m_blockChanged = on;
-+}
-+
- void Resource::changed()
- {
-- if ( m_project ) {
-+ if (m_project && !m_blockChanged) {
- m_project->changed( this );
- }
- }
-diff --git a/plan/libs/kernel/kptresource.h b/plan/libs/kernel/kptresource.h
-index 10f6b92..fba020a 100644
---- a/plan/libs/kernel/kptresource.h
-+++ b/plan/libs/kernel/kptresource.h
-@@ -177,6 +177,8 @@ public:
- DateTime startTime( long id ) const;
- DateTime endTime( long id ) const;
-
-+ void blockChanged(bool on = true);
-+
- #ifndef NDEBUG
-
- void printDebug( const QString& ident );
-@@ -199,7 +201,7 @@ private:
- Type m_type;
-
- QList<ResourceGroupRequest*> m_requests;
--
-+ bool m_blockChanged;
- };
-
- /**
-@@ -492,6 +494,8 @@ public:
- /// Set the @p account
- void setAccount( Account *account );
-
-+ void blockChanged(bool on = true);
-+
- // for xml loading code
-
- class WorkInfoCache
-@@ -564,6 +568,7 @@ private:
-
- // return this if resource has no calendar and is a material resource
- Calendar m_materialCalendar;
-+ bool m_blockChanged;
-
- #ifndef NDEBUG
- public:
---
-cgit v0.11.2
-
diff --git a/app-office/calligra/files/calligra-3.0.0-words-crash.patch b/app-office/calligra/files/calligra-3.0.0-words-crash.patch
deleted file mode 100644
index 4fe9283..00000000
--- a/app-office/calligra/files/calligra-3.0.0-words-crash.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 2d86293939bafd80bc320849ffcc7544350fc2bf Mon Sep 17 00:00:00 2001
-From: Dag Andersen <danders@get2net.dk>
-Date: Fri, 9 Dec 2016 11:19:36 +0100
-Subject: Words: Fix crash when adding connected text frame
-
-Summary:
-KWFrameConnectSelector crashes you activate existsingRadio button but do not select a frameset.
-This patch selects a frameset if none is selected.
-
-Reviewers: boemann
-
-Reviewed By: boemann
-
-Tags: #kexi, #calligra:_3.0
-
-Differential Revision: https://phabricator.kde.org/D3632
----
- words/part/dialogs/KWFrameConnectSelector.cpp | 14 ++++++++++++++
- words/part/dialogs/KWFrameConnectSelector.h | 1 +
- 2 files changed, 15 insertions(+)
-
-diff --git a/words/part/dialogs/KWFrameConnectSelector.cpp b/words/part/dialogs/KWFrameConnectSelector.cpp
-index 566dfe2..590d3b7 100644
---- a/words/part/dialogs/KWFrameConnectSelector.cpp
-+++ b/words/part/dialogs/KWFrameConnectSelector.cpp
-@@ -21,6 +21,7 @@
- #include "KWDocument.h"
- #include "frames/KWTextFrameSet.h"
- #include "Words.h"
-+#include "WordsDebug.h"
-
- KWFrameConnectSelector::KWFrameConnectSelector(FrameConfigSharedState *state)
- : m_state(state),
-@@ -30,6 +31,8 @@ KWFrameConnectSelector::KWFrameConnectSelector(FrameConfigSharedState *state)
-
- connect(widget.framesList, SIGNAL(itemClicked(QTreeWidgetItem*,int)),
- this, SLOT(frameSetSelected()));
-+ connect(widget.existingRadio, SIGNAL(clicked(bool)),
-+ this, SLOT(existingRadioClicked(bool)));
- connect(widget.frameSetName, SIGNAL(textChanged(QString)),
- this, SLOT(nameChanged(QString)));
- }
-@@ -50,6 +53,17 @@ bool KWFrameConnectSelector::canOpen(KoShape *shape)
- return true;
- }
-
-+void KWFrameConnectSelector::existingRadioClicked(bool on)
-+{
-+ // make sure there is a selcted frameset
-+ if (on && !widget.framesList->currentItem() && widget.framesList->model()->rowCount() > 0) {
-+ QModelIndex curr = widget.framesList->model()->index(0, 0);
-+ widget.framesList->setCurrentIndex(curr);
-+ widget.framesList->selectionModel()->select(curr, QItemSelectionModel::Select);
-+ }
-+ debugWords<<Q_FUNC_INFO<<on<<widget.framesList->currentItem();
-+}
-+
- void KWFrameConnectSelector::frameSetSelected()
- {
- widget.existingRadio->setChecked(true);
-diff --git a/words/part/dialogs/KWFrameConnectSelector.h b/words/part/dialogs/KWFrameConnectSelector.h
-index 74d3f0d..75ec1613 100644
---- a/words/part/dialogs/KWFrameConnectSelector.h
-+++ b/words/part/dialogs/KWFrameConnectSelector.h
-@@ -50,6 +50,7 @@ public:
- }
-
- private Q_SLOTS:
-+ void existingRadioClicked(bool on);
- void frameSetSelected();
- void nameChanged(const QString &text);
-
---
-cgit v0.11.2
-
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/, app-office/calligra/files/
@ 2017-01-06 22:35 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2017-01-06 22:35 UTC (permalink / raw
To: gentoo-commits
commit: 40af205e956491a6115c088a186080f63b84a9d4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 4 13:27:19 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 6 22:30:32 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40af205e
app-office/calligra: Fix DEPENDs, add USE=jpeg2k,phonon
Make USE=lcms do something (enable PLUGIN_COLORENGINES)
Make USE=spacenav do sth (enable PLUGIN_SPACENAVIGATOR)
Revert upstream disabling AkonadiContact
Block calligra-l10n:4
Drop unused libpng dependency
Move boost,threadweaver RDEPEND -> DEPEND
KDE_TEST=forceoptional-recursive to eliminate a truckload of warnings
Disable benchmarks as well, nothing is installed
Patch out bogus references to kdelibs4
Package-Manager: portage-2.3.0
app-office/calligra/calligra-3.0.0.1-r1.ebuild | 253 +++++++++++++++++++++
.../calligra/files/calligra-3.0.0.1-deps1.patch | 31 +++
.../calligra/files/calligra-3.0.0.1-deps2.patch | 65 ++++++
.../calligra/files/calligra-3.0.0.1-deps3.patch | 31 +++
.../files/calligra-3.0.0.1-nokdelibs4.patch | 38 ++++
.../files/calligra-3.0.0.1-reenable-akonadi.patch | 113 +++++++++
.../files/calligra-3.0.0.1-relax-deps.patch | 34 +++
app-office/calligra/metadata.xml | 2 +
8 files changed, 567 insertions(+)
diff --git a/app-office/calligra/calligra-3.0.0.1-r1.ebuild b/app-office/calligra/calligra-3.0.0.1-r1.ebuild
new file mode 100644
index 00000000..130d128
--- /dev/null
+++ b/app-office/calligra/calligra-3.0.0.1-r1.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+CHECKREQS_DISK_BUILD="4G"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional-recursive"
+inherit check-reqs kde5 versionator
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="http://www.calligra.org/"
+[[ ${KDE_BUILD_TYPE} == release ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+
+[[ ${KDE_BUILD_TYPE} == release ]] && \
+KEYWORDS="~amd64 ~x86"
+
+CAL_FTS=( karbon plan sheets words )
+CAL_EXP_FTS=( braindump stage )
+
+IUSE="activities +crypt +eigen +fontconfig gsl import-filter jpeg2k +lcms okular openexr +pdf
+phonon pim marble spacenav +truetype vc +xml X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})
+$(printf 'calligra_experimental_features_%s ' ${CAL_EXP_FTS[@]})"
+
+REQUIRED_USE="calligra_features_sheets? ( eigen )"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0
+COMMON_DEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kemoticons)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kross)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep sonnet)
+ $(add_qt_dep designer)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtsvg)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ dev-lang/perl
+ sys-libs/zlib
+ virtual/libiconv
+ activities? ( $(add_frameworks_dep kactivities) )
+ crypt? ( app-crypt/qca:2[qt5] )
+ eigen? ( dev-cpp/eigen:3 )
+ fontconfig? ( media-libs/fontconfig )
+ gsl? ( sci-libs/gsl )
+ import-filter? (
+ $(add_frameworks_dep khtml)
+ app-text/libetonyek
+ app-text/libodfgen
+ app-text/libwpd:*
+ app-text/libwpg:*
+ >=app-text/libwps-0.4
+ dev-libs/librevenge
+ media-libs/libvisio
+ )
+ lcms? (
+ media-libs/ilmbase:=
+ media-libs/lcms:2
+ )
+ marble? ( $(add_kdeapps_dep marble) )
+ openexr? ( media-libs/openexr )
+ pdf? ( app-text/poppler:=[qt5] )
+ phonon? ( media-libs/phonon[qt5] )
+ spacenav? ( dev-libs/libspnav )
+ truetype? ( media-libs/freetype:2 )
+ X? (
+ $(add_qt_dep qtx11extras)
+ x11-libs/libX11
+ )
+ calligra_experimental_features_braindump? ( $(add_qt_dep qtwebkit) )
+ calligra_experimental_features_stage? (
+ $(add_qt_dep qtwebkit)
+ okular? ( $(add_kdeapps_dep okular) )
+ )
+ calligra_features_karbon? ( jpeg2k? ( media-libs/openjpeg:= ) )
+ calligra_features_plan? (
+ $(add_frameworks_dep khtml)
+ $(add_qt_dep qtcore '' '' '5=')
+ dev-libs/kdiagram:5
+ =dev-libs/kproperty-3.0*:5
+ =dev-libs/kreport-3.0*:5
+ pim? (
+ $(add_kdeapps_dep akonadi)
+ $(add_kdeapps_dep akonadi-contacts)
+ $(add_kdeapps_dep kcalcore)
+ $(add_kdeapps_dep kcontacts)
+ )
+ )
+ calligra_features_words? (
+ dev-libs/libxslt
+ okular? ( $(add_kdeapps_dep okular) )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost
+ sys-devel/gettext
+ x11-misc/shared-mime-info
+ test? ( $(add_frameworks_dep threadweaver) )
+ vc? ( >=dev-libs/vc-1.1.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+ calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
+ !app-office/calligra:4
+ !app-office/calligra-l10n:4
+"
+RESTRICT+=" test"
+
+PATCHES=(
+ "${FILESDIR}/${PN}"-3.0.0-no-arch-detection.patch
+ # upstream master
+ "${FILESDIR}/${P}"-nokdelibs4.patch
+ "${FILESDIR}/${P}"-relax-deps.patch
+ # pending upstream
+ "${FILESDIR}/${P}"-reenable-akonadi.patch
+ "${FILESDIR}/${P}"-deps{1,2,3}.patch
+)
+
+pkg_pretend() {
+ check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+ kde5_pkg_setup
+ check-reqs_pkg_setup
+}
+
+src_prepare() {
+ kde5_src_prepare
+
+ if ! use test; then
+ sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \
+ -i libs/pigment/CMakeLists.txt || die
+ fi
+
+ # Unconditionally disable deprecated deps (required by QtQuick1)
+ punt_bogus_dep Qt5 Declarative
+ punt_bogus_dep Qt5 OpenGL
+
+ if ! use calligra_experimental_features_stage && \
+ ! use calligra_experimental_features_braindump; then
+ punt_bogus_dep Qt5 WebKitWidgets
+ punt_bogus_dep Qt5 WebKit
+ fi
+
+ # Hack around the excessive use of CMake macros
+ if use okular && ! use calligra_features_words; then
+ sed -i -e "/add_subdirectory( *okularodtgenerator *)/ s/^/#DONT/" \
+ extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT"
+ fi
+
+ if use okular && ! use calligra_experimental_features_stage; then
+ sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \
+ extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP"
+ fi
+}
+
+src_configure() {
+ local cal_ft myproducts experimental=OFF
+
+ # applications
+ for cal_ft in ${CAL_FTS[@]}; do
+ if use calligra_features_${cal_ft} ; then
+ myproducts+=( "${cal_ft^^}" )
+ fi
+ done
+ # experimental/unmaintained applications
+ for cal_ft in ${CAL_EXP_FTS[@]}; do
+ if use calligra_experimental_features_${cal_ft} ; then
+ experimental=ON
+ myproducts+=( "${cal_ft^^}" )
+ fi
+ done
+
+ use lcms && myproducts+=( PLUGIN_COLORENGINES )
+ use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
+
+ local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
+
+ if [[ ${KDE_BUILD_TYPE} == release ]] ; then
+ mycmakeargs+=(
+ -DRELEASE_BUILD=ON
+ -DBUILD_UNMAINTAINED=${experimental}
+ )
+ fi
+
+ mycmakeargs+=(
+ -DPACKAGERS_BUILD=OFF
+ -DWITH_Iconv=ON
+ $(cmake-utils_use_find_package activities KF5Activities)
+ -DWITH_Qca-qt5=$(usex crypt)
+ -DWITH_Eigen3=$(usex eigen)
+ -DWITH_Fontconfig=$(usex fontconfig)
+ -DWITH_GSL=$(usex gsl)
+ -DWITH_LibEtonyek=$(usex import-filter)
+ -DWITH_LibOdfGen=$(usex import-filter)
+ -DWITH_LibRevenge=$(usex import-filter)
+ -DWITH_LibVisio=$(usex import-filter)
+ -DWITH_LibWpd=$(usex import-filter)
+ -DWITH_LibWpg=$(usex import-filter)
+ -DWITH_LibWps=$(usex import-filter)
+ $(cmake-utils_use_find_package jpeg2k OpenJPEG)
+ $(cmake-utils_use_find_package phonon Phonon4Qt5)
+ $(cmake-utils_use_find_package pim KF5Akonadi)
+ $(cmake-utils_use_find_package pim KF5AkonadiContact)
+ $(cmake-utils_use_find_package pim KF5CalendarCore)
+ $(cmake-utils_use_find_package pim KF5Contacts)
+ -DWITH_LCMS2=$(usex lcms)
+ $(cmake-utils_use_find_package marble Marble)
+ -DWITH_Okular5=$(usex okular)
+ -DWITH_OpenEXR=$(usex openexr)
+ -DWITH_Poppler=$(usex pdf)
+ -ENABLE_CSTESTER_TESTING=$(usex test)
+ -DWITH_Freetype=$(usex truetype)
+ -DWITH_Vc=$(usex vc)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Libgit2=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Libqgit2=ON
+ )
+
+ kde5_src_configure
+}
diff --git a/app-office/calligra/files/calligra-3.0.0.1-deps1.patch b/app-office/calligra/files/calligra-3.0.0.1-deps1.patch
new file mode 100644
index 00000000..9ee98ff
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.0.0.1-deps1.patch
@@ -0,0 +1,31 @@
+commit 3e3c3a16b9a8b114cc407da9152e20d5dfc422c6
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Wed Jan 4 14:10:56 2017 +0100
+
+ Make Activities and KF5Html really optional.
+
+ Before, trying to use CMAKE_DISABLE_FIND_PACKAGE_KF5{Activities,KHtml}
+ errored out with:
+
+ "if given arguments: "VERSION_LESS" "5.16.0" Unknown arguments specified"
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0394af4..e11d998 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -223,11 +223,10 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
+ Notifications
+ KCMUtils
+ )
+-find_package(KF5 ${REQUIRED_KF5_VERSION} QUIET
+- OPTIONAL_COMPONENTS
+- Activities
+- KHtml
+-)
++
++find_package(KF5Activities)
++find_package(KF5KHtml)
++
+ set_package_properties(KF5Activities PROPERTIES
+ TYPE OPTIONAL
+ )
diff --git a/app-office/calligra/files/calligra-3.0.0.1-deps2.patch b/app-office/calligra/files/calligra-3.0.0.1-deps2.patch
new file mode 100644
index 00000000..c0e3587
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.0.0.1-deps2.patch
@@ -0,0 +1,65 @@
+commit 511d4014beff9f79aeab1c0013470f21ac6b7df7
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Wed Jan 4 14:13:19 2017 +0100
+
+ Fix dependencies, sort and clean trailing whitespaces
+
+ Add missing KF5JobWidgets
+ Drop unused KF5TextEditor
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e11d998..6fab26b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -195,33 +195,33 @@ set(REQUIRED_KF5_VERSION "5.7.0")
+
+ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
+ COMPONENTS
+- Archive
+- Codecs
++ Archive
++ Codecs
+ Completion
+- Config
+- ConfigWidgets
++ Config
++ ConfigWidgets
+ CoreAddons
+ DBusAddons
+ DocTools
+- GuiAddons
+- I18n
+- IconThemes
++ GuiAddons
++ I18n
++ IconThemes
+ ItemViews
++ JobWidgets
++ KCMUtils
+ KDELibs4Support
+- KIO
+- Kross
+- Parts
++ KIO
++ Kross
++ Notifications
++ NotifyConfig
++ Parts
+ Sonnet
+- TextEditor
+- TextWidgets
++ TextWidgets
+ ThreadWeaver
+- Wallet
+- WidgetsAddons
++ Wallet
++ WidgetsAddons
+ WindowSystem
+- XmlGui
+- NotifyConfig
+- Notifications
+- KCMUtils
++ XmlGui
+ )
+
+ find_package(KF5Activities)
diff --git a/app-office/calligra/files/calligra-3.0.0.1-deps3.patch b/app-office/calligra/files/calligra-3.0.0.1-deps3.patch
new file mode 100644
index 00000000..2459178
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.0.0.1-deps3.patch
@@ -0,0 +1,31 @@
+commit 019f7e77a341661742b179c92cbce485b7ae361e
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Wed Jan 4 23:51:32 2017 +0100
+
+ Push KF5Threadweaver dep to the only place where it is used
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6fab26b..ace6f52 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -217,7 +217,6 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
+ Parts
+ Sonnet
+ TextWidgets
+- ThreadWeaver
+ Wallet
+ WidgetsAddons
+ WindowSystem
+diff --git a/libs/widgets/tests/CMakeLists.txt b/libs/widgets/tests/CMakeLists.txt
+index 3934630..744828c 100644
+--- a/libs/widgets/tests/CMakeLists.txt
++++ b/libs/widgets/tests/CMakeLists.txt
+@@ -4,6 +4,8 @@ include_directories( ${KOMAIN_INCLUDES} ${CMAKE_SOURCE_DIR}/libs/widgets)
+ add_definitions(-DFILES_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data/")
+ add_definitions(-DFILES_OUTPUT_DIR="${CMAKE_CURRENT_BINARY_DIR}")
+
++find_package(KF5ThreadWeaver ${REQUIRED_KF5_VERSION} REQUIRED)
++
+ #add_subdirectory(filedialogtester)
+
+ # call: kowidgets_add_unit_test(<test-name> <sources> LINK_LIBRARIES <library> [<library> [...]] [GUI])
diff --git a/app-office/calligra/files/calligra-3.0.0.1-nokdelibs4.patch b/app-office/calligra/files/calligra-3.0.0.1-nokdelibs4.patch
new file mode 100644
index 00000000..faf4c87
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.0.0.1-nokdelibs4.patch
@@ -0,0 +1,38 @@
+commit 8d2383d29beaaad1ebb0b9de2b73589a8b964cdc
+Author: Dag Andersen <danders@get2net.dk>
+Date: Thu Jan 5 09:32:12 2017 +0100
+
+ Plan does not depend on Kdelibs4Support
+
+diff --git a/plan/libs/kernel/CMakeLists.txt b/plan/libs/kernel/CMakeLists.txt
+index d85b537..fddb9c3 100644
+--- a/plan/libs/kernel/CMakeLists.txt
++++ b/plan/libs/kernel/CMakeLists.txt
+@@ -45,8 +45,6 @@ target_link_libraries(kplatokernel
+ kowidgetutils
+ kundo2
+ KF5::KIOWidgets
+- PRIVATE
+- KF5::KDELibs4Support
+ )
+
+ set_target_properties(kplatokernel PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} )
+commit 3a3ee7863b65313f573593bf868584f829b725f2
+Author: Dag Andersen <danders@get2net.dk>
+Date: Thu Jan 5 12:15:04 2017 +0100
+
+ Plan: klocale.h is from kde4, so remove
+
+diff --git a/plan/libs/kernel/kptlocale.cpp b/plan/libs/kernel/kptlocale.cpp
+index 6bfc7d8..2145f7c 100644
+--- a/plan/libs/kernel/kptlocale.cpp
++++ b/plan/libs/kernel/kptlocale.cpp
+@@ -22,8 +22,6 @@
+
+ #include "kptdebug.h"
+
+-#include <klocale.h>
+-
+ #include <QLocale>
+
+
diff --git a/app-office/calligra/files/calligra-3.0.0.1-reenable-akonadi.patch b/app-office/calligra/files/calligra-3.0.0.1-reenable-akonadi.patch
new file mode 100644
index 00000000..0ce83b6
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.0.0.1-reenable-akonadi.patch
@@ -0,0 +1,113 @@
+commit b8de9669eab6487387d76e3181e0d38df46205a5
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Wed Jan 4 13:55:13 2017 +0100
+
+ Revert "Workaround bug 311940: Plan crashes when typing a text in..."
+
+ "...the filter textbox before the textbook is fully loaded when selecting
+ a contact from the adressbook"
+
+ This reverts commit
+ 1fb81d2e5fc2df149261c6fc20a13b4a6a03dd7a
+ and partially
+ b8d7a4034e5e85577e8a7eff523c226ca2d965c5
+
+diff --git a/plan/CMakeLists.txt b/plan/CMakeLists.txt
+index 25427da..119b23c 100644
+--- a/plan/CMakeLists.txt
++++ b/plan/CMakeLists.txt
+@@ -5,10 +5,7 @@ project(kplato)
+ add_definitions( -DKDE_DEFAULT_DEBUG_AREA=42000 )
+
+ if (KF5AkonadiContact_FOUND)
+- # disable for now: there is a bug
+- # it only works if you use kde contacts (of course) but many use other stuff, so gets dissapointed
+- # add_definitions(-DPLAN_KDEPIMLIBS_FOUND)
+- message(WARNING "AkonadiContacs available, but funtion is disabled due to Bug 311940")
++ add_definitions(-DPLAN_KDEPIMLIBS_FOUND)
+ endif ()
+
+ if (PLANCHARTDEBUG)
+@@ -25,6 +22,7 @@ set( KPLATO_INCLUDES
+ ${CMAKE_BINARY_DIR}/plan
+
+ ${KOMAIN_INCLUDES}
++ ${KDEPIMLIBS_INCLUDE_DIR}
+ )
+
+ add_subdirectory( libs )
+diff --git a/plan/kpttaskdefaultpanel.cpp b/plan/kpttaskdefaultpanel.cpp
+index 27eca57..6f119e5 100644
+--- a/plan/kpttaskdefaultpanel.cpp
++++ b/plan/kpttaskdefaultpanel.cpp
+@@ -55,10 +55,6 @@ ConfigTaskPanelImpl::ConfigTaskPanelImpl(QWidget *p )
+ chooseLeader->hide();
+ #endif
+
+- // FIXME
+- // [Bug 311940] New: Plan crashes when typing a text in the filter textbox before the textbook is fully loaded when selecting a contact from the adressbook
+- chooseLeader->hide();
+-
+ initDescription();
+
+ connect(chooseLeader, SIGNAL(clicked()), SLOT(changeLeader()));
+diff --git a/plan/libs/ui/kptmainprojectpanel.cpp b/plan/libs/ui/kptmainprojectpanel.cpp
+index ac7212b..2078d4d 100644
+--- a/plan/libs/ui/kptmainprojectpanel.cpp
++++ b/plan/libs/ui/kptmainprojectpanel.cpp
+@@ -48,10 +48,6 @@ MainProjectPanel::MainProjectPanel(Project &p, QWidget *parent)
+ chooseLeader->hide();
+ #endif
+
+- // FIXME
+- // [Bug 311940] New: Plan crashes when typing a text in the filter textbox before the textbook is fully loaded when selecting a contact from the adressbook
+- chooseLeader->hide();
+-
+ QString s = i18n( "The Work Breakdown Structure introduces numbering for all tasks in the project, according to the task structure.\nThe WBS code is auto-generated.\nYou can define the WBS code pattern using the Define WBS Pattern command in the Tools menu." );
+ wbslabel->setWhatsThis( s );
+ wbs->setWhatsThis( s );
+diff --git a/plan/libs/ui/kptresourcedialog.cpp b/plan/libs/ui/kptresourcedialog.cpp
+index 5e092c4..ff9eae0 100644
+--- a/plan/libs/ui/kptresourcedialog.cpp
++++ b/plan/libs/ui/kptresourcedialog.cpp
+@@ -53,10 +53,6 @@ ResourceDialogImpl::ResourceDialogImpl( const Project &project, Resource &resour
+ chooseBtn->hide();
+ #endif
+
+- // FIXME
+- // [Bug 311940] New: Plan crashes when typing a text in the filter textbox before the textbook is fully loaded when selecting a contact from the adressbook
+- chooseBtn->hide();
+-
+ QSortFilterProxyModel *pr = new QSortFilterProxyModel( ui_teamView );
+ QStandardItemModel *m = new QStandardItemModel( ui_teamView );
+ pr->setSourceModel( new QStandardItemModel( ui_teamView ) );
+diff --git a/plan/libs/ui/kptsummarytaskgeneralpanel.cpp b/plan/libs/ui/kptsummarytaskgeneralpanel.cpp
+index 1a2af87..dd66ca8 100644
+--- a/plan/libs/ui/kptsummarytaskgeneralpanel.cpp
++++ b/plan/libs/ui/kptsummarytaskgeneralpanel.cpp
+@@ -45,10 +45,6 @@ SummaryTaskGeneralPanel::SummaryTaskGeneralPanel(Task &task, QWidget *p, const c
+ chooseLeader->hide();
+ #endif
+
+- // FIXME
+- // [Bug 311940] New: Plan crashes when typing a text in the filter textbox before the textbook is fully loaded when selecting a contact from the adressbook
+- chooseLeader->hide();
+-
+ m_description = new TaskDescriptionPanel( task, this );
+ m_description->namefield->hide();
+ m_description->namelabel->hide();
+diff --git a/plan/libs/ui/kpttaskgeneralpanel.cpp b/plan/libs/ui/kpttaskgeneralpanel.cpp
+index b3c2974..562ea9d 100644
+--- a/plan/libs/ui/kpttaskgeneralpanel.cpp
++++ b/plan/libs/ui/kpttaskgeneralpanel.cpp
+@@ -228,10 +228,6 @@ TaskGeneralPanelImpl::TaskGeneralPanelImpl(QWidget *p, const char *n)
+ chooseLeader->hide();
+ #endif
+
+- // FIXME
+- // [Bug 311940] New: Plan crashes when typing a text in the filter textbox before the textbook is fully loaded when selecting a contact from the adressbook
+- chooseLeader->hide();
+-
+ connect(namefield, SIGNAL(textChanged(QString)), SLOT(checkAllFieldsFilled()));
+ connect(leaderfield, SIGNAL(textChanged(QString)), SLOT(checkAllFieldsFilled()));
+ connect(chooseLeader, SIGNAL(clicked()), SLOT(changeLeader()));
diff --git a/app-office/calligra/files/calligra-3.0.0.1-relax-deps.patch b/app-office/calligra/files/calligra-3.0.0.1-relax-deps.patch
new file mode 100644
index 00000000..3eeb557
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.0.0.1-relax-deps.patch
@@ -0,0 +1,34 @@
+From c769476b16068a82c20e195134e7c32ae7c7a081 Mon Sep 17 00:00:00 2001
+From: Dag Andersen <danders@get2net.dk>
+Date: Thu, 5 Jan 2017 12:51:26 +0100
+Subject: We should accept all 3.0 versions of KReport/KProperty
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4de94a4..f963bde 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -480,7 +480,7 @@ set_package_properties(KChart PROPERTIES
+ ##
+ ## Test for KReport
+ ##
+-macro_optional_find_package(KReport 3.0.0 EXACT QUIET)
++macro_optional_find_package(KReport 3.0 QUIET)
+ set_package_properties(KReport PROPERTIES
+ DESCRIPTION "A framework for the creation and generation of reports in multiple formats"
+ URL "https://community.kde.org/KReport"
+@@ -491,7 +491,7 @@ set_package_properties(KReport PROPERTIES
+ ##
+ ## Test for KPropertyWidgets
+ ##
+-macro_optional_find_package(KPropertyWidgets 3.0.0 EXACT QUIET)
++macro_optional_find_package(KPropertyWidgets 3.0 QUIET)
+ set_package_properties(KPropertyWidgets PROPERTIES
+ DESCRIPTION "A property editing framework with editor widget"
+ URL "https://community.kde.org/KProperty"
+--
+cgit v0.11.2
+
diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index f29d053..9c760ee 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -19,8 +19,10 @@
<flag name="gsf">Enable support for ODT structures extraction via <pkg>gnome-extra/libgsf</pkg></flag>
<flag name="import-filter">Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote</flag>
<flag name="kdcraw">Enable support for KDE image manipulating interface via <pkg>kde-apps/libkdcraw</pkg></flag>
+ <flag name="lcms">Build colorengine plugins using <pkg>media-libs/lcms</pkg></flag>
<flag name="marble">Enable displaying of maps using Marble</flag>
<flag name="okular">Enable bindings for <pkg>kde-apps/okular</pkg></flag>
+ <flag name="phonon">Build stage/eventplugins and videoshape plugin using <pkg>media-libs/phonon</pkg></flag>
<flag name="pim">Enable support for KDE PIM resources integration</flag>
<flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>
<flag name="vc">Enable support for <pkg>dev-libs/vc</pkg>, could be a significant speed boost on krita</flag>
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/, app-office/calligra/files/
@ 2017-01-07 10:59 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2017-01-07 10:59 UTC (permalink / raw
To: gentoo-commits
commit: eab0160da05c97f4a7c663e2fc630d0a00cc513a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 7 10:41:34 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 7 10:59:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eab0160d
app-office/calligra: Drop old
Package-Manager: portage-2.3.0
app-office/calligra/calligra-3.0.0.1-r1.ebuild | 253 ---------------------
.../files/calligra-3.0.0.1-reenable-akonadi.patch | 113 ---------
2 files changed, 366 deletions(-)
diff --git a/app-office/calligra/calligra-3.0.0.1-r1.ebuild b/app-office/calligra/calligra-3.0.0.1-r1.ebuild
deleted file mode 100644
index 130d128..00000000
--- a/app-office/calligra/calligra-3.0.0.1-r1.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="4G"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional-recursive"
-inherit check-reqs kde5 versionator
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="http://www.calligra.org/"
-[[ ${KDE_BUILD_TYPE} == release ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-
-[[ ${KDE_BUILD_TYPE} == release ]] && \
-KEYWORDS="~amd64 ~x86"
-
-CAL_FTS=( karbon plan sheets words )
-CAL_EXP_FTS=( braindump stage )
-
-IUSE="activities +crypt +eigen +fontconfig gsl import-filter jpeg2k +lcms okular openexr +pdf
-phonon pim marble spacenav +truetype vc +xml X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})
-$(printf 'calligra_experimental_features_%s ' ${CAL_EXP_FTS[@]})"
-
-REQUIRED_USE="calligra_features_sheets? ( eigen )"
-
-# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
-# Required for the matlab/octave formula tool
-# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0
-COMMON_DEPEND="
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kcmutils)
- $(add_frameworks_dep kcodecs)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdelibs4support)
- $(add_frameworks_dep kemoticons)
- $(add_frameworks_dep kglobalaccel)
- $(add_frameworks_dep kguiaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kitemmodels)
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep kjobwidgets)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep knotifyconfig)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep kross)
- $(add_frameworks_dep ktextwidgets)
- $(add_frameworks_dep kwallet)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep sonnet)
- $(add_qt_dep designer)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtdeclarative)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtscript)
- $(add_qt_dep qtsvg)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- dev-lang/perl
- sys-libs/zlib
- virtual/libiconv
- activities? ( $(add_frameworks_dep kactivities) )
- crypt? ( app-crypt/qca:2[qt5] )
- eigen? ( dev-cpp/eigen:3 )
- fontconfig? ( media-libs/fontconfig )
- gsl? ( sci-libs/gsl )
- import-filter? (
- $(add_frameworks_dep khtml)
- app-text/libetonyek
- app-text/libodfgen
- app-text/libwpd:*
- app-text/libwpg:*
- >=app-text/libwps-0.4
- dev-libs/librevenge
- media-libs/libvisio
- )
- lcms? (
- media-libs/ilmbase:=
- media-libs/lcms:2
- )
- marble? ( $(add_kdeapps_dep marble) )
- openexr? ( media-libs/openexr )
- pdf? ( app-text/poppler:=[qt5] )
- phonon? ( media-libs/phonon[qt5] )
- spacenav? ( dev-libs/libspnav )
- truetype? ( media-libs/freetype:2 )
- X? (
- $(add_qt_dep qtx11extras)
- x11-libs/libX11
- )
- calligra_experimental_features_braindump? ( $(add_qt_dep qtwebkit) )
- calligra_experimental_features_stage? (
- $(add_qt_dep qtwebkit)
- okular? ( $(add_kdeapps_dep okular) )
- )
- calligra_features_karbon? ( jpeg2k? ( media-libs/openjpeg:= ) )
- calligra_features_plan? (
- $(add_frameworks_dep khtml)
- $(add_qt_dep qtcore '' '' '5=')
- dev-libs/kdiagram:5
- =dev-libs/kproperty-3.0*:5
- =dev-libs/kreport-3.0*:5
- pim? (
- $(add_kdeapps_dep akonadi)
- $(add_kdeapps_dep akonadi-contacts)
- $(add_kdeapps_dep kcalcore)
- $(add_kdeapps_dep kcontacts)
- )
- )
- calligra_features_words? (
- dev-libs/libxslt
- okular? ( $(add_kdeapps_dep okular) )
- )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
- sys-devel/gettext
- x11-misc/shared-mime-info
- test? ( $(add_frameworks_dep threadweaver) )
- vc? ( >=dev-libs/vc-1.1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
- calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
- !app-office/calligra:4
- !app-office/calligra-l10n:4
-"
-RESTRICT+=" test"
-
-PATCHES=(
- "${FILESDIR}/${PN}"-3.0.0-no-arch-detection.patch
- # upstream master
- "${FILESDIR}/${P}"-nokdelibs4.patch
- "${FILESDIR}/${P}"-relax-deps.patch
- # pending upstream
- "${FILESDIR}/${P}"-reenable-akonadi.patch
- "${FILESDIR}/${P}"-deps{1,2,3}.patch
-)
-
-pkg_pretend() {
- check-reqs_pkg_pretend
-}
-
-pkg_setup() {
- kde5_pkg_setup
- check-reqs_pkg_setup
-}
-
-src_prepare() {
- kde5_src_prepare
-
- if ! use test; then
- sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \
- -i libs/pigment/CMakeLists.txt || die
- fi
-
- # Unconditionally disable deprecated deps (required by QtQuick1)
- punt_bogus_dep Qt5 Declarative
- punt_bogus_dep Qt5 OpenGL
-
- if ! use calligra_experimental_features_stage && \
- ! use calligra_experimental_features_braindump; then
- punt_bogus_dep Qt5 WebKitWidgets
- punt_bogus_dep Qt5 WebKit
- fi
-
- # Hack around the excessive use of CMake macros
- if use okular && ! use calligra_features_words; then
- sed -i -e "/add_subdirectory( *okularodtgenerator *)/ s/^/#DONT/" \
- extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT"
- fi
-
- if use okular && ! use calligra_experimental_features_stage; then
- sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \
- extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP"
- fi
-}
-
-src_configure() {
- local cal_ft myproducts experimental=OFF
-
- # applications
- for cal_ft in ${CAL_FTS[@]}; do
- if use calligra_features_${cal_ft} ; then
- myproducts+=( "${cal_ft^^}" )
- fi
- done
- # experimental/unmaintained applications
- for cal_ft in ${CAL_EXP_FTS[@]}; do
- if use calligra_experimental_features_${cal_ft} ; then
- experimental=ON
- myproducts+=( "${cal_ft^^}" )
- fi
- done
-
- use lcms && myproducts+=( PLUGIN_COLORENGINES )
- use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
-
- local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
-
- if [[ ${KDE_BUILD_TYPE} == release ]] ; then
- mycmakeargs+=(
- -DRELEASE_BUILD=ON
- -DBUILD_UNMAINTAINED=${experimental}
- )
- fi
-
- mycmakeargs+=(
- -DPACKAGERS_BUILD=OFF
- -DWITH_Iconv=ON
- $(cmake-utils_use_find_package activities KF5Activities)
- -DWITH_Qca-qt5=$(usex crypt)
- -DWITH_Eigen3=$(usex eigen)
- -DWITH_Fontconfig=$(usex fontconfig)
- -DWITH_GSL=$(usex gsl)
- -DWITH_LibEtonyek=$(usex import-filter)
- -DWITH_LibOdfGen=$(usex import-filter)
- -DWITH_LibRevenge=$(usex import-filter)
- -DWITH_LibVisio=$(usex import-filter)
- -DWITH_LibWpd=$(usex import-filter)
- -DWITH_LibWpg=$(usex import-filter)
- -DWITH_LibWps=$(usex import-filter)
- $(cmake-utils_use_find_package jpeg2k OpenJPEG)
- $(cmake-utils_use_find_package phonon Phonon4Qt5)
- $(cmake-utils_use_find_package pim KF5Akonadi)
- $(cmake-utils_use_find_package pim KF5AkonadiContact)
- $(cmake-utils_use_find_package pim KF5CalendarCore)
- $(cmake-utils_use_find_package pim KF5Contacts)
- -DWITH_LCMS2=$(usex lcms)
- $(cmake-utils_use_find_package marble Marble)
- -DWITH_Okular5=$(usex okular)
- -DWITH_OpenEXR=$(usex openexr)
- -DWITH_Poppler=$(usex pdf)
- -ENABLE_CSTESTER_TESTING=$(usex test)
- -DWITH_Freetype=$(usex truetype)
- -DWITH_Vc=$(usex vc)
- -DCMAKE_DISABLE_FIND_PACKAGE_Libgit2=ON
- -DCMAKE_DISABLE_FIND_PACKAGE_Libqgit2=ON
- )
-
- kde5_src_configure
-}
diff --git a/app-office/calligra/files/calligra-3.0.0.1-reenable-akonadi.patch b/app-office/calligra/files/calligra-3.0.0.1-reenable-akonadi.patch
deleted file mode 100644
index 0ce83b6..00000000
--- a/app-office/calligra/files/calligra-3.0.0.1-reenable-akonadi.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-commit b8de9669eab6487387d76e3181e0d38df46205a5
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Wed Jan 4 13:55:13 2017 +0100
-
- Revert "Workaround bug 311940: Plan crashes when typing a text in..."
-
- "...the filter textbox before the textbook is fully loaded when selecting
- a contact from the adressbook"
-
- This reverts commit
- 1fb81d2e5fc2df149261c6fc20a13b4a6a03dd7a
- and partially
- b8d7a4034e5e85577e8a7eff523c226ca2d965c5
-
-diff --git a/plan/CMakeLists.txt b/plan/CMakeLists.txt
-index 25427da..119b23c 100644
---- a/plan/CMakeLists.txt
-+++ b/plan/CMakeLists.txt
-@@ -5,10 +5,7 @@ project(kplato)
- add_definitions( -DKDE_DEFAULT_DEBUG_AREA=42000 )
-
- if (KF5AkonadiContact_FOUND)
-- # disable for now: there is a bug
-- # it only works if you use kde contacts (of course) but many use other stuff, so gets dissapointed
-- # add_definitions(-DPLAN_KDEPIMLIBS_FOUND)
-- message(WARNING "AkonadiContacs available, but funtion is disabled due to Bug 311940")
-+ add_definitions(-DPLAN_KDEPIMLIBS_FOUND)
- endif ()
-
- if (PLANCHARTDEBUG)
-@@ -25,6 +22,7 @@ set( KPLATO_INCLUDES
- ${CMAKE_BINARY_DIR}/plan
-
- ${KOMAIN_INCLUDES}
-+ ${KDEPIMLIBS_INCLUDE_DIR}
- )
-
- add_subdirectory( libs )
-diff --git a/plan/kpttaskdefaultpanel.cpp b/plan/kpttaskdefaultpanel.cpp
-index 27eca57..6f119e5 100644
---- a/plan/kpttaskdefaultpanel.cpp
-+++ b/plan/kpttaskdefaultpanel.cpp
-@@ -55,10 +55,6 @@ ConfigTaskPanelImpl::ConfigTaskPanelImpl(QWidget *p )
- chooseLeader->hide();
- #endif
-
-- // FIXME
-- // [Bug 311940] New: Plan crashes when typing a text in the filter textbox before the textbook is fully loaded when selecting a contact from the adressbook
-- chooseLeader->hide();
--
- initDescription();
-
- connect(chooseLeader, SIGNAL(clicked()), SLOT(changeLeader()));
-diff --git a/plan/libs/ui/kptmainprojectpanel.cpp b/plan/libs/ui/kptmainprojectpanel.cpp
-index ac7212b..2078d4d 100644
---- a/plan/libs/ui/kptmainprojectpanel.cpp
-+++ b/plan/libs/ui/kptmainprojectpanel.cpp
-@@ -48,10 +48,6 @@ MainProjectPanel::MainProjectPanel(Project &p, QWidget *parent)
- chooseLeader->hide();
- #endif
-
-- // FIXME
-- // [Bug 311940] New: Plan crashes when typing a text in the filter textbox before the textbook is fully loaded when selecting a contact from the adressbook
-- chooseLeader->hide();
--
- QString s = i18n( "The Work Breakdown Structure introduces numbering for all tasks in the project, according to the task structure.\nThe WBS code is auto-generated.\nYou can define the WBS code pattern using the Define WBS Pattern command in the Tools menu." );
- wbslabel->setWhatsThis( s );
- wbs->setWhatsThis( s );
-diff --git a/plan/libs/ui/kptresourcedialog.cpp b/plan/libs/ui/kptresourcedialog.cpp
-index 5e092c4..ff9eae0 100644
---- a/plan/libs/ui/kptresourcedialog.cpp
-+++ b/plan/libs/ui/kptresourcedialog.cpp
-@@ -53,10 +53,6 @@ ResourceDialogImpl::ResourceDialogImpl( const Project &project, Resource &resour
- chooseBtn->hide();
- #endif
-
-- // FIXME
-- // [Bug 311940] New: Plan crashes when typing a text in the filter textbox before the textbook is fully loaded when selecting a contact from the adressbook
-- chooseBtn->hide();
--
- QSortFilterProxyModel *pr = new QSortFilterProxyModel( ui_teamView );
- QStandardItemModel *m = new QStandardItemModel( ui_teamView );
- pr->setSourceModel( new QStandardItemModel( ui_teamView ) );
-diff --git a/plan/libs/ui/kptsummarytaskgeneralpanel.cpp b/plan/libs/ui/kptsummarytaskgeneralpanel.cpp
-index 1a2af87..dd66ca8 100644
---- a/plan/libs/ui/kptsummarytaskgeneralpanel.cpp
-+++ b/plan/libs/ui/kptsummarytaskgeneralpanel.cpp
-@@ -45,10 +45,6 @@ SummaryTaskGeneralPanel::SummaryTaskGeneralPanel(Task &task, QWidget *p, const c
- chooseLeader->hide();
- #endif
-
-- // FIXME
-- // [Bug 311940] New: Plan crashes when typing a text in the filter textbox before the textbook is fully loaded when selecting a contact from the adressbook
-- chooseLeader->hide();
--
- m_description = new TaskDescriptionPanel( task, this );
- m_description->namefield->hide();
- m_description->namelabel->hide();
-diff --git a/plan/libs/ui/kpttaskgeneralpanel.cpp b/plan/libs/ui/kpttaskgeneralpanel.cpp
-index b3c2974..562ea9d 100644
---- a/plan/libs/ui/kpttaskgeneralpanel.cpp
-+++ b/plan/libs/ui/kpttaskgeneralpanel.cpp
-@@ -228,10 +228,6 @@ TaskGeneralPanelImpl::TaskGeneralPanelImpl(QWidget *p, const char *n)
- chooseLeader->hide();
- #endif
-
-- // FIXME
-- // [Bug 311940] New: Plan crashes when typing a text in the filter textbox before the textbook is fully loaded when selecting a contact from the adressbook
-- chooseLeader->hide();
--
- connect(namefield, SIGNAL(textChanged(QString)), SLOT(checkAllFieldsFilled()));
- connect(leaderfield, SIGNAL(textChanged(QString)), SLOT(checkAllFieldsFilled()));
- connect(chooseLeader, SIGNAL(clicked()), SLOT(changeLeader()));
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/, app-office/calligra/files/
@ 2017-01-29 23:00 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2017-01-29 23:00 UTC (permalink / raw
To: gentoo-commits
commit: 532423fcf84a3c18df2612bde5921a58fb4a466a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 15:15:02 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 23:00:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=532423fc
app-office/calligra: Drop USE=attica, bump EAPI 6, config w/ PG9.6
Drop USE=attica, obsolete by GHNS default off
Drop unused build options: cstester, pqxx
Add upstream patch to detect PostgreSQL 9.6
Package-Manager: portage-2.3.3
app-office/calligra/calligra-2.9.11-r1.ebuild | 130 ++++++++++-----------
.../files/calligra-2.9.11-postgresql-9.6.patch | 19 +++
2 files changed, 78 insertions(+), 71 deletions(-)
diff --git a/app-office/calligra/calligra-2.9.11-r1.ebuild b/app-office/calligra/calligra-2.9.11-r1.ebuild
index 795c6aa..9fcd32a 100644
--- a/app-office/calligra/calligra-2.9.11-r1.ebuild
+++ b/app-office/calligra/calligra-2.9.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -6,7 +6,7 @@
# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
# krita/CMakeLists.txt
-EAPI=5
+EAPI=6
CHECKREQS_DISK_BUILD="4G"
KDE_HANDBOOK="optional"
@@ -40,10 +40,9 @@ if [[ ${KDE_BUILD_TYPE} == release ]] ; then
KEYWORDS="~amd64 ~arm ~x86"
fi
-IUSE="attica color-management +crypt +eigen +exif fftw +fontconfig freetds
-+glew +glib +gsf gsl import-filter +jpeg jpeg2k +kdcraw +lcms marble mysql
-+okular openexr +pdf +pim postgres spacenav sybase test tiff +threads
-+truetype vc xbase +xml"
+IUSE="color-management +crypt +eigen +exif fftw +fontconfig freetds +glew +glib
++gsf gsl import-filter +jpeg jpeg2k +kdcraw +lcms marble mysql +okular openexr
++pdf +pim postgres spacenav sybase test tiff +threads +truetype vc xbase +xml"
# Don't use Active, it's broken on desktops.
CAL_FTS="author braindump flow gemini karbon kexi krita plan sheets stage words"
@@ -67,12 +66,11 @@ RDEPEND="
dev-lang/perl
dev-libs/boost
dev-qt/qtcore:4[exceptions]
- media-libs/libpng:0
+ media-libs/libpng:0=
sys-libs/zlib
virtual/libiconv
- attica? ( dev-libs/libattica )
color-management? ( media-libs/opencolorio )
- crypt? ( app-crypt/qca:2[qt4(+)] )
+ crypt? ( app-crypt/qca:2[qt4] )
eigen? ( dev-cpp/eigen:3 )
exif? ( media-gfx/exiv2:= )
fftw? ( sci-libs/fftw:3.0 )
@@ -80,7 +78,7 @@ RDEPEND="
freetds? ( dev-db/freetds )
glib? ( dev-libs/glib:2 )
gsf? ( gnome-extra/libgsf )
- gsl? ( sci-libs/gsl )
+ gsl? ( sci-libs/gsl:= )
import-filter? (
app-text/libetonyek
app-text/libodfgen
@@ -99,12 +97,12 @@ RDEPEND="
)
marble? ( $(add_kdeapps_dep marble) )
mysql? ( virtual/mysql )
- okular? ( >=kde-apps/okular-4.4:4=[aqua=] )
+ okular? ( kde-apps/okular:4=[aqua=] )
+ openexr? ( media-libs/openexr:= )
opengl? (
media-libs/glew:0
virtual/glu
)
- openexr? ( media-libs/openexr )
pdf? (
app-text/poppler:=
media-gfx/pstoedit
@@ -121,7 +119,7 @@ RDEPEND="
vc? ( <dev-libs/vc-1.0.0 )
xbase? ( dev-db/xbase )
calligra_features_kexi? (
- >=dev-db/sqlite-3.8.7:3[extensions(+)]
+ dev-db/sqlite:3[extensions(+)]
dev-libs/icu:=
)
calligra_features_krita? (
@@ -142,7 +140,10 @@ PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
# bug 394273
RESTRICT=test
-PATCHES=( "${FILESDIR}"/${PN}-2.9.1-no-arch-detection.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.9.1-no-arch-detection.patch
+ "${FILESDIR}"/${P}-postgresql-9.6.patch
+)
pkg_pretend() {
check-reqs_pkg_pretend
@@ -154,10 +155,10 @@ pkg_setup() {
}
src_prepare() {
+ kde4-base_src_prepare
if ! use webkit; then
sed -i CMakeLists.txt -e "/^find_package/ s/QtWebKit //" || die
fi
- kde4-base_src_prepare
}
src_configure() {
@@ -165,70 +166,57 @@ src_configure() {
# applications
for cal_ft in ${CAL_FTS}; do
- # Switch to ^^ when we switch to EAPI=6.
- #local prod=${cal_ft^^}
- local prod=$(tr '[:lower:]' '[:upper:]' <<<"${cal_ft}")
- use calligra_features_${cal_ft} && myproducts+=( "${prod}" )
+ use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
done
local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
- # first write out things we want to hard-enable
- mycmakeargs+=(
- "-DWITH_Iconv=ON" # available on all supported arches and many more
- )
-
- # default disablers
- mycmakeargs+=(
- "-DCREATIVEONLY=OFF"
- "-DPACKAGERS_BUILD=OFF"
- "-DWITH_Soprano=OFF"
- "-DWITH_KActivities=OFF" # deprecated Plasma 4 activities integration
- )
-
# regular options
mycmakeargs+=(
- $(cmake-utils_use_with attica LibAttica)
- $(cmake-utils_use_with color-management OCIO)
- $(cmake-utils_use_with crypt QCA2)
- $(cmake-utils_use_with eigen Eigen3)
- $(cmake-utils_use_with exif Exiv2)
- $(cmake-utils_use_with fftw FFTW3)
- $(cmake-utils_use_with fontconfig Fontconfig)
- $(cmake-utils_use_with freetds FreeTDS)
- $(cmake-utils_use_with glib GLIB2)
- $(cmake-utils_use_with gsl GSL)
- $(cmake-utils_use_with import-filter LibEtonyek)
- $(cmake-utils_use_with import-filter LibOdfGen)
- $(cmake-utils_use_with import-filter LibRevenge)
- $(cmake-utils_use_with import-filter LibVisio)
- $(cmake-utils_use_with import-filter LibWpd)
- $(cmake-utils_use_with import-filter LibWpg)
- $(cmake-utils_use_with import-filter LibWps)
- $(cmake-utils_use_with jpeg JPEG)
- $(cmake-utils_use_with jpeg2k OpenJPEG)
- $(cmake-utils_use_with kdcraw Kdcraw)
- $(cmake-utils_use_with lcms LCMS2)
- $(cmake-utils_use_with marble CalligraMarble)
- $(cmake-utils_use_with mysql MySQL)
- $(cmake-utils_use_with okular Okular)
- $(cmake-utils_use_with openexr OpenEXR)
- $(cmake-utils_use opengl USEOPENGL)
- $(cmake-utils_use_with pdf Poppler)
- $(cmake-utils_use_with pdf Pstoedit)
- $(cmake-utils_use_with pim KdepimLibs)
- $(cmake-utils_use_with postgres CalligraPostgreSQL)
- $(cmake-utils_use_build postgres pqxx)
- $(cmake-utils_use_with spacenav Spnav)
- $(cmake-utils_use_with sybase FreeTDS)
- $(cmake-utils_use_with tiff TIFF)
- $(cmake-utils_use_with threads Threads)
- $(cmake-utils_use_with truetype Freetype)
- $(cmake-utils_use_with vc Vc)
- $(cmake-utils_use_with xbase XBase)
+ -DCREATIVEONLY=OFF
+ -DPACKAGERS_BUILD=OFF
+ -DWITH_Soprano=OFF
+ -DWITH_KActivities=OFF
+ -DWITH_Iconv=ON
+ -DWITH_OCIO=$(usex color-management)
+ -DWITH_QCA2=$(usex crypt)
+ -DWITH_Eigen3=$(usex eigen)
+ -DWITH_Exiv2=$(usex exif)
+ -DWITH_FFTW3=$(usex fftw)
+ -DWITH_Fontconfig=$(usex fontconfig)
+ -DWITH_FreeTDS=$(usex freetds)
+ -DWITH_GLIB2=$(usex glib)
+ -DWITH_GSL=$(usex gsl)
+ -DWITH_LibEtonyek=$(usex import-filter)
+ -DWITH_LibOdfGen=$(usex import-filter)
+ -DWITH_LibRevenge=$(usex import-filter)
+ -DWITH_LibVisio=$(usex import-filter)
+ -DWITH_LibWpd=$(usex import-filter)
+ -DWITH_LibWpg=$(usex import-filter)
+ -DWITH_LibWps=$(usex import-filter)
+ -DWITH_JPEG=$(usex jpeg)
+ -DWITH_OpenJPEG=$(usex jpeg2k)
+ -DWITH_Kdcraw=$(usex kdcraw)
+ -DWITH_LCMS2=$(usex lcms)
+ -DWITH_CalligraMarble=$(usex marble)
+ -DWITH_MySQL=$(usex mysql)
+ -DWITH_Okular=$(usex okular)
+ -DWITH_OpenEXR=$(usex openexr)
+ -DUSEOPENGL=$(usex opengl)
+ -DWITH_Poppler=$(usex pdf)
+ -DWITH_Pstoedit=$(usex pdf)
+ -DWITH_KdepimLibs=$(usex pim)
+ -DWITH_CalligraPostgreSQL=$(usex postgres)
+ -DWITH_Spnav=$(usex spacenav)
+ -DWITH_FreeTDS=$(usex sybase)
+ -DWITH_Threads=$(usex threads)
+ -DWITH_TIFF=$(usex tiff)
+ -DWITH_Freetype=$(usex truetype)
+ -DWITH_Vc=$(usex vc)
+ -DWITH_XBase=$(usex xbase)
)
- mycmakeargs+=( $(cmake-utils_use_build test cstester) )
+ use test && mycmakeargs+=( -DENABLE_CSTESTER_TESTING=$(usex test) )
kde4-base_src_configure
}
diff --git a/app-office/calligra/files/calligra-2.9.11-postgresql-9.6.patch b/app-office/calligra/files/calligra-2.9.11-postgresql-9.6.patch
new file mode 100644
index 00000000..617a0c3
--- /dev/null
+++ b/app-office/calligra/files/calligra-2.9.11-postgresql-9.6.patch
@@ -0,0 +1,19 @@
+commit 843c41decfa85e351349f7a410893ac85c9d60b7
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Oct 8 16:17:17 2016 +0200
+
+ cmake: find PostgreSQL 9.6
+
+diff --git a/cmake/modules/FindCalligraPostgreSQL.cmake b/cmake/modules/FindCalligraPostgreSQL.cmake
+index 035508b..98a1e88 100644
+--- a/cmake/modules/FindCalligraPostgreSQL.cmake
++++ b/cmake/modules/FindCalligraPostgreSQL.cmake
+@@ -83,7 +83,7 @@ set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to wher
+
+
+ set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
+- "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
++ "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
+
+ # Define additional search paths for root directories.
+ foreach (suffix ${PostgreSQL_KNOWN_VERSIONS} )
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/, app-office/calligra/files/
@ 2017-03-31 20:23 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2017-03-31 20:23 UTC (permalink / raw
To: gentoo-commits
commit: d835f1db2c95dfbbb5b97d4d17eade2f89bf3a80
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 31 18:46:52 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 20:22:31 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d835f1db
app-office/calligra: Drop old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-office/calligra/Manifest | 1 -
app-office/calligra/calligra-3.0.0.1-r2.ebuild | 248 ---------------------
.../calligra/files/calligra-3.0.0.1-deps1.patch | 31 ---
.../calligra/files/calligra-3.0.0.1-deps2.patch | 65 ------
.../calligra/files/calligra-3.0.0.1-deps3.patch | 31 ---
.../files/calligra-3.0.0.1-nokdelibs4.patch | 38 ----
.../files/calligra-3.0.0.1-relax-deps.patch | 34 ---
7 files changed, 448 deletions(-)
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 32aced423fd..dfb1872d714 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,3 +1,2 @@
DIST calligra-2.9.11.tar.xz 196039892 SHA256 b18d2d0f87bc92753ec8b1eb780a596770a49141e3e60d811da51e752e54ea09 SHA512 69fbb38dbc3d59a744ed1fae5361f61bde15da298d28942f226d3d99d399a95f5ee67cca755996290c65943aa9babf6367c44f0d0199dacce22a9879346f82f8 WHIRLPOOL 973a17eb639ddfaa5a913b064c90957935ded7fe3fdb5237c27112b6686b3dbe3e411c168f920947ef98c4a3d951842220f849565503fac67ebe75784f339e74
-DIST calligra-3.0.0.1.tar.xz 61111072 SHA256 dedc51efc42f7dda37514d450cb772d9db37a658e0abbcf0f513712a04c1f011 SHA512 826495dfa843f51ecb1139ca8d6d19f6a3fd49e4ca186b4c6a5d1498cdecbfb38461a871153bf8b9944e729725e50918434849acc78c375591636d06ef5d5f6a WHIRLPOOL 085be69fbc32fe54b567e81727aaed7bf613d8c6f2fc9d6eaaac3348e5a4e116278b6da86be953d7d17ea8854dc94021c11c81eb29d8c9a68c517b31457d2242
DIST calligra-3.0.1.tar.xz 60764344 SHA256 452bddc4e03cfbf48de508b991dc94209d386d86bf010ea9d10afed0f5694db2 SHA512 ec17d007262d598e16045c6c75f8a37dfdf73b980b02ae9bea20282cbd4dd53202f62fc4d8bd84484193a501859c2150079a76d83c1638d8449f41526df57ee0 WHIRLPOOL 6e1dfecb877ee57bf43a9d2ec597972f474b4acb7fe7acff5ad6f72bc81cae9484e4ac7ad425652d6a08051810a1ff99efd2b854ead20b9e437746e080c99397
diff --git a/app-office/calligra/calligra-3.0.0.1-r2.ebuild b/app-office/calligra/calligra-3.0.0.1-r2.ebuild
deleted file mode 100644
index 745e657f988..00000000000
--- a/app-office/calligra/calligra-3.0.0.1-r2.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="4G"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional-recursive"
-inherit check-reqs kde5 versionator
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="http://www.calligra.org/"
-[[ ${KDE_BUILD_TYPE} == release ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-
-[[ ${KDE_BUILD_TYPE} == release ]] && \
-KEYWORDS="~amd64 ~x86"
-
-CAL_FTS=( karbon plan sheets words )
-CAL_EXP_FTS=( braindump stage )
-
-IUSE="activities +crypt +fontconfig gsl import-filter jpeg2k +lcms okular openexr +pdf
- phonon pim spacenav +truetype vc X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})
- $(printf 'calligra_experimental_features_%s ' ${CAL_EXP_FTS[@]})"
-
-# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
-# Required for the matlab/octave formula tool
-# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0
-# FIXME: Disabled by upstream for good reason
-# Crashes plan (https://bugs.kde.org/show_bug.cgi?id=311940)
-# $(add_kdeapps_dep akonadi)
-# $(add_kdeapps_dep akonadi-contacts)
-COMMON_DEPEND="
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kcmutils)
- $(add_frameworks_dep kcodecs)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdelibs4support)
- $(add_frameworks_dep kemoticons)
- $(add_frameworks_dep kglobalaccel)
- $(add_frameworks_dep kguiaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kitemmodels)
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep kjobwidgets)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep knotifyconfig)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep kross)
- $(add_frameworks_dep ktextwidgets)
- $(add_frameworks_dep kwallet)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep sonnet)
- $(add_qt_dep designer)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtdeclarative)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtscript)
- $(add_qt_dep qtsvg)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- dev-lang/perl
- sys-libs/zlib
- virtual/libiconv
- activities? ( $(add_frameworks_dep kactivities) )
- crypt? ( app-crypt/qca:2[qt5] )
- fontconfig? ( media-libs/fontconfig )
- gsl? ( sci-libs/gsl )
- import-filter? (
- $(add_frameworks_dep khtml)
- app-text/libetonyek
- app-text/libodfgen
- app-text/libwpd:*
- app-text/libwpg:*
- >=app-text/libwps-0.4
- dev-libs/librevenge
- media-libs/libvisio
- )
- lcms? (
- media-libs/ilmbase:=
- media-libs/lcms:2
- )
- openexr? ( media-libs/openexr )
- pdf? ( app-text/poppler:=[qt5] )
- phonon? ( media-libs/phonon[qt5] )
- spacenav? ( dev-libs/libspnav )
- truetype? ( media-libs/freetype:2 )
- X? (
- $(add_qt_dep qtx11extras)
- x11-libs/libX11
- )
- calligra_experimental_features_braindump? ( $(add_qt_dep qtwebkit) )
- calligra_experimental_features_stage? (
- $(add_qt_dep qtwebkit)
- okular? ( $(add_kdeapps_dep okular) )
- )
- calligra_features_karbon? ( jpeg2k? ( media-libs/openjpeg:= ) )
- calligra_features_plan? (
- $(add_frameworks_dep khtml)
- $(add_qt_dep qtcore '' '' '5=')
- dev-libs/kdiagram:5
- =dev-libs/kproperty-3.0*:5
- =dev-libs/kreport-3.0*:5
- pim? (
- $(add_kdeapps_dep kcalcore)
- $(add_kdeapps_dep kcontacts)
- )
- )
- calligra_features_sheets? ( dev-cpp/eigen:3 )
- calligra_features_words? (
- dev-libs/libxslt
- okular? ( $(add_kdeapps_dep okular) )
- )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
- sys-devel/gettext
- x11-misc/shared-mime-info
- test? ( $(add_frameworks_dep threadweaver) )
- vc? ( >=dev-libs/vc-1.1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
- calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
- !app-office/calligra:4
- !app-office/calligra-l10n:4
-"
-RESTRICT+=" test"
-
-PATCHES=(
- "${FILESDIR}/${PN}"-3.0.0-no-arch-detection.patch
- # upstream master
- "${FILESDIR}/${P}"-nokdelibs4.patch
- "${FILESDIR}/${P}"-relax-deps.patch
- "${FILESDIR}/${P}"-deps{1,2,3}.patch
-)
-
-pkg_pretend() {
- check-reqs_pkg_pretend
-}
-
-pkg_setup() {
- kde5_pkg_setup
- check-reqs_pkg_setup
-}
-
-src_prepare() {
- kde5_src_prepare
-
- if ! use test; then
- sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \
- -i libs/pigment/CMakeLists.txt || die
- fi
-
- # Unconditionally disable deprecated deps (required by QtQuick1)
- punt_bogus_dep Qt5 Declarative
- punt_bogus_dep Qt5 OpenGL
-
- if ! use calligra_experimental_features_stage && \
- ! use calligra_experimental_features_braindump; then
- punt_bogus_dep Qt5 WebKitWidgets
- punt_bogus_dep Qt5 WebKit
- fi
-
- # Hack around the excessive use of CMake macros
- if use okular && ! use calligra_features_words; then
- sed -i -e "/add_subdirectory( *okularodtgenerator *)/ s/^/#DONT/" \
- extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT"
- fi
-
- if use okular && ! use calligra_experimental_features_stage; then
- sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \
- extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP"
- fi
-}
-
-src_configure() {
- local cal_ft myproducts experimental=OFF
-
- # applications
- for cal_ft in ${CAL_FTS[@]}; do
- if use calligra_features_${cal_ft} ; then
- myproducts+=( "${cal_ft^^}" )
- fi
- done
- # experimental/unmaintained applications
- for cal_ft in ${CAL_EXP_FTS[@]}; do
- if use calligra_experimental_features_${cal_ft} ; then
- experimental=ON
- myproducts+=( "${cal_ft^^}" )
- fi
- done
-
- use lcms && myproducts+=( PLUGIN_COLORENGINES )
- use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
-
- local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
-
- if [[ ${KDE_BUILD_TYPE} == release ]] ; then
- mycmakeargs+=(
- -DRELEASE_BUILD=ON
- -DBUILD_UNMAINTAINED=${experimental}
- )
- fi
-
- use calligra_features_karbon && \
- mycmakeargs+=( $(cmake-utils_use_find_package jpeg2k OpenJPEG) )
-
- mycmakeargs+=(
- -DPACKAGERS_BUILD=OFF
- -DWITH_Iconv=ON
- $(cmake-utils_use_find_package activities KF5Activities)
- -DWITH_Qca-qt5=$(usex crypt)
- -DWITH_Fontconfig=$(usex fontconfig)
- -DWITH_GSL=$(usex gsl)
- -DWITH_LibEtonyek=$(usex import-filter)
- -DWITH_LibOdfGen=$(usex import-filter)
- -DWITH_LibRevenge=$(usex import-filter)
- -DWITH_LibVisio=$(usex import-filter)
- -DWITH_LibWpd=$(usex import-filter)
- -DWITH_LibWpg=$(usex import-filter)
- -DWITH_LibWps=$(usex import-filter)
- $(cmake-utils_use_find_package phonon Phonon4Qt5)
- $(cmake-utils_use_find_package pim KF5CalendarCore)
- $(cmake-utils_use_find_package pim KF5Contacts)
- -DWITH_LCMS2=$(usex lcms)
- -DWITH_Okular5=$(usex okular)
- -DWITH_OpenEXR=$(usex openexr)
- -DWITH_Poppler=$(usex pdf)
- -DWITH_Eigen3=$(usex calligra_features_sheets)
- -ENABLE_CSTESTER_TESTING=$(usex test)
- -DWITH_Freetype=$(usex truetype)
- -DWITH_Vc=$(usex vc)
- -DCMAKE_DISABLE_FIND_PACKAGE_Libgit2=ON
- -DCMAKE_DISABLE_FIND_PACKAGE_Libqgit2=ON
- )
-
- kde5_src_configure
-}
diff --git a/app-office/calligra/files/calligra-3.0.0.1-deps1.patch b/app-office/calligra/files/calligra-3.0.0.1-deps1.patch
deleted file mode 100644
index 9ee98ffff6c..00000000000
--- a/app-office/calligra/files/calligra-3.0.0.1-deps1.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 3e3c3a16b9a8b114cc407da9152e20d5dfc422c6
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Wed Jan 4 14:10:56 2017 +0100
-
- Make Activities and KF5Html really optional.
-
- Before, trying to use CMAKE_DISABLE_FIND_PACKAGE_KF5{Activities,KHtml}
- errored out with:
-
- "if given arguments: "VERSION_LESS" "5.16.0" Unknown arguments specified"
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0394af4..e11d998 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -223,11 +223,10 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
- Notifications
- KCMUtils
- )
--find_package(KF5 ${REQUIRED_KF5_VERSION} QUIET
-- OPTIONAL_COMPONENTS
-- Activities
-- KHtml
--)
-+
-+find_package(KF5Activities)
-+find_package(KF5KHtml)
-+
- set_package_properties(KF5Activities PROPERTIES
- TYPE OPTIONAL
- )
diff --git a/app-office/calligra/files/calligra-3.0.0.1-deps2.patch b/app-office/calligra/files/calligra-3.0.0.1-deps2.patch
deleted file mode 100644
index c0e3587aee6..00000000000
--- a/app-office/calligra/files/calligra-3.0.0.1-deps2.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-commit 511d4014beff9f79aeab1c0013470f21ac6b7df7
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Wed Jan 4 14:13:19 2017 +0100
-
- Fix dependencies, sort and clean trailing whitespaces
-
- Add missing KF5JobWidgets
- Drop unused KF5TextEditor
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e11d998..6fab26b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -195,33 +195,33 @@ set(REQUIRED_KF5_VERSION "5.7.0")
-
- find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
- COMPONENTS
-- Archive
-- Codecs
-+ Archive
-+ Codecs
- Completion
-- Config
-- ConfigWidgets
-+ Config
-+ ConfigWidgets
- CoreAddons
- DBusAddons
- DocTools
-- GuiAddons
-- I18n
-- IconThemes
-+ GuiAddons
-+ I18n
-+ IconThemes
- ItemViews
-+ JobWidgets
-+ KCMUtils
- KDELibs4Support
-- KIO
-- Kross
-- Parts
-+ KIO
-+ Kross
-+ Notifications
-+ NotifyConfig
-+ Parts
- Sonnet
-- TextEditor
-- TextWidgets
-+ TextWidgets
- ThreadWeaver
-- Wallet
-- WidgetsAddons
-+ Wallet
-+ WidgetsAddons
- WindowSystem
-- XmlGui
-- NotifyConfig
-- Notifications
-- KCMUtils
-+ XmlGui
- )
-
- find_package(KF5Activities)
diff --git a/app-office/calligra/files/calligra-3.0.0.1-deps3.patch b/app-office/calligra/files/calligra-3.0.0.1-deps3.patch
deleted file mode 100644
index 24591789763..00000000000
--- a/app-office/calligra/files/calligra-3.0.0.1-deps3.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 019f7e77a341661742b179c92cbce485b7ae361e
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Wed Jan 4 23:51:32 2017 +0100
-
- Push KF5Threadweaver dep to the only place where it is used
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6fab26b..ace6f52 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -217,7 +217,6 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
- Parts
- Sonnet
- TextWidgets
-- ThreadWeaver
- Wallet
- WidgetsAddons
- WindowSystem
-diff --git a/libs/widgets/tests/CMakeLists.txt b/libs/widgets/tests/CMakeLists.txt
-index 3934630..744828c 100644
---- a/libs/widgets/tests/CMakeLists.txt
-+++ b/libs/widgets/tests/CMakeLists.txt
-@@ -4,6 +4,8 @@ include_directories( ${KOMAIN_INCLUDES} ${CMAKE_SOURCE_DIR}/libs/widgets)
- add_definitions(-DFILES_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data/")
- add_definitions(-DFILES_OUTPUT_DIR="${CMAKE_CURRENT_BINARY_DIR}")
-
-+find_package(KF5ThreadWeaver ${REQUIRED_KF5_VERSION} REQUIRED)
-+
- #add_subdirectory(filedialogtester)
-
- # call: kowidgets_add_unit_test(<test-name> <sources> LINK_LIBRARIES <library> [<library> [...]] [GUI])
diff --git a/app-office/calligra/files/calligra-3.0.0.1-nokdelibs4.patch b/app-office/calligra/files/calligra-3.0.0.1-nokdelibs4.patch
deleted file mode 100644
index faf4c87f247..00000000000
--- a/app-office/calligra/files/calligra-3.0.0.1-nokdelibs4.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-commit 8d2383d29beaaad1ebb0b9de2b73589a8b964cdc
-Author: Dag Andersen <danders@get2net.dk>
-Date: Thu Jan 5 09:32:12 2017 +0100
-
- Plan does not depend on Kdelibs4Support
-
-diff --git a/plan/libs/kernel/CMakeLists.txt b/plan/libs/kernel/CMakeLists.txt
-index d85b537..fddb9c3 100644
---- a/plan/libs/kernel/CMakeLists.txt
-+++ b/plan/libs/kernel/CMakeLists.txt
-@@ -45,8 +45,6 @@ target_link_libraries(kplatokernel
- kowidgetutils
- kundo2
- KF5::KIOWidgets
-- PRIVATE
-- KF5::KDELibs4Support
- )
-
- set_target_properties(kplatokernel PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} )
-commit 3a3ee7863b65313f573593bf868584f829b725f2
-Author: Dag Andersen <danders@get2net.dk>
-Date: Thu Jan 5 12:15:04 2017 +0100
-
- Plan: klocale.h is from kde4, so remove
-
-diff --git a/plan/libs/kernel/kptlocale.cpp b/plan/libs/kernel/kptlocale.cpp
-index 6bfc7d8..2145f7c 100644
---- a/plan/libs/kernel/kptlocale.cpp
-+++ b/plan/libs/kernel/kptlocale.cpp
-@@ -22,8 +22,6 @@
-
- #include "kptdebug.h"
-
--#include <klocale.h>
--
- #include <QLocale>
-
-
diff --git a/app-office/calligra/files/calligra-3.0.0.1-relax-deps.patch b/app-office/calligra/files/calligra-3.0.0.1-relax-deps.patch
deleted file mode 100644
index 3eeb557239e..00000000000
--- a/app-office/calligra/files/calligra-3.0.0.1-relax-deps.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c769476b16068a82c20e195134e7c32ae7c7a081 Mon Sep 17 00:00:00 2001
-From: Dag Andersen <danders@get2net.dk>
-Date: Thu, 5 Jan 2017 12:51:26 +0100
-Subject: We should accept all 3.0 versions of KReport/KProperty
-
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4de94a4..f963bde 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -480,7 +480,7 @@ set_package_properties(KChart PROPERTIES
- ##
- ## Test for KReport
- ##
--macro_optional_find_package(KReport 3.0.0 EXACT QUIET)
-+macro_optional_find_package(KReport 3.0 QUIET)
- set_package_properties(KReport PROPERTIES
- DESCRIPTION "A framework for the creation and generation of reports in multiple formats"
- URL "https://community.kde.org/KReport"
-@@ -491,7 +491,7 @@ set_package_properties(KReport PROPERTIES
- ##
- ## Test for KPropertyWidgets
- ##
--macro_optional_find_package(KPropertyWidgets 3.0.0 EXACT QUIET)
-+macro_optional_find_package(KPropertyWidgets 3.0 QUIET)
- set_package_properties(KPropertyWidgets PROPERTIES
- DESCRIPTION "A property editing framework with editor widget"
- URL "https://community.kde.org/KProperty"
---
-cgit v0.11.2
-
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/, app-office/calligra/files/
@ 2017-07-06 12:49 Michael Palimaka
0 siblings, 0 replies; 19+ messages in thread
From: Michael Palimaka @ 2017-07-06 12:49 UTC (permalink / raw
To: gentoo-commits
commit: 07319fb870a05e878406f2ae5ab497f87468306c
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 6 12:47:30 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jul 6 12:48:58 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07319fb8
app-office/calligra: remove 2.9.11-r1
Package-Manager: Portage-2.3.6, Repoman-2.3.2
app-office/calligra/Manifest | 1 -
app-office/calligra/calligra-2.9.11-r1.ebuild | 227 ---------------------
.../files/calligra-2.9.1-no-arch-detection.patch | 14 --
.../files/calligra-2.9.11-libwps-0.4.patch | 46 -----
.../files/calligra-2.9.11-postgresql-9.6.patch | 19 --
app-office/calligra/metadata.xml | 7 -
6 files changed, 314 deletions(-)
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index dfb1872d714..89021be4b8c 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,2 +1 @@
-DIST calligra-2.9.11.tar.xz 196039892 SHA256 b18d2d0f87bc92753ec8b1eb780a596770a49141e3e60d811da51e752e54ea09 SHA512 69fbb38dbc3d59a744ed1fae5361f61bde15da298d28942f226d3d99d399a95f5ee67cca755996290c65943aa9babf6367c44f0d0199dacce22a9879346f82f8 WHIRLPOOL 973a17eb639ddfaa5a913b064c90957935ded7fe3fdb5237c27112b6686b3dbe3e411c168f920947ef98c4a3d951842220f849565503fac67ebe75784f339e74
DIST calligra-3.0.1.tar.xz 60764344 SHA256 452bddc4e03cfbf48de508b991dc94209d386d86bf010ea9d10afed0f5694db2 SHA512 ec17d007262d598e16045c6c75f8a37dfdf73b980b02ae9bea20282cbd4dd53202f62fc4d8bd84484193a501859c2150079a76d83c1638d8449f41526df57ee0 WHIRLPOOL 6e1dfecb877ee57bf43a9d2ec597972f474b4acb7fe7acff5ad6f72bc81cae9484e4ac7ad425652d6a08051810a1ff99efd2b854ead20b9e437746e080c99397
diff --git a/app-office/calligra/calligra-2.9.11-r1.ebuild b/app-office/calligra/calligra-2.9.11-r1.ebuild
deleted file mode 100644
index ae488fe4583..00000000000
--- a/app-office/calligra/calligra-2.9.11-r1.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# note: files that need to be checked for dependencies etc:
-# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
-# krita/CMakeLists.txt
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="4G"
-KDE_HANDBOOK="optional"
-KDE_LINGUAS_LIVE_OVERRIDE="true"
-OPENGL_REQUIRED="optional"
-WEBKIT_REQUIRED="optional"
-inherit check-reqs kde4-base versionator
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="https://www.calligra.org/"
-
-case ${PV} in
- 2.[456789].[789]?)
- # beta or rc releases
- SRC_URI="mirror://kde/unstable/${P}/${P}.tar.xz" ;;
- 2.[456789].?|2.[456789].??)
- # stable releases
- SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;;
- 2.[456789].9999)
- # stable branch live ebuild
- SRC_URI="" ;;
- 9999)
- # master branch live ebuild
- SRC_URI="" ;;
-esac
-
-LICENSE="GPL-2"
-SLOT="4"
-
-if [[ ${KDE_BUILD_TYPE} == release ]] ; then
- KEYWORDS="amd64 ~arm x86"
-fi
-
-IUSE="color-management +crypt +eigen +exif fftw +fontconfig freetds +glew +glib
-+gsf gsl import-filter +jpeg jpeg2k +lcms mysql openexr +pdf +pim
-postgres spacenav sybase test tiff +threads +truetype vc xbase +xml"
-
-# Don't use Active, it's broken on desktops.
-CAL_FTS="author braindump flow gemini karbon kexi krita plan sheets stage words"
-for cal_ft in ${CAL_FTS}; do
- IUSE+=" calligra_features_${cal_ft}"
-done
-unset cal_ft
-
-REQUIRED_USE="
- || ( $(printf 'calligra_features_%s ' ${CAL_FTS[@]}) )
- calligra_features_author? ( calligra_features_words )
- calligra_features_gemini? ( opengl )
- calligra_features_krita? ( eigen exif lcms opengl )
- calligra_features_plan? ( pim )
- calligra_features_sheets? ( eigen )
- calligra_features_stage? ( webkit )
- vc? ( calligra_features_krita )
- test? ( calligra_features_karbon )
-"
-
-RDEPEND="
- dev-lang/perl
- dev-libs/boost
- dev-qt/qtcore:4[exceptions]
- media-libs/libpng:0=
- sys-libs/zlib
- virtual/libiconv
- color-management? ( media-libs/opencolorio )
- crypt? ( app-crypt/qca:2[qt4] )
- eigen? ( dev-cpp/eigen:3 )
- exif? ( media-gfx/exiv2:= )
- fftw? ( sci-libs/fftw:3.0 )
- fontconfig? ( media-libs/fontconfig )
- freetds? ( dev-db/freetds )
- glib? ( dev-libs/glib:2 )
- gsf? ( gnome-extra/libgsf )
- gsl? ( sci-libs/gsl:= )
- import-filter? (
- app-text/libetonyek
- app-text/libodfgen
- app-text/libwpd:*
- app-text/libwpg:*
- app-text/libwps
- dev-libs/librevenge
- media-libs/libvisio
- )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/openjpeg:0 )
- lcms? (
- media-libs/lcms:2
- x11-libs/libX11
- )
- mysql? ( virtual/mysql )
- openexr? ( media-libs/openexr:= )
- opengl? (
- media-libs/glew:0
- virtual/glu
- )
- pdf? (
- app-text/poppler:=
- media-gfx/pstoedit
- )
- pim? ( $(add_kdeapps_dep kdepimlibs) )
- postgres? (
- dev-db/postgresql:*
- dev-libs/libpqxx
- )
- spacenav? ( dev-libs/libspnav )
- sybase? ( dev-db/freetds )
- tiff? ( media-libs/tiff:0 )
- truetype? ( media-libs/freetype:2 )
- vc? ( <dev-libs/vc-1.0.0 )
- xbase? ( dev-db/xbase )
- calligra_features_kexi? (
- dev-db/sqlite:3[extensions(+)]
- dev-libs/icu:=
- )
- calligra_features_krita? (
- dev-qt/qtdeclarative:4
- net-misc/curl
- x11-libs/libX11
- x11-libs/libXi
- )
- calligra_features_words? ( dev-libs/libxslt )
-"
-DEPEND="${RDEPEND}
- x11-misc/shared-mime-info
-"
-
-[[ ${PV} == 9999 ]] && LANGVERSION="2.9" || LANGVERSION="$(get_version_component_range 1-2)"
-PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
-
-# bug 394273
-RESTRICT=test
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.9.1-no-arch-detection.patch
- "${FILESDIR}"/${P}-postgresql-9.6.patch
- "${FILESDIR}"/${P}-libwps-0.4.patch
-)
-
-pkg_pretend() {
- check-reqs_pkg_pretend
-}
-
-pkg_setup() {
- kde4-base_pkg_setup
- check-reqs_pkg_setup
-}
-
-src_prepare() {
- kde4-base_src_prepare
- if ! use webkit; then
- sed -i CMakeLists.txt -e "/^find_package/ s/QtWebKit //" || die
- fi
-}
-
-src_configure() {
- local cal_ft myproducts
-
- # applications
- for cal_ft in ${CAL_FTS}; do
- use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
- done
-
- local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
-
- # regular options
- mycmakeargs+=(
- -DCREATIVEONLY=OFF
- -DPACKAGERS_BUILD=OFF
- -DWITH_Soprano=OFF
- -DWITH_KActivities=OFF
- -DWITH_CalligraMarble=OFF
- -DWITH_Iconv=ON
- -DWITH_OCIO=$(usex color-management)
- -DWITH_QCA2=$(usex crypt)
- -DWITH_Eigen3=$(usex eigen)
- -DWITH_Exiv2=$(usex exif)
- -DWITH_FFTW3=$(usex fftw)
- -DWITH_Fontconfig=$(usex fontconfig)
- -DWITH_FreeTDS=$(usex freetds)
- -DWITH_GLIB2=$(usex glib)
- -DWITH_GSL=$(usex gsl)
- -DWITH_LibEtonyek=$(usex import-filter)
- -DWITH_LibOdfGen=$(usex import-filter)
- -DWITH_LibRevenge=$(usex import-filter)
- -DWITH_LibVisio=$(usex import-filter)
- -DWITH_LibWpd=$(usex import-filter)
- -DWITH_LibWpg=$(usex import-filter)
- -DWITH_LibWps=$(usex import-filter)
- -DWITH_JPEG=$(usex jpeg)
- -DWITH_OpenJPEG=$(usex jpeg2k)
- -DWITH_Kdcraw=OFF
- -DWITH_LCMS2=$(usex lcms)
- -DWITH_MySQL=$(usex mysql)
- -DWITH_Okular=OFF
- -DWITH_OpenEXR=$(usex openexr)
- -DUSEOPENGL=$(usex opengl)
- -DWITH_Poppler=$(usex pdf)
- -DWITH_Pstoedit=$(usex pdf)
- -DWITH_KdepimLibs=$(usex pim)
- -DWITH_CalligraPostgreSQL=$(usex postgres)
- -DWITH_Spnav=$(usex spacenav)
- -DWITH_FreeTDS=$(usex sybase)
- -DWITH_Threads=$(usex threads)
- -DWITH_TIFF=$(usex tiff)
- -DWITH_Freetype=$(usex truetype)
- -DWITH_Vc=$(usex vc)
- -DWITH_XBase=$(usex xbase)
- )
-
- use test && mycmakeargs+=( -DENABLE_CSTESTER_TESTING=$(usex test) )
-
- kde4-base_src_configure
-}
-
-src_install() {
- kde4-base_src_install
-
- # bug 613414
- QA_DT_NEEDED="usr/lib64/libkoversion.so.14.0.0"
-}
diff --git a/app-office/calligra/files/calligra-2.9.1-no-arch-detection.patch b/app-office/calligra/files/calligra-2.9.1-no-arch-detection.patch
deleted file mode 100644
index 85f401bbd61..00000000000
--- a/app-office/calligra/files/calligra-2.9.1-no-arch-detection.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/CMakeLists.txt 2016-12-07 12:48:03.771533639 -0200
-+++ b/CMakeLists.txt 2016-12-07 12:49:07.534866207 -0200
-@@ -441,11 +441,6 @@
- endif()
- endmacro()
- endif()
--
-- if (NOT PACKAGERS_BUILD)
-- # Optimize the whole Calligra for current architecture
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}")
-- endif ()
- endif()
- set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} )
-
diff --git a/app-office/calligra/files/calligra-2.9.11-libwps-0.4.patch b/app-office/calligra/files/calligra-2.9.11-libwps-0.4.patch
deleted file mode 100644
index 79595d9f883..00000000000
--- a/app-office/calligra/files/calligra-2.9.11-libwps-0.4.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Last-Update: 2015-06-17
-Forwarded: no
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788969
-Origin: http://pkgs.fedoraproject.org/cgit/calligra.git/commit/?id=124c28df44584e08b00d4dbb859362af73c41070
-From: David Tardon <dtardon@redhat.com>
-Description: adapt to libwps 0.4
-
---- a/cmake/modules/FindLibWps.cmake
-+++ b/cmake/modules/FindLibWps.cmake
-@@ -9,18 +9,18 @@
- # Redistribution and use is allowed according to the terms of the BSD license.
-
- include(LibFindMacros)
- libfind_package(LIBWPS LibWpd)
--libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.3)
-+libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.4)
-
- find_path(LIBWPS_INCLUDE_DIR
- NAMES libwps/libwps.h
- HINTS ${LIBWPS_PKGCONF_INCLUDE_DIRS} ${LIBWPS_PKGCONF_INCLUDEDIR}
-- PATH_SUFFIXES libwps-0.3
-+ PATH_SUFFIXES libwps-0.4
- )
-
- find_library(LIBWPS_LIBRARY
-- NAMES wps wps-0.3
-+ NAMES wps wps-0.4
- HINTS ${LIBWPS_PKGCONF_LIBRARY_DIRS} ${LIBWPS_PKGCONF_LIBDIR}
- )
-
- set(LIBWPS_PROCESS_LIBS LIBWPS_LIBRARY LIBWPD_LIBRARIES)
---- a/filters/words/works/import/WPSImport.cpp
-+++ b/filters/words/works/import/WPSImport.cpp
-@@ -90,9 +90,11 @@
- }
- bool isSupportedFormat(librevenge::RVNGInputStream &input)
- {
- WPSKind kind = WPS_TEXT;
-- WPSConfidence confidence = WPSDocument::isFileFormatSupported(&input, kind);
-+ WPSCreator creator = WPS_MSWORKS;
-+ bool needsEncoding = false;
-+ WPSConfidence confidence = WPSDocument::isFileFormatSupported(&input, kind, creator, needsEncoding);
- if (confidence == WPS_CONFIDENCE_NONE || kind != WPS_TEXT)
- return false;
- return true;
- }
diff --git a/app-office/calligra/files/calligra-2.9.11-postgresql-9.6.patch b/app-office/calligra/files/calligra-2.9.11-postgresql-9.6.patch
deleted file mode 100644
index 617a0c3358e..00000000000
--- a/app-office/calligra/files/calligra-2.9.11-postgresql-9.6.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 843c41decfa85e351349f7a410893ac85c9d60b7
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Oct 8 16:17:17 2016 +0200
-
- cmake: find PostgreSQL 9.6
-
-diff --git a/cmake/modules/FindCalligraPostgreSQL.cmake b/cmake/modules/FindCalligraPostgreSQL.cmake
-index 035508b..98a1e88 100644
---- a/cmake/modules/FindCalligraPostgreSQL.cmake
-+++ b/cmake/modules/FindCalligraPostgreSQL.cmake
-@@ -83,7 +83,7 @@ set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to wher
-
-
- set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
-- "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
-+ "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
-
- # Define additional search paths for root directories.
- foreach (suffix ${PostgreSQL_KNOWN_VERSIONS} )
diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index e19fadc0436..d600cd47a36 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -11,18 +11,11 @@
</maintainer>
<use>
<flag name="activities">Enable kactivities support</flag>
- <flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag>
- <flag name="eigen">Enable <pkg>dev-cpp/eigen</pkg> mathematical templates support</flag>
- <flag name="glew">Enable <pkg>media-libs/glew</pkg> opengl extension library support</flag>
- <flag name="glib">Enable support for C library routines from <pkg>dev-libs/glib</pkg></flag>
- <flag name="gsf">Enable support for ODT structures extraction via <pkg>gnome-extra/libgsf</pkg></flag>
<flag name="import-filter">Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote</flag>
<flag name="lcms">Build colorengine plugins using <pkg>media-libs/lcms</pkg></flag>
<flag name="okular">Enable bindings for <pkg>kde-apps/okular</pkg></flag>
<flag name="phonon">Build stage/eventplugins and videoshape plugin using <pkg>media-libs/phonon</pkg></flag>
<flag name="pim">Enable support for KDE PIM resources integration</flag>
<flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>
- <flag name="vc">Enable support for <pkg>dev-libs/vc</pkg>, could be a significant speed boost on krita</flag>
- <flag name="xbase">Enable support for xbase compatible database formats</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/, app-office/calligra/files/
@ 2018-03-15 16:34 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2018-03-15 16:34 UTC (permalink / raw
To: gentoo-commits
commit: be82e02e9b9524bedc5a21051a23c800e5135f1a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 19 16:58:49 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 15 16:33:32 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be82e02e
app-office/calligra: Workaround unexpected KDE_DOC_DIR content
Closes: https://bugs.gentoo.org/648126
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-office/calligra/calligra-3.1.0-r2.ebuild | 235 +++++++++++++++++++++
app-office/calligra/files/calligra-3.1.0-doc.patch | 13 ++
2 files changed, 248 insertions(+)
diff --git a/app-office/calligra/calligra-3.1.0-r2.ebuild b/app-office/calligra/calligra-3.1.0-r2.ebuild
new file mode 100644
index 00000000000..68e6f30d1dd
--- /dev/null
+++ b/app-office/calligra/calligra-3.1.0-r2.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CHECKREQS_DISK_BUILD="4G"
+KDE_APPS_MINIMAL="17.12.0"
+KDE_DOC_DIR="xxx" # contains no language subdirs
+KDE_HANDBOOK="forceoptional"
+KDE_PO_DIRS="po plan/po"
+KDE_TEST="forceoptional"
+inherit check-reqs kde5 versionator
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="https://www.calligra.org/"
+[[ ${KDE_BUILD_TYPE} == release ]] && \
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
+ calligra_features_plan? ( mirror://kde/stable/${PN}/${PV}/${PN}plan-${PV}.tar.xz )"
+
+LICENSE="GPL-2"
+
+[[ ${KDE_BUILD_TYPE} == release ]] && \
+KEYWORDS="~amd64 ~x86"
+
+CAL_FTS=( karbon plan sheets words )
+
+IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf
+ phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})
+ calligra_experimental_features_stage"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+# FIXME: Disabled by upstream for good reason
+# Crashes plan (https://bugs.kde.org/show_bug.cgi?id=311940)
+# $(add_kdeapps_dep akonadi)
+# $(add_kdeapps_dep akonadi-contacts)
+# Currently upstream-disabled in plan
+# =dev-libs/kproperty-3.0*:5
+# =dev-libs/kreport-3.0*:5
+COMMON_DEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kemoticons)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kross)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep sonnet)
+ $(add_qt_dep designer)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtsvg)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ dev-lang/perl
+ sys-libs/zlib
+ virtual/libiconv
+ activities? ( $(add_frameworks_dep kactivities) )
+ crypt? ( app-crypt/qca:2[qt5] )
+ fontconfig? ( media-libs/fontconfig )
+ gemini? ( $(add_qt_dep qtdeclarative 'widgets') )
+ gsl? ( sci-libs/gsl )
+ import-filter? (
+ $(add_frameworks_dep khtml)
+ app-text/libetonyek
+ app-text/libodfgen
+ app-text/libwpd:*
+ app-text/libwpg:*
+ >=app-text/libwps-0.4
+ dev-libs/librevenge
+ media-libs/libvisio
+ )
+ lcms? (
+ media-libs/ilmbase:=
+ media-libs/lcms:2
+ )
+ openexr? ( media-libs/openexr )
+ pdf? ( app-text/poppler[qt5] )
+ phonon? ( media-libs/phonon[qt5(+)] )
+ spacenav? ( dev-libs/libspnav )
+ truetype? ( media-libs/freetype:2 )
+ X? (
+ $(add_qt_dep qtx11extras)
+ x11-libs/libX11
+ )
+ calligra_experimental_features_stage? (
+ $(add_qt_dep qtwebkit)
+ okular? ( $(add_kdeapps_dep okular) )
+ )
+ calligra_features_plan? (
+ $(add_frameworks_dep khtml)
+ $(add_frameworks_dep kholidays)
+ dev-libs/kdiagram:5
+ pim? (
+ $(add_kdeapps_dep kcalcore)
+ $(add_kdeapps_dep kcontacts)
+ )
+ )
+ calligra_features_sheets? ( dev-cpp/eigen:3 )
+ calligra_features_words? (
+ dev-libs/libxslt
+ okular? ( $(add_kdeapps_dep okular) )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost
+ sys-devel/gettext
+ x11-misc/shared-mime-info
+ test? ( $(add_frameworks_dep threadweaver) )
+"
+RDEPEND="${COMMON_DEPEND}
+ calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
+ !app-office/calligra:4
+ !app-office/calligra-l10n:4
+"
+RESTRICT+=" test"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-no-arch-detection.patch
+ "${FILESDIR}"/${P}-doc.patch
+)
+
+pkg_pretend() {
+ check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+ kde5_pkg_setup
+ check-reqs_pkg_setup
+}
+
+src_prepare() {
+ if use calligra_features_plan && [[ ${KDE_BUILD_TYPE} == release ]]; then
+ mv ../${PN}plan-${PV} plan || die
+ sed -e "/add_subdirectory(plan)/s/#//" \
+ -e "/^calligra_disable_product(APP_PLAN/s/^/#/" \
+ -i CMakeLists.txt || die
+ fi
+ kde5_src_prepare
+
+ if ! use test; then
+ sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \
+ -i libs/pigment/CMakeLists.txt || die
+ fi
+
+ # Unconditionally disable deprecated deps (required by QtQuick1)
+ punt_bogus_dep Qt5 Declarative
+ punt_bogus_dep Qt5 OpenGL
+
+ if ! use calligra_experimental_features_stage; then
+ punt_bogus_dep Qt5 WebKitWidgets
+ punt_bogus_dep Qt5 WebKit
+ fi
+
+ # Hack around the excessive use of CMake macros
+ if use okular && ! use calligra_features_words; then
+ sed -i -e "/add_subdirectory( *okularodtgenerator *)/ s/^/#DONT/" \
+ extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT"
+ fi
+
+ if use okular && ! use calligra_experimental_features_stage; then
+ sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \
+ extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP"
+ fi
+}
+
+src_configure() {
+ local cal_ft myproducts
+
+ # applications
+ for cal_ft in ${CAL_FTS[@]}; do
+ use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
+ done
+
+ use calligra_experimental_features_stage && myproducts+=( STAGE )
+
+ use lcms && myproducts+=( PLUGIN_COLORENGINES )
+ use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
+
+ local mycmakeargs=(
+ -DPACKAGERS_BUILD=OFF
+ -DRELEASE_BUILD=ON
+ -DWITH_Iconv=ON
+ -DPRODUCTSET="${myproducts[*]}"
+ $(cmake-utils_use_find_package activities KF5Activities)
+ -DWITH_Qca-qt5=$(usex crypt)
+ -DWITH_Fontconfig=$(usex fontconfig)
+ $(cmake-utils_use_find_package gemini Libgit2)
+ $(cmake-utils_use_find_package gemini Qt5QuickWidgets)
+ -DWITH_GSL=$(usex gsl)
+ -DWITH_LibEtonyek=$(usex import-filter)
+ -DWITH_LibOdfGen=$(usex import-filter)
+ -DWITH_LibRevenge=$(usex import-filter)
+ -DWITH_LibVisio=$(usex import-filter)
+ -DWITH_LibWpd=$(usex import-filter)
+ -DWITH_LibWpg=$(usex import-filter)
+ -DWITH_LibWps=$(usex import-filter)
+ $(cmake-utils_use_find_package phonon Phonon4Qt5)
+ $(cmake-utils_use_find_package pim KF5CalendarCore)
+ $(cmake-utils_use_find_package pim KF5Contacts)
+ -DWITH_LCMS2=$(usex lcms)
+ -DWITH_Okular5=$(usex okular)
+ -DWITH_OpenEXR=$(usex openexr)
+ -DWITH_Poppler=$(usex pdf)
+ -DWITH_Eigen3=$(usex calligra_features_sheets)
+ -DBUILD_UNMAINTAINED=$(usex calligra_experimental_features_stage)
+ -ENABLE_CSTESTER_TESTING=$(usex test)
+ -DWITH_Freetype=$(usex truetype)
+ )
+
+ kde5_src_configure
+}
diff --git a/app-office/calligra/files/calligra-3.1.0-doc.patch b/app-office/calligra/files/calligra-3.1.0-doc.patch
new file mode 100644
index 00000000000..ad150edbf8a
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.0-doc.patch
@@ -0,0 +1,13 @@
+--- a/CMakeLists.txt 2018-03-15 16:59:36.624682111 +0100
++++ b/CMakeLists.txt 2018-03-15 17:07:02.306267220 +0100
+@@ -1160,9 +1160,7 @@
+ add_subdirectory(braindump)
+ endif()
+
+-if(SHOULD_BUILD_DOC)
+- add_subdirectory(doc)
+-endif()
++add_subdirectory(doc)
+
+ if(SHOULD_BUILD_PART_QTQUICK)
+ add_subdirectory(qtquick)
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/, app-office/calligra/files/
@ 2018-03-18 14:17 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2018-03-18 14:17 UTC (permalink / raw
To: gentoo-commits
commit: d6b997b31b37d2e63f4642b77bad12a39c2c66df
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 18 13:20:02 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 18 14:02:47 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6b997b3
app-office/calligra: Fix build with Qt 5.11
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-office/calligra/calligra-3.1.0-r2.ebuild | 1 +
.../calligra/files/calligra-3.1.0-qt-5.11.patch | 212 +++++++++++++++++++++
2 files changed, 213 insertions(+)
diff --git a/app-office/calligra/calligra-3.1.0-r2.ebuild b/app-office/calligra/calligra-3.1.0-r2.ebuild
index 4c861b1050f..2084d5f44db 100644
--- a/app-office/calligra/calligra-3.1.0-r2.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r2.ebuild
@@ -141,6 +141,7 @@ RESTRICT+=" test"
PATCHES=(
"${FILESDIR}"/${P}-no-arch-detection.patch
"${FILESDIR}"/${P}-doc.patch
+ "${FILESDIR}"/${P}-qt-5.11.patch
)
pkg_pretend() {
diff --git a/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch b/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch
new file mode 100644
index 00000000000..e49f5747699
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch
@@ -0,0 +1,212 @@
+From c52295c8dc90b964d26567d6750f46fd202145ae Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 18 Mar 2018 11:56:57 +0100
+Subject: [PATCH] Fix build with Qt 5.11 (missing headers)
+
+---
+ libs/widgets/KoCsvImportDialog.cpp | 1 +
+ libs/widgets/KoPageLayoutWidget.cpp | 2 ++
+ plan/src/kptview.h | 1 +
+ plan/src/kptviewlist.cpp | 1 +
+ plan/src/libs/ui/kptaccountseditor.cpp | 1 +
+ plan/src/libs/ui/kptdocumentspanel.h | 1 +
+ plan/src/libs/ui/kptitemviewsettup.cpp | 2 +-
+ plan/src/libs/ui/kpttaskeditor.cpp | 1 +
+ plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp | 1 +
+ plan/src/libs/widgets/KoPageLayoutWidget.cpp | 2 ++
+ plugins/chartshape/dialogs/TableEditorDialog.cpp | 1 +
+ plugins/formulashape/FormulaToolWidget.cpp | 1 +
+ sheets/dialogs/LayoutDialog.cpp | 1 +
+ words/part/dialogs/KWAnchoringProperties.cpp | 1 +
+ words/part/dialogs/KWRunAroundProperties.cpp | 2 ++
+ 15 files changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/libs/widgets/KoCsvImportDialog.cpp b/libs/widgets/KoCsvImportDialog.cpp
+index 0ffdcf62a70..cdca006dc62 100644
+--- a/libs/widgets/KoCsvImportDialog.cpp
++++ b/libs/widgets/KoCsvImportDialog.cpp
+@@ -21,6 +21,7 @@
+ #include "KoCsvImportDialog.h"
+
+ // Qt
++#include <QButtonGroup>
+ #include <QTextCodec>
+ #include <QTextStream>
+
+diff --git a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp
+index f91555ca262..2b9d04450b3 100644
+--- a/libs/widgets/KoPageLayoutWidget.cpp
++++ b/libs/widgets/KoPageLayoutWidget.cpp
+@@ -19,6 +19,8 @@
+
+ #include "KoPageLayoutWidget.h"
+
++#include <QButtonGroup>
++
+ #include <ui_KoPageLayoutWidget.h>
+
+ #include <KoUnit.h>
+diff --git a/plan/src/kptview.h b/plan/src/kptview.h
+index 44d11935e71..a98e55342db 100644
+--- a/plan/src/kptview.h
++++ b/plan/src/kptview.h
+@@ -28,6 +28,7 @@
+ #include "kptcontext.h"
+ #include "kptviewbase.h"
+
++#include <QActionGroup>
+ #include <QDockWidget>
+ #include <QMap>
+
+diff --git a/plan/src/kptviewlist.cpp b/plan/src/kptviewlist.cpp
+index f34e702e055..0e6db7b2ffe 100644
+--- a/plan/src/kptviewlist.cpp
++++ b/plan/src/kptviewlist.cpp
+@@ -25,6 +25,7 @@
+ #include <QStyle>
+ #include <QBrush>
+ #include <QContextMenuEvent>
++#include <QHeaderView>
+ #include <QMenu>
+
+ #include <kmessagebox.h>
+diff --git a/plan/src/libs/ui/kptaccountseditor.cpp b/plan/src/libs/ui/kptaccountseditor.cpp
+index 7991fafd779..54e3a87c94f 100644
+--- a/plan/src/libs/ui/kptaccountseditor.cpp
++++ b/plan/src/libs/ui/kptaccountseditor.cpp
+@@ -40,6 +40,7 @@
+ #include <QContextMenuEvent>
+ #include <QMenu>
+ #include <QAction>
++#include <QHeaderView>
+
+ #include <KLocalizedString>
+ #include <kactioncollection.h>
+diff --git a/plan/src/libs/ui/kptdocumentspanel.h b/plan/src/libs/ui/kptdocumentspanel.h
+index 00ea3af80b2..491cb1ebb86 100644
+--- a/plan/src/libs/ui/kptdocumentspanel.h
++++ b/plan/src/libs/ui/kptdocumentspanel.h
+@@ -26,6 +26,7 @@
+
+ #include "kptdocuments.h"
+
++#include <QModelIndexList>
+ #include <QWidget>
+ #include <kundo2qstack.h>
+
+diff --git a/plan/src/libs/ui/kptitemviewsettup.cpp b/plan/src/libs/ui/kptitemviewsettup.cpp
+index d1c3b1fc157..7c97a070b9a 100644
+--- a/plan/src/libs/ui/kptitemviewsettup.cpp
++++ b/plan/src/libs/ui/kptitemviewsettup.cpp
+@@ -25,9 +25,9 @@
+
+ #include "KoPageLayoutWidget.h"
+
++#include <QHeaderView>
+ #include <QPushButton>
+
+-
+ namespace KPlato
+ {
+
+diff --git a/plan/src/libs/ui/kpttaskeditor.cpp b/plan/src/libs/ui/kpttaskeditor.cpp
+index 5f79abfd917..d08d7f231f4 100644
+--- a/plan/src/libs/ui/kpttaskeditor.cpp
++++ b/plan/src/libs/ui/kpttaskeditor.cpp
+@@ -45,6 +45,7 @@
+ #include <QVBoxLayout>
+ #include <QDragMoveEvent>
+ #include <QAction>
++#include <QHeaderView>
+ #include <QMenu>
+
+ #include <kactionmenu.h>
+diff --git a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
+index 344ebc2b599..9146f06ab8c 100644
+--- a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
++++ b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
+@@ -31,6 +31,7 @@
+ #include <KFile>
+
+ #include <QAction>
++#include <QHeaderView>
+ #include <QTreeView>
+ #include <QStandardItemModel>
+ #include <QModelIndex>
+diff --git a/plan/src/libs/widgets/KoPageLayoutWidget.cpp b/plan/src/libs/widgets/KoPageLayoutWidget.cpp
+index c9e17b748a9..3abc81b939e 100644
+--- a/plan/src/libs/widgets/KoPageLayoutWidget.cpp
++++ b/plan/src/libs/widgets/KoPageLayoutWidget.cpp
+@@ -21,6 +21,8 @@
+
+ #include <ui_KoPageLayoutWidget.h>
+
++#include <QButtonGroup>
++
+ #include <KoUnit.h>
+
+ class Q_DECL_HIDDEN KoPageLayoutWidget::Private
+diff --git a/plugins/chartshape/dialogs/TableEditorDialog.cpp b/plugins/chartshape/dialogs/TableEditorDialog.cpp
+index c0d5136f09e..d2a772e83c2 100644
+--- a/plugins/chartshape/dialogs/TableEditorDialog.cpp
++++ b/plugins/chartshape/dialogs/TableEditorDialog.cpp
+@@ -24,6 +24,7 @@
+
+ // Qt
+ #include <QAbstractItemModel>
++#include <QAction>
+
+ // Calligra
+ #include <KoIcon.h>
+diff --git a/plugins/formulashape/FormulaToolWidget.cpp b/plugins/formulashape/FormulaToolWidget.cpp
+index ed109192cc5..8f521779617 100644
+--- a/plugins/formulashape/FormulaToolWidget.cpp
++++ b/plugins/formulashape/FormulaToolWidget.cpp
+@@ -30,6 +30,7 @@
+ #include <QWidgetAction>
+ #include <QTableWidget>
+ #include <QAction>
++#include <QHeaderView>
+ #include <QMenu>
+
+ FormulaToolWidget::FormulaToolWidget( KoFormulaTool* tool, QWidget* parent )
+diff --git a/sheets/dialogs/LayoutDialog.cpp b/sheets/dialogs/LayoutDialog.cpp
+index a0a9832ddfc..7d7db53823b 100644
+--- a/sheets/dialogs/LayoutDialog.cpp
++++ b/sheets/dialogs/LayoutDialog.cpp
+@@ -36,6 +36,7 @@
+ #include <math.h>
+
+ #include <QIntValidator>
++#include <QButtonGroup>
+ #include <QCheckBox>
+ #include <QFrame>
+ #include <QLabel>
+diff --git a/words/part/dialogs/KWAnchoringProperties.cpp b/words/part/dialogs/KWAnchoringProperties.cpp
+index d64208cbdb6..bfddb3a03f5 100644
+--- a/words/part/dialogs/KWAnchoringProperties.cpp
++++ b/words/part/dialogs/KWAnchoringProperties.cpp
+@@ -35,6 +35,7 @@
+
+ #include <kundo2command.h>
+
++#include <QButtonGroup>
+ #include <QComboBox>
+
+ const int KWAnchoringProperties::vertRels[4][20] = {
+diff --git a/words/part/dialogs/KWRunAroundProperties.cpp b/words/part/dialogs/KWRunAroundProperties.cpp
+index e38599a06d7..d96df6405a5 100644
+--- a/words/part/dialogs/KWRunAroundProperties.cpp
++++ b/words/part/dialogs/KWRunAroundProperties.cpp
+@@ -17,6 +17,8 @@
+ * Boston, MA 02110-1301, USA.
+ */
+
++#include <QButtonGroup>
++
+ #include "KWRunAroundProperties.h"
+ #include "KWFrameDialog.h"
+ #include "KWDocument.h"
+--
+2.16.2
+
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/, app-office/calligra/files/
@ 2018-07-15 10:38 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2018-07-15 10:38 UTC (permalink / raw
To: gentoo-commits
commit: 005aebaa26b159d7c4a755c719bf2c5bb2b8d490
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 15 10:01:56 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 15 10:38:19 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=005aebaa
app-office/calligra: Fix build with Qt-5.11
Closes: https://bugs.gentoo.org/661222
Package-Manager: Portage-2.3.41, Repoman-2.3.9
app-office/calligra/calligra-3.1.0-r2.ebuild | 1 +
.../files/calligra-3.1.0-stage-qt-5.11.patch | 23 ++++++++++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/app-office/calligra/calligra-3.1.0-r2.ebuild b/app-office/calligra/calligra-3.1.0-r2.ebuild
index 0389b5b7c9d..e2a76aa73c6 100644
--- a/app-office/calligra/calligra-3.1.0-r2.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r2.ebuild
@@ -142,6 +142,7 @@ PATCHES=(
"${FILESDIR}"/${P}-no-arch-detection.patch
"${FILESDIR}"/${P}-doc.patch
"${FILESDIR}"/${P}-qt-5.11.patch
+ "${FILESDIR}"/${P}-stage-qt-5.11.patch
)
pkg_pretend() {
diff --git a/app-office/calligra/files/calligra-3.1.0-stage-qt-5.11.patch b/app-office/calligra/files/calligra-3.1.0-stage-qt-5.11.patch
new file mode 100644
index 00000000000..120864e11d4
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.0-stage-qt-5.11.patch
@@ -0,0 +1,23 @@
+From ee83e0f2c251072e47a2799619cdc79efe67e651 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Tue, 3 Apr 2018 00:31:19 +0200
+Subject: Fix compilation with Qt 5.11 (missing include)
+
+---
+ stage/part/KPrPresentationTool.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp
+index ae743da..3007f91 100644
+--- a/stage/part/KPrPresentationTool.cpp
++++ b/stage/part/KPrPresentationTool.cpp
+@@ -32,6 +32,7 @@
+ #include <QDesktopServices>
+ #include <QUrl>
+ #include <QDBusConnection>
++#include <QFrame>
+
+ #include <KoShape.h>
+ #include <KoShapeManager.h>
+--
+cgit v0.11.2
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/, app-office/calligra/files/
@ 2019-01-24 22:59 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2019-01-24 22:59 UTC (permalink / raw
To: gentoo-commits
commit: 88fc96ebeee2e19bf7f5b48b2037257a008bb5e4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 24 22:57:21 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 24 22:59:33 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88fc96eb
app-office/calligra: Avoid dep on poppler[glib] for ifdef
Closes: https://bugs.gentoo.org/675972
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/calligra/calligra-3.1.0-r3.ebuild | 8 ++--
.../files/calligra-3.1.0-poppler-0.72.patch | 43 +++++++---------------
2 files changed, 19 insertions(+), 32 deletions(-)
diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild b/app-office/calligra/calligra-3.1.0-r3.ebuild
index c3913bd48d1..81597b0d7d1 100644
--- a/app-office/calligra/calligra-3.1.0-r3.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r3.ebuild
@@ -104,7 +104,6 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}
dev-libs/boost
sys-devel/gettext
- x11-misc/shared-mime-info
test? ( $(add_frameworks_dep threadweaver) )
"
RDEPEND="${COMMON_DEPEND}
@@ -121,8 +120,6 @@ PATCHES=(
"${FILESDIR}"/${P}-stage-qt-5.11.patch
"${FILESDIR}"/${P}-poppler-0.69.patch
"${FILESDIR}"/${P}-poppler-0.71.patch
- "${FILESDIR}"/${P}-poppler-0.72.patch # not upstreamable
- "${FILESDIR}"/${P}-poppler-0.73.patch
"${FILESDIR}"/${P}-no-webkit.patch
)
@@ -138,6 +135,11 @@ pkg_setup() {
src_prepare() {
kde5_src_prepare
+ if has_version ">=app-text/poppler-0.72"; then
+ eapply "${FILESDIR}"/${P}-poppler-0.72.patch # not upstreamable
+ eapply "${FILESDIR}"/${P}-poppler-0.73.patch
+ fi
+
if ! use test; then
sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \
-i libs/pigment/CMakeLists.txt || die
diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch
index 3b2e690257b..817a8ddcd67 100644
--- a/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch
+++ b/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch
@@ -1,54 +1,39 @@
-From 8f20ea906235cbee1d4aac4706e4eb03366875bf Mon Sep 17 00:00:00 2001
-From: "Tobias C. Berner" <tcberner@FreeBSD.org>
-Date: Mon, 7 Jan 2019 19:50:48 +0100
-Subject: [PATCH] Make compatible with poppler 0.72
+From 3784fdf0259a14f1f7b20c156dcfe42b45d76896 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 24 Jan 2019 23:55:02 +0100
+Subject: [PATCH] Fix build with poppler-0.72
+This is a downstream fix without backwards compat, not upstreamable.
---
- filters/karbon/pdf/SvgOutputDev.cpp | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
+ filters/karbon/pdf/SvgOutputDev.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
-index 4a1fad6bbcf..b1d4ea2d427 100644
+index 391e86cc117..bc72a003efb 100644
--- a/filters/karbon/pdf/SvgOutputDev.cpp
+++ b/filters/karbon/pdf/SvgOutputDev.cpp
-@@ -25,6 +25,7 @@
- #include <poppler/GfxState.h>
- #include <poppler/Stream.h>
- #include <poppler/GfxFont.h>
-+#include <poppler/glib/poppler-features.h>
-
- #include <QFile>
- #include <QTextStream>
-@@ -409,7 +410,11 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
+@@ -402,7 +402,7 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
QString str;
-+#if POPPLER_CHECK_VERSION(0,72,0)
+- const char * p = s->getCString();
+ const char * p = s->c_str();
-+#else
- const char * p = s->getCString();
-+#endif
int len = s->getLength();
CharCode code;
Unicode *u = nullptr;
-@@ -459,10 +464,18 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
+@@ -451,10 +451,10 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
*d->body << " y=\"" << y << "px\"";
if (font && font->getFamily()) {
-+#if POPPLER_CHECK_VERSION(0,72,0)
+- *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->getCString()) << "\"";
+ *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->c_str()) << "\"";
-+#else
- *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->getCString()) << "\"";
-+#endif
//debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->getCString() );
} else if (font && font->getName()) {
-+#if POPPLER_CHECK_VERSION(0,72,0)
+- *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->getCString()) << "\"";
+ *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->c_str()) << "\"";
-+#else
- *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->getCString()) << "\"";
-+#endif
//debugPdf << "font name:" << QString::fromLatin1( font->getName()->getCString() );
}
*d->body << " font-size=\"" << qMax(state->getFontSize(), state->getTransformedFontSize()) << "px\"";
--
2.20.1
+
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/, app-office/calligra/files/
@ 2019-08-11 8:19 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2019-08-11 8:19 UTC (permalink / raw
To: gentoo-commits
commit: 601b38ca8080c16e4adc418365d0dd76375b8dc4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 11 07:24:55 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 08:19:25 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=601b38ca
app-office/calligra: Fix missing header with Frameworks 5.61
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/calligra/calligra-3.1.0-r3.ebuild | 1 +
| 23 ++++++++++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild b/app-office/calligra/calligra-3.1.0-r3.ebuild
index 81597b0d7d1..77136854363 100644
--- a/app-office/calligra/calligra-3.1.0-r3.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r3.ebuild
@@ -121,6 +121,7 @@ PATCHES=(
"${FILESDIR}"/${P}-poppler-0.69.patch
"${FILESDIR}"/${P}-poppler-0.71.patch
"${FILESDIR}"/${P}-no-webkit.patch
+ "${FILESDIR}"/${P}-missing-header.patch
)
pkg_pretend() {
--git a/app-office/calligra/files/calligra-3.1.0-missing-header.patch b/app-office/calligra/files/calligra-3.1.0-missing-header.patch
new file mode 100644
index 00000000000..f15c3787172
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.0-missing-header.patch
@@ -0,0 +1,23 @@
+From 0c5430697bdcf41a45046107b28014e40c49a11a Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Tue, 23 Jul 2019 13:02:34 +0200
+Subject: Fix compilation with Qt 5.13 (missing include)
+
+---
+ sheets/plugins/calendar/CalendarToolWidget.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sheets/plugins/calendar/CalendarToolWidget.cpp b/sheets/plugins/calendar/CalendarToolWidget.cpp
+index b10b230..0c5eeb6 100644
+--- a/sheets/plugins/calendar/CalendarToolWidget.cpp
++++ b/sheets/plugins/calendar/CalendarToolWidget.cpp
+@@ -30,6 +30,7 @@
+ #include <kdatepicker.h>
+
+ #include <QPushButton>
++#include <QDate>
+
+ namespace Calligra
+ {
+--
+cgit v1.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/, app-office/calligra/files/
@ 2019-11-02 15:23 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2019-11-02 15:23 UTC (permalink / raw
To: gentoo-commits
commit: 11e22c282ae1fc952dfcdfa407a40c55ab0e3cd0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 1 20:07:56 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 2 15:22:29 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11e22c28
app-office/calligra: Fix build with poppler-0.82.0
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/calligra/calligra-3.1.0-r4.ebuild | 4 +++
.../files/calligra-3.1.0-poppler-0.82.patch | 35 ++++++++++++++++++++++
2 files changed, 39 insertions(+)
diff --git a/app-office/calligra/calligra-3.1.0-r4.ebuild b/app-office/calligra/calligra-3.1.0-r4.ebuild
index 37e03558459..411c8177f1c 100644
--- a/app-office/calligra/calligra-3.1.0-r4.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r4.ebuild
@@ -135,6 +135,10 @@ pkg_setup() {
src_prepare() {
kde5_src_prepare
+ if has_version ">=app-text/poppler-0.82"; then
+ eapply "${FILESDIR}/${P}-poppler-0.82.patch" # TODO: make upstreamable patch
+ fi
+
if ! use test; then
sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \
-i libs/pigment/CMakeLists.txt || die
diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.82.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.82.patch
new file mode 100644
index 00000000000..4cb9d1872eb
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.0-poppler-0.82.patch
@@ -0,0 +1,35 @@
+Patch stolen from Mageia Cauldron but had to be modified quite a bit.
+
+diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
+index ffdbf01..70bc9f8 100644
+--- a/filters/karbon/pdf/SvgOutputDev.cpp
++++ b/filters/karbon/pdf/SvgOutputDev.cpp
+@@ -405,7 +405,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s)
+ const char * p = s->c_str();
+ int len = s->getLength();
+ CharCode code;
+- Unicode *u = nullptr;
++ const Unicode *u = nullptr;
+ int uLen;
+ double dx, dy, originX, originY;
+ while (len > 0) {
+@@ -545,7 +545,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str,
+
+ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
+ int width, int height, GfxImageColorMap *colorMap,
+- bool /*interpolate*/, int *maskColors, bool inlineImg)
++ bool /*interpolate*/, const int *maskColors, bool inlineImg)
+ {
+ drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg);
+ }
+--- a/filters/karbon/pdf/SvgOutputDev.h
++++ b/filters/karbon/pdf/SvgOutputDev.h
+@@ -63,7 +63,7 @@ public:
+ // images
+ void drawImage(GfxState *state, Object *ref, Stream *str,
+ int width, int height, GfxImageColorMap *colorMap,
+- bool interpolate, int *maskColors, bool inlineImg) override;
++ bool interpolate, const int *maskColors, bool inlineImg) override;
+
+ // styles
+ virtual void updateAll(GfxState *state);
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/, app-office/calligra/files/
@ 2020-04-24 14:10 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2020-04-24 14:10 UTC (permalink / raw
To: gentoo-commits
commit: 91811eefedfd2e0bd104987a3a6c029e07f29d39
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 24 13:32:45 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 24 14:10:15 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91811eef
app-office/calligra: 3.2.0 version bump
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/calligra/Manifest | 1 +
app-office/calligra/calligra-3.2.0.ebuild | 201 +++++++++++++++++++++
.../files/calligra-3.1.89-no-arch-detection.patch | 17 ++
3 files changed, 219 insertions(+)
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 510689b2e98..ac459e7481d 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1 +1,2 @@
DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50 SHA512 ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b
+DIST calligra-3.2.0.tar.xz 55205468 BLAKE2B 4e59e0e22195894ccd11db4e54841079ec4225ab3e35c166af3bf7a55e96db92a1e9818affa34bc4d99743257569abebc6c14db07dc8e3ac9f62e8e30f944c9e SHA512 625886ae6f0e81eb4c489a9f6bd45b57fdb35fd8131ddf9b59a6fe0a80e338b487f70a90bd28e138281309dbfeb23e49d7ef93856fe1815f4fa16fa37964c013
diff --git a/app-office/calligra/calligra-3.2.0.ebuild b/app-office/calligra/calligra-3.2.0.ebuild
new file mode 100644
index 00000000000..dc2f5fb9f55
--- /dev/null
+++ b/app-office/calligra/calligra-3.2.0.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CHECKREQS_DISK_BUILD="4G"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit check-reqs ecm kde.org
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="https://www.calligra.org/"
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+CAL_FTS=( karbon sheets stage words )
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="activities +charts +crypt +fontconfig gemini gsl import-filter +lcms okular openexr
+ +pdf phonon spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+BDEPEND="
+ sys-devel/gettext
+"
+COMMON_DEPEND="
+ dev-lang/perl
+ >=dev-qt/designer-${QTMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtscript-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kcmutils-${KFMIN}:5
+ >=kde-frameworks/kcodecs-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdelibs4support-${KFMIN}:5
+ >=kde-frameworks/kemoticons-${KFMIN}:5
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kitemmodels-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kross-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwallet-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/sonnet-${KFMIN}:5
+ sys-libs/zlib
+ virtual/libiconv
+ activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+ charts? ( dev-libs/kdiagram:5 )
+ crypt? ( app-crypt/qca:2[qt5(+)] )
+ fontconfig? ( media-libs/fontconfig )
+ gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] )
+ gsl? ( sci-libs/gsl )
+ import-filter? (
+ app-text/libetonyek
+ app-text/libodfgen
+ app-text/libwpd:*
+ app-text/libwpg:*
+ >=app-text/libwps-0.4
+ dev-libs/librevenge
+ >=kde-frameworks/khtml-${KFMIN}:5
+ media-libs/libvisio
+ )
+ lcms? (
+ media-libs/ilmbase:=
+ media-libs/lcms:2
+ )
+ openexr? ( media-libs/openexr )
+ pdf? ( app-text/poppler:=[qt5] )
+ phonon? ( media-libs/phonon[qt5(+)] )
+ spacenav? ( dev-libs/libspnav )
+ truetype? ( media-libs/freetype:2 )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ )
+ calligra_features_sheets? ( dev-cpp/eigen:3 )
+ calligra_features_stage? ( okular? ( kde-apps/okular:5 ) )
+ calligra_features_words? (
+ dev-libs/libxslt
+ okular? ( kde-apps/okular:5 )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost
+ test? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+ calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
+ gemini? (
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ )
+"
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.1.89-no-arch-detection.patch )
+
+pkg_pretend() {
+ check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+ ecm_pkg_setup
+ check-reqs_pkg_setup
+}
+
+src_prepare() {
+ ecm_src_prepare
+
+ if ! use test; then
+ sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \
+ -i libs/pigment/CMakeLists.txt || die
+ fi
+
+ # Unconditionally disable deprecated deps (required by QtQuick1)
+ ecm_punt_bogus_dep Qt5 Declarative
+ ecm_punt_bogus_dep Qt5 OpenGL
+
+ # Hack around the excessive use of CMake macros
+ if use okular && ! use calligra_features_words; then
+ sed -i -e "/add_subdirectory( *okularodtgenerator *)/ s/^/#DONT/" \
+ extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT"
+ fi
+
+ if use okular && ! use calligra_features_stage; then
+ sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \
+ extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP"
+ fi
+}
+
+src_configure() {
+ local cal_ft myproducts
+
+ # applications
+ for cal_ft in ${CAL_FTS[@]}; do
+ use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
+ done
+
+ use lcms && myproducts+=( PLUGIN_COLORENGINES )
+ use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
+
+ local mycmakeargs=(
+ -DPACKAGERS_BUILD=OFF
+ -DRELEASE_BUILD=ON
+ -DWITH_Iconv=ON
+ -DPRODUCTSET="${myproducts[*]}"
+ $(cmake_use_find_package activities KF5Activities)
+ $(cmake_use_find_package charts KChart)
+ -DWITH_Qca-qt5=$(usex crypt)
+ -DWITH_Fontconfig=$(usex fontconfig)
+ $(cmake_use_find_package gemini Libgit2)
+ $(cmake_use_find_package gemini Qt5QuickWidgets)
+ -DWITH_GSL=$(usex gsl)
+ -DWITH_LibEtonyek=$(usex import-filter)
+ -DWITH_LibOdfGen=$(usex import-filter)
+ -DWITH_LibRevenge=$(usex import-filter)
+ -DWITH_LibVisio=$(usex import-filter)
+ -DWITH_LibWpd=$(usex import-filter)
+ -DWITH_LibWpg=$(usex import-filter)
+ -DWITH_LibWps=$(usex import-filter)
+ $(cmake_use_find_package phonon Phonon4Qt5)
+ -DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON
+ -DWITH_LCMS2=$(usex lcms)
+ -DWITH_Okular5=$(usex okular)
+ -DWITH_OpenEXR=$(usex openexr)
+ -DWITH_Poppler=$(usex pdf)
+ -DWITH_Eigen3=$(usex calligra_features_sheets)
+ -DBUILD_UNMAINTAINED=$(usex calligra_features_stage)
+ -ENABLE_CSTESTER_TESTING=$(usex test)
+ -DWITH_Freetype=$(usex truetype)
+ )
+
+ ecm_src_configure
+}
diff --git a/app-office/calligra/files/calligra-3.1.89-no-arch-detection.patch b/app-office/calligra/files/calligra-3.1.89-no-arch-detection.patch
new file mode 100644
index 00000000000..f4efa3d81a4
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.89-no-arch-detection.patch
@@ -0,0 +1,17 @@
+Avoid automagic CXXFLAG detection courtesy of dev-libs/vc.
+
+Gentoo-bug: 584118
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -617,10 +617,6 @@
+ endif()
+ endmacro()
+
+- if (NOT PACKAGERS_BUILD)
+- # Optimize the whole Calligra for current architecture
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}")
+- endif ()
+ endif()
+ set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} )
+
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/, app-office/calligra/files/
@ 2021-12-20 13:25 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2021-12-20 13:25 UTC (permalink / raw
To: gentoo-commits
commit: e6b799b70528727944e2e7612f4625acf0e61e29
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 19 22:47:52 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 20 13:25:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6b799b7
app-office/calligra: EAPI-8, drop IUSE openexr, missing RDEPEND
Fully switch to dev-libs/imath DEPEND.
Drop unused ENABLE_CSTESTER_TESTING cmake var, APP_CSTESTER not ON.
Silence cmake about Cauchy dependency (dead as can be).
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/calligra/calligra-3.2.1-r4.ebuild | 185 +++++++++++++++++++++
.../calligra/files/calligra-3.2.1-imath.patch | 30 ++++
.../calligra/files/calligra-3.2.1-openexr-3.patch | 93 +++++++++++
3 files changed, 308 insertions(+)
diff --git a/app-office/calligra/calligra-3.2.1-r4.ebuild b/app-office/calligra/calligra-3.2.1-r4.ebuild
new file mode 100644
index 000000000000..6ef745321e5d
--- /dev/null
+++ b/app-office/calligra/calligra-3.2.1-r4.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHECKREQS_DISK_BUILD="4G"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.88.0
+QTMIN=5.15.2
+inherit check-reqs ecm kde.org
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="https://calligra.org/"
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+CAL_FTS=( karbon sheets stage words )
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="activities +charts +crypt +fontconfig gemini gsl +import-filter +lcms
+ okular +pdf phonon spacenav +truetype X
+ $(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
+
+RESTRICT="test"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+COMMON_DEPEND="
+ dev-lang/perl
+ >=dev-qt/designer-${QTMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtscript-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kcmutils-${KFMIN}:5
+ >=kde-frameworks/kcodecs-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdelibs4support-${KFMIN}:5
+ >=kde-frameworks/kemoticons-${KFMIN}:5
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kitemmodels-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kross-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwallet-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/sonnet-${KFMIN}:5
+ sys-libs/zlib
+ virtual/libiconv
+ activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+ charts? ( dev-libs/kdiagram:5 )
+ crypt? ( >=app-crypt/qca-2.3.0:2 )
+ fontconfig? ( media-libs/fontconfig )
+ gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] )
+ gsl? ( sci-libs/gsl:= )
+ import-filter? (
+ app-text/libetonyek
+ app-text/libodfgen
+ app-text/libwpd:*
+ app-text/libwpg:*
+ >=app-text/libwps-0.4
+ dev-libs/librevenge
+ media-libs/libvisio
+ )
+ lcms? ( media-libs/lcms:2 )
+ okular? ( kde-apps/okular:5 )
+ pdf? ( app-text/poppler:=[qt5] )
+ phonon? ( >=media-libs/phonon-4.11.0 )
+ spacenav? ( dev-libs/libspnav )
+ truetype? ( media-libs/freetype:2 )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ )
+ calligra_features_sheets? ( dev-cpp/eigen:3 )
+ calligra_features_words? ( dev-libs/libxslt )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost
+ lcms? ( dev-libs/imath:3 )
+ test? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+ calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
+ gemini? (
+ >=dev-qt/qtquickcontrols-${QTMIN}:5
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ )
+"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.1.89-no-arch-detection.patch
+ "${FILESDIR}"/${P}-cmake-3.16.patch # bug 796224
+ "${FILESDIR}"/${P}-{openexr-3,imath}.patch
+)
+
+pkg_pretend() {
+ check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+ ecm_pkg_setup
+ check-reqs_pkg_setup
+}
+
+src_prepare() {
+ ecm_src_prepare
+
+ # Unconditionally disable deprecated deps (required by QtQuick1)
+ ecm_punt_bogus_dep Qt5 Declarative
+ ecm_punt_bogus_dep Qt5 OpenGL
+}
+
+src_configure() {
+ local cal_ft myproducts
+
+ # applications
+ for cal_ft in ${CAL_FTS[@]}; do
+ use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
+ done
+
+ use lcms && myproducts+=( PLUGIN_COLORENGINES )
+ use okular && myproducts+=( OKULAR )
+ use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
+
+ local mycmakeargs=(
+ -DPACKAGERS_BUILD=OFF
+ -DRELEASE_BUILD=ON
+ -DWITH_Iconv=ON
+ -DWITH_Imath=ON # w/ LCMS: 16 bit floating point Grayscale colorspace
+ -DCMAKE_DISABLE_FIND_PACKAGE_Cauchy=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON
+ -DPRODUCTSET="${myproducts[*]}"
+ $(cmake_use_find_package activities KF5Activities)
+ $(cmake_use_find_package charts KChart)
+ -DWITH_Qca-qt5=$(usex crypt)
+ -DWITH_Fontconfig=$(usex fontconfig)
+ $(cmake_use_find_package gemini Libgit2)
+ $(cmake_use_find_package gemini Qt5QuickWidgets)
+ -DWITH_GSL=$(usex gsl)
+ -DWITH_LibEtonyek=$(usex import-filter)
+ -DWITH_LibOdfGen=$(usex import-filter)
+ -DWITH_LibRevenge=$(usex import-filter)
+ -DWITH_LibVisio=$(usex import-filter)
+ -DWITH_LibWpd=$(usex import-filter)
+ -DWITH_LibWpg=$(usex import-filter)
+ -DWITH_LibWps=$(usex import-filter)
+ $(cmake_use_find_package phonon Phonon4Qt5)
+ -DWITH_LCMS2=$(usex lcms)
+ -DWITH_Okular5=$(usex okular)
+ -DWITH_Poppler=$(usex pdf)
+ -DWITH_Eigen3=$(usex calligra_features_sheets)
+ -DBUILD_UNMAINTAINED=$(usex calligra_features_stage)
+ -DWITH_Freetype=$(usex truetype)
+ )
+
+ ecm_src_configure
+}
diff --git a/app-office/calligra/files/calligra-3.2.1-imath.patch b/app-office/calligra/files/calligra-3.2.1-imath.patch
new file mode 100644
index 000000000000..62a2daa2f5dc
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.2.1-imath.patch
@@ -0,0 +1,30 @@
+From c52eb33f20a66acb648b725e2eee3ed977eae896 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Tue, 3 Aug 2021 10:41:09 +0200
+Subject: [PATCH] Only link to Imath when OpenEXR version is >= 3.0
+
+Since OpenEXR 3.0, Imath is in a separate, independently released library. Since that's the only library that Calligra needs, there's no need to link to the full OpenEXR
+---
+ CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cdcc02f0236..91c72882d3a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -338,9 +338,9 @@ endif ()
+ ## Check for OpenEXR
+ ##
+
+-macro_optional_find_package(OpenEXR 3.0 CONFIG QUIET)
+-if(TARGET OpenEXR::OpenEXR)
+- set(OPENEXR_LIBRARIES OpenEXR::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()
+--
+GitLab
+
diff --git a/app-office/calligra/files/calligra-3.2.1-openexr-3.patch b/app-office/calligra/files/calligra-3.2.1-openexr-3.patch
new file mode 100644
index 000000000000..d9175a63ce6b
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.2.1-openexr-3.patch
@@ -0,0 +1,93 @@
+From eab11436712f92afc6e7b14b25d1f6df217d79d7 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 11:19:52 +0200
+Subject: [PATCH] Support building with OpenEXR 3
+
+Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR
+---
+ CMakeLists.txt | 9 +++++++--
+ libs/pigment/CMakeLists.txt | 2 +-
+ plugins/colorengines/lcms2/CMakeLists.txt | 6 +++---
+ plugins/colorengines/lcms2/tests/CMakeLists.txt | 2 +-
+ 4 files changed, 12 insertions(+), 7 deletions(-)
+
+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} )
+--
+GitLab
+
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/, app-office/calligra/files/
@ 2022-03-12 15:53 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2022-03-12 15:53 UTC (permalink / raw
To: gentoo-commits
commit: a976c14d3eb189f1866b298e418e979f7a912350
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 12 15:39:32 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 12 15:52:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a976c14d
app-office/calligra: Fix build with >=app-text/poppler-22.03.0
Patch taken from Arch Linux
Closes: https://bugs.gentoo.org/834539
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/calligra/calligra-3.2.1-r5.ebuild | 1 +
.../files/calligra-3.2.1-poppler-22.03.0.patch | 51 ++++++++++++++++++++++
2 files changed, 52 insertions(+)
diff --git a/app-office/calligra/calligra-3.2.1-r5.ebuild b/app-office/calligra/calligra-3.2.1-r5.ebuild
index 99221952f06f..d80568af53ec 100644
--- a/app-office/calligra/calligra-3.2.1-r5.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r5.ebuild
@@ -120,6 +120,7 @@ PATCHES=(
"${FILESDIR}"/${P}-{openexr-3,imath-{1,2}}.patch
"${FILESDIR}"/${P}-cxx17-for-poppler-22.patch
"${FILESDIR}"/${P}-cxx17-fixes.patch
+ "${FILESDIR}"/${P}-poppler-22.03.0.patch # by Archlinux, TODO upstream
)
pkg_pretend() {
diff --git a/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0.patch b/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0.patch
new file mode 100644
index 000000000000..c704d7896e1f
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0.patch
@@ -0,0 +1,51 @@
+From 8f328bef497a9e3bc628e4e294c1a70b0c8b0eab Mon Sep 17 00:00:00 2001
+From: foutrelis <foutrelis@eb2447ed-0c53-47e4-bac8-5bc4a241df78>
+Date: Wed, 2 Mar 2022 10:28:24 +0000
+Subject: [PATCH] Fix build with poppler 22.03.0
+
+diff -uprw a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLists.txt
+--- a/filters/karbon/pdf/CMakeLists.txt 2020-05-14 09:51:30.000000000 +0300
++++ b/filters/karbon/pdf/CMakeLists.txt 2022-03-02 12:19:08.039939530 +0200
+@@ -14,6 +14,10 @@ if(Poppler_VERSION VERSION_LESS "0.83.0"
+ add_definitions("-DHAVE_POPPLER_PRE_0_83")
+ endif()
+
++if(Poppler_VERSION VERSION_LESS "22.3.0")
++ add_definitions("-DHAVE_POPPLER_PRE_22_3")
++endif()
++
+ set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp SvgOutputDev.cpp )
+
+ add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS})
+diff -uprw a/filters/karbon/pdf/Pdf2OdgImport.cpp b/filters/karbon/pdf/Pdf2OdgImport.cpp
+--- a/filters/karbon/pdf/Pdf2OdgImport.cpp 2020-05-14 09:51:30.000000000 +0300
++++ b/filters/karbon/pdf/Pdf2OdgImport.cpp 2022-03-02 12:20:35.125605950 +0200
+@@ -86,8 +86,12 @@ KoFilter::ConversionStatus Pdf2OdgImport
+ if (! globalParams)
+ return KoFilter::NotImplemented;
+
++#ifdef HAVE_POPPLER_PRE_22_3
+ GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data());
+ PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0);
++#else
++ PDFDoc * pdfDoc = new PDFDoc(std::make_unique<GooString>(QFile::encodeName(m_chain->inputFile()).data()));
++#endif
+ if (! pdfDoc) {
+ #ifdef HAVE_POPPLER_PRE_0_83
+ delete globalParams;
+diff -uprw a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp
+--- a/filters/karbon/pdf/PdfImport.cpp 2020-05-14 09:51:30.000000000 +0300
++++ b/filters/karbon/pdf/PdfImport.cpp 2022-03-02 12:21:46.197510028 +0200
+@@ -73,8 +73,12 @@ KoFilter::ConversionStatus PdfImport::co
+ if (! globalParams)
+ return KoFilter::NotImplemented;
+
++#ifdef HAVE_POPPLER_PRE_22_3
+ GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data());
+ PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0);
++#else
++ PDFDoc * pdfDoc = new PDFDoc(std::make_unique<GooString>(QFile::encodeName(m_chain->inputFile()).data()));
++#endif
+ if (! pdfDoc) {
+ #ifdef HAVE_POPPLER_PRE_0_83
+ delete globalParams;
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/, app-office/calligra/files/
@ 2023-04-22 13:35 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2023-04-22 13:35 UTC (permalink / raw
To: gentoo-commits
commit: 591c90d4a4afd60e49e7b89ef42da60a0ce0de58
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 22 13:32:08 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 22 13:35:19 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=591c90d4
app-office/calligra: USE cmake FindGSL module instead of bundled one
Fixes potential build issues. Upstream commit
fb545574a3e3b48b937dc4f741048c7033735e04, readjusted on top of our
modifications.
Closes: https://bugs.gentoo.org/903343
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/calligra/calligra-3.2.1-r7.ebuild | 2 ++
.../calligra-3.2.1-use-cmake-FindGSL-module.patch | 29 ++++++++++++++++++++++
2 files changed, 31 insertions(+)
diff --git a/app-office/calligra/calligra-3.2.1-r7.ebuild b/app-office/calligra/calligra-3.2.1-r7.ebuild
index f2e157c7c232..27b0ebbf1634 100644
--- a/app-office/calligra/calligra-3.2.1-r7.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r7.ebuild
@@ -4,6 +4,7 @@
EAPI=8
CHECKREQS_DISK_BUILD="4G"
+CMAKE_REMOVE_MODULES_LIST=( FindGSL )
ECM_HANDBOOK="forceoptional"
ECM_TEST="forceoptional"
KFMIN=5.88.0
@@ -124,6 +125,7 @@ PATCHES=(
"${WORKDIR}"/${PATCHSET}/${P}-poppler-22.04.0.patch
"${WORKDIR}"/${PATCHSET}/${P}-clang-16-c++17.patch
"${WORKDIR}"/${PATCHSET}/${P}-kross-optional.patch # bug 903532
+ "${FILESDIR}"/${P}-use-cmake-FindGSL-module.patch # bug 903343
)
pkg_pretend() {
diff --git a/app-office/calligra/files/calligra-3.2.1-use-cmake-FindGSL-module.patch b/app-office/calligra/files/calligra-3.2.1-use-cmake-FindGSL-module.patch
new file mode 100644
index 000000000000..07e31a0ed77d
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.2.1-use-cmake-FindGSL-module.patch
@@ -0,0 +1,29 @@
+From fb545574a3e3b48b937dc4f741048c7033735e04 Mon Sep 17 00:00:00 2001
+From: Dan Leinir Turthra Jensen <admin@leinir.dk>
+Date: Thu, 29 Apr 2021 13:02:39 +0100
+Subject: [PATCH] Fix GSL find module
+
+This increases the CMake requirement to 3.2 so we can use the GSL find
+module that ships with CMake since then. The custom find module
+apparently doesn't work right on Windows, so...
+---
+ sheets/plugins/solver/CMakeLists.txt | 4 +-
+ 1 filee changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sheets/plugins/solver/CMakeLists.txt b/sheets/plugins/solver/CMakeLists.txt
+index 41bc4a77ae9..ecd4bd8d218 100644
+--- a/sheets/plugins/solver/CMakeLists.txt
++++ b/sheets/plugins/solver/CMakeLists.txt
+@@ -25,8 +25,8 @@ calligrasheets_viewplugin_desktop_to_json(sheetssolver sheetssolver.desktop)
+
+
+ target_link_libraries( sheetssolver
+- ${GSL_LIBRARIES}
+- ${GSL_CBLAS_LIBRARIES}
++ GSL::gsl
++ GSL::gslcblas
+ calligrasheetscommon
+ )
+
+--
+GitLab
^ permalink raw reply related [flat|nested] 19+ messages in thread
end of thread, other threads:[~2023-04-22 13:35 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-12 15:53 [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/, app-office/calligra/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-04-22 13:35 Andreas Sturmlechner
2021-12-20 13:25 Andreas Sturmlechner
2020-04-24 14:10 Andreas Sturmlechner
2019-11-02 15:23 Andreas Sturmlechner
2019-08-11 8:19 Andreas Sturmlechner
2019-01-24 22:59 Andreas Sturmlechner
2018-07-15 10:38 Andreas Sturmlechner
2018-03-18 14:17 Andreas Sturmlechner
2018-03-15 16:34 Andreas Sturmlechner
2017-07-06 12:49 Michael Palimaka
2017-03-31 20:23 Andreas Sturmlechner
2017-01-29 23:00 Andreas Sturmlechner
2017-01-07 10:59 Andreas Sturmlechner
2017-01-06 22:35 Andreas Sturmlechner
2017-01-04 9:50 Andreas Sturmlechner
2016-12-30 0:26 Andreas Sturmlechner
2016-12-23 8:51 Johannes Huber
2015-08-19 15:21 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox