From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- app-admin/gnome-abrt/Manifest | 5 +- ...xpert-mode-and-the-remaining-Analyze-code.patch | 108 --------------------- app-admin/gnome-abrt/gnome-abrt-1.2.6.ebuild | 67 ------------- app-admin/gnome-abrt/gnome-abrt-1.3.6.ebuild | 57 +++++++++++ 4 files changed, 59 insertions(+), 178 deletions(-) delete mode 100644 app-admin/gnome-abrt/files/0001-Remove-Expert-mode-and-the-remaining-Analyze-code.patch delete mode 100644 app-admin/gnome-abrt/gnome-abrt-1.2.6.ebuild create mode 100644 app-admin/gnome-abrt/gnome-abrt-1.3.6.ebuild (limited to 'app-admin/gnome-abrt') diff --git a/app-admin/gnome-abrt/Manifest b/app-admin/gnome-abrt/Manifest index 95ed3478383d..8e44d22bfe92 100644 --- a/app-admin/gnome-abrt/Manifest +++ b/app-admin/gnome-abrt/Manifest @@ -1,6 +1,5 @@ -AUX 0001-Remove-Expert-mode-and-the-remaining-Analyze-code.patch 4329 BLAKE2B 408bd52cd8a7ae8ae60a938da810a2af35556111791f330887d7c6f9af1f27eb50a4efa4f646144fb3e2483398f7e4af21afb4b587f6068a5764004d0efdfca4 SHA512 e7c505da3355a721c38d043fd0dc7397f664d90f1c243203a5055dfeefde7b8aafe02a8bd3acb22ba32941740e4aab38873fa75178ee1d4776a2da182e6b2033 -DIST gnome-abrt-1.2.6.tar.gz 340308 BLAKE2B 5221fe43fd72fe8798f2c11275863e6936e616632641448c53dd24118d3b6b808fc373fe98b8775f1f1c58820c06195a665f6d417c95eaa7cc333cd7660b2d0b SHA512 12bcdeefa481b7caa04da046ee11d6adc9fd582b32f709d79a2d94cf61ca02643edd418cd9257c0f732a30aa5714fe83a282a4c794ff4260ddad038f7721ff2c DIST gnome-abrt-1.2.7.tar.gz 339961 BLAKE2B cdacc079c4661c364f13af3102e2231adbeaf4226ba937436f5ce3ae109f28b87c9424c6dfbc016b912599205386f92c32b036ca31adbea79b9a54d7f3a27c4a SHA512 57446b1c1c312f3a47ea3dd2a40ac1d4ec5392df3181eac73086675b65d45cad9a01fba5252d073970878ef97d7d272508bc5b86a56779543ffdc8d083fb5413 -EBUILD gnome-abrt-1.2.6.ebuild 1297 BLAKE2B d6afeb893e9c9733c0ca7f55e80bc24c76195244afe699a9efb662816a6b0667a8697f95f8d5156631f051b4b419fa9da3453871e288bdd1d6ab9dd2818d13d6 SHA512 183486b2d92ace64b16183e7fa35a44424bbb25eebe9a65cd2a94b9f03b305d7742838580bd700317e861a9e2b8b80d96ff25f38f66d33e9b06cb4e7a8d6e50d +DIST gnome-abrt-1.3.6.tar.gz 112255 BLAKE2B d0e87ef5543e84c246f9e98aac8f92984af9e8220357359ffa76f91e00bb35ccb9b60a00c8e0b00d3464ecfc9ddffaeb61fb15b57480066d957a2af44b49c3be SHA512 7bd15c9956d2e4bafce7d1ef73e930f679119fe8ccebda8a27171a5b3b1dfa90255c572e3a0c70606fe389d50079870399b89f61f683896d4ca6380a7d3f7cc2 EBUILD gnome-abrt-1.2.7.ebuild 1301 BLAKE2B d98bb45e945c4945b831f5007e6a9b69aa4a03d8bee8e53b38dfef2bed5d95fd5b3c67c317f9fe4a78e71b806e58975b689325a710fcbfcdaf36f9ea95e1874b SHA512 3a0d1333af2f9e2adc55c0f1acba8bf856433c7f97e44dbc304588cba4151473faa10f322f98d29c474fafd5c47b50f7adaebfc89220183c10f6354fa3134703 +EBUILD gnome-abrt-1.3.6.ebuild 1158 BLAKE2B cad8b6ffd29eee5d8383512f316688cb6890e5d74c91413c7d44c076704e2422e5e7564e518f13577b48eb62a5b32c9f01df1c3fc3fc59e1d09ed729c6507aed SHA512 d035095657ef1449c146e87ef7b56836f180b2a4ecd33352343858a9d4cfa56fe91cec0254edc033d79998a4c78c37adadbc5930a76605cb92ebc6b7efbe199c MISC metadata.xml 333 BLAKE2B 7dfc442159eac1c4501c5bfaeec34615e2e8dd63b982759f30a0835143a1d5b661cce8e85868be70115c93c26f7ed70389b9f7ad6ae88f93b081f126c42beef3 SHA512 8c2e01101d19e3cd8ade5da1921864d2103eaa2f140c0eccb398e2567254d839311ba1384e25e0bea316345943c0649aee92aabb3ec2092d1a9e0728436fadc4 diff --git a/app-admin/gnome-abrt/files/0001-Remove-Expert-mode-and-the-remaining-Analyze-code.patch b/app-admin/gnome-abrt/files/0001-Remove-Expert-mode-and-the-remaining-Analyze-code.patch deleted file mode 100644 index 21d088efab4f..000000000000 --- a/app-admin/gnome-abrt/files/0001-Remove-Expert-mode-and-the-remaining-Analyze-code.patch +++ /dev/null @@ -1,108 +0,0 @@ -From ab72d64818a5d88ceb4ab94f1eaae04268519e73 Mon Sep 17 00:00:00 2001 -From: Rafal Luzynski -Date: Mon, 21 Aug 2017 11:55:41 +0200 -Subject: [PATCH] Remove Expert mode and the remaining Analyze code - -The Expert mode was originally introduced together with the Analyze -feature by the commit 532cbd4. The Expert mode was intended to hide -the Analyze feature by default and show in only when the Expert mode -is on. Later the commit f5eb93f removed most of the Analyze feature -although some of its code still remained and was unused. At the same -time, probably by mistake, the Expert mode was switched to control -the visibility of the Details context menu item. - -This commit removes the Expert mode which is unused and implemented -incorrectly and any remains of the Analyze feature. Closes #182. ---- - src/gnome-abrt | 3 --- - src/gnome_abrt/controller.py.in | 7 ------- - src/gnome_abrt/oops.glade | 8 -------- - src/gnome_abrt/views.py | 7 ------- - 4 files changed, 25 deletions(-) - -diff --git a/src/gnome-abrt b/src/gnome-abrt -index f8e96e8..b1044d3 100755 ---- a/src/gnome-abrt -+++ b/src/gnome-abrt -@@ -401,8 +401,6 @@ if __name__ == "__main__": - help=_('Be verbose')) - CMDARGS.add_argument('-p', '--problem', - help=_('Selected problem ID')) -- CMDARGS.add_argument('-x', '--expert', action='store_true', -- help=_('Expert mode')) - - OPTIONS = CMDARGS.parse_args() - -@@ -414,7 +412,6 @@ if __name__ == "__main__": - CONF = get_configuration() - # TODO : mark this option as hidden or something like that - CONF.add_option('problemid', default_value=None) -- CONF.add_option('expert', default_value=(OPTIONS.expert)) - - APP_CMDLINE = [] - if 'problem' in VARS: -diff --git a/src/gnome_abrt/controller.py.in b/src/gnome_abrt/controller.py.in -index fc16dc2..86db419 100644 ---- a/src/gnome_abrt/controller.py.in -+++ b/src/gnome_abrt/controller.py.in -@@ -45,13 +45,6 @@ class Controller(object): - - problem.delete() - -- def analyze(self, problem): -- if not problem: -- logging.error("BUG: Controller: Can't open detail of None problem") -- return -- -- self.run_event_fn("open-gui", problem) -- - def _refresh_sources(self): - for name, src in self.sources: - try: -diff --git a/src/gnome_abrt/oops.glade b/src/gnome_abrt/oops.glade -index bbb732b..b8ddb42 100644 ---- a/src/gnome_abrt/oops.glade -+++ b/src/gnome_abrt/oops.glade -@@ -23,14 +23,6 @@ - - - -- -- Analy_ze -- Open selected problem for analysis -- -- -- -- -- - - D_etails - Show technical details -diff --git a/src/gnome_abrt/views.py b/src/gnome_abrt/views.py -index 82b606f..ec7b211 100644 ---- a/src/gnome_abrt/views.py -+++ b/src/gnome_abrt/views.py -@@ -527,7 +527,6 @@ class OopsWindow(Gtk.ApplicationWindow): - conf.set_watch('T_FMT', self._options_observer) - conf.set_watch('D_T_FMT', self._options_observer) - self._options_observer.option_updated(conf, 'problemid') -- self._builder.mi_detail.set_visible(conf['expert']) - - # enable observer - self._source_observer.enable() -@@ -1002,12 +1001,6 @@ _("This problem has been reported, but a Bugzilla ticket has not" - selected[0].problem_id, self) - - @handle_problem_and_source_errors -- def on_gac_analyze_activate(self, action): -- selected = self._get_selected(self.lss_problems) -- if selected: -- self._controller.analyze(selected[0]) -- -- @handle_problem_and_source_errors - def on_gac_report_activate(self, action): - selected = self._get_selected(self.lss_problems) - if selected and not selected[0]['not-reportable']: --- -2.13.6 - diff --git a/app-admin/gnome-abrt/gnome-abrt-1.2.6.ebuild b/app-admin/gnome-abrt/gnome-abrt-1.2.6.ebuild deleted file mode 100644 index bdd38d68cccd..000000000000 --- a/app-admin/gnome-abrt/gnome-abrt-1.2.6.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_6 ) - -inherit autotools gnome2-utils python-single-r1 - -DESCRIPTION="A utility for viewing problems that have occurred with the system" -HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project" -SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - x11-libs/gtk+:3 - >=dev-libs/libreport-2.0.20[python] - >=app-admin/abrt-2.10.10-r1 - dev-python/pygobject:3 - x11-libs/libX11 - >=dev-python/pyxdg-0.19 -" -DEPEND="${RDEPEND} - app-text/asciidoc - app-text/xmlto - >=dev-util/intltool-0.35.0 - virtual/pkgconfig - >=sys-devel/gettext-0.17 -" - -PATCHES=( - # From Fedora (fixed in next release) - "${FILESDIR}"/0001-Remove-Expert-mode-and-the-remaining-Analyze-code.patch -) - -src_prepare() { - default - ./gen-version > gnome-abrt-version || die - eautoreconf -} - -src_configure() { - myeconfargs=( - --localstatedir="${EPREFIX}/var" - --with-nopylint - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/app-admin/gnome-abrt/gnome-abrt-1.3.6.ebuild b/app-admin/gnome-abrt/gnome-abrt-1.3.6.ebuild new file mode 100644 index 000000000000..b9ff00b24a57 --- /dev/null +++ b/app-admin/gnome-abrt/gnome-abrt-1.3.6.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..9} ) + +inherit meson python-r1 + +DESCRIPTION="A utility for viewing problems that have occurred with the system" +HOMEPAGE="https://github.com/abrt/gnome-abrt" +SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="doc" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + >=x11-libs/gtk+-3.10.0:3 + >=dev-libs/libreport-2.0.20[python,${PYTHON_USEDEP}] + >=app-admin/abrt-2.10.10-r1 + >=dev-python/pygobject-3.29.1:3[${PYTHON_USEDEP}] + >=dev-python/pyxdg-0.19[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( + app-text/asciidoc + app-text/xmlto + ) + virtual/pkgconfig + >=sys-devel/gettext-0.17 +" + +src_configure() { + local emesonargs=( + $(meson_use doc docs) + -Dlint=false + ) + + python_foreach_impl meson_src_configure +} + +src_compile() { + python_foreach_impl meson_src_compile +} + +src_install() { + python_foreach_impl meson_src_install + python_foreach_impl python_optimize +} + +src_test() { + python_foreach_impl meson_src_test +} -- cgit v1.2.3