diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-03-18 04:54:42 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-03-18 04:54:42 +0000 |
| commit | 5510d9d7d1c93c2ea71a2bd6f0666168808d5dd6 (patch) | |
| tree | c968fff3108e2b4d88e4e564a56bfd066f170573 /app-office/calligra | |
| parent | 1dde4e5c4b92d849bf1abf0a48135b2a0644f7e1 (diff) | |
gentoo resync : 18.03.2018
Diffstat (limited to 'app-office/calligra')
| -rw-r--r-- | app-office/calligra/Manifest | 3 | ||||
| -rw-r--r-- | app-office/calligra/calligra-3.1.0-r2.ebuild (renamed from app-office/calligra/calligra-3.1.0-r1.ebuild) | 8 | ||||
| -rw-r--r-- | app-office/calligra/files/calligra-3.1.0-doc.patch | 13 |
3 files changed, 21 insertions, 3 deletions
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest index 7c9d351f608f..7b3410a70f39 100644 --- a/app-office/calligra/Manifest +++ b/app-office/calligra/Manifest @@ -1,8 +1,9 @@ AUX calligra-3.0.0-no-arch-detection.patch 408 BLAKE2B adff8aade0b9718692e84d8ab407caa3b8b8d279609fefd3daafa0617421bb18dee4ba41374aa0eed5e41e766e7a856e7f82dbec7ac7b4985d7e133fdf4eaed9 SHA512 91e1f5a760f118c3f7abdba1409c8c119265bcf43eef405ec0fdeb7b5b4fd7c0c7e38166acebe4b1766fe276015eb12e6a62743f3d8d648c20856e25c9231557 +AUX calligra-3.1.0-doc.patch 323 BLAKE2B 56a886a5b4a4f371eebe3c4f72d5a4817b2fa19af29e55ee0af1f84751a84ec28df8794b8cb7ceb026c701843356ef83d0310dfc2454815d09c95edbb93a0c08 SHA512 6254828157896b44ba77ae36f99876a2806dd917e65a36fdf25ee75e1a6683678ef1dd4275d6712d4f25f808d53dcb20bc3787bb4217e77054e9797bf0ccef72 AUX calligra-3.1.0-no-arch-detection.patch 436 BLAKE2B 117544b6089912f34b3c4cb3ee7837fb4f4377cdc0edc8a6de91156fb99ce010bc857752cf683f7f57ca604dd6393b36eeb807a6007e59bf589e404d02d0cef1 SHA512 f8f747279eabb165da68fe83300223a2bd49a530116c04c9a31de2a32f9f2b3eb46f7866ce194c91d9fcb0ab77fde628574dc9a55e6a08c327e2716849a0da8d DIST calligra-3.0.1.tar.xz 60764344 BLAKE2B e264f1eb5928d2f11fba9c9b71a77d2685230b9128105264d109d3aca51f32a814795dd04f5f8fb980dce4fa4d4365c4073b35c2abb8933c906238bc0b25aef2 SHA512 ec17d007262d598e16045c6c75f8a37dfdf73b980b02ae9bea20282cbd4dd53202f62fc4d8bd84484193a501859c2150079a76d83c1638d8449f41526df57ee0 DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50 SHA512 ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed SHA512 a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156 EBUILD calligra-3.0.1.ebuild 6814 BLAKE2B 62e0cb77ebdbafc0d4dcf5e4e298122f84087dd895d9182b212ff4f040e62b04f52722860cdadf247880b9688d202985ef43b72f59841a2b79c73befb9c69924 SHA512 9fb02a5ab71bdfd24fe1588576fe1f9fbef96e4e3885e11d6a649cee6e44551c36430ae2f4c0693e9de4e5ddf5186713106a56f0b8e4df1efe61bd7711ad7adb -EBUILD calligra-3.1.0-r1.ebuild 6638 BLAKE2B 0d1df11b3054975c90a07fa8b79eee25c712db1eb1fe01d74b1e8706a7ef658076cb104555e1f202d8dea9b6dfa8073b039864d0692928d3fc78a56df0ce5706 SHA512 2de362cb860f96377b791f3a560c6b38611201983bcf8a1be925a05d3d9338843e69c318a76a702c80ad44a5c9d465f7455d9c4d51e0b0b692a0022982798a44 +EBUILD calligra-3.1.0-r2.ebuild 6721 BLAKE2B af410cfa24b444cb0c6f438f43297bbddd6daf25cb0f0897f535f41f18abff0fd8ddb49fdac594965da991d495e910029e3fb44c63eade47abf05986aa1011da SHA512 94de4d10a6a84f8c208f7cea72f6d8e7d4cbfec060ae27d179798264be62c3ccb3465e20a440798f35c04f41cab942a3360b9cb32ee6b5c645e38b2f95ef0edd MISC metadata.xml 1108 BLAKE2B 266bc6539219906527f6e8692cfac1a4c894164466e01bd3ddc290ed665d19af6419ae1a8939002a4ccc719826def4038264ecdd65fca3aef8627106114c804b SHA512 61655e86072fdb828475b721492c3029b834931126af3cd015b2de87f3e7d56a866707d04b04dc36319f45f77fe5f3b650131c1e82a4e65d094288d8effe1893 diff --git a/app-office/calligra/calligra-3.1.0-r1.ebuild b/app-office/calligra/calligra-3.1.0-r2.ebuild index d0f98bb0a470..4c861b1050f8 100644 --- a/app-office/calligra/calligra-3.1.0-r1.ebuild +++ b/app-office/calligra/calligra-3.1.0-r2.ebuild @@ -5,6 +5,7 @@ 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" @@ -78,7 +79,7 @@ COMMON_DEPEND=" sys-libs/zlib virtual/libiconv activities? ( $(add_frameworks_dep kactivities) ) - crypt? ( app-crypt/qca:2[qt5] ) + crypt? ( app-crypt/qca:2[qt5(+)] ) fontconfig? ( media-libs/fontconfig ) gemini? ( $(add_qt_dep qtdeclarative 'widgets') ) gsl? ( sci-libs/gsl ) @@ -137,7 +138,10 @@ RDEPEND="${COMMON_DEPEND} " RESTRICT+=" test" -PATCHES=( "${FILESDIR}"/${P}-no-arch-detection.patch ) +PATCHES=( + "${FILESDIR}"/${P}-no-arch-detection.patch + "${FILESDIR}"/${P}-doc.patch +) pkg_pretend() { check-reqs_pkg_pretend 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 000000000000..ad150edbf8a4 --- /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) |