Commit ac0f6a75e02f2fe9e52752586f3bb433a6805ff1 - cinnamon-screensaver

+6

-6

.circleci/config.yml less more

46	46	fi
47	47
48	48	jobs:
49		"mint19":
	49	"mint20":
50	50	<<: *shared
51	51	docker:
52		- image: linuxmintd/mint19-amd64
	52	- image: linuxmintd/mint20-amd64
53	53
54		"lmde3":
	54	"lmde4":
55	55	<<: *shared
56	56	docker:
57		- image: linuxmintd/lmde3-amd64
	57	- image: linuxmintd/lmde4-amd64
58	58
59	59	workflows:
60	60	version: 2
61	61	build:
62	62	jobs:
63		- "mint19"
64		- "lmde3"
	63	- "mint20"
	64	- "lmde4"

+2

-0

data/cinnamon-screensaver.pam.debian less more

	0	@include common-auth
	1	auth optional pam_gnome_keyring.so

+13

-1

data/meson.build less more

20	20	configuration: misc_conf
21	21	)
22	22
23		install_data('cinnamon-screensaver', install_dir: join_paths(pamdir, 'pam.d'))
	23	if get_option('use-debian-pam')
	24	install_data(
	25	'cinnamon-screensaver.pam.debian',
	26	rename: 'cinnamon-screensaver',
	27	install_dir: join_paths(pamdir, 'pam.d')
	28	)
	29	else
	30	install_data(
	31	'cinnamon-screensaver',
	32	install_dir: join_paths(pamdir, 'pam.d')
	33	)
	34	endif
	35
24	36	install_data(desktop, install_dir: join_paths(datadir, 'applications'))
25	37	install_data(dbus_service, install_dir: dbus_services_dir)

+24

-0

debian/changelog less more

	0	cinnamon-screensaver (4.8.0) ulyssa; urgency=medium
	1
	2	[ Michael Webster ]
	3	* Build: Only generate python bytecode during builds with no temporary install folder. Package managers should handle this otherwise.
	4
	5	[ Fabio Fantoni ]
	6	* CI: Update targets
	7	* use debhelper 11 for integrated meson support
	8	* CI: Update targets (#339)
	9
	10	[ Michael Webster ]
	11	* build: Don't rely on debian magic to install the correct pam file.
	12
	13	[ Sparky Bluefang ]
	14	* Fix meson syntax error when xinerama support is disabled.
	15
	16	[ WORLDofPEACE ]
	17	* build: use datadir in define_variable for dbus_services_dir
	18
	19	[ Michael Webster ]
	20	* album art: Adjust the album art url for spotify.
	21
	22	-- Clement Lefebvre <root@linuxmint.com> Thu, 26 Nov 2020 13:49:22 +0000
	23
0	24	cinnamon-screensaver (4.6.0) ulyana; urgency=medium
1	25
2	26	[ Eli Schwartz ]

+0

-2

~~debian/cinnamon-screensaver.pam~~ less more

0		@include common-auth
1		auth optional pam_gnome_keyring.so

+1

-1

debian/compat less more

0		10
	0	11

+1

-1

debian/control less more

2	2	Priority: optional
3	3	Maintainer: Linux Mint <root@linuxmint.com>
4	4	Build-Depends:
5		debhelper (>= 10),
	5	debhelper (>= 11.1~),
6	6	dh-python,
7	7	gnome-pkg-tools (>= 0.10),
8	8	gobject-introspection,

+6

-14

debian/rules less more

9	9	dh_strip --dbg-package=libcscreensaver-dbg
10	10
11	11	override_dh_auto_configure:
12		mkdir -p debian/build
13		meson debian/build \
14		--prefix=/usr \
15		--libdir=lib/$(DEB_HOST_MULTIARCH) \
16		--libexecdir=lib/$(DEB_HOST_MULTIARCH)/cinnamon-screensaver
17
18		override_dh_auto_build:
19		ninja -C debian/build
20
21		override_dh_auto_install:
22		DESTDIR=${CURDIR}/debian/tmp \
23		ninja -C debian/build install
	12	dh_auto_configure -- \
	13	--libexecdir=lib/$(DEB_HOST_MULTIARCH)/cinnamon-screensaver \
	14	-D use-debian-pam=true
24	15
25	16	# there has never been a testsuite, so don't try running it and breaking
26	17	# just because there isn't one
27	18	override_dh_auto_test:
28	19
29		override_dh_install:
30		dh_install --list-missing
	20	# --list-missing will be default in compat 12
	21	override_dh_missing:
	22	dh_missing --list-missing
31	23
32	24	override_dh_python3:
33	25	dh_python3 usr/share/cinnamon-screensaver

+16

-0

install-scripts/meson.build less more

	0	# These scripts run as post-installation scripts.
	1
	2	# They're designed to do nothing if DESTDIR is set, which happens
	3	# during debian builds for instance - there's a fake install target
	4	# so running these would be pointless.
	5
	6	# When using deb packaging, these aren't needed, as these operations
	7	# are run automatically by the package manager.
	8
	9	# They're really only necessary in straight builds where 'ninja install'
	10	# will be run directly, to install the program onto the system.
	11
	12
	13	# Generate python bytecode
	14	meson.add_install_script('meson_compile_python.py')
	15

+10

-0

install-scripts/meson_compile_python.py less more

	0	#!/usr/bin/python3
	1
	2	import os
	3	import subprocess
	4
	5	pythondir = os.path.join(os.environ['MESON_INSTALL_PREFIX'], 'share', 'cinnamon-screensaver')
	6
	7	if not os.environ.get('DESTDIR'):
	8	print('Generating python bytecode...')
	9	subprocess.call(['sh', '-c', 'python3 -m compileall "%s"' % pythondir])

+6

-1

libcscreensaver/meson.build less more

144	144	dbus_built
145	145	]
146	146
	147	libcscreensaver_deps = [gobject, gtk, gdk, x11, xrandr, xext, glib, gio, gthread, pam, m]
	148	if use_xinerama
	149	libcscreensaver_deps += xinerama
	150	endif
	151
