diff -Nru cinnamon-screensaver-4.6.0/.circleci/config.yml cinnamon-screensaver-4.8.1/.circleci/config.yml --- cinnamon-screensaver-4.6.0/.circleci/config.yml 2020-05-12 13:06:06.000000000 +0000 +++ cinnamon-screensaver-4.8.1/.circleci/config.yml 2020-12-08 10:24:33.000000000 +0000 @@ -47,19 +47,19 @@ fi jobs: - "mint19": + "mint20": <<: *shared docker: - - image: linuxmintd/mint19-amd64 + - image: linuxmintd/mint20-amd64 - "lmde3": + "lmde4": <<: *shared docker: - - image: linuxmintd/lmde3-amd64 + - image: linuxmintd/lmde4-amd64 workflows: version: 2 build: jobs: - - "mint19" - - "lmde3" + - "mint20" + - "lmde4" diff -Nru cinnamon-screensaver-4.6.0/data/cinnamon-screensaver.pam.debian cinnamon-screensaver-4.8.1/data/cinnamon-screensaver.pam.debian --- cinnamon-screensaver-4.6.0/data/cinnamon-screensaver.pam.debian 1970-01-01 00:00:00.000000000 +0000 +++ cinnamon-screensaver-4.8.1/data/cinnamon-screensaver.pam.debian 2020-12-08 10:24:33.000000000 +0000 @@ -0,0 +1,2 @@ +@include common-auth +auth optional pam_gnome_keyring.so diff -Nru cinnamon-screensaver-4.6.0/data/meson.build cinnamon-screensaver-4.8.1/data/meson.build --- cinnamon-screensaver-4.6.0/data/meson.build 2020-05-12 13:06:06.000000000 +0000 +++ cinnamon-screensaver-4.8.1/data/meson.build 2020-12-08 10:24:33.000000000 +0000 @@ -21,6 +21,18 @@ configuration: misc_conf ) -install_data('cinnamon-screensaver', install_dir: join_paths(pamdir, 'pam.d')) +if get_option('use-debian-pam') + install_data( + 'cinnamon-screensaver.pam.debian', + rename: 'cinnamon-screensaver', + install_dir: join_paths(pamdir, 'pam.d') + ) +else + install_data( + 'cinnamon-screensaver', + install_dir: join_paths(pamdir, 'pam.d') + ) +endif + install_data(desktop, install_dir: join_paths(datadir, 'applications')) install_data(dbus_service, install_dir: dbus_services_dir) diff -Nru cinnamon-screensaver-4.6.0/debian/changelog cinnamon-screensaver-4.8.1/debian/changelog --- cinnamon-screensaver-4.6.0/debian/changelog 2020-06-25 01:55:16.000000000 +0000 +++ cinnamon-screensaver-4.8.1/debian/changelog 2020-12-16 03:37:58.000000000 +0000 @@ -1,3 +1,24 @@ +cinnamon-screensaver (4.8.1-2) unstable; urgency=medium + + * Release to unstable. + + -- Norbert Preining Wed, 16 Dec 2020 12:37:58 +0900 + +cinnamon-screensaver (4.8.1-1) experimental; urgency=medium + + * Use upstream's Debian-version pam file. + * New upstream version 4.8.1 (no changes it seems) + + -- Norbert Preining Tue, 08 Dec 2020 19:43:45 +0900 + +cinnamon-screensaver (4.8.0-1) experimental; urgency=medium + + * New upstream version 4.8.0 + * remove autoconf related build-deps + * Bump inter-cinnamon deps to 4.8 + + -- Norbert Preining Tue, 01 Dec 2020 08:36:02 +0900 + cinnamon-screensaver (4.6.0-2) unstable; urgency=medium * Upload to unstable diff -Nru cinnamon-screensaver-4.6.0/debian/cinnamon-screensaver.pam cinnamon-screensaver-4.8.1/debian/cinnamon-screensaver.pam --- cinnamon-screensaver-4.6.0/debian/cinnamon-screensaver.pam 2020-06-25 01:55:16.000000000 +0000 +++ cinnamon-screensaver-4.8.1/debian/cinnamon-screensaver.pam 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -@include common-auth -auth optional pam_gnome_keyring.so diff -Nru cinnamon-screensaver-4.6.0/debian/control cinnamon-screensaver-4.8.1/debian/control --- cinnamon-screensaver-4.6.0/debian/control 2020-06-25 01:55:16.000000000 +0000 +++ cinnamon-screensaver-4.8.1/debian/control 2020-12-16 03:37:58.000000000 +0000 @@ -8,8 +8,6 @@ Fabio Fantoni , Norbert Preining Build-Depends: - autoconf-archive, - automake, debhelper-compat (= 13), dh-python, gnome-pkg-tools (>= 0.10), @@ -33,9 +31,9 @@ Architecture: any Pre-Depends: ${misc:Pre-Depends} Depends: - cinnamon-desktop-data (>= 4.6), + cinnamon-desktop-data (>= 4.8), gir1.2-accountsservice-1.0, - gir1.2-cinnamondesktop-3.0 (>= 4.6), + gir1.2-cinnamondesktop-3.0 (>= 4.8), gir1.2-gkbd-3.0, gir1.2-glib-2.0, gir1.2-gtk-3.0, @@ -52,8 +50,8 @@ ${shlibs:Depends}, Recommends: libpam-gnome-keyring Breaks: - cinnamon (<< 4.6), - cinnamon-core (<< 4.6~), + cinnamon (<< 4.8~), + cinnamon-core (<< 4.8~), cinnamon-screensaver-pam-helper (<< 3.8), cinnamon-screensaver-webkit-plugin (<< 3.9), cinnamon-screensaver-x-plugin (<< 3.9) diff -Nru cinnamon-screensaver-4.6.0/debian/rules cinnamon-screensaver-4.8.1/debian/rules --- cinnamon-screensaver-4.6.0/debian/rules 2020-06-25 01:55:16.000000000 +0000 +++ cinnamon-screensaver-4.8.1/debian/rules 2020-12-16 03:37:58.000000000 +0000 @@ -9,6 +9,7 @@ override_dh_auto_configure: dh_auto_configure -- \ + -D use-debian-pam=true \ --libexecdir=lib/$(DEB_HOST_MULTIARCH)/cinnamon-screensaver override_dh_python3: diff -Nru cinnamon-screensaver-4.6.0/install-scripts/meson.build cinnamon-screensaver-4.8.1/install-scripts/meson.build --- cinnamon-screensaver-4.6.0/install-scripts/meson.build 1970-01-01 00:00:00.000000000 +0000 +++ cinnamon-screensaver-4.8.1/install-scripts/meson.build 2020-12-08 10:24:33.000000000 +0000 @@ -0,0 +1,16 @@ +# These scripts run as post-installation scripts. + +# They're designed to do nothing if DESTDIR is set, which happens +# during debian builds for instance - there's a fake install target +# so running these would be pointless. + +# When using deb packaging, these aren't needed, as these operations +# are run automatically by the package manager. + +# They're really only necessary in straight builds where 'ninja install' +# will be run directly, to install the program onto the system. + + +# Generate python bytecode +meson.add_install_script('meson_compile_python.py') + diff -Nru cinnamon-screensaver-4.6.0/install-scripts/meson_compile_python.py cinnamon-screensaver-4.8.1/install-scripts/meson_compile_python.py --- cinnamon-screensaver-4.6.0/install-scripts/meson_compile_python.py 1970-01-01 00:00:00.000000000 +0000 +++ cinnamon-screensaver-4.8.1/install-scripts/meson_compile_python.py 2020-12-08 10:24:33.000000000 +0000 @@ -0,0 +1,10 @@ +#!/usr/bin/python3 + +import os +import subprocess + +pythondir = os.path.join(os.environ['MESON_INSTALL_PREFIX'], 'share', 'cinnamon-screensaver') + +if not os.environ.get('DESTDIR'): + print('Generating python bytecode...') + subprocess.call(['sh', '-c', 'python3 -m compileall "%s"' % pythondir]) diff -Nru cinnamon-screensaver-4.6.0/libcscreensaver/meson.build cinnamon-screensaver-4.8.1/libcscreensaver/meson.build --- cinnamon-screensaver-4.6.0/libcscreensaver/meson.build 2020-05-12 13:06:06.000000000 +0000 +++ cinnamon-screensaver-4.8.1/libcscreensaver/meson.build 2020-12-08 10:24:33.000000000 +0000 @@ -145,13 +145,18 @@ dbus_built ] +libcscreensaver_deps = [gobject, gtk, gdk, x11, xrandr, xext, glib, gio, gthread, pam, m] +if use_xinerama + libcscreensaver_deps += xinerama +endif + libcscreensaver = library( 'cscreensaver', cscreensaver_sources + gir_sources, version: '0.0.0', include_directories: inc, cpp_args: '-DG_LOG_DOMAIN="CScreensaver"', - dependencies: [gobject, gtk, gdk, x11, xinerama, xrandr, xext, glib, gio, gthread, pam, m], + dependencies: libcscreensaver_deps, install: true ) diff -Nru cinnamon-screensaver-4.6.0/meson.build cinnamon-screensaver-4.8.1/meson.build --- cinnamon-screensaver-4.6.0/meson.build 2020-05-12 13:06:06.000000000 +0000 +++ cinnamon-screensaver-4.8.1/meson.build 2020-12-08 10:24:33.000000000 +0000 @@ -1,4 +1,4 @@ -project('cinnamon-screensaver', 'c', version: '4.6.0', meson_version: '>=0.40.0') +project('cinnamon-screensaver', 'c', version: '4.8.1', meson_version: '>=0.46.0') cc = meson.get_compiler('c') @@ -43,7 +43,7 @@ xext = dependency('xext') xrandr = dependency('xrandr', required: false) m = cc.find_library('m') -dbus_services_dir = dependency('dbus-1').get_pkgconfig_variable('session_bus_services_dir', define_variable: ['prefix', prefix]) +dbus_services_dir = dependency('dbus-1').get_pkgconfig_variable('session_bus_services_dir', define_variable: ['datadir', datadir]) # check for symbols and headers foreach header : [ @@ -61,7 +61,8 @@ endif endforeach -if get_option('xinerama') +use_xinerama = get_option('xinerama') +if use_xinerama if host_machine.system() == 'solaris' xinerama = cc.find_library('Xext') xinerama_h = cc.has_header('X11/extensions/xinerama.h') @@ -123,6 +124,7 @@ inc = include_directories('.') +subdir('install-scripts') subdir('libcscreensaver') subdir('data') subdir('src') diff -Nru cinnamon-screensaver-4.6.0/meson_options.txt cinnamon-screensaver-4.8.1/meson_options.txt --- cinnamon-screensaver-4.6.0/meson_options.txt 2020-05-12 13:06:06.000000000 +0000 +++ cinnamon-screensaver-4.8.1/meson_options.txt 2020-12-08 10:24:33.000000000 +0000 @@ -2,3 +2,4 @@ option('locking', type : 'boolean', value : true, description: 'Compile in support for locking the display') option('xinerama', type : 'boolean', value : true, description: 'Use of the Xinerama extension') option('pam-prefix', type : 'string', value : '', description: 'specify where pam files go') +option('use-debian-pam', type : 'boolean', value : false, description: 'use the debian pam file') diff -Nru cinnamon-screensaver-4.6.0/src/albumArt.py cinnamon-screensaver-4.8.1/src/albumArt.py --- cinnamon-screensaver-4.6.0/src/albumArt.py 2020-05-12 13:06:06.000000000 +0000 +++ cinnamon-screensaver-4.8.1/src/albumArt.py 2020-12-08 10:24:33.000000000 +0000 @@ -61,6 +61,9 @@ def update_image(self): url = self.player.get_albumart_url() + if self.player.get_identity() == "spotify": + url = url.replace("open.spotify.com", "i.scdn.co"); + if url == self.current_url: return diff -Nru cinnamon-screensaver-4.6.0/src/dbusdepot/mediaPlayerWatcher.py cinnamon-screensaver-4.8.1/src/dbusdepot/mediaPlayerWatcher.py --- cinnamon-screensaver-4.6.0/src/dbusdepot/mediaPlayerWatcher.py 2020-05-12 13:06:06.000000000 +0000 +++ cinnamon-screensaver-4.8.1/src/dbusdepot/mediaPlayerWatcher.py 2020-12-08 10:24:33.000000000 +0000 @@ -31,6 +31,7 @@ name, path) + self.identity = None self.metadata = None self.album_name = "" self.track_name = "" @@ -48,6 +49,14 @@ self.ensure_metadata() + # This isn't the app-provided MediaPlayer.Identity, but we'd need to + # set up another proxy and it's not really necessary for what this is + # used for. + self.identity = self.proxy.get_name().rpartition(".")[2] + + def get_identity(self): + return self.identity + def get_playback_status(self): status = PlaybackStatus.Unknown diff -Nru cinnamon-screensaver-4.6.0/src/meson.build cinnamon-screensaver-4.8.1/src/meson.build --- cinnamon-screensaver-4.6.0/src/meson.build 2020-05-12 13:06:06.000000000 +0000 +++ cinnamon-screensaver-4.8.1/src/meson.build 2020-12-08 10:24:33.000000000 +0000 @@ -64,5 +64,3 @@ meson.add_install_script('sh', '-c', 'ln -sf "@0@" "$DESTDIR/@1@"'.format(join_paths(pkgdatadir, script[0]), join_paths(bindir, script[1]))) endforeach - -meson.add_install_script('sh', '-c', 'python3 -m compileall "$DESTDIR/@0@"'.format(pkgdatadir) )