Bug 560764 – gnome-extra/cinnamon-screensaver-2.6.4: make webkit optional dependency

• Product: Gentoo Linux
• Status: RESOLVED FIXED

[Description Garry Filakhtov 2015-09-18 15:49:10 UTC]

Suddenly the latest version of cinnamon-screensaver depends on net-libs/webkit-gtk:3, which is not cool from my pov. So I decided to create a patch that makes webkit-gtk optional (thus removing possibility to run webkit-based screensavers).

Reproducible: Always

[Comment 1 Garry Filakhtov 2015-09-18 15:49:55 UTC]

Created attachment 412170 [details]
Ebuild with optional webkit

Added webkit flag and patch support.

[Comment 2 Garry Filakhtov 2015-09-18 15:50:42 UTC]

Created attachment 412172 [details, diff]
Patch for making webkit-gtk optional

Patches configure.ac, enables flag --disable-webkit, skips webkit checks.

[Comment 3 Matthew Turnbull 2015-09-26 02:29:33 UTC]

Created attachment 412926 [details, diff]
Patch for making webkit-gtk optional 2.0

This is an updated patch which skips installing the webkit screensaver files when webkit support is disabled.

This is my first foray into autotools, so correctness or completeness isn't guaranteed :)

[Comment 4 Pacho Ramos 2015-11-16 11:56:10 UTC]

Could you forward this to upstream to let them check the patch?
https://github.com/linuxmint/cinnamon-screensaver/issues

Thanks

[Comment 5 Cănărău Constantin 2017-01-13 09:35:59 UTC]

Created attachment 459856 [details, diff]
3.2.13-r1 ebuild patch

Add webkit useflag and make webkit-gtk optional for cinnamon-screensaver-3.2.13-r1

[Comment 6 Cănărău Constantin 2017-01-13 09:36:44 UTC]

Created attachment 459858 [details, diff]
Ugly patch to disable webkit build

[Comment 7 Cănărău Constantin 2017-01-13 09:50:39 UTC]

Upstream closed previous bug.
Above patches brutally disable webkit-gtk by disable build of cinnamon-screensaver-webkit-plugin as suggested by upstream.

[Comment 8 Kristian Fiskerstrand (RETIRED) 2017-01-13 12:16:35 UTC]