147	152	libcscreensaver = library(
148	153	'cscreensaver',
149	154	cscreensaver_sources + gir_sources,
150	155	version: '0.0.0',
151	156	include_directories: inc,
152	157	cpp_args: '-DG_LOG_DOMAIN="CScreensaver"',
153		dependencies: [gobject, gtk, gdk, x11, xinerama, xrandr, xext, glib, gio, gthread, pam, m],
	158	dependencies: libcscreensaver_deps,
154	159	install: true
155	160	)
156	161

+5

-3

meson.build less more

0		project('cinnamon-screensaver', 'c', version: '4.6.0', meson_version: '>=0.40.0')
	0	project('cinnamon-screensaver', 'c', version: '4.8.0', meson_version: '>=0.46.0')
1	1
2	2	cc = meson.get_compiler('c')
3	3

42	42	xext = dependency('xext')
43	43	xrandr = dependency('xrandr', required: false)
44	44	m = cc.find_library('m')
45		dbus_services_dir = dependency('dbus-1').get_pkgconfig_variable('session_bus_services_dir', define_variable: ['prefix', prefix])
	45	dbus_services_dir = dependency('dbus-1').get_pkgconfig_variable('session_bus_services_dir', define_variable: ['datadir', datadir])
46	46
47	47	# check for symbols and headers
48	48	foreach header : [

60	60	endif
61	61	endforeach
62	62
63		if get_option('xinerama')
	63	use_xinerama = get_option('xinerama')
	64	if use_xinerama
64	65	if host_machine.system() == 'solaris'
65	66	xinerama = cc.find_library('Xext')
66	67	xinerama_h = cc.has_header('X11/extensions/xinerama.h')

122	123
123	124	inc = include_directories('.')
124	125
	126	subdir('install-scripts')
125	127	subdir('libcscreensaver')
126	128	subdir('data')
127	129	subdir('src')

+1

-0

meson_options.txt less more

1	1	option('locking', type : 'boolean', value : true, description: 'Compile in support for locking the display')
2	2	option('xinerama', type : 'boolean', value : true, description: 'Use of the Xinerama extension')
3	3	option('pam-prefix', type : 'string', value : '', description: 'specify where pam files go')
	4	option('use-debian-pam', type : 'boolean', value : false, description: 'use the debian pam file')

+3

-0

src/albumArt.py less more

60	60	def update_image(self):
61	61	url = self.player.get_albumart_url()
62	62
	63	if self.player.get_identity() == "spotify":
	64	url = url.replace("open.spotify.com", "i.scdn.co");
	65
63	66	if url == self.current_url:
64	67	return
65	68

+9

-0

src/dbusdepot/mediaPlayerWatcher.py less more

30	30	name,
31	31	path)
32	32
	33	self.identity = None
33	34	self.metadata = None
34	35	self.album_name = ""
35	36	self.track_name = ""

46	47	self.on_metadata_changed)
47	48
48	49	self.ensure_metadata()
	50
	51	# This isn't the app-provided MediaPlayer.Identity, but we'd need to
	52	# set up another proxy and it's not really necessary for what this is
	53	# used for.
	54	self.identity = self.proxy.get_name().rpartition(".")[2]
	55
	56	def get_identity(self):
	57	return self.identity
49	58
50	59	def get_playback_status(self):
51	60	status = PlaybackStatus.Unknown

+0

-2

src/meson.build less more

63	63	meson.add_install_script('sh', '-c',
64	64	'ln -sf "@0@" "$DESTDIR/@1@"'.format(join_paths(pkgdatadir, script[0]), join_paths(bindir, script[1])))
65	65	endforeach
66
67		meson.add_install_script('sh', '-c', 'python3 -m compileall "$DESTDIR/@0@"'.format(pkgdatadir) )