diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-01-31 16:00:27 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-01-31 16:00:27 +0000 |
| commit | 1db00cc6e94b90c08090bb5b8c406622946c4ae5 (patch) | |
| tree | c34bf820c2809fb7e08ed5564df2a25cf759516f /app-office/skrooge | |
| parent | 693cc9b6e847a01c1bb692153021aaf9fb0fab25 (diff) | |
gentoo resync 31.01.2019
Diffstat (limited to 'app-office/skrooge')
| -rw-r--r-- | app-office/skrooge/Manifest | 4 | ||||
| -rw-r--r-- | app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch | 34 | ||||
| -rw-r--r-- | app-office/skrooge/skrooge-2.17.0.ebuild | 7 |
3 files changed, 26 insertions, 19 deletions
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest index 2fe44edafe6e..b26ab1c10260 100644 --- a/app-office/skrooge/Manifest +++ b/app-office/skrooge/Manifest @@ -1,6 +1,6 @@ -AUX skrooge-2.17.0-noqtwebkit.patch 783 BLAKE2B 681447209c263fbfb3def61a5b3ef7a98a4a431bf7d9c4ab00f8e30df97f9447e0ca125f15f7b8cfaa1e8cbc76d928cedf055c46709297af550435b8e16b5967 SHA512 e42fb804dd941ea190ab5d2e9e9c556b206b85430a60308f5fb0ecabf66a4bb9659fa40d9bc187ee52a48be345f6ff003182d02842847db84c83c6d69068ab62 +AUX skrooge-2.17.0-noqtwebkit.patch 1093 BLAKE2B d0798788899494bf794b2b7859ba8313e94d1c61b9b9b72a989c29eb02c703aee3aaedee474b2596077fd685f1206dfc187715af295c2425b65b66213bca8496 SHA512 6f745a69beb1e41a73a058940d12609c2dc0d990d777b410b2c8c269e9e314e03f3442cf58277f95229e1bf54f3c54ac90b21b497d0039f3deda6bd86e7dc3d5 DIST skrooge-2.16.2.tar.xz 21005424 BLAKE2B c8e11df29defc714fe71ad4f488cd6207dcc8bfc0cbee28422682f9c683ed7af8200b84f90cfdd0ca6d0bd0292dab46724c6b9afa0155c9f1603bbbe189b001d SHA512 4bc7de279cf55888a258700c2a8450270904066684b1ce0b121cf5eb966da174d969daa3db432781de62d94420e706ab5364e386e053dde7617d967442eae397 DIST skrooge-2.17.0.tar.xz 23421972 BLAKE2B c0e08ef7235a6e05e945fcb92a222cc89e7a99ead4b30ba112fea7b420e150545e002e174b747bf7955415241eb55e8007d97e7fd92fa547a1f596360ab68156 SHA512 e65a1e1ed30af7c76776dbdf22f62d475ec3aece9c866453634d2692c6d1f1d6c00cb04376861cb3b09a990a3202f08dcb70ffe28f3c146cce17ade3a3a67a47 EBUILD skrooge-2.16.2.ebuild 2362 BLAKE2B f2733b59125117086e4d26bbe321feea256ac62cb187b8fc10ba1e74a895248676644d73d5a02613c3655133c0d1d5babc6d1c53f606265a9d60465e6d7a6fc9 SHA512 a46d06ec91d13303ae03201e9e015289392ec4771b4cba76b1b064e650df56cbbb2dbb65b996b5e899485cf4ce545f937aa1ff1d5c70a08b2239438f4612e03e -EBUILD skrooge-2.17.0.ebuild 2579 BLAKE2B 619aecc69ca29e7cc6ae1c04691566b18246904d3e76d97b7e700be4226c653dc9ecb803428831e2fe89b7efaee5133c1bc88828605417ac10e27d5016fa27ad SHA512 d18c09c8d4c506d47025af5c80f49235bd2f08c7a24a5ee379c8ec455c43f644169a4b6c0cea2546cc17bcdddaeca69639598a1152bc5265f4e3f96b680175f5 +EBUILD skrooge-2.17.0.ebuild 2534 BLAKE2B 26757a0ebe2a5cb9ffbb2797b18eb07968b7e54ad8ff353c5d3989ceaf3e5b2ed948ead8e5d63189137eec29511c23230369edccf44ab9c6a10f1f9033ee82b4 SHA512 7f35aefaafb18774ac51fc7c742ba6738e2f7a53884fbb9e13f305665f2211bf470caba81a9bca720d05000d72163d647bc55cb06a5326c59dba94e73ff40107 MISC metadata.xml 508 BLAKE2B b55c79406982c895e2c0a3f680944fb561823a3713408f67b4f8de74d03246cd9b52a654d4ec97935d4f7740b9d9f4ebf27d81a9c226dc67d9922500c6e6bde0 SHA512 0b38f9d35783e7fbf2b86b9ead3772416b7080d3df07b801ecd9ef4e5329f7690e6e1b9f817d2fd8947d6735f89cfa57fb516fbcc2b383d5278f27fd89390e97 diff --git a/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch b/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch index cb56d16388f5..588c4c116e0c 100644 --- a/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch +++ b/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch @@ -1,28 +1,36 @@ -From 6ba59f2f707829242ad2410803f48089062c7241 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Thu, 24 Jan 2019 23:20:09 +0100 -Subject: [PATCH] Fix build without Qt5WebKit installed +From dab0fd4adf2cbee89a417c483350ddffda77ed3b Mon Sep 17 00:00:00 2001 +From: Stephane MANKOWSKI <stephane@mankowski.fr> +Date: Sun, 27 Jan 2019 17:13:28 +0100 +Subject: skrooge w/ -DSKG_WEBENGINE=ON: ui_skgtablewithgraph.h:15:10: fatal + error: QtWebKitWidgets/QWebView: No such file or directory BUG:403575 --- - skgbasegui/skgtablewithgraph.ui | 5 ----- - 1 file changed, 5 deletions(-) + skgbasegui/skgtablewithgraph.ui | 6 ------ + 1 file changed, 6 deletions(-) diff --git a/skgbasegui/skgtablewithgraph.ui b/skgbasegui/skgtablewithgraph.ui -index e1a3058aa..df93115f3 100644 +index e1a3058..b00273f 100644 --- a/skgbasegui/skgtablewithgraph.ui +++ b/skgbasegui/skgtablewithgraph.ui -@@ -151,11 +151,6 @@ - </layout> +@@ -152,11 +152,6 @@ </widget> <customwidgets> -- <customwidget> + <customwidget> - <class>QWebView</class> - <extends>QWidget</extends> - <header>QtWebKitWidgets/QWebView</header> - </customwidget> - <customwidget> +- <customwidget> <class>SKGGraphicsView</class> <extends>QWidget</extends> + <header>skggraphicsview.h</header> +@@ -173,7 +168,6 @@ + </customwidget> + <customwidget> + <class>SKGWebView</class> +- <extends>QWebView</extends> + <header>skgwebview.h</header> + </customwidget> + </customwidgets> -- -2.20.1 - +cgit v1.1 diff --git a/app-office/skrooge/skrooge-2.17.0.ebuild b/app-office/skrooge/skrooge-2.17.0.ebuild index 063a50e94080..2aa99f0b78df 100644 --- a/app-office/skrooge/skrooge-2.17.0.ebuild +++ b/app-office/skrooge/skrooge-2.17.0.ebuild @@ -77,10 +77,9 @@ RDEPEND="${COMMON_DEPEND} # hangs + installs files RESTRICT+=" test" -src_prepare() { - use webkit || eapply "${FILESDIR}"/${P}-noqtwebkit.patch # bug 676196 - kde5_src_prepare -} +PATCHES=( + "${FILESDIR}"/${P}-noqtwebkit.patch # bug 676196 +) src_configure() { local mycmakeargs=( |