Hello community,
here is the log from the commit of package cinnamon-screensaver for
openSUSE:Factory checked in at 2020-12-13 17:29:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cinnamon-screensaver (Old)
and /work/SRC/openSUSE:Factory/.cinnamon-screensaver.new.2328 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-screensaver"
Sun Dec 13 17:29:54 2020 rev:20 rq:855375 version:4.8.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/cinnamon-screensaver/cinnamon-screensaver.changes
2020-10-06 17:10:55.161517384 +0200
+++
/work/SRC/openSUSE:Factory/.cinnamon-screensaver.new.2328/cinnamon-screensaver.changes
2020-12-13 17:30:27.780393556 +0100
@@ -1,0 +2,14 @@
+Sun Dec 6 12:01:53 UTC 2020 - andy great <[email protected]>
+
+- Update to version 4.8.0.
+ * Build: Only generate python bytecode during builds with no
+ temporary install folder. Package managers should handle this
+ otherwise.
+ * use debhelper 11 for integrated meson support
+ * build: Don't rely on debian magic to install the correct pam
+ file.
+ * Fix meson syntax error when xinerama support is disabled.
+ * build: use datadir in define_variable for dbus_services_dir
+ * album art: Adjust the album art url for spotify.
+
+-------------------------------------------------------------------
Old:
----
cinnamon-screensaver-4.6.0.tar.gz
New:
----
cinnamon-screensaver-4.8.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cinnamon-screensaver.spec ++++++
--- /var/tmp/diff_new_pack.59nrDz/_old 2020-12-13 17:30:28.440394225 +0100
+++ /var/tmp/diff_new_pack.59nrDz/_new 2020-12-13 17:30:28.444394230 +0100
@@ -17,7 +17,7 @@
Name: cinnamon-screensaver
-Version: 4.6.0
+Version: 4.8.0
Release: 0
Summary: Cinnamon screensaver and locker
License: GPL-2.0-or-later
++++++ cinnamon-screensaver-4.6.0.tar.gz -> cinnamon-screensaver-4.8.0.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-4.6.0/.circleci/config.yml
new/cinnamon-screensaver-4.8.0/.circleci/config.yml
--- old/cinnamon-screensaver-4.6.0/.circleci/config.yml 2020-05-12
15:06:06.000000000 +0200
+++ new/cinnamon-screensaver-4.8.0/.circleci/config.yml 2020-11-26
14:49:46.000000000 +0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-4.6.0/data/cinnamon-screensaver.pam.debian
new/cinnamon-screensaver-4.8.0/data/cinnamon-screensaver.pam.debian
--- old/cinnamon-screensaver-4.6.0/data/cinnamon-screensaver.pam.debian
1970-01-01 01:00:00.000000000 +0100
+++ new/cinnamon-screensaver-4.8.0/data/cinnamon-screensaver.pam.debian
2020-11-26 14:49:46.000000000 +0100
@@ -0,0 +1,2 @@
+@include common-auth
+auth optional pam_gnome_keyring.so
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-4.6.0/data/meson.build
new/cinnamon-screensaver-4.8.0/data/meson.build
--- old/cinnamon-screensaver-4.6.0/data/meson.build 2020-05-12
15:06:06.000000000 +0200
+++ new/cinnamon-screensaver-4.8.0/data/meson.build 2020-11-26
14:49:46.000000000 +0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-4.6.0/debian/changelog
new/cinnamon-screensaver-4.8.0/debian/changelog
--- old/cinnamon-screensaver-4.6.0/debian/changelog 2020-05-12
15:06:06.000000000 +0200
+++ new/cinnamon-screensaver-4.8.0/debian/changelog 2020-11-26
14:49:46.000000000 +0100
@@ -1,3 +1,27 @@
+cinnamon-screensaver (4.8.0) ulyssa; urgency=medium
+
+ [ Michael Webster ]
+ * Build: Only generate python bytecode during builds with no temporary
install folder. Package managers should handle this otherwise.
+
+ [ Fabio Fantoni ]
+ * CI: Update targets
+ * use debhelper 11 for integrated meson support
+ * CI: Update targets (#339)
+
+ [ Michael Webster ]
+ * build: Don't rely on debian magic to install the correct pam file.
+
+ [ Sparky Bluefang ]
+ * Fix meson syntax error when xinerama support is disabled.
+
+ [ WORLDofPEACE ]
+ * build: use datadir in define_variable for dbus_services_dir
+
+ [ Michael Webster ]
+ * album art: Adjust the album art url for spotify.
+
+ -- Clement Lefebvre <[email protected]> Thu, 26 Nov 2020 13:49:22 +0000
+
cinnamon-screensaver (4.6.0) ulyana; urgency=medium
[ Eli Schwartz ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-4.6.0/debian/cinnamon-screensaver.pam
new/cinnamon-screensaver-4.8.0/debian/cinnamon-screensaver.pam
--- old/cinnamon-screensaver-4.6.0/debian/cinnamon-screensaver.pam
2020-05-12 15:06:06.000000000 +0200
+++ new/cinnamon-screensaver-4.8.0/debian/cinnamon-screensaver.pam
1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-@include common-auth
-auth optional pam_gnome_keyring.so
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-4.6.0/debian/compat
new/cinnamon-screensaver-4.8.0/debian/compat
--- old/cinnamon-screensaver-4.6.0/debian/compat 2020-05-12
15:06:06.000000000 +0200
+++ new/cinnamon-screensaver-4.8.0/debian/compat 2020-11-26
14:49:46.000000000 +0100
@@ -1 +1 @@
-10
+11
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-4.6.0/debian/control
new/cinnamon-screensaver-4.8.0/debian/control
--- old/cinnamon-screensaver-4.6.0/debian/control 2020-05-12
15:06:06.000000000 +0200
+++ new/cinnamon-screensaver-4.8.0/debian/control 2020-11-26
14:49:46.000000000 +0100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Linux Mint <[email protected]>
Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 11.1~),
dh-python,
gnome-pkg-tools (>= 0.10),
gobject-introspection,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-4.6.0/debian/rules
new/cinnamon-screensaver-4.8.0/debian/rules
--- old/cinnamon-screensaver-4.6.0/debian/rules 2020-05-12 15:06:06.000000000
+0200
+++ new/cinnamon-screensaver-4.8.0/debian/rules 2020-11-26 14:49:46.000000000
+0100
@@ -10,25 +10,17 @@
dh_strip --dbg-package=libcscreensaver-dbg
override_dh_auto_configure:
- mkdir -p debian/build
- meson debian/build \
- --prefix=/usr \
- --libdir=lib/$(DEB_HOST_MULTIARCH) \
- --libexecdir=lib/$(DEB_HOST_MULTIARCH)/cinnamon-screensaver
-
-override_dh_auto_build:
- ninja -C debian/build
-
-override_dh_auto_install:
- DESTDIR=${CURDIR}/debian/tmp \
- ninja -C debian/build install
+ dh_auto_configure -- \
+ --libexecdir=lib/$(DEB_HOST_MULTIARCH)/cinnamon-screensaver \
+ -D use-debian-pam=true
# there has never been a testsuite, so don't try running it and breaking
# just because there isn't one
override_dh_auto_test:
-override_dh_install:
- dh_install --list-missing
+# --list-missing will be default in compat 12
+override_dh_missing:
+ dh_missing --list-missing
override_dh_python3:
dh_python3 usr/share/cinnamon-screensaver
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-4.6.0/install-scripts/meson.build
new/cinnamon-screensaver-4.8.0/install-scripts/meson.build
--- old/cinnamon-screensaver-4.6.0/install-scripts/meson.build 1970-01-01
01:00:00.000000000 +0100
+++ new/cinnamon-screensaver-4.8.0/install-scripts/meson.build 2020-11-26
14:49:46.000000000 +0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-4.6.0/install-scripts/meson_compile_python.py
new/cinnamon-screensaver-4.8.0/install-scripts/meson_compile_python.py
--- old/cinnamon-screensaver-4.6.0/install-scripts/meson_compile_python.py
1970-01-01 01:00:00.000000000 +0100
+++ new/cinnamon-screensaver-4.8.0/install-scripts/meson_compile_python.py
2020-11-26 14:49:46.000000000 +0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-4.6.0/libcscreensaver/meson.build
new/cinnamon-screensaver-4.8.0/libcscreensaver/meson.build
--- old/cinnamon-screensaver-4.6.0/libcscreensaver/meson.build 2020-05-12
15:06:06.000000000 +0200
+++ new/cinnamon-screensaver-4.8.0/libcscreensaver/meson.build 2020-11-26
14:49:46.000000000 +0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-4.6.0/meson.build
new/cinnamon-screensaver-4.8.0/meson.build
--- old/cinnamon-screensaver-4.6.0/meson.build 2020-05-12 15:06:06.000000000
+0200
+++ new/cinnamon-screensaver-4.8.0/meson.build 2020-11-26 14:49:46.000000000
+0100
@@ -1,4 +1,4 @@
-project('cinnamon-screensaver', 'c', version: '4.6.0', meson_version:
'>=0.40.0')
+project('cinnamon-screensaver', 'c', version: '4.8.0', 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-4.6.0/meson_options.txt
new/cinnamon-screensaver-4.8.0/meson_options.txt
--- old/cinnamon-screensaver-4.6.0/meson_options.txt 2020-05-12
15:06:06.000000000 +0200
+++ new/cinnamon-screensaver-4.8.0/meson_options.txt 2020-11-26
14:49:46.000000000 +0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-4.6.0/src/albumArt.py
new/cinnamon-screensaver-4.8.0/src/albumArt.py
--- old/cinnamon-screensaver-4.6.0/src/albumArt.py 2020-05-12
15:06:06.000000000 +0200
+++ new/cinnamon-screensaver-4.8.0/src/albumArt.py 2020-11-26
14:49:46.000000000 +0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-4.6.0/src/dbusdepot/mediaPlayerWatcher.py
new/cinnamon-screensaver-4.8.0/src/dbusdepot/mediaPlayerWatcher.py
--- old/cinnamon-screensaver-4.6.0/src/dbusdepot/mediaPlayerWatcher.py
2020-05-12 15:06:06.000000000 +0200
+++ new/cinnamon-screensaver-4.8.0/src/dbusdepot/mediaPlayerWatcher.py
2020-11-26 14:49:46.000000000 +0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-4.6.0/src/meson.build
new/cinnamon-screensaver-4.8.0/src/meson.build
--- old/cinnamon-screensaver-4.6.0/src/meson.build 2020-05-12
15:06:06.000000000 +0200
+++ new/cinnamon-screensaver-4.8.0/src/meson.build 2020-11-26
14:49:46.000000000 +0100
@@ -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) )
_______________________________________________
openSUSE Commits mailing list -- [email protected]
To unsubscribe, email [email protected]
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/[email protected]