(In reply to Cănărău Constantin from comment #7)
> Upstream closed previous bug.
> Above patches brutally disable webkit-gtk by disable build of
> cinnamon-screensaver-webkit-plugin as suggested by upstream.

Got any reference to such discussion? and why is it done non-optionally depending on USE flag?

[Comment 9 Kristian Fiskerstrand (RETIRED) 2017-01-13 12:18:29 UTC]

(In reply to Kristian Fiskerstrand from comment #8)
> (In reply to Cănărău Constantin from comment #7)
> > Upstream closed previous bug.
> > Above patches brutally disable webkit-gtk by disable build of
> > cinnamon-screensaver-webkit-plugin as suggested by upstream.
> 
> Got any reference to such discussion? and why is it done non-optionally
> depending on USE flag?

Missed the ebuild... the patch shouldn't be applied optionally, the patch should be applied in any case and other mechanisms used to determine whether it applies. Why mixing in a python 3.5 switch into this?

[Comment 10 Cănărău Constantin 2017-01-13 14:04:48 UTC]

Here is the closed bug: https://github.com/linuxmint/cinnamon-screensaver/issues/125
The rest of errors are due to lack of experience from my part. I am not Gentoo developer. I am sorry. Of course, python  part can be ignored.

configure does not accept something like disable-webkit or disable webkit-gtk so that's why the ugly patch:

--- cinnamon-screensaver-3.2.13-r1.ebuild.orig	2017-01-13 16:01:33.727348270 +0200
+++ cinnamon-screensaver-3.2.13-r1.ebuild	2017-01-13 12:12:07.000000000 +0200
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="debug doc pam systemd"
+IUSE="debug doc pam systemd webkit"
 KEYWORDS="~amd64 ~x86"
 
 COMMON_DEPEND="
@@ -24,7 +24,7 @@
 	>=gnome-base/libgnomekbd-3.6
 	>=dev-libs/dbus-glib-0.78
 
-	net-libs/webkit-gtk:4[introspection]
+	webkit? ( net-libs/webkit-gtk:4[introspection] )
 
 	sys-apps/dbus
 	x11-libs/libxklavier
@@ -69,6 +69,7 @@
 }
 
 src_prepare() {
+	use webkit || epatch "${FILESDIR}/no-webkit.patch"
 	python_fix_shebang screensavers
 	eautoreconf
 	gnome2_src_prepare

Please feel free to improve the patches.

[Comment 11 Kristian Fiskerstrand (RETIRED) 2017-01-13 14:22:13 UTC]

(In reply to Cănărău Constantin from comment #10)
> Here is the closed bug:
> https://github.com/linuxmint/cinnamon-screensaver/issues/125
> The rest of errors are due to lack of experience from my part. I am not
> Gentoo developer. 

That is fine :) Thank you for trying to work with this, however lets get it correct before introducing the patch. 

> I am sorry. Of course, python  part can be ignored.

Lets fix that in a later version of the patch
> 
> configure does not accept something like disable-webkit or disable
> webkit-gtk so that's why the ugly patch:

Then we can add it. I can recommend reading flameeyes book (a fellow gentoo developer): https://autotools.io/index.html

You want to look at configure.ac and Makefile.am

[Comment 12 Matthew Turnbull 2017-01-17 11:04:37 UTC]

Created attachment 460440 [details]
cinnamon-screensaver-3.2.13-r2 optional webkit

Is using pkg_preinst a faux pas? There is no build system dependency on webkit, so it is entirely runtime.

[Comment 13 Matthew Turnbull 2017-12-22 04:14:29 UTC]

Created attachment 511432 [details]
Update for cinnamon-screensaver-3.6.1

[Comment 14 Matthew Turnbull 2018-12-18 20:58:15 UTC]

Created attachment 558114 [details]
Update for cinnamon 4.0.0

Update for cinnamon 4.0.0.

Can we also get the component changed back to Current? This is an ongoing ask applicable to the current cinnamon versions.

[Comment 15 Matthew Turnbull 2018-12-19 06:21:45 UTC]

Created attachment 558124 [details]
Drop webkit dependency.

So, *minor* update...

cinnamon-screensaver 4.0.0 removed support for plugins (i.e. webkit and xscreensaver).

I guess this goes to show how often I actually see my screensaver. I didn't even notice my xscreensaver hack no longer being loaded...

So the webkit dependency can now be dropped entirely.

[Comment 16 Larry the Git Cow 2020-05-29 00:11:28 UTC]

The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b37d7d0b09b5921135cdc38c63a0605662d60cf

commit 2b37d7d0b09b5921135cdc38c63a0605662d60cf
Author:     Matthew Turnbull <[e-mail]>
AuthorDate: 2020-05-13 02:21:46 +0000
Commit:     Matt Turner <[e-mail]>
CommitDate: 2020-05-29 00:10:45 +0000

    gnome-extra/cinnamon-screensaver: 4.4.1 version bump
    
    Update cinnamon-screensaver to 4.4.1. Python 3.7/3.8
    support and fix shebangs. Cleanup dependencies.
    Upstream dropped webkit and xscreensaver support.
    
    Bug: https://bugs.gentoo.org/718316
    Bug: https://bugs.gentoo.org/704532
    Closes: https://bugs.gentoo.org/560764
    Closes: https://bugs.gentoo.org/613736
    Closes: https://bugs.gentoo.org/720152
    Package-Manager: Portage-2.3.99, Repoman-2.3.22
    Signed-off-by: Matthew S. Turnbull <[e-mail]>
    Signed-off-by: Matt Turner <[e-mail]>

 gnome-extra/cinnamon-screensaver/Manifest          |  1 +
 .../cinnamon-screensaver-4.4.1.ebuild              | 67 ++++++++++++++++++++++
 gnome-extra/cinnamon-screensaver/metadata.xml      |  8 +++
 3 files changed, 76 insertions(+)