Hello community, here is the log from the commit of package cinnamon-session for openSUSE:Factory checked in at 2018-04-26 13:37:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cinnamon-session (Old) and /work/SRC/openSUSE:Factory/.cinnamon-session.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-session" Thu Apr 26 13:37:04 2018 rev:14 rq:599236 version:3.8.1 Changes: -------- --- /work/SRC/openSUSE:Factory/cinnamon-session/cinnamon-session.changes 2017-11-23 09:44:45.043777128 +0100 +++ /work/SRC/openSUSE:Factory/.cinnamon-session.new/cinnamon-session.changes 2018-04-26 13:37:05.230156485 +0200 @@ -1,0 +2,17 @@ +Thu Apr 19 20:07:54 UTC 2018 - [email protected] + +- Update to version 3.8.1 (changes since 3.6.1): + * Switch to Meson. + * csm-manager: Detect D-Bus user-session at runtime. + * Add support for elogind. + * circleci: Add install of updated cinnamon-desktop. + * circleci: Remove mint18 job. + * Stop trying to handle Qt integration at all. + * Quit dialogue: Don't skip taskbar. + * debian: wrap-and-sort -bst. + * Fix generation of LOCALE_DIR. +- Remove the no longer needed upower-glib dependency. +- Replace cinnamon-session-fix-qt-themes.patch with + cinnamon-session-qt-5.7-styleoverride.patch. + +------------------------------------------------------------------- Old: ---- cinnamon-session-3.6.1.tar.gz cinnamon-session-fix-qt-themes.patch New: ---- cinnamon-session-3.8.1.tar.gz cinnamon-session-qt-5.7-styleoverride.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon-session.spec ++++++ --- /var/tmp/diff_new_pack.vh7GmG/_old 2018-04-26 13:37:05.902131858 +0200 +++ /var/tmp/diff_new_pack.vh7GmG/_new 2018-04-26 13:37:05.906131712 +0200 @@ -1,7 +1,7 @@ # # spec file for package cinnamon-session # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,23 +17,19 @@ Name: cinnamon-session -Version: 3.6.1 +Version: 3.8.1 Release: 0 Summary: The session manager for the Cinnamon Desktop -License: GPL-2.0+ AND LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/GUI/Other -Url: https://github.com/linuxmint/cinnamon-session +URL: https://github.com/linuxmint/cinnamon-session Source: https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: %{name}-logind.gschema.override -# PATCH-FIX-OPENSUSE cinnamon-session-fix-qt-themes.patch boo#1002900 [email protected] -- Use Gtk2 Platform Theme on Qt 5.7+ and no gnome theme on 5.6. -Patch0: cinnamon-session-fix-qt-themes.patch -BuildRequires: autoconf -BuildRequires: autoconf-archive -BuildRequires: automake -BuildRequires: docutils +# PATCH-FIX-OPENSUSE cinnamon-session-qt-5.7-styleoverride.patch [email protected] -- On Qt 5.7+ use Gtk2 Platform Theme. +Patch0: cinnamon-session-qt-5.7-styleoverride.patch +BuildRequires: docbook BuildRequires: hicolor-icon-theme -BuildRequires: intltool -BuildRequires: libtool +BuildRequires: meson BuildRequires: pkgconfig BuildRequires: tcpd-devel BuildRequires: update-desktop-files @@ -42,13 +38,13 @@ BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.10.0 +BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libcanberra) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(pangox) BuildRequires: pkgconfig(sm) -BuildRequires: pkgconfig(upower-glib) +BuildRequires: pkgconfig(xapp) >= 1.2.0 BuildRequires: pkgconfig(xcomposite) BuildRequires: pkgconfig(xtst) Requires: cinnamon @@ -57,7 +53,7 @@ Requires: upower >= 0.9.0 Recommends: %{name}-lang %glib2_gsettings_schema_requires -%if 0%{?suse_version} > 1320 +%if 0%{?suse_version} >= 1500 # Make native styling in Qt5 happen. Requires: libqt5-qtstyleplugins-platformtheme-gtk2 %endif @@ -70,17 +66,20 @@ %patch0 -p1 %build -NOCONFIGURE=1 ./autogen.sh -%configure \ -%if 0%{?suse_version} > 1320 - --enable-qt57-theme-support +%meson \ + -Dwith-docbook=true \ + -Dwith-gconf=false \ +%if 0%{?suse_version} >= 1500 + -Dwith-qt5-theme-support=true \ %else - --disable-qt57-theme-support + -Dwith-qt5-theme-support=false \ %endif -make %{?_smp_mflags} V=1 + -Dwith-ipv6=true \ + -Dwith-xtrans=true +%meson_build %install -%make_install +%meson_install # We should own this directory. mkdir -p %{buildroot}%{_datadir}/%{name}/sessions/ @@ -94,7 +93,7 @@ install -Dpm 0644 %{SOURCE1} \ %{buildroot}%{_datadir}/glib-2.0/schemas/org.cinnamon.desktop.session.gschema.override -%if 0%{?suse_version} <= 1320 +%if 0%{?suse_version} < 1500 %post %desktop_database_post %icon_theme_cache_post @@ -107,7 +106,8 @@ %endif %files -%doc AUTHORS COPYING README README.md +%license COPYING +%doc AUTHORS README README.md %dir %{_docdir}/%{name}/dbus/ %doc %{_docdir}/%{name}/dbus/%{name}.html %{_bindir}/%{name} ++++++ cinnamon-session-3.6.1.tar.gz -> cinnamon-session-3.8.1.tar.gz ++++++ ++++ 2323 lines of diff (skipped) ++++++ cinnamon-session-qt-5.7-styleoverride.patch ++++++ --- a/cinnamon-session/main.c +++ b/cinnamon-session/main.c @@ -339,6 +339,18 @@ main (int argc, char **argv) */ csm_util_setenv ("GNOME_DESKTOP_SESSION_ID", "this-is-deprecated"); + /* Make Qt5 apps follow the GTK+ style */ + if (!HAVE_QT57 && g_getenv("QT_STYLE_OVERRIDE") == NULL) { + csm_util_setenv("QT_STYLE_OVERRIDE", "gtk"); + } + else if (HAVE_QT57 && g_getenv("QT_STYLE_OVERRIDE") != NULL) { + g_unsetenv("QT_STYLE_OVERRIDE"); + } + + if (HAVE_QT57 && g_getenv("QT_QPA_PLATFORMTHEME") == NULL) { + csm_util_setenv("QT_QPA_PLATFORMTHEME", "gtk2"); + } + /* GTK Overlay scrollbars */ settings = g_settings_new ("org.cinnamon.desktop.interface"); --- a/meson.build +++ b/meson.build @@ -78,6 +78,7 @@ else endif conf.set('HAVE_ELOGIND', elogind.found()) +conf.set10('HAVE_QT57', get_option('with-qt5-theme-support')) xtest = dependency('xtst', required: false) conf.set('HAVE_XTEST', xtest.found()) @@ -196,6 +197,7 @@ message('\n'.join([ '', ' GConf support: @0@'.format(gconf.found()), ' Logind support: @0@'.format(logind.found()), +' Qt 5.7+ theme support: @0@'.format(get_option('with-qt5-theme-support')), ' IPv6 support: @0@'.format(have_ipv6), ' Backtrace support: @0@'.format(backtrace.found()), ' XRender support: @0@'.format(xrender.found()), --- a/meson_options.txt +++ b/meson_options.txt @@ -2,4 +2,5 @@ option('with-frequent-warnings', type: option('with-docbook', type: 'boolean', value: true) option('with-gconf', type: 'boolean', value: true) option('with-ipv6', type: 'boolean', value: true) +option('with-qt5-theme-support', type: 'boolean', value: false) option('with-xtrans', type: 'boolean', value: true)
