January 2020 - openSUSE Commits - openSUSE Mailing Lists

commit mutter for openSUSE:Leap:15.2
by root 30 Jan '20

30 Jan '20

Hello community, here is the log from the commit of package mutter for openSUSE:Leap:15.2 checked in at 2020-01-30 14:50:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/mutter (Old) and /work/SRC/openSUSE:Leap:15.2/.mutter.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mutter" Thu Jan 30 14:50:25 2020 rev:56 rq:761858 version:3.34.3+0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/mutter/mutter.changes 2020-01-15 15:31:42.830788112 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.mutter.new.26092/mutter.changes 2020-01-30 14:51:36.874941209 +0100 @@ -2 +2 @@ -Mon May 6 06:20:50 UTC 2019 - Chingkai <qkzhu(a)suse.com> +Sun Jan 05 14:34:37 UTC 2020 - bjorn.lie(a)gmail.com @@ -4,4 +4,2 @@ -- Add mutter-bsc1133445-Fix-time-comparison-bug-causing-hang.patch: - A comparison in translate_device_event() does not account for the - fact that X's clock wraps about every 49.7 days. When triggered, - this causes an unresponsive GUI (bsc#1133445, glgo#GNOME/mutter#12). +- Update to version 3.34.3+0: + * Bump version to 3.34.3 @@ -10 +8 @@ -Wed Feb 20 11:08:12 UTC 2019 - qkzhu(a)suse.com +Wed Jan 01 20:16:09 UTC 2020 - bjorn.lie(a)gmail.com @@ -12,4 +10,3 @@ -- Add mutter-Lower-HIDPI_LIMIT-to-144.patch: mutter will set scaling - factor to 2 when the monitor's dpi is greater than 144 (96*1.5) to - keep GNOME's behavior consistent with YaST Installer (fate#326682, - bsc#1125467). +- Update to version 3.34.2+2: + * clutter/stage: Fix picking of rectangles with negative + positions. @@ -18 +15 @@ -Thu Jan 31 06:18:58 UTC 2019 - qkzhu(a)suse.com +Tue Dec 24 11:32:52 UTC 2019 - dimstar(a)opensuse.org @@ -20,4 +17,2 @@ -- Add mutter-keybindings-Super-should-be-inhibitable.patch: when a - Wayland client issues a shortcut inhibit request which is granted - by the user, the Super key should be passed to the surface instead - of being handled by the compositor (bgo#790627, bsc#1120372). +- Update to version 3.34.2+1: + * screen-cast: Fix window recording on HiDPI @@ -26 +21 @@ -Thu Jan 17 01:16:47 UTC 2019 - xwang(a)suse.com +Fri Dec 13 06:32:34 UTC 2019 - dead_mozay(a)opensuse.org @@ -28,3 +23,5 @@ -- Add mutter-xwayland-Don-t-abort-if-Xwayland-crashes.patch: make - mutter exit instead of crash if Xwayland goes away unexpectedly. - upstream commit 2d80fd (glgo#GNOME/mutter!76). +- Update to version 3.34.2+0: + * Update British English translation + * backends/native: Fix double free of error + * kms-impl/simple: Fix meta_set_fallback_feedback_idle + * kms: Process impl idle callbacks before pre dispatch flush @@ -33 +30 @@ -Wed Dec 26 09:09:50 UTC 2018 - qkzhu(a)suse.com +Tue Dec 10 10:26:41 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> @@ -35,3 +32,2 @@ -- Add mutter-bring-back-cursor-when-using-magnifier.patch: cursor is - missing when using magnifier on 3.26, this patch contains 6 commits - from mutter-3.27.91 (bgo#754806, bsc#1120290). +- Add explicit pkgconfig(fribidi) and pkgconfig(glib-2.0) + BuildRequires: meson checks for it. @@ -40 +36 @@ -Mon Dec 10 20:52:22 CET 2018 - hpj(a)suse.com +Mon Dec 2 10:38:04 UTC 2019 - Frederic Crozat <fcrozat(a)suse.com> @@ -42 +38,810 @@ -- Add mutter-bsc1093541-fix-window-icon-leak.patch (bsc#1093541). +- Add mutter-disable-cvt-s390x.patch: do not search cvt on s390x, + it doesn't exist there (bsc#1158128). + +------------------------------------------------------------------- +Mon Dec 02 10:09:22 UTC 2019 - dimstar(a)opensuse.org + +- Update to version 3.34.1+66: + * stack: Allow promoting transient windows to their parent's layer + * shaped-texture: Do not invalidate content on set_cogl_texture() + * cursor-tracker: Add API to keep the wayland pointer focus while hidden + * device-manager-x11: Ignore events if no source device is set + * clutter/cally-root: Use g_clear_signal_handler and fix a signal leak + * wayland: Move "ownership" of the DnD selection source to the data device + * wayland: Do not cancel data source on offer destruction + * wayland: Avoid redundant cancel() call + * wayland: Drop unused wl_signal structs + +------------------------------------------------------------------- +Tue Nov 19 11:56:58 UTC 2019 - dimstar(a)opensuse.org + +- Update to version 3.34.1+57: + * cursor-renderer/native: Fix cursor drawing in combination with panel_orientation_transform + * output-kms: Fix "panel orientation" kms-prop being ignored on native outputs + * compositor: Plug cairo_region_t leak + * backends: Plug MetaKmsPageFlipData leak + * input-settings/x11: Add missing clutter_x11_trap_x_errors around XIGetProperty + * plugin-manager: Kill window effects on destroy + * plugins/default: Handle skipped animations + * wayland/surface: Don't double scale when getting absolute coordinates + * window-props: Don't set override redirect windows as top-level parent + * window-props: Don't look for parent multiple times + * window: Assert we only set a NULL workspace when unmanaging + * window: Warn if O-R window workspace state is used + * wayland/actor-surface: Always store away frame callbacks on commit + * ci: Fix checking out gnome-shell on stable branches + * x11-display: Don't unset the X11 focused window after setting one + * tests/monitor-unit-tests: Add another tiling window hot plug test + * window: Reset tile monitor number when untiling + * tests/monitor-unit-tests: Add window tiling hot plug test + * tests/runner: Move window shown synchronization to helper + * tests/monitor-unit-tests: Move test client sanity check into helper + * window: Always update tile monitor number on hot plug + * plugins/default: Clean up tile preview when closing display + * plugin/default: Init quark before using + * display: Add 'closing' signal + * renderer-native: Separate offscreen and shadowfb + * clutter/stage-view: Separate offscreen and shadowfb + +------------------------------------------------------------------- +Wed Oct 30 15:43:16 UTC 2019 - dimstar(a)opensuse.org + +- Update to version 3.34.1+31: + * wayland: Check stylus serials on meta_wayland_seat_can_popup() + * x11: Limit touch replay pointer events to when replaying + * display: Move finishing of touch sequence to the backend + * x11: Update X11 focus before updating MetaDisplay focus + +------------------------------------------------------------------- +Wed Oct 23 18:14:18 UTC 2019 - bjorn.lie(a)gmail.com + +- Update to version 3.34.1+27: + + wayland/surface: Reset buffer_destroy_handler_id. + + window-actor: Add a missing NULL-check. + + monitor-manager: check for underscan setting validity upfront. + + clutter/stage: Actually set key focus to an actor on key focus. + + clutter/actor: Save key-focus state and unset it before + destruction. + + dbus-session-watcher: Chain up to parent finalize(). + +------------------------------------------------------------------- +Thu Oct 17 08:03:06 UTC 2019 - Alynx Zhou <alynx.zhou(a)suse.com> + +- Rebase patches: + + Update mutter-SLE-bell.patch + + Disable mutter-SLE-bsc984738-grab-display.patch + +------------------------------------------------------------------- +Sun Oct 13 17:58:09 UTC 2019 - bjorn.lie(a)gmail.com + +- Update to version 3.34.1+21: + + x11: Map mimetypes back to selection atoms + + wayland: + - Figure out better the right selection source for a + wl_data_offer + - Set dummy selection source on .set_selection(null) + - Simplify MetaSelectionSourceWayland + - Check resource before emitting cancelled event + - Emit wl/primary offer after changing selection + - Chain up to the right finalize on + MetaWaylandDataSourceWayland + - Drop field from MetaWaylandDataSourcePrimary + - Plug MetaSelectionSourceWayland leaks + + clutter/shader-effect: Initialize shader-type properly + + ci: Change the without-native-backend to not build with Wayland + too + + main: Warn instead of error in meta_test_init() +- Switch to the now available 3-34 stable branch in service. + +------------------------------------------------------------------- +Thu Oct 10 21:46:49 UTC 2019 - bjorn.lie(a)gmail.com + +- Update to version 3.34.1+9: + + kms/crtc: Read gamma state when prediction failed. + + kms: Always predict state after processing update. + + clutter-backend-x11: Don't push keymap events to clutter. + + event-x11: Use CLUTTER prefix for X11 filter docs. + + x11: Translate well known selection atoms to mimetypes. + + wayland/actor-surface: Queue redraw for frame callback. + + wayland/surface: Some minor coding style clean up. + + cogl-pango/meson.build: Remove extraneous quoting. + + backends: Update inhibited state for the monitor and respect + that state. + +------------------------------------------------------------------- +Wed Oct 9 09:38:35 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 3.34.1: + + Fix startup of X11 session services on wayland. + + Fix _NET_ACTIVE_WINDOW emission. + + Fix initial view perspective. + + Fix screenshots and window animations when scaled. + + Re-enable coredumps when capabilities are set. + + Fix scaling of DND surface actors. + + Optimize blitting of untransformed offscreen stage views. + + Fix freeze of pointer event delivery on X11. + + Fix scaling of stylus input coordinates with HiDPI. + + Fix memory leak when using implicit animations. + + Fix numlock state for native backend. + + Fixed crashes. + + Misc. bug fixes and cleanups. + + Updated translations. + +------------------------------------------------------------------- +Thu Oct 3 10:17:28 UTC 2019 - Frederic Crozat <fcrozat(a)suse.com> + +- Disable sysprof support until it get security team approval. + +------------------------------------------------------------------- +Sat Sep 21 17:08:50 UTC 2019 - bjorn.lie(a)gmail.com + +- Update to version 3.34.0+30: ++++ 779 more lines (skipped) ++++ between /work/SRC/openSUSE:Leap:15.2/mutter/mutter.changes ++++ and /work/SRC/openSUSE:Leap:15.2/.mutter.new.26092/mutter.changes Old: ---- mutter-3.26.2+20180207.4b2d21ff0.tar.xz mutter-bring-back-cursor-when-using-magnifier.patch mutter-bsc1093541-fix-window-icon-leak.patch mutter-bsc1133445-Fix-time-comparison-bug-causing-hang.patch mutter-fix-startup.patch mutter-force-rgb8.patch mutter-iconcache-Support-RGB16_565-format-for-16-bit-color-.patch mutter-keybindings-Super-should-be-inhibitable.patch mutter-xwayland-Don-t-abort-if-Xwayland-crashes.patch mutter-xwayland-create-xauthority.patch New: ---- mutter-3.34.3+0.obscpio mutter-disable-cvt-s390x.patch mutter.obsinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mutter.spec ++++++ --- /var/tmp/diff_new_pack.OdEzgs/_old 2020-01-30 14:51:37.430941505 +0100 +++ /var/tmp/diff_new_pack.OdEzgs/_new 2020-01-30 14:51:37.434941507 +0100 @@ -1,7 +1,7 @@ # # spec file for package mutter # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,81 +12,80 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +# don't enable sysprof support by default +%bcond_with profiler + +%define api_major 5 +%define api_minor 0 +%define libmutter libmutter-%{api_major}-%{api_minor} Name: mutter -Version: 3.26.2+20180207.4b2d21ff0 +Version: 3.34.3+0 Release: 0 Summary: Window and compositing manager based on Clutter License: GPL-2.0-or-later Group: System/GUI/GNOME -Url: https://www.gnome.org -#Source0: https://download.gnome.org/sources/mutter/3.26/%%{name}-%%{version}.tar.xz +URL: https://www.gnome.org Source: %{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM mutter-fix-startup.patch bgo#768531 zaitor(a)opensuse.org -- Fix slow startup notification on wayland -Patch0: mutter-fix-startup.patch -# PATCH-FEATURE-UPSTREAM mutter-iconcache-Support-RGB16_565-format-for-16-bit-color-.patch FATE#323412 bgo#781704 bsc#1024748 vliaskovitis(a)suse.com -- iconcache: Support RGB16_565 format for 16-bit sessions -Patch1: mutter-iconcache-Support-RGB16_565-format-for-16-bit-color-.patch -# PATCH-FIX-UPSTREAM mutter-force-rgb8.patch bsc#1081931 glgo#GNOME/mutter#2 fcrozat(a)suse.Com -- Force RGB8 to prevent Wayland slowness -Patch2: mutter-force-rgb8.patch -# PATCH-FIX-OPENSUSE mutter-xwayland-create-xauthority.patch bsc#1084737 hpj(a)suse.com -- Create and pass an Xauthority file to Xwayland and session -Patch3: mutter-xwayland-create-xauthority.patch -# PATCH-FIX-UPSTREAM mutter-bsc1093541-fix-window-icon-leak.patch bsc#1093541 hpj(a)suse.com -- Fix memory leak -Patch4: mutter-bsc1093541-fix-window-icon-leak.patch -# PATCH-FIX-UPSTREAM mutter-bring-back-cursor-when-using-magnifier.patch bgo#754806 bsc#1120290 qkzhu(a)suse.com -- Bring back cursor when using magnifier -Patch5: mutter-bring-back-cursor-when-using-magnifier.patch -# PATCH-FIX-UPSTREAM mutter-xwayland-Don-t-abort-if-Xwayland-crashes.patch glgo#GNOME/mutter!76 xwang(a)suse.com -- makes mutter exit instead of crash -Patch6: mutter-xwayland-Don-t-abort-if-Xwayland-crashes.patch -# PATCH-FIX-UPSTREAM mutter-keybindings-Super-should-be-inhibitable.patch bgo#790627, bsc#1120372 qkzhu(a)suse.com -- Add Xwayland grab keyboard support -Patch7: mutter-keybindings-Super-should-be-inhibitable.patch # PATCH-FIX-OPENSUSE mutter-Lower-HIDPI_LIMIT-to-144.patch fate#326682, bsc#1125467 qkzhu(a)suse.com -- Lower HIDPI_LIMIT to 144 -Patch8: mutter-Lower-HIDPI_LIMIT-to-144.patch -# PATCH-FIX-UPSTREAM mutter-bsc1133445-Fix-time-comparison-bug-causing-hang.patch bsc#1133445, glgo#GNOME/mutter#12 qkzhu(a)suse.com -- Fix time-comparison bug -Patch9: mutter-bsc1133445-Fix-time-comparison-bug-causing-hang.patch - -# SLE-only patches start at 1000 +Patch3: mutter-Lower-HIDPI_LIMIT-to-144.patch +# PATCH-FIX-UPSTREAM mutter-disable-cvt-s390x.patch bsc#1158128 fcrozat(a)suse.com -- Do not search for cvt on s390x, it doesn't exist there +Patch4: mutter-disable-cvt-s390x.patch +## SLE-only patches start at 1000 # PATCH-FEATURE-SLE mutter-SLE-bell.patch FATE#316042 bnc#889218 idonmez(a)suse.com -- make audible bell work out of the box. Patch1000: mutter-SLE-bell.patch # PATCH-FIX-SLE mutter-SLE-relax-some-constraints-on-CSD-windows.patch bnc#883491 cxiong(a)suse.com -- Relax some constraints on window positioning for CSD windows s.t. they can be placed at the very top of the monitor. Patch1001: mutter-SLE-relax-some-constraints-on-CSD-windows.patch -# PATCH-FIX-UPSTREAM mutter-SLE-bsc984738-grab-display.patch bsc#984738 bgo#769387 hpj(a)suse.com -- Revert a upstream commit to avoid X11 race condition that results in wrong dialog sizes. +# PATCH-NEEDS-REBASE mutter-SLE-bsc984738-grab-display.patch bsc#984738 bgo#769387 hpj(a)suse.com -- Revert a upstream commit to avoid X11 race condition that results in wrong dialog sizes. Patch1002: mutter-SLE-bsc984738-grab-display.patch +BuildRequires: Mesa-libGLESv3-devel +BuildRequires: cmake BuildRequires: fdupes -BuildRequires: intltool -BuildRequires: libtool +BuildRequires: meson BuildRequires: pkgconfig +BuildRequires: translation-update-upstream +BuildRequires: xorg-x11-server +BuildRequires: xorg-x11-server-wayland BuildRequires: zenity BuildRequires: pkgconfig(cairo) >= 1.10.0 BuildRequires: pkgconfig(egl) -BuildRequires: pkgconfig(gbm) >= 10.3 -BuildRequires: pkgconfig(gio-unix-2.0) >= 2.53.2 +BuildRequires: pkgconfig(fribidi) +BuildRequires: pkgconfig(gbm) >= 17.1 +BuildRequires: pkgconfig(gio-unix-2.0) >= 2.61.1 BuildRequires: pkgconfig(glesv2) +BuildRequires: pkgconfig(glib-2.0) >= 2.61.1 BuildRequires: pkgconfig(gnome-desktop-3.0) +BuildRequires: pkgconfig(gnome-settings-daemon) BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.9.5 -BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.19.3 +BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.33.0 BuildRequires: pkgconfig(gtk+-3.0) >= 3.19.7 BuildRequires: pkgconfig(gudev-1.0) >= 232 BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libcanberra-gtk3) -BuildRequires: pkgconfig(libdrm) +BuildRequires: pkgconfig(libdrm) >= 2.4.83 BuildRequires: pkgconfig(libinput) -# Not available in openSUSE yet -# BuildRequires: pkgconfig(libpipewire-0.1) +BuildRequires: pkgconfig(libpipewire-0.2) >= 0.2.5 BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libudev) >= 136 BuildRequires: pkgconfig(libwacom) BuildRequires: pkgconfig(pango) >= 1.2.0 BuildRequires: pkgconfig(sm) +%if %{with profiler} +BuildRequires: pkgconfig(sysprof-3) +BuildRequires: pkgconfig(sysprof-capture-3) +%endif BuildRequires: pkgconfig(upower-glib) >= 0.99.0 -BuildRequires: pkgconfig(wayland-protocols) >= 1.9 +BuildRequires: pkgconfig(wayland-protocols) >= 1.18 BuildRequires: pkgconfig(wayland-server) >= 1.13.0 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11-xcb) +BuildRequires: pkgconfig(xau) BuildRequires: pkgconfig(xcb-randr) BuildRequires: pkgconfig(xcomposite) >= 0.2 BuildRequires: pkgconfig(xcursor) @@ -107,21 +106,24 @@ Provides: windowmanager # Obsolete the now private typelib. Obsoletes: typelib-1_0-Meta-3_0 -BuildRequires: translation-update-upstream %description Mutter is a window and compositing manager based on Clutter, forked from Metacity. -%package -n libmutter-1-0 +%package -n %{libmutter} Summary: Window and compositing manager based on Clutter # we need the gsettings schema; hopefully, they'll stay backwards compatible # (since we can't require = version, to not break SLPP) Group: System/Libraries Requires: %{name}-data >= %{version} +# We need to obsolete the old mutter libs, as otherwise upgrading is impossible +# This makes me believe we should probably fold libmutter into the main package +# with the next update (3.30) +Obsoletes: libmutter-1-0 Obsoletes: libmutter0 -%description -n libmutter-1-0 +%description -n %{libmutter} Mutter is a window and compositing manager based on Clutter, forked from Metacity. @@ -141,8 +143,8 @@ %package devel Summary: Development files for mutter, a window and compositing manager Group: Development/Libraries/GNOME +Requires: %{libmutter} = %{version} Requires: %{name} = %{version} -Requires: libmutter-1-0 = %{version} %description devel This subpackage contains libraries and header files for developing @@ -152,74 +154,72 @@ %prep %setup -q -translation-update-upstream -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 # SLE-only patches and translations. +translation-update-upstream po mutter %if !0%{?is_opensuse} %patch1000 -p1 %patch1001 -p1 -%patch1002 -p1 +# %patch1002 -p1 %endif %build -# FIXME add --enable-remote-desktop when libpipewire-0.1 is available -NOCONFIGURE=1 ./autogen.sh -%configure \ - --enable-wayland \ - --enable-native-backend \ - --disable-static \ - --enable-egl-device \ - --enable-compile-warnings=maximum \ +%define _lto_cflags %{nil} +%meson \ + -Degl_device=true \ + -Dcogl_tests=false \ + -Dclutter_tests=false \ + -Dtests=false \ + -Dinstalled_tests=false \ +%if %{with profiler} + -Dprofiler=true \ +%else + -Dprofiler=false \ +%endif %{nil} -%make_build +%meson_build + +#%%check +#%%meson_test %install -%make_install -find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print +%meson_install %find_lang %{name} %{?no_lang_C} %fdupes %{buildroot}%{_prefix} -%post -n libmutter-1-0 -p /sbin/ldconfig -%postun -n libmutter-1-0 -p /sbin/ldconfig +%post -n %{libmutter} -p /sbin/ldconfig +%postun -n %{libmutter} -p /sbin/ldconfig %files %license COPYING %doc NEWS %{_mandir}/man1/mutter.1%{?ext_man} %{_bindir}/mutter -# These so files are not split out since they are private to mutter -%{_libdir}/mutter/libmutter-clutter-1.so -%{_libdir}/mutter/libmutter-cogl-pango-1.so -%{_libdir}/mutter/libmutter-cogl-path-1.so -%{_libdir}/mutter/libmutter-cogl-1.so -%{_libdir}/mutter/plugins/default.so -# %{_libexecdir}/mutter-restart-helper %{_datadir}/applications/mutter.desktop -# These typelibs are not split out since they are private to mutter -%{_libdir}/mutter/Cally-1.typelib -%{_libdir}/mutter/Clutter-1.typelib -%{_libdir}/mutter/ClutterX11-1.typelib -%{_libdir}/mutter/Cogl-1.typelib -%{_libdir}/mutter/CoglPango-1.typelib -%{_libdir}/mutter/Meta-1.typelib -# -%files -n libmutter-1-0 -%{_libdir}/libmutter-1.so.* -%dir %{_libdir}/mutter/ +# These so files are not split out since they are private to mutter +%{_libdir}/mutter-%{api_major}/libmutter-clutter-%{api_major}.so.* +%{_libdir}/mutter-%{api_major}/libmutter-cogl-pango-%{api_major}.so.* +%{_libdir}/mutter-%{api_major}/libmutter-cogl-path-%{api_major}.so.* +%{_libdir}/mutter-%{api_major}/libmutter-cogl-%{api_major}.so.* +%{_libdir}/mutter-%{api_major}/plugins/libdefault.so + +# These typelibs are not split out since they are private to mutter +%{_libdir}/mutter-%{api_major}/Cally-%{api_major}.typelib +%{_libdir}/mutter-%{api_major}/Clutter-%{api_major}.typelib +%{_libdir}/mutter-%{api_major}/ClutterX11-%{api_major}.typelib +%{_libdir}/mutter-%{api_major}/Cogl-%{api_major}.typelib +%{_libdir}/mutter-%{api_major}/CoglPango-%{api_major}.typelib +%{_libdir}/mutter-%{api_major}/Meta-%{api_major}.typelib + +%files -n %{libmutter} +%{_libdir}/libmutter-%{api_major}.so.* +%dir %{_libdir}/mutter-%{api_major}/ # users of libmutter need this directory -%dir %{_libdir}/mutter/plugins/ +%dir %{_libdir}/mutter-%{api_major}/plugins/ %files data # Do not depend on g-c-c just for a directory @@ -233,22 +233,26 @@ %{_datadir}/glib-2.0/schemas/org.gnome.mutter.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.mutter.wayland.gschema.xml -%files lang -f %{name}.lang - %files devel -%{_includedir}/mutter/ -%{_libdir}/libmutter-1.so -%{_libdir}/mutter/Meta-1.gir -%{_libdir}/mutter/Cally-1.gir -%{_libdir}/mutter/Clutter-1.gir -%{_libdir}/mutter/ClutterX11-1.gir -%{_libdir}/mutter/Cogl-1.gir -%{_libdir}/mutter/CoglPango-1.gir -%{_libdir}/pkgconfig/libmutter-1.pc -%{_libdir}/pkgconfig/mutter-clutter-1.pc -%{_libdir}/pkgconfig/mutter-clutter-x11-1.pc -%{_libdir}/pkgconfig/mutter-cogl-1.pc -%{_libdir}/pkgconfig/mutter-cogl-pango-1.pc -%{_libdir}/pkgconfig/mutter-cogl-path-1.pc +%{_includedir}/mutter-%{api_major}/ +%{_libdir}/mutter-%{api_major}/Meta-%{api_major}.gir +%{_libdir}/mutter-%{api_major}/Cally-%{api_major}.gir +%{_libdir}/mutter-%{api_major}/Clutter-%{api_major}.gir +%{_libdir}/mutter-%{api_major}/ClutterX11-%{api_major}.gir +%{_libdir}/mutter-%{api_major}/Cogl-%{api_major}.gir +%{_libdir}/mutter-%{api_major}/CoglPango-%{api_major}.gir +%{_libdir}/mutter-%{api_major}/libmutter-clutter-%{api_major}.so +%{_libdir}/mutter-%{api_major}/libmutter-cogl-pango-%{api_major}.so +%{_libdir}/mutter-%{api_major}/libmutter-cogl-path-%{api_major}.so +%{_libdir}/mutter-%{api_major}/libmutter-cogl-%{api_major}.so +%{_libdir}/libmutter-%{api_major}.so +%{_libdir}/pkgconfig/libmutter-%{api_major}.pc +%{_libdir}/pkgconfig/mutter-clutter-%{api_major}.pc +%{_libdir}/pkgconfig/mutter-clutter-x11-%{api_major}.pc +%{_libdir}/pkgconfig/mutter-cogl-%{api_major}.pc +%{_libdir}/pkgconfig/mutter-cogl-pango-%{api_major}.pc +%{_libdir}/pkgconfig/mutter-cogl-path-%{api_major}.pc + +%files lang -f %{name}.lang %changelog ++++++ _service ++++++ --- /var/tmp/diff_new_pack.OdEzgs/_old 2020-01-30 14:51:37.450941515 +0100 +++ /var/tmp/diff_new_pack.OdEzgs/_new 2020-01-30 14:51:37.450941515 +0100 @@ -1,15 +1,17 @@ <services> - <service mode="disabled" name="tar_scm"> - <param name="url">https://gitlab.gnome.org/GNOME/mutter.git</param> + <service name="obs_scm" mode="disabled"> <param name="scm">git</param> - <param name="revision">gnome-3-26</param> - <param name="versionformat">3.26.2+%cd.%h</param> + <param name="url">https://gitlab.gnome.org/GNOME/mutter.git</param> + <param name="revision">gnome-3-34</param> + <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param> <param name="changesgenerate">enable</param> </service> - <service mode="disabled" name="recompress"> + <service name="tar" mode="buildtime"/> + <service name="recompress" mode="buildtime"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> - <service mode="disabled" name="set_version" /> + <service name="set_version" mode="disabled" /> </services> + ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.OdEzgs/_old 2020-01-30 14:51:37.462941522 +0100 +++ /var/tmp/diff_new_pack.OdEzgs/_new 2020-01-30 14:51:37.462941522 +0100 @@ -1,6 +1,4 @@ <servicedata> <service name="tar_scm"> - <param name="url">git://git.gnome.org/mutter</param> - <param name="changesrevision">0bd1d7cf09be046d6a698fde88540bfb8cbc78e7</param></service><service name="tar_scm"> <param name="url">https://gitlab.gnome.org/GNOME/mutter.git</param> - <param name="changesrevision">4b2d21ff03ed389138fcb9bca778aec02bafcadb</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">4947e8ae5becc6ff3b2e21c16279b243d8abdd31</param></service></servicedata> \ No newline at end of file ++++++ mutter-Lower-HIDPI_LIMIT-to-144.patch ++++++ --- /var/tmp/diff_new_pack.OdEzgs/_old 2020-01-30 14:51:37.470941526 +0100 +++ /var/tmp/diff_new_pack.OdEzgs/_new 2020-01-30 14:51:37.470941526 +0100 @@ -1,6 +1,6 @@ -From 6f073b9df220eaa4dd9f639a0d9acdd9683e0bde Mon Sep 17 00:00:00 2001 +From 1511039a96d158bcf4b731599ae3af3f98b9b166 Mon Sep 17 00:00:00 2001 From: Chingkai <qkzhu(a)suse.com> -Date: Wed, 20 Feb 2019 18:57:54 +0800 +Date: Thu, 21 Feb 2019 12:39:52 +0800 Subject: [PATCH] monitor: Lower HIDPI_LIMIT to 144 --- @@ -8,10 +8,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backends/meta-monitor.c b/src/backends/meta-monitor.c -index 9c58ccb..eeabe91 100644 +index 60f3674..e0db546 100644 --- a/src/backends/meta-monitor.c +++ b/src/backends/meta-monitor.c -@@ -1373,7 +1373,7 @@ meta_monitor_calculate_crtc_pos (MetaMonitor *monitor, +@@ -1476,7 +1476,7 @@ meta_monitor_calculate_crtc_pos (MetaMonitor *monitor, } /* The minimum resolution at which we turn on a window-scale of 2 */ ++++++ mutter-SLE-bell.patch ++++++ --- /var/tmp/diff_new_pack.OdEzgs/_old 2020-01-30 14:51:37.474941528 +0100 +++ /var/tmp/diff_new_pack.OdEzgs/_new 2020-01-30 14:51:37.474941528 +0100 @@ -1,8 +1,8 @@ -Index: mutter-3.23.2/src/meta/prefs.h +Index: mutter-3.34.1+24/src/meta/prefs.h =================================================================== ---- mutter-3.23.2.orig/src/meta/prefs.h -+++ mutter-3.23.2/src/meta/prefs.h -@@ -89,6 +89,7 @@ typedef enum +--- mutter-3.34.1+24.orig/src/meta/prefs.h ++++ mutter-3.34.1+24/src/meta/prefs.h +@@ -91,6 +91,7 @@ typedef enum META_PREF_WORKSPACE_NAMES, META_PREF_VISUAL_BELL, META_PREF_AUDIBLE_BELL, @@ -10,27 +10,29 @@ META_PREF_VISUAL_BELL_TYPE, META_PREF_GNOME_ACCESSIBILITY, META_PREF_GNOME_ANIMATIONS, -@@ -399,6 +400,7 @@ MetaKeyBindingAction meta_prefs_get_keyb - - gboolean meta_prefs_get_visual_bell (void); +@@ -479,6 +480,9 @@ META_EXPORT gboolean meta_prefs_bell_is_audible (void); + + META_EXPORT +gboolean meta_prefs_bell_force_through_server (void); ++ ++META_EXPORT GDesktopVisualBellType meta_prefs_get_visual_bell_type (void); #endif -Index: mutter-3.23.2/src/core/prefs.c +Index: mutter-3.34.1+24/src/core/prefs.c =================================================================== ---- mutter-3.23.2.orig/src/core/prefs.c -+++ mutter-3.23.2/src/core/prefs.c -@@ -93,6 +93,7 @@ static gboolean auto_raise_delay = 500; +--- mutter-3.34.1+24.orig/src/core/prefs.c ++++ mutter-3.34.1+24/src/core/prefs.c +@@ -99,6 +99,7 @@ static gboolean auto_raise_delay = 500; static gboolean focus_change_on_pointer_rest = FALSE; static gboolean bell_is_visible = FALSE; static gboolean bell_is_audible = TRUE; +static gboolean bell_force_through_server = FALSE; static gboolean gnome_accessibility = FALSE; static gboolean gnome_animations = TRUE; - static char *cursor_theme = NULL; -@@ -353,6 +354,13 @@ static MetaBoolPreference preferences_bo + static gboolean locate_pointer_is_enabled = FALSE; +@@ -346,6 +347,13 @@ static MetaBoolPreference preferences_bo &bell_is_audible, /* FIXME: change the name: it's confusing */ }, { @@ -44,7 +46,7 @@ { KEY_GNOME_ACCESSIBILITY, SCHEMA_INTERFACE, META_PREF_GNOME_ACCESSIBILITY, -@@ -1813,6 +1821,9 @@ meta_preference_to_string (MetaPreferenc +@@ -1654,6 +1662,9 @@ meta_preference_to_string (MetaPreferenc case META_PREF_AUDIBLE_BELL: return "AUDIBLE_BELL"; @@ -54,7 +56,7 @@ case META_PREF_VISUAL_BELL_TYPE: return "VISUAL_BELL_TYPE"; -@@ -2077,6 +2088,12 @@ meta_prefs_bell_is_audible (void) +@@ -1929,6 +1940,12 @@ meta_prefs_bell_is_audible (void) return bell_is_audible; } @@ -67,28 +69,42 @@ GDesktopVisualBellType meta_prefs_get_visual_bell_type (void) { -Index: mutter-3.23.2/src/core/bell.c +Index: mutter-3.34.1+24/src/core/bell.c =================================================================== ---- mutter-3.23.2.orig/src/core/bell.c -+++ mutter-3.23.2/src/core/bell.c -@@ -220,6 +220,12 @@ meta_bell_notify (MetaDisplay *display, +--- mutter-3.34.1+24.orig/src/core/bell.c ++++ mutter-3.34.1+24/src/core/bell.c +@@ -54,6 +54,11 @@ + #include "core/window-private.h" + #include "meta/compositor.h" + ++#include "meta/display.h" ++#include "meta/meta-x11-display.h" ++#include <X11/Xlib.h> ++#include <X11/XKBlib.h> ++ + G_DEFINE_TYPE (MetaBell, meta_bell, G_TYPE_OBJECT) + + enum +@@ -202,6 +207,14 @@ meta_bell_notify (MetaDisplay *display, if (meta_prefs_get_visual_bell ()) bell_visual_notify (display, window); + if (meta_prefs_bell_force_through_server ()) + { -+ XkbForceBell (display->xdisplay, 100); ++ MetaX11Display *x11_display = meta_display_get_x11_display (display); ++ Display *xdisplay = meta_x11_display_get_xdisplay (x11_display); ++ XkbForceBell (xdisplay, 100); + return TRUE; + } + if (meta_prefs_bell_is_audible ()) return bell_audible_notify (display, window); -Index: mutter-3.23.2/data/org.gnome.mutter.gschema.xml.in +Index: mutter-3.34.1+24/data/org.gnome.mutter.gschema.xml.in =================================================================== ---- mutter-3.23.2.orig/data/org.gnome.mutter.gschema.xml.in -+++ mutter-3.23.2/data/org.gnome.mutter.gschema.xml.in -@@ -102,6 +102,16 @@ +--- mutter-3.34.1+24.orig/data/org.gnome.mutter.gschema.xml.in ++++ mutter-3.34.1+24/data/org.gnome.mutter.gschema.xml.in +@@ -137,6 +137,16 @@ </description> </key> ++++++ mutter-disable-cvt-s390x.patch ++++++ Index: mutter-3.34.1+27/src/meson.build =================================================================== --- mutter-3.34.1+27.orig/src/meson.build 2019-10-21 15:03:25.000000000 +0200 +++ mutter-3.34.1+27/src/meson.build 2019-12-02 13:30:20.320685900 +0100 @@ -722,6 +722,7 @@ endif if have_native_backend + if host_machine.cpu_family() != 's390x' cvt = find_program('cvt') gen_default_modes = find_program('backends/native/gen-default-modes.py') @@ -729,6 +730,9 @@ output: 'meta-default-modes.h', command: [gen_default_modes, '@OUTPUT@'] ) + else + default_modes_h = 'backends/native/meta-default-modes.h' + endif mutter_built_sources += default_modes_h gdbus_codegen = find_program('gdbus-codegen') Index: mutter-3.34.1+27/src/backends/native/meta-default-modes.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ mutter-3.34.1+27/src/backends/native/meta-default-modes.h 2019-12-02 13:09:44.832632052 +0100 @@ -0,0 +1,57 @@ +/* Generated by gen-default-modes.py */ + +static const drmModeModeInfo meta_default_landscape_drm_mode_infos[] = { +{ 38250, 800, 832, 912, 1024, 0, 600, 603, 607, 624, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "800x600_60.00" }, +{ 63500, 1024, 1072, 1176, 1328, 0, 768, 771, 775, 798, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1024x768_60.00" }, +{ 81750, 1152, 1216, 1336, 1520, 0, 864, 867, 871, 897, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1152x864_60.00" }, +{ 101250, 1280, 1360, 1488, 1696, 0, 960, 963, 967, 996, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1280x960_60.00" }, +{ 121750, 1400, 1488, 1632, 1864, 0, 1050, 1053, 1057, 1089, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1400x1050_60.00" }, +{ 129000, 1440, 1528, 1680, 1920, 0, 1080, 1083, 1087, 1120, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1440x1080_60.00" }, +{ 161000, 1600, 1712, 1880, 2160, 0, 1200, 1203, 1207, 1245, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1600x1200_60.00" }, +{ 233500, 1920, 2064, 2264, 2608, 0, 1440, 1443, 1447, 1493, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1920x1440_60.00" }, +{ 267250, 2048, 2208, 2424, 2800, 0, 1536, 1539, 1543, 1592, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "2048x1536_60.00" }, +{ 83500, 1280, 1352, 1480, 1680, 0, 800, 803, 809, 831, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1280x800_60.00" }, +{ 106500, 1440, 1528, 1672, 1904, 0, 900, 903, 909, 934, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1440x900_60.00" }, +{ 146250, 1680, 1784, 1960, 2240, 0, 1050, 1053, 1059, 1089, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1680x1050_60.00" }, +{ 193250, 1920, 2056, 2256, 2592, 0, 1200, 1203, 1209, 1245, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1920x1200_60.00" }, +{ 348500, 2560, 2760, 3032, 3504, 0, 1600, 1603, 1609, 1658, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "2560x1600_60.00" }, +{ 74500, 1280, 1344, 1472, 1664, 0, 720, 723, 728, 748, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1280x720_60.00" }, +{ 85250, 1368, 1440, 1576, 1784, 0, 768, 771, 781, 798, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1368x768_60.00" }, +{ 118250, 1600, 1696, 1856, 2112, 0, 900, 903, 908, 934, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1600x900_60.00" }, +{ 173000, 1920, 2048, 2248, 2576, 0, 1080, 1083, 1088, 1120, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "1920x1080_60.00" }, +{ 197000, 2048, 2184, 2400, 2752, 0, 1152, 1155, 1160, 1195, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "2048x1152_60.00" }, +{ 312250, 2560, 2752, 3024, 3488, 0, 1440, 1443, 1448, 1493, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "2560x1440_60.00" }, +{ 396250, 2880, 3096, 3408, 3936, 0, 1620, 1623, 1628, 1679, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "2880x1620_60.00" }, +{ 492000, 3200, 3456, 3800, 4400, 0, 1800, 1803, 1808, 1865, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "3200x1800_60.00" }, +{ 712750, 3840, 4160, 4576, 5312, 0, 2160, 2163, 2168, 2237, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "3840x2160_60.00" }, +{ 813000, 4096, 4440, 4888, 5680, 0, 2304, 2307, 2312, 2386, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "4096x2304_60.00" }, +{ 1276500, 5120, 5560, 6128, 7136, 0, 2880, 2883, 2888, 2982, 0, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, DRM_MODE_TYPE_DEFAULT, "5120x2880_60.00" }, +}; + +static const drmModeModeInfo meta_default_portrait_drm_mode_infos[] = { +{ 38250, 600, 603, 607, 624, 0, 800, 832, 912, 1024, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "600x800_60.00" }, +{ 63500, 768, 771, 775, 798, 0, 1024, 1072, 1176, 1328, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "768x1024_60.00" }, +{ 81750, 864, 867, 871, 897, 0, 1152, 1216, 1336, 1520, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "864x1152_60.00" }, +{ 101250, 960, 963, 967, 996, 0, 1280, 1360, 1488, 1696, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "960x1280_60.00" }, +{ 121750, 1050, 1053, 1057, 1089, 0, 1400, 1488, 1632, 1864, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1050x1400_60.00" }, +{ 129000, 1080, 1083, 1087, 1120, 0, 1440, 1528, 1680, 1920, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1080x1440_60.00" }, +{ 161000, 1200, 1203, 1207, 1245, 0, 1600, 1712, 1880, 2160, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1200x1600_60.00" }, +{ 233500, 1440, 1443, 1447, 1493, 0, 1920, 2064, 2264, 2608, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1440x1920_60.00" }, +{ 267250, 1536, 1539, 1543, 1592, 0, 2048, 2208, 2424, 2800, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1536x2048_60.00" }, +{ 83500, 800, 803, 809, 831, 0, 1280, 1352, 1480, 1680, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "800x1280_60.00" }, +{ 106500, 900, 903, 909, 934, 0, 1440, 1528, 1672, 1904, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "900x1440_60.00" }, +{ 146250, 1050, 1053, 1059, 1089, 0, 1680, 1784, 1960, 2240, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1050x1680_60.00" }, +{ 193250, 1200, 1203, 1209, 1245, 0, 1920, 2056, 2256, 2592, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1200x1920_60.00" }, +{ 348500, 1600, 1603, 1609, 1658, 0, 2560, 2760, 3032, 3504, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1600x2560_60.00" }, +{ 74500, 720, 723, 728, 748, 0, 1280, 1344, 1472, 1664, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "720x1280_60.00" }, +{ 85250, 768, 771, 781, 798, 0, 1368, 1440, 1576, 1784, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "768x1368_60.00" }, +{ 118250, 900, 903, 908, 934, 0, 1600, 1696, 1856, 2112, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "900x1600_60.00" }, +{ 173000, 1080, 1083, 1088, 1120, 0, 1920, 2048, 2248, 2576, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1080x1920_60.00" }, +{ 197000, 1152, 1155, 1160, 1195, 0, 2048, 2184, 2400, 2752, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1152x2048_60.00" }, +{ 312250, 1440, 1443, 1448, 1493, 0, 2560, 2752, 3024, 3488, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1440x2560_60.00" }, +{ 396250, 1620, 1623, 1628, 1679, 0, 2880, 3096, 3408, 3936, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1620x2880_60.00" }, +{ 492000, 1800, 1803, 1808, 1865, 0, 3200, 3456, 3800, 4400, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "1800x3200_60.00" }, +{ 712750, 2160, 2163, 2168, 2237, 0, 3840, 4160, 4576, 5312, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "2160x3840_60.00" }, +{ 813000, 2304, 2307, 2312, 2386, 0, 4096, 4440, 4888, 5680, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "2304x4096_60.00" }, +{ 1276500, 2880, 2883, 2888, 2982, 0, 5120, 5560, 6128, 7136, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "2880x5120_60.00" }, +}; ++++++ mutter.obsinfo ++++++ name: mutter version: 3.34.3+0 mtime: 1578224225 commit: 4947e8ae5becc6ff3b2e21c16279b243d8abdd31

1 0

commit gnome-shell for openSUSE:Leap:15.2
by root 30 Jan '20

30 Jan '20

Hello community, here is the log from the commit of package gnome-shell for openSUSE:Leap:15.2 checked in at 2020-01-30 14:50:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/gnome-shell (Old) and /work/SRC/openSUSE:Leap:15.2/.gnome-shell.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-shell" Thu Jan 30 14:50:24 2020 rev:56 rq:761857 version:3.34.3+0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/gnome-shell/gnome-shell.changes 2020-01-15 15:04:54.893888028 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.gnome-shell.new.26092/gnome-shell.changes 2020-01-30 14:51:33.706939524 +0100 @@ -2 +2 @@ -Wed May 8 06:55:22 UTC 2019 - Chingkai <qkzhu(a)suse.com> +Sun Jan 05 14:37:40 UTC 2020 - bjorn.lie(a)gmail.com @@ -4,4 +4,2 @@ -- Add gnome-shell-partial-screenlock-bypass-CVE-2019-3820.patch: - + shellActionModes: disable POPUP keybindings in unlock screen - + panel: Don't allow opening hidden menus via keybindings - (bsc#1124493, glgo#GNOME/gnome-shell#851, CVE-2019-3820). +- Update to version 3.34.3+0: + * Bump verion to 3.34.3 @@ -10 +8,433 @@ -Mon Apr 1 01:19:37 UTC 2019 - xwang(a)suse.com +Mon Dec 30 10:08:06 UTC 2019 - Frederic Crozat <fcrozat(a)suse.com> + +- Update BuildRequires for latest release of gnome-desktop-3 + to get systemd scope support for launched applications. +- Update BuildRequires to mutter libraries >= 3.34.0 and + gsettings-desktop-schemas >= 3.33.1. + +------------------------------------------------------------------- +Fri Dec 27 09:05:56 UTC 2019 - dimstar(a)opensuse.org + +- Update to version 3.34.2+2: + * polkitAgent: Only set key focus to password entry after opening dialog + +------------------------------------------------------------------- +Tue Dec 24 11:30:30 UTC 2019 - dimstar(a)opensuse.org + +- Update to version 3.34.2+1: + * keyboard: Stop accessing deprecated actor property + +------------------------------------------------------------------- +Fri Dec 13 06:30:17 UTC 2019 - dead_mozay(a)opensuse.org + +- Update to version 3.34.2+0: + * popupMenu: Close when a system modal pops up + * switcherPopup: Dismiss when a system modal dialog opens + * weather: Only require auto-location authorization if sandboxed + * util: Place spawned processes into a systemd scope + * shell-global: Place launched applications into a systemd scope + * Update Malay translation + * closeDialog: Fix scale of dialog for x11 clients in Wayland sessions + * switcherPopup: Fix scrollable check + * calendar-server: Use correct timezone for all-day events + * theme: Add light styling to message buttons + * Update Chinese (Taiwan) translation + * appIcon: Draw running dot above the overview icon + * texture-cache: Remove also scaled keys from the cache + * data: Enable clean session shutdown after gnome-shell failure + * extensionSystem: Create a file to flag that extensions are being loaded + * extensions-tool: Fix removing from settings list + * introspect: Fix whitelist check + * theme: Add :active styling to message-close and media control buttons + * theme: Add message close button styling + * theme: Darken hovered message-media-control button + * magnifier: Use new cursor tracker API to keep wayland focus while hidden + * magnifier: Use own showSystemCursor() instead of set_pointer_visible() + * Update Brazilian Portuguese translation + * polkitAgent: Use dialog as confirmation when the user has no password + * polkitAgent: Update user name on user changes + * polkitAgent: Fix a typo of a signal name + * appDisplay: Add a timeout when switching pages during DnD + * appDisplay: Add threshold after overshoot page switches + * appDisplay: Simplify event blocking while folder is opened + * appDisplay: Ensure we don't recreate existing AppIcons for folders + * appDisplay: Add missing .actor + * keyboard: Try harder to find a matching layout + * screenShield: Replace child properties + * switcherPopup: Fix last commit + * switcherPopup: Improve modifier-less keybinding navigation + * switcherPopup: Use roundtrip time when the popup is modifier-less + * appDisplay: Don't crash if app is missing categories + * panel: Update window section items on title changes + * power: Handle "100% but charging" case + * closeDialog: Fix dialog size when using geometry scaling + * appIcon: Remove drag monitor on destroy + * folderView: Reset schemas before removing the folder + * baseAppView: Destroy icon when removing + * allView: Rename variable + * allView, frequentView: Only create icons when necessary + * polkitAgent: Fix spinner + * Increase .calendar-today visibility + * appMenu: Hide stopped spinner actor + * animation: Add parameter for hiding stopped Spinner actor + * animation: Turn Spinner animate parameter into Params option + +------------------------------------------------------------------- +Thu Nov 21 15:58:13 UTC 2019 - Frederic Crozat <fcrozat(a)suse.com> + +- Update gnome-shell-domain.patch to fix syntax errors. + +------------------------------------------------------------------- +Tue Nov 19 12:09:59 UTC 2019 - dimstar(a)opensuse.org + +- Update to version 3.34.1+14: + * windowManager: Replace left-over calls to _removeEffect() + * Update Russian translation + * windowManager: Complete interrupted size change effects + * windowManager: Use Sets to track ongoing effects + * ci: Fix checking out mutter on stable branches + * theme: Adjust system-menu-action buttons + * calendar-server: Uses wrong timezone for event times + +------------------------------------------------------------------- +Fri Nov 1 08:03:00 UTC 2019 - Alynx Zhou <alynx.zhou(a)suse.com> + +- Rebase patch gnome-shell-domain.patch and + gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch. + +------------------------------------------------------------------- +Wed Oct 30 15:41:25 UTC 2019 - dimstar(a)opensuse.org + +- Update to version 3.34.1+7: + * dnd: Skip drag target when its acceptDrop() throws an exception + +------------------------------------------------------------------- +Wed Oct 23 18:16:39 UTC 2019 - bjorn.lie(a)gmail.com + +- Update to version 3.34.1+6: + + shell-screenshots: Do not pass a clip for window screenshots. + + workspace: Sort windows in overview grid using cached center. + + screenShield: Compute lock timeout fade duration using + animation settings. + + environment: Only disable unredirection of ongoing transitions. + + js: Replace Tweener time leftovers with ease duration. + + animation: Finish porting to clutter transitions. + +------------------------------------------------------------------- +Wed Oct 9 10:26:03 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 3.34.1: + + Fix "Frequent" view icons disappearing on hover + + Allow editing app folder names. + + Skip property transitions while hidden. + + Make menu animations more consistent. + + Improve performance when enabling/disabling all extensions. + + Fix extra icons appearing in "Frequent" view animation. + + Fix fading out desktop icons. + + Fix box-shadow glitch with prerendered resources. + + Fix accidentally skipped animations. + + Fix screenshots and window animations when scaled. + + Don't leak NOTIFY_SOCKET environment variable to applications. + + Fix lock-up on X11 when ibus is already running on startup. + + Fix screen dimming on idle. + + Do not notify systemd before initialization is complete. + + Support SAE secrets in network agent. + + Fix various regressions with dynamic workspaces. + + Fixed crashes. + + Misc. bug fixes and cleanups. + + Updated translations. + +------------------------------------------------------------------- +Sat Sep 21 17:10:28 UTC 2019 - bjorn.lie(a)gmail.com + +- Update to version 3.34.0+148: + + shell-util: Do not scale the clip in + get_content_for_window_actor() + + Update Galician translation + + screenShield: Stop using deprecated actor property + + unlockDialog: Use inheritance instead of composition + + loginDialog: Stop using deprecated actor property + + environment: Try harder to find a transition + + layout: Don't use the actors pick workaround on update regions + + renameFolderMenu: Use a custom menu item inheriting from + PopupBaseMenuItem + + renameFolderMenu: Move to non-legacy coding style + + renameFolderMenu: Set the entry as menu focus actor + + popupMenu: Add focusActor property to define the default focus + actor + + popupBaseMenuItem: Add support for Hidden Ornament + + renameFolderMenu: Don't save the source + + folderIcon: Remove duplicated addMenu call + + workspace: Fix an incorrect signal check + + appDisplay: Animate DnD app icons at the position they were + dropped + + appDisplay: Add API to animate launch at given position + + workspace: Return results of forwarded acceptDrop + + overview: Only accept AppIcon drops if the app can open a new + window + + shell-app: Never allow opening new windows while an app is + starting + + workspace: Use AppIcon.app to check action-support by the drag + source + + introspect: Check whitelist also for GetRunningWindows() + + st: Fix box-shadow drawing with prerendered_texture + + workspace: Remove unused properties of WindowClone + + viewSelector: Only reset search entry if it has key focus + + workspace: Reset idle hide timeout for overlays on reentry + + workspace: Make title of overlay reactive + + workspace: Continue overlay idle hide timeout when pointing at + close button + + Updated translations. + +------------------------------------------------------------------- +Tue Sep 17 09:11:28 UTC 2019 - bjorn.lie(a)gmail.com + +- Update to version 3.34.0+117: + + util: Handle trailing LTR/RTL markers in URLs ++++ 833 more lines (skipped) ++++ between /work/SRC/openSUSE:Leap:15.2/gnome-shell/gnome-shell.changes ++++ and /work/SRC/openSUSE:Leap:15.2/.gnome-shell.new.26092/gnome-shell.changes Old: ---- gnome-shell-1127231-fixesof4-JS-invalid-access.patch gnome-shell-1127231-workspace-JS-invalid-access.patch gnome-shell-3.26.2+20180130.0d9c74212.tar.xz gnome-shell-fix-menutrackeritem-leak.patch gnome-shell-meson.patch gnome-shell-osk-dont-popup-when-not-needed.patch gnome-shell-partial-screenlock-bypass-CVE-2019-3820.patch gnome-shell-private-Avoid-unnecessary-conversions-in-shadow-comp.patch gnome-shell-screenShield-Handle-signal-StatusChanged.patch gnome-shell-st-Do-not-force-allocation-updates-during-shadow-creation.patch New: ---- gnome-shell-3.34.3+0.obscpio gnome-shell-jscSLE9267-Remove-sessionList-of-endSessionDialog.patch gnome-shell.obsinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-shell.spec ++++++ --- /var/tmp/diff_new_pack.bBGuan/_old 2020-01-30 14:51:34.442939915 +0100 +++ /var/tmp/diff_new_pack.bBGuan/_new 2020-01-30 14:51:34.442939915 +0100 @@ -1,7 +1,7 @@ # # spec file for package gnome-shell # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,51 +12,37 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %global __requires_exclude typelib\$Meta\$ + Name: gnome-shell -Version: 3.26.2+20180130.0d9c74212 +Version: 3.34.3+0 Release: 0 Summary: GNOME Shell -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/GUI/GNOME -Url: https://wiki.gnome.org/Projects/GnomeShell -#Source0: https://download.gnome.org/sources/gnome-shell/3.26/%%{name}-%%{version}.ta… +URL: https://wiki.gnome.org/Projects/GnomeShell Source: %{name}-%{version}.tar.xz -# SOURCE-FEATURE-SLE aboutMenu fate#314545 dliang(a)suse.com -- Add an applet on login UI to display suse icon, product name, hostname. -Source2: aboutMenu.js -# SOURCE-FEATURE-SLE sle-background bsc#1007468 xwang(a)suse.com -- Add SUSE logo on lock screen for GNOME theme -Source3: sle-background.png -# PATCH-FIX-OPENSUSE gnome-shell-meson.patch dimstar(a)opensuse.org -- Fix rpath statement for gvc (needs validation, upstream fix) -Patch0: gnome-shell-meson.patch # PATCH-FIX-UPSTREAM gnome-shell-private-connection.patch bnc#751211 bgo#646187 dimstar(a)opensuse.org -- create private connections if the user is not authorized Patch1: gnome-shell-private-connection.patch -# PATCH-FIX-OPENSUSE gnome-shell-disable-ibus-when-not-installed.patch bsc#987360 qzhao(a)suse.com -- disable ibus start when outof Chinese, Japanese, Korean area. +# SOURCE-FEATURE-SLE aboutMenu fate#314545 dliang(a)suse.com -- Add an applet on login UI to display suse icon, product name, hostname. +Source1: aboutMenu.js +# SOURCE-FEATURE-SLE sle-background bsc#1007468 xwang(a)suse.com -- Add SUSE logo on lock screen for GNOME theme +Source2: sle-background.png + +# PATCH-FIX-OPENSUSE gnome-shell-disable-ibus-when-not-installed.patch bsc#987360 qzhao(a)suse.com -- disable ibus start when outof Chinese, Japanese, Korean area Patch2: gnome-shell-disable-ibus-when-not-installed.patch # PATCH-FIX-UPSTREAM gnome-shell-Avoid-loginDialog-grab-focus-when-locked.patch bsc#1058521 bgo#788169 xwang(a)suse.com -- Avoid login dialog grabs focus when screen locked Patch3: gnome-shell-Avoid-loginDialog-grab-focus-when-locked.patch -# PATCH-FIX-UPSTREAM gnome-shell-osk-dont-popup-when-not-needed.patch bgo#788188 badshah400(a)gmail.com -- Stop the on-screen keyboard from showing up when touchscreen use doesn't activate a text field; patch taken from upstream bug report -Patch4: gnome-shell-osk-dont-popup-when-not-needed.patch -# PATCH-FIX-UPSTREAM gnome-shell-private-Avoid-unnecessary-conversions-in-shadow-comp.patch bgo#788627 bsc#1084341 xwang(a)suse.com -- Avoid unnecessary conversions in shadow computation -Patch5: gnome-shell-private-Avoid-unnecessary-conversions-in-shadow-comp.patch -# PATCH-FIX-UPSTREAM gnome-shell-st-Do-not-force-allocation-updates-during-shadow-creation.patch bgo#788908 bsc#1084341 xwang(a)suse.com -- Do not force allocation updates during shadow creation -Patch6: gnome-shell-st-Do-not-force-allocation-updates-during-shadow-creation.patch -# PATCH-FEATURE-OPENSUSE gnome-shell-fate324570-Make-GDM-background-image-configurable.patch fate#324570, glgo#GNOME/gnome-shell#680, bsc#1120178 qkzhu(a)suse.com -- Make GDM background image configurable -Patch7: gnome-shell-fate324570-Make-GDM-background-image-configurable.patch -# PATCH-FIX-UPSTREAM gnome-shell-fix-menutrackeritem-leak.patch glgo#GNOME/gnome-shell!50, bsc#1093541 hpj(a)suse.com -- Fix a small memory leak -Patch8: gnome-shell-fix-menutrackeritem-leak.patch -# PATCH-FIX-UPSTREAM gnome-shell-1127231-workspace-JS-invalid-access.patch glgo#GNOME/gnome-shell!143, bgo#791233, bsc#1127231 qkzhu(a)suse.com -- fixes for some JS warnings of workspace -Patch9: gnome-shell-1127231-workspace-JS-invalid-access.patch -# PATCH-FIX-UPSTREAM gnome-shell-1127231-fixesof4-JS-invalid-access.patch glgo#GNOME/gnome-shell!209, bgo#791233, bsc#1127231 qkzhu(a)suse.com -- 4 Javascript invalid access fixes -Patch10: gnome-shell-1127231-fixesof4-JS-invalid-access.patch -# PATCH-FIX-UPSTREAM gnome-shell-screenShield-Handle-signal-StatusChanged.patch bsc#1118286 glgo#GNOME/gnome-shell#900 xwang(a)suse.com -- Enable dimming screen when screen is locked -Patch11: gnome-shell-screenShield-Handle-signal-StatusChanged.patch -# PATCH-FIX-UPSTREAM gnome-shell-partial-screenlock-bypass-CVE-2019-3820.patch bsc#1124493, glgo#GNOME/gnome-shell#851, CVE-2019-3820 qkzhu(a)suse.com -- Partial screenlock bypass fix -Patch12: gnome-shell-partial-screenlock-bypass-CVE-2019-3820.patch +# PATCH-FEATURE-OPENSUSE gnome-shell-fate324570-Make-GDM-background-image-configurable.patch fate#324570, glgo#GNOME/gnome-shell#680 qkzhu(a)suse.com -- make GDM background image configurable +Patch4: gnome-shell-fate324570-Make-GDM-background-image-configurable.patch +# PATCH-FEATURE-OPENSUSE gnome-shell-jscSLE9267-Remove-sessionList-of-endSessionDialog.patch jsc#SLE-9267 qkzhu(a)suse.com -- Remove sessionList of endSessionDialog +Patch5: gnome-shell-jscSLE9267-Remove-sessionList-of-endSessionDialog.patch + ## NOTE: Keep SLE-only patches at bottom (starting on 1000). # PATCH-FEATURE-SLE gnome-shell-gdm-login-applet.patch fate#314545 dliang(a)suse.com -- Add an applet on login UI to display suse icon, product name, hostname. Patch1001: gnome-shell-gdm-login-applet.patch @@ -76,54 +62,58 @@ Patch1008: gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch # needed for directory ownership +BuildRequires: asciidoc BuildRequires: dbus-1 BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gtk-doc -BuildRequires: meson +BuildRequires: meson >= 0.47.0 BuildRequires: pkgconfig +BuildRequires: sassc +BuildRequires: translation-update-upstream BuildRequires: xsltproc BuildRequires: pkgconfig(atk-bridge-2.0) BuildRequires: pkgconfig(gcr-base-3) >= 3.7.5 BuildRequires: pkgconfig(gdk-pixbuf-2.0) -BuildRequires: pkgconfig(gio-2.0) >= 2.53.0 -BuildRequires: pkgconfig(gjs-1.0) >= 1.47.0 +BuildRequires: pkgconfig(gdk-x11-3.0) +BuildRequires: pkgconfig(gio-2.0) >= 2.56.0 +BuildRequires: pkgconfig(gio-unix-2.0) >= 2.56.0 +BuildRequires: pkgconfig(gjs-1.0) >= 1.57.3 +BuildRequires: pkgconfig(gnome-autoar-0) BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= 3.9.0 -BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.7.90 +BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.34.2 BuildRequires: pkgconfig(gnome-keybindings) +BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.49.1 -BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.21.2 +BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.33.1 BuildRequires: pkgconfig(gstreamer-1.0) >= 0.11.92 BuildRequires: pkgconfig(gstreamer-base-1.0) BuildRequires: pkgconfig(gtk+-3.0) >= 3.15.0 +BuildRequires: pkgconfig(ibus-1.0) >= 1.5.2 BuildRequires: pkgconfig(json-glib-1.0) >= 0.13.2 BuildRequires: pkgconfig(libcanberra) BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libcroco-0.6) >= 0.6.8 +BuildRequires: pkgconfig(libecal-2.0) >= 3.33.1 BuildRequires: pkgconfig(libedataserver-1.2) >= 3.17.2 BuildRequires: pkgconfig(libgnome-menu-3.0) >= 3.5.3 -BuildRequires: pkgconfig(libmutter-1) >= 3.26.1 -BuildRequires: pkgconfig(libnm-glib) -BuildRequires: pkgconfig(libnm-gtk) >= 0.9.8 -BuildRequires: pkgconfig(libnm-util) >= 0.9.8 +BuildRequires: pkgconfig(libmutter-5) >= 3.34.0 +BuildRequires: pkgconfig(libnm) >= 1.10.4 BuildRequires: pkgconfig(libpulse) >= 2.0 BuildRequires: pkgconfig(libpulse-mainloop-glib) -BuildRequires: pkgconfig(libsecret-unstable) +BuildRequires: pkgconfig(libsecret-1) >= 0.18 BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(libstartup-notification-1.0) >= 0.11 BuildRequires: pkgconfig(libsystemd) -BuildRequires: pkgconfig(mutter-clutter-1) >= 3.26.0 -BuildRequires: pkgconfig(mutter-cogl-pango-1) >= 3.25.2 +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(mutter-clutter-5) >= 3.34.0 +BuildRequires: pkgconfig(mutter-cogl-5) >= 3.34.0 +BuildRequires: pkgconfig(mutter-cogl-pango-5) >= 3.34.0 BuildRequires: pkgconfig(polkit-agent-1) >= 0.100 -BuildRequires: pkgconfig(xtst) +BuildRequires: pkgconfig(x11) BuildRequires: python(abi) >= 3 - Requires: gdk-pixbuf-loader-rsvg -## Finally, dependencies for session services that are needed for system icons and the user menu -# bluetooth system icon -# (lowered to recommends due to bsc#1067603, some setups without bluetooth might want to avoid this dependency) -Recommends: gnome-bluetooth # "System settings" menu item Requires: gnome-control-center Requires: gnome-session @@ -134,17 +124,18 @@ Requires: gsettings-desktop-schemas # Due to now private typelib(Meta) Requires: mutter +Requires: typelib(Rsvg) Recommends: %{name}-calendar -Recommends: %{name}-lang -# network system icon -Recommends: NetworkManager-gnome +## Finally, dependencies for session services that are needed for system icons and the user menu +# bluetooth system icon +# (lowered to recommends due to bsc#1067603, some setups without bluetooth might want to avoid this dependency) +Recommends: gnome-bluetooth # The dateTime applet in the panel launches gnome-clocks upon user request Recommends: gnome-clocks # gnome-shell implements the dbus interface org.freedesktop.Notifications directly Provides: dbus(org.freedesktop.Notifications) -%if !0%{?is_opensuse} -BuildRequires: translation-update-upstream -%endif +# gnome-shell-browser-plugin dropped in 3.31.4 +Obsoletes: gnome-shell-browser-plugin <= %{version} %description The GNOME Shell redefines user interactions with the GNOME desktop. In @@ -161,19 +152,6 @@ particular, it offers new paradigms for launching applications, accessing documents, and organizing open windows in GNOME. -%package browser-plugin -Summary: GNOME Shell Browser Plugin for the Extensions Repository -Group: System/GUI/GNOME -Requires: %{name} = %{version} -Supplements: packageand(%{name}:epiphany) - -%description browser-plugin -The GNOME Shell Browser Plugin provides integration with gnome-shell -and the corresponding extensions repository. The plugin allows the -extensions repository to provide good integration, letting the website -know which extensions are enabled and disabled, and allowing the website -to enable, disable and install them. - %package calendar Summary: Evolution Calendar support for GNOME Shell Group: System/GUI/GNOME @@ -190,19 +168,13 @@ %prep %setup -q -%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 + +translation-update-upstream %if !0%{?is_opensuse} %patch1001 -p1 @@ -213,21 +185,20 @@ %patch1006 -p1 %patch1007 -p1 %patch1008 -p1 -translation-update-upstream %endif + %if !0%{?is_opensuse} -cp %{SOURCE2} js/ui/ -cp %{SOURCE3} data/theme/ +cp %{SOURCE1} js/ui/ +cp %{SOURCE2} data/theme/ %endif %build %meson \ --libexecdir=%{_libexecdir}/%{name} \ - -D enable-browser-plugin=true \ - -D enable-documentation=true \ - -D enable-man=true \ - -D enable-networkmanager=yes \ - -D enable-systemd=yes \ + -Dgtk_doc=true \ + -Dman=true \ + -Dnetworkmanager=true \ + -Dsystemd=true \ %{nil} %meson_build @@ -244,8 +215,9 @@ %files %license COPYING -%doc README NEWS +%doc README.md NEWS %{_bindir}/gnome-shell +%{_bindir}/gnome-extensions %{_bindir}/gnome-shell-extension-prefs %dir %{_libdir}/gnome-shell %dir %{_libexecdir}/gnome-shell @@ -255,7 +227,7 @@ %{_libexecdir}/gnome-shell/gnome-shell-portal-helper %{_libdir}/gnome-shell/Gvc-1.0.typelib %{_libdir}/gnome-shell/Shell-0.1.typelib -%{_libdir}/gnome-shell/ShellMenu-0.1.typelib +#%%{_libdir}/gnome-shell/ShellMenu-0.1.typelib %{_libdir}/gnome-shell/St-1.0.typelib %{_libdir}/gnome-shell/libgnome-shell-menu.so %{_libdir}/gnome-shell/libgnome-shell.so @@ -267,6 +239,8 @@ %{_datadir}/applications/org.gnome.Shell.desktop %{_datadir}/applications/gnome-shell-extension-prefs.desktop %{_datadir}/applications/org.gnome.Shell.PortalHelper.desktop +%{_datadir}/dbus-1/interfaces/org.gnome.Shell.Extensions.xml +%{_datadir}/dbus-1/interfaces/org.gnome.Shell.Introspect.xml %{_datadir}/dbus-1/interfaces/org.gnome.Shell.PadOsd.xml %{_datadir}/dbus-1/interfaces/org.gnome.Shell.Screencast.xml %{_datadir}/dbus-1/interfaces/org.gnome.Shell.Screenshot.xml @@ -280,25 +254,31 @@ %dir %{_datadir}/gnome-shell/extensions %dir %{_datadir}/gnome-shell/search-providers %dir %{_datadir}/gnome-shell/modes +%{_datadir}/gnome-shell/gnome-shell-dbus-interfaces.gresource %{_datadir}/gnome-shell/gnome-shell-theme.gresource +%{_datadir}/gnome-shell/gnome-shell-osk-layouts.gresource %{_datadir}/gnome-shell/perf-background.xml %{_mandir}/man?/gnome-shell.?%{ext_man} +%{_mandir}/man?/gnome-extensions.?%{ext_man} %dir %{_datadir}/xdg-desktop-portal %dir %{_datadir}/xdg-desktop-portal/portals %{_datadir}/xdg-desktop-portal/portals/gnome-shell.portal +%{_userunitdir}/gnome-shell-wayland.target +%{_userunitdir}/gnome-shell-x11.target +%{_userunitdir}/gnome-shell-wayland.service +%{_userunitdir}/gnome-shell-x11.service +%{_userunitdir}/gnome-shell-disable-extensions.service +%{_sysconfdir}/xdg/autostart/gnome-shell-overrides-migration.desktop +%{_libexecdir}/gnome-shell/gnome-shell-overrides-migration.sh +%{_datadir}/glib-2.0/schemas/00_org.gnome.shell.gschema.override %files devel +%doc HACKING.md %doc %{_datadir}/gtk-doc/html %{_bindir}/gnome-shell-extension-tool %{_bindir}/gnome-shell-perf-tool %{_datadir}/gnome-shell/*.gir -%files browser-plugin -%doc browser-plugin/README -%dir %{_libdir}/mozilla/plugins/ -%dir %{_libdir}/mozilla -%{_libdir}/mozilla/plugins/libgnome-shell-browser-plugin.* - %files calendar %{_datadir}/applications/evolution-calendar.desktop %{_libexecdir}/gnome-shell/gnome-shell-calendar-server ++++++ _service ++++++ --- /var/tmp/diff_new_pack.bBGuan/_old 2020-01-30 14:51:34.470939930 +0100 +++ /var/tmp/diff_new_pack.bBGuan/_new 2020-01-30 14:51:34.470939930 +0100 @@ -1,16 +1,16 @@ - <services> - <service mode="disabled" name="tar_scm"> + <service name="obs_scm" mode="disabled" > <param name="url">https://gitlab.gnome.org/GNOME/gnome-shell.git</param> <param name="scm">git</param> - <param name="revision">gnome-3-26</param> - <param name="versionformat">3.26.2+%cd.%h</param> + <param name="revision">gnome-3-34</param> + <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param> <param name="changesgenerate">enable</param> </service> - <service mode="disabled" name="recompress"> + <service name="tar" mode="buildtime"/> + <service name="recompress" mode="buildtime"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> - <service mode="disabled" name="set_version" /> + <service name="set_version" mode="disabled" /> </services> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.bBGuan/_old 2020-01-30 14:51:34.486939939 +0100 +++ /var/tmp/diff_new_pack.bBGuan/_new 2020-01-30 14:51:34.486939939 +0100 @@ -1,6 +1,4 @@ <servicedata> <service name="tar_scm"> - <param name="url">git://git.gnome.org/gnome-shell</param> - <param name="changesrevision">15b1810a615ec34f375395f4b93bef3eee04b85e</param></service><service name="tar_scm"> <param name="url">https://gitlab.gnome.org/GNOME/gnome-shell.git</param> - <param name="changesrevision">0d9c742127f4a79416478b46a9fa5273701d92e3</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">f7fe7bc676b0cae37405b941822ba9f2b989add6</param></service></servicedata> \ No newline at end of file ++++++ gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch ++++++ --- /var/tmp/diff_new_pack.bBGuan/_old 2020-01-30 14:51:34.510939952 +0100 +++ /var/tmp/diff_new_pack.bBGuan/_new 2020-01-30 14:51:34.510939952 +0100 @@ -1,37 +1,37 @@ -Index: gnome-shell-3.26.0/data/gnome-shell-theme.gresource.xml +Index: gnome-shell-3.34.1+7/data/gnome-shell-theme.gresource.xml =================================================================== ---- gnome-shell-3.26.0.orig/data/gnome-shell-theme.gresource.xml -+++ gnome-shell-3.26.0/data/gnome-shell-theme.gresource.xml -@@ -38,5 +38,6 @@ +--- gnome-shell-3.34.1+7.orig/data/gnome-shell-theme.gresource.xml ++++ gnome-shell-3.34.1+7/data/gnome-shell-theme.gresource.xml +@@ -31,5 +31,6 @@ + <file>toggle-on.svg</file> + <file>toggle-on-dark.svg</file> <file>toggle-on-hc.svg</file> - <file>ws-switch-arrow-up.png</file> - <file>ws-switch-arrow-down.png</file> + <file>sle-background.png</file> </gresource> </gresources> -Index: gnome-shell-3.26.0/data/theme/gnome-shell.css +Index: gnome-shell-3.34.1+7/data/theme/gnome-shell-sass/_common.scss =================================================================== ---- gnome-shell-3.26.0.orig/data/theme/gnome-shell.css -+++ gnome-shell-3.26.0/data/theme/gnome-shell.css -@@ -1599,6 +1599,9 @@ StScrollBar { - padding-top: 24px; - max-width: 23em; } +--- gnome-shell-3.34.1+7.orig/data/theme/gnome-shell-sass/_common.scss ++++ gnome-shell-3.34.1+7/data/theme/gnome-shell-sass/_common.scss +@@ -1919,6 +1919,9 @@ StScrollBar { + max-width: 23em; + } +.login-dialog-sle { + background: #2e3436 url(sle-background.png); } + .login-dialog { + //reset border: none; - background-color: transparent; } -Index: gnome-shell-3.26.0/js/ui/unlockDialog.js +Index: gnome-shell-3.34.1+7/js/ui/unlockDialog.js =================================================================== ---- gnome-shell-3.26.0.orig/js/ui/unlockDialog.js -+++ gnome-shell-3.26.0/js/ui/unlockDialog.js -@@ -37,6 +37,7 @@ var UnlockDialog = new Lang.Class({ - layout_manager: new Clutter.BoxLayout(), - visible: false }); +--- gnome-shell-3.34.1+7.orig/js/ui/unlockDialog.js ++++ gnome-shell-3.34.1+7/js/ui/unlockDialog.js +@@ -23,6 +23,7 @@ var UnlockDialog = GObject.registerClass + visible: false, + }); -+ this.actor.add_style_class_name('login-dialog-sle'); - this.actor.add_constraint(new Layout.MonitorConstraint({ primary: true })); - parentActor.add_child(this.actor); ++ this.add_style_class_name('login-dialog-sle'); + this.add_constraint(new Layout.MonitorConstraint({ primary: true })); + parentActor.add_child(this); ++++++ gnome-shell-864872-unlock-by-mouse-motion.patch ++++++ --- /var/tmp/diff_new_pack.bBGuan/_old 2020-01-30 14:51:34.522939958 +0100 +++ /var/tmp/diff_new_pack.bBGuan/_new 2020-01-30 14:51:34.522939958 +0100 @@ -1,30 +1,30 @@ -Index: gnome-shell-3.24.2/js/ui/screenShield.js -=================================================================== ---- gnome-shell-3.24.2.orig/js/ui/screenShield.js -+++ gnome-shell-3.24.2/js/ui/screenShield.js -@@ -438,6 +438,8 @@ const ScreenShield = new Lang.Class({ +diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js +index 7b154f2..ff7315d 100644 +--- a/js/ui/screenShield.js ++++ b/js/ui/screenShield.js +@@ -431,6 +431,8 @@ var ScreenShield = class { this.actor = Main.layoutManager.screenShieldGroup; this._lockScreenState = MessageTray.State.HIDDEN; + this._last_x = -1; + this._last_y = -1; - this._lockScreenGroup = new St.Widget({ x_expand: true, - y_expand: true, - reactive: true, -@@ -447,6 +449,8 @@ const ScreenShield = new Lang.Class({ - }); + this._lockScreenGroup = new St.Widget({ + x_expand: true, + y_expand: true, +@@ -441,6 +443,8 @@ var ScreenShield = class { + }); this._lockScreenGroup.connect('key-press-event', - Lang.bind(this, this._onLockScreenKeyPress)); + this._onLockScreenKeyPress.bind(this)); + this._lockScreenGroup.connect('motion-event', -+ Lang.bind(this, this._onLockScreenMotion)); ++ this._onLockScreenMotion.bind(this)); this._lockScreenGroup.connect('scroll-event', - Lang.bind(this, this._onLockScreenScroll)); + this._onLockScreenScroll.bind(this)); Main.ctrlAltTabManager.addGroup(this._lockScreenGroup, _("Lock"), 'changes-prevent-symbolic'); -@@ -686,6 +690,25 @@ const ScreenShield = new Lang.Class({ +@@ -720,6 +724,25 @@ var ScreenShield = class { return Clutter.EVENT_STOP; - }, + } -+ _onLockScreenMotion: function(actor, event) { ++ _onLockScreenMotion(actor, event) { + if (this._lockScreenState != MessageTray.State.SHOWN) + return false; + let [X, Y] = event.get_coords(); @@ -41,12 +41,12 @@ + if (distance >= min_distance) + this._liftShield(true, 0); + return true; -+ }, ++ } + - _onLockScreenScroll: function(actor, event) { + _onLockScreenScroll(actor, event) { if (this._lockScreenState != MessageTray.State.SHOWN) return Clutter.EVENT_PROPAGATE; -@@ -1005,6 +1028,8 @@ const ScreenShield = new Lang.Class({ +@@ -1036,6 +1059,8 @@ var ScreenShield = class { return; this._ensureLockScreen(); ++++++ gnome-shell-Avoid-loginDialog-grab-focus-when-locked.patch ++++++ --- /var/tmp/diff_new_pack.bBGuan/_old 2020-01-30 14:51:34.530939962 +0100 +++ /var/tmp/diff_new_pack.bBGuan/_new 2020-01-30 14:51:34.530939962 +0100 @@ -1,4 +1,4 @@ -From 8a46458bf59300fb73ac4d1271c80c5b9ab571c4 Mon Sep 17 00:00:00 2001 +From 83b01d946517b5995e6423582de13307af91716b Mon Sep 17 00:00:00 2001 From: Xiaoguang Wang <xwang(a)suse.com> Date: Tue, 26 Sep 2017 16:54:15 +0800 Subject: [PATCH] gdm: Avoid loginDialog grab focus when locked @@ -9,19 +9,19 @@ 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js -index 1cae3db85..b83129150 100644 +index 6c4d135..cfc445b 100644 --- a/js/gdm/loginDialog.js +++ b/js/gdm/loginDialog.js -@@ -1128,7 +1128,8 @@ var LoginDialog = new Lang.Class({ +@@ -1119,7 +1119,8 @@ var LoginDialog = GObject.registerClass({ this._sessionMenuButton.close(); this._setUserListExpanded(true); this._notListedButton.show(); - this._userList.actor.grab_key_focus(); + if (!Main.screenShield.locked) + this._userList.actor.grab_key_focus(); - }, + } - _beginVerificationForItem: function(item) { + _beginVerificationForItem(item) { -- -2.12.3 +2.16.4 ++++++ gnome-shell-disable-ibus-when-not-installed.patch ++++++ --- /var/tmp/diff_new_pack.bBGuan/_old 2020-01-30 14:51:34.538939966 +0100 +++ /var/tmp/diff_new_pack.bBGuan/_new 2020-01-30 14:51:34.538939966 +0100 @@ -1,15 +1,27 @@ -Index: gnome-shell-3.26.0/js/misc/ibusManager.js -=================================================================== ---- gnome-shell-3.26.0.orig/js/misc/ibusManager.js -+++ gnome-shell-3.26.0/js/misc/ibusManager.js -@@ -45,6 +45,10 @@ var IBusManager = new Lang.Class({ - _PRELOAD_ENGINES_DELAY_TIME: 30, // sec +From d8109a8e9db11cc7374faba3264b9f00dc5e1699 Mon Sep 17 00:00:00 2001 +From: Chingkai <qkzhu(a)suse.com> +Date: Wed, 13 Mar 2019 14:50:22 +0800 +Subject: [PATCH] Disable ibus when out of CJK + +--- + js/misc/ibusManager.js | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/js/misc/ibusManager.js b/js/misc/ibusManager.js +index d20ad2f..0595573 100644 +--- a/js/misc/ibusManager.js ++++ b/js/misc/ibusManager.js +@@ -31,6 +31,10 @@ function getIBusManager() { - _init: function() { + var IBusManager = class { + constructor() { + let daemon = Gio.File.new_for_path('/usr/bin/ibus-daemon'); + if (!daemon.query_exists(null)) + return; + - if (!IBus) - return; + IBus.init(); + // This is the longest we'll keep the keyboard frozen until an input +-- +2.16.4 + ++++++ gnome-shell-domain.patch ++++++ --- /var/tmp/diff_new_pack.bBGuan/_old 2020-01-30 14:51:34.542939969 +0100 +++ /var/tmp/diff_new_pack.bBGuan/_new 2020-01-30 14:51:34.546939971 +0100 @@ -1,7 +1,7 @@ -Index: gnome-shell-3.26.0/js/gdm/domain.js +Index: gnome-shell-3.34.1+7/js/gdm/domain.js =================================================================== --- /dev/null -+++ gnome-shell-3.26.0/js/gdm/domain.js ++++ gnome-shell-3.34.1+7/js/gdm/domain.js @@ -0,0 +1,243 @@ +// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- +/* @@ -246,21 +246,21 @@ + } +}); +Signals.addSignalMethods(DomainMenuButton.prototype); -Index: gnome-shell-3.26.0/js/gdm/loginDialog.js +Index: gnome-shell-3.34.1+7/js/gdm/loginDialog.js =================================================================== ---- gnome-shell-3.26.0.orig/js/gdm/loginDialog.js -+++ gnome-shell-3.26.0/js/gdm/loginDialog.js -@@ -33,6 +33,7 @@ const Signals = imports.signals; - const St = imports.gi.St; +--- gnome-shell-3.34.1+7.orig/js/gdm/loginDialog.js ++++ gnome-shell-3.34.1+7/js/gdm/loginDialog.js +@@ -22,6 +22,7 @@ const { AccountsService, Atk, Clutter, G + const Signals = imports.signals; const AuthPrompt = imports.gdm.authPrompt; +const Domain = imports.gdm.domain; const Batch = imports.gdm.batch; const BoxPointer = imports.ui.boxpointer; const CtrlAltTab = imports.ui.ctrlAltTab; -@@ -452,6 +453,14 @@ var LoginDialog = new Lang.Class({ +@@ -437,6 +438,14 @@ var LoginDialog = GObject.registerClass( this._authPrompt.hide(); - this.actor.add_child(this._authPrompt.actor); + this.add_child(this._authPrompt.actor); + this._userLayout = new St.BoxLayout({ vertical: false, + x_expand: true @@ -273,7 +273,7 @@ // translators: this message is shown below the user list on the // login screen. It can be activated to reveal an entry for // manually entering the username. -@@ -469,10 +478,24 @@ var LoginDialog = new Lang.Class({ +@@ -454,10 +463,24 @@ var LoginDialog = GObject.registerClass( this._notListedButton.hide(); @@ -300,11 +300,11 @@ this._bannerView = new St.ScrollView({ style_class: 'login-dialog-banner-view', opacity: 0, -@@ -948,6 +971,37 @@ var LoginDialog = new Lang.Class({ - })); - }, +@@ -942,6 +965,37 @@ var LoginDialog = GObject.registerClass( + }); + } -+ _askForDomainUsernameAndBeginVerification: function(domain) { ++ _askForDomainUsernameAndBeginVerification(domain) { + this._authPrompt.setPasswordChar(''); + this._authPrompt.setQuestion(this._domainMenuButton.getQuestionMessage()); + @@ -333,24 +333,24 @@ + })); + this._updateCancelButton(); + this._showPrompt(); -+ }, ++ } + - _startSession: function(serviceName) { - Tweener.addTween(this.actor, - { opacity: 0, -@@ -1116,6 +1170,11 @@ var LoginDialog = new Lang.Class({ + _startSession(serviceName) { + this._bindOpacity(); + this.ease({ +@@ -1099,6 +1153,11 @@ var LoginDialog = GObject.registerClass( this._askForUsernameAndBeginVerification(); - }, + } -+ _hideUserListAskForDomainUsernameAndBeginVerification: function() { ++ _hideUserListAskForDomainUsernameAndBeginVerification() { + this._hideUserList(); + this._askForDomainUsernameAndBeginVerification(); -+ }, ++ } + - _hideUserListAndBeginVerification: function() { + _hideUserListAndBeginVerification() { this._hideUserList(); this._authPrompt.begin(); -@@ -1128,6 +1187,9 @@ var LoginDialog = new Lang.Class({ +@@ -1111,6 +1170,9 @@ var LoginDialog = GObject.registerClass( this._sessionMenuButton.close(); this._setUserListExpanded(true); this._notListedButton.show(); @@ -359,23 +359,11 @@ + this._userLayout.show(); if (!Main.screenShield.locked) this._userList.actor.grab_key_focus(); - }, -Index: gnome-shell-3.26.0/po/POTFILES.in -=================================================================== ---- gnome-shell-3.26.0.orig/po/POTFILES.in -+++ gnome-shell-3.26.0/po/POTFILES.in -@@ -7,6 +7,7 @@ data/org.gnome.shell.gschema.xml.in - data/org.gnome.Shell.PortalHelper.desktop.in.in - js/extensionPrefs/main.js - js/gdm/authPrompt.js -+js/gdm/domain.js - js/gdm/loginDialog.js - js/gdm/util.js - js/misc/systemActions.js -Index: gnome-shell-3.26.0/js/js-resources.gresource.xml + } +Index: gnome-shell-3.34.1+7/js/js-resources.gresource.xml =================================================================== ---- gnome-shell-3.26.0.orig/js/js-resources.gresource.xml -+++ gnome-shell-3.26.0/js/js-resources.gresource.xml +--- gnome-shell-3.34.1+7.orig/js/js-resources.gresource.xml ++++ gnome-shell-3.34.1+7/js/js-resources.gresource.xml @@ -2,6 +2,7 @@ <gresources> <gresource prefix="/org/gnome/shell"> @@ -384,3 +372,15 @@ <file>gdm/batch.js</file> <file>gdm/fingerprint.js</file> <file>gdm/loginDialog.js</file> +Index: gnome-shell-3.34.1+7/po/POTFILES.in +=================================================================== +--- gnome-shell-3.34.1+7.orig/po/POTFILES.in ++++ gnome-shell-3.34.1+7/po/POTFILES.in +@@ -7,6 +7,7 @@ data/org.gnome.shell.gschema.xml.in + data/org.gnome.Shell.PortalHelper.desktop.in.in + js/extensionPrefs/main.js + js/gdm/authPrompt.js ++js/gdm/domain.js + js/gdm/loginDialog.js + js/gdm/util.js + js/misc/systemActions.js ++++++ gnome-shell-fate324570-Make-GDM-background-image-configurable.patch ++++++ --- /var/tmp/diff_new_pack.bBGuan/_old 2020-01-30 14:51:34.550939973 +0100 +++ /var/tmp/diff_new_pack.bBGuan/_new 2020-01-30 14:51:34.550939973 +0100 @@ -1,6 +1,6 @@ -From 5039e3ba630ecfcd1b7db70696d4251f53e65cd5 Mon Sep 17 00:00:00 2001 -From: Chingkai <qkzhu(a)suse.com> -Date: Thu, 15 Nov 2018 13:14:08 +0800 +From 7ec0b20a9c8c62f34203e1e93b64764f3fbd20d7 Mon Sep 17 00:00:00 2001 +From: Chingkai <chuchingkai(a)gmail.com> +Date: Fri, 19 Oct 2018 13:25:35 +0800 Subject: [PATCH] screenShield: Make login and lock screen background configurable @@ -10,26 +10,25 @@ https://gitlab.gnome.org/GNOME/gnome-shell/issues/680 --- - js/ui/screenShield.js | 42 ++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 42 insertions(+) + js/ui/screenShield.js | 41 +++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 41 insertions(+) diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js -index 9f3ff84..d5642ab 100644 +index 3f45b8a..6c09a5d 100644 --- a/js/ui/screenShield.js +++ b/js/ui/screenShield.js -@@ -37,6 +37,9 @@ const LOCKDOWN_SCHEMA = 'org.gnome.desktop.lockdown'; +@@ -27,6 +27,8 @@ const LOCK_DELAY_KEY = 'lock-delay'; + const LOCKDOWN_SCHEMA = 'org.gnome.desktop.lockdown'; const DISABLE_LOCK_KEY = 'disable-lock-screen'; - const LOCKED_STATE_STR = 'screenShield.locked'; -+ +const LOCKDIALOG_BACKGROUND_SCHEMA = 'org.gnome.desktop.background.lockdialog'; + + const LOCKED_STATE_STR = 'screenShield.locked'; // fraction of screen height the arrow must reach before completing // the slide up automatically - var ARROW_DRAG_THRESHOLD = 0.1; -@@ -511,6 +514,16 @@ var ScreenShield = new Lang.Class({ - this._onStatusChanged(status); - })); +@@ -493,6 +495,16 @@ var ScreenShield = class { + pivot_point: new Clutter.Point({ x: 0.5, y: 0.5 }), + name: 'lockDialogGroup' }); + // Add background for this._lockDialogGroup + this._bgLockDialogGroup = new Clutter.Actor(); @@ -41,12 +40,12 @@ + this._updateBgLockDialogGroup(); + Main.layoutManager.connect('monitors-changed', this._updateBgLockDialogGroup.bind(this)); + - this._screenSaverDBus = new ShellDBus.ScreenSaverDBus(this); + this.actor.add_actor(this._lockDialogGroup); + this.actor.add_actor(this._lockScreenGroup); - this._smartcardManager = SmartcardManager.getSmartcardManager(); -@@ -588,6 +601,35 @@ var ScreenShield = new Lang.Class({ +@@ -586,6 +598,35 @@ var ScreenShield = class { this._syncInhibitor(); - }, + } + _createBgLockDialogGroup(monitorIndex) { + let monitor = Main.layoutManager.monitors[monitorIndex]; @@ -64,7 +63,7 @@ + this._bgManagersLockDialogGroup.push(bgManager); + + this._bgLockDialogGroup.add_child(widget); -+ }, ++ } + + _updateBgLockDialogGroup() { + for (let i = 0; i < this._bgManagersLockDialogGroup.length; i++) @@ -75,9 +74,9 @@ + + for (let i = 0; i < Main.layoutManager.monitors.length; i++) + this._createBgLockDialogGroup(i); -+ }, ++ } + - _createBackground: function(monitorIndex) { + _createBackground(monitorIndex) { let monitor = Main.layoutManager.monitors[monitorIndex]; let widget = new St.Widget({ style_class: 'screen-shield-background', -- ++++++ gnome-shell-gdm-login-applet.patch ++++++ --- /var/tmp/diff_new_pack.bBGuan/_old 2020-01-30 14:51:34.558939978 +0100 +++ /var/tmp/diff_new_pack.bBGuan/_new 2020-01-30 14:51:34.562939979 +0100 @@ -1,19 +1,17 @@ -Index: gnome-shell-3.26.0/js/js-resources.gresource.xml -=================================================================== ---- gnome-shell-3.26.0.orig/js/js-resources.gresource.xml -+++ gnome-shell-3.26.0/js/js-resources.gresource.xml -@@ -34,6 +34,7 @@ - - <file>portalHelper/main.js</file> +diff -urpN gnome-shell-3.33.91.orig/js/js-resources.gresource.xml gnome-shell-3.33.91/js/js-resources.gresource.xml +--- gnome-shell-3.33.91.orig/js/js-resources.gresource.xml 2019-08-21 15:00:39.000000000 -0500 ++++ gnome-shell-3.33.91/js/js-resources.gresource.xml 2019-09-04 10:15:21.233934725 -0500 +@@ -32,6 +32,7 @@ + <file>perf/core.js</file> + <file>perf/hwtest.js</file> + <file>ui/aboutMenu.js</file> <file>ui/accessDialog.js</file> <file>ui/altTab.js</file> <file>ui/animation.js</file> -Index: gnome-shell-3.26.0/js/ui/aboutMenu.js -=================================================================== ---- /dev/null -+++ gnome-shell-3.26.0/js/ui/aboutMenu.js +diff -urpN gnome-shell-3.33.91.orig/js/ui/aboutMenu.js gnome-shell-3.33.91/js/ui/aboutMenu.js +--- gnome-shell-3.33.91.orig/js/ui/aboutMenu.js 1969-12-31 18:00:00.000000000 -0600 ++++ gnome-shell-3.33.91/js/ui/aboutMenu.js 2019-09-04 10:15:40.562037171 -0500 @@ -0,0 +1,150 @@ +// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- + @@ -29,7 +27,7 @@ +const AboutMenuButton = new Lang.Class({ + Name: 'AboutMenuButton', + Extends: PanelMenu.Button, -+ _init: function() { ++ _init() { + this._hostname = null; + this._updateHostnameId = 0; + this._ticket = 1; @@ -95,7 +93,7 @@ + return; + }, + -+ _updateHostname: function(){ ++ _updateHostname(){ + let hostname_text = get_hostname(); + + if ((this._hostname == null) || (this._hostname != hostname_text)) { @@ -115,7 +113,7 @@ + })); + }, + -+ _destroy: function() { ++ _destroy() { + this._ticket = 1; + if (this._updateHostnameId) { + GLib.source_remove (this._updateHostnameId); @@ -165,11 +163,10 @@ + + return hostname; +} -Index: gnome-shell-3.26.0/js/ui/panel.js -=================================================================== ---- gnome-shell-3.26.0.orig/js/ui/panel.js -+++ gnome-shell-3.26.0/js/ui/panel.js -@@ -758,6 +758,7 @@ var AggregateMenu = new Lang.Class({ +diff -urpN gnome-shell-3.33.91.orig/js/ui/panel.js gnome-shell-3.33.91/js/ui/panel.js +--- gnome-shell-3.33.91.orig/js/ui/panel.js 2019-08-21 15:00:39.000000000 -0500 ++++ gnome-shell-3.33.91/js/ui/panel.js 2019-09-04 10:15:40.562037171 -0500 +@@ -769,6 +769,7 @@ class AggregateMenu extends PanelMenu.Bu }); const PANEL_ITEM_IMPLEMENTATIONS = { @@ -177,16 +174,15 @@ 'activities': ActivitiesButton, 'aggregateMenu': AggregateMenu, 'appMenu': AppMenuButton, -Index: gnome-shell-3.26.0/js/ui/sessionMode.js -=================================================================== ---- gnome-shell-3.26.0.orig/js/ui/sessionMode.js -+++ gnome-shell-3.26.0/js/ui/sessionMode.js -@@ -47,7 +47,7 @@ const _modes = { - unlockDialog: imports.gdm.loginDialog.LoginDialog, - components: ['polkitAgent'], +diff -urpN gnome-shell-3.33.91.orig/js/ui/sessionMode.js gnome-shell-3.33.91/js/ui/sessionMode.js +--- gnome-shell-3.33.91.orig/js/ui/sessionMode.js 2019-08-21 15:00:39.000000000 -0500 ++++ gnome-shell-3.33.91/js/ui/sessionMode.js 2019-09-04 10:18:12.262841288 -0500 +@@ -33,7 +33,7 @@ const _modes = { + unlockDialog: null, + components: [], panel: { - left: [], + left: ['aboutMenu'], - center: ['dateMenu'], - right: ['a11yGreeter', 'keyboard', 'aggregateMenu'], + center: [], + right: [] }, ++++++ gnome-shell-jscSLE9267-Remove-sessionList-of-endSessionDialog.patch ++++++ diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js index f51eb7b..5abad41 100644 --- a/js/ui/endSessionDialog.js +++ b/js/ui/endSessionDialog.js @@ -327,11 +327,11 @@ class EndSessionDialog extends ModalDialog.ModalDialog { this._inhibitorSection.add_actor(this._applicationList); this._sessionHeader = new St.Label({ style_class: 'end-session-dialog-list-header', - text: _("Other users are logged in.") }); + text: _("Other users are logged in. You can list these users by 'who' command.") }); this._sessionList = new St.BoxLayout({ style_class: 'end-session-dialog-session-list', vertical: true }); this._inhibitorSection.add_actor(this._sessionHeader); - this._inhibitorSection.add_actor(this._sessionList); + //this._inhibitorSection.add_actor(this._sessionList); Hide _sessionList for jsc#SLE-9267 this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(EndSessionDialogIface, this); this._dbusImpl.export(Gio.DBus.session, '/org/gnome/SessionManager/EndSessionDialog'); ++++++ gnome-shell-lock-bg-on-primary.patch ++++++ --- /var/tmp/diff_new_pack.bBGuan/_old 2020-01-30 14:51:34.574939985 +0100 +++ /var/tmp/diff_new_pack.bBGuan/_new 2020-01-30 14:51:34.574939985 +0100 @@ -1,14 +1,18 @@ -Index: gnome-shell-3.24.2/js/ui/screenShield.js -=================================================================== ---- gnome-shell-3.24.2.orig/js/ui/screenShield.js -+++ gnome-shell-3.24.2/js/ui/screenShield.js -@@ -498,9 +498,31 @@ const ScreenShield = new Lang.Class({ +diff -urp gnome-shell-3.33.91.orig/js/ui/screenShield.js gnome-shell-3.33.91/js/ui/screenShield.js +--- gnome-shell-3.33.91.orig/js/ui/screenShield.js 2019-09-04 14:04:13.523059437 -0500 ++++ gnome-shell-3.33.91/js/ui/screenShield.js 2019-09-04 14:20:01.448084179 -0500 +@@ -492,7 +492,7 @@ var ScreenShield = class { y_expand: true, reactive: true, pivot_point: new Clutter.Point({ x: 0.5, y: 0.5 }), - name: 'lockDialogGroup' }); + name: 'lockDialogGroupReal' }); + // Add background for this._lockDialogGroup + this._bgLockDialogGroup = new Clutter.Actor(); +@@ -505,6 +505,28 @@ var ScreenShield = class { + Main.layoutManager.connect('monitors-changed', this._updateBgLockDialogGroup.bind(this)); + this.actor.add_actor(this._lockDialogGroup); + + let primaryBackground = new St.Widget({ x_expand: true, @@ -17,7 +21,7 @@ + pivot_point: new Clutter.Point({ x: 0.5, y: 0.5 }), + name: 'lockDialogGroup' }); + primaryBackground.add_constraint(new Layout.MonitorConstraint({ primary: true })); -+ this.actor.insert_child_below(primaryBackground, null); +++ this.actor.insert_child_below(primaryBackground, null); + + for (let i = 0; i < Main.layoutManager.monitors.length; i++) { + if (Main.layoutManager.monitors [i].index == Main.layoutManager.primaryMonitor.index) @@ -34,4 +38,4 @@ + this.actor.add_actor(this._lockScreenGroup); - this._presence = new GnomeSession.Presence(Lang.bind(this, function(proxy, error) { + this._presence = new GnomeSession.Presence((proxy, error) => { ++++++ gnome-shell-private-connection.patch ++++++ --- /var/tmp/diff_new_pack.bBGuan/_old 2020-01-30 14:51:34.582939990 +0100 +++ /var/tmp/diff_new_pack.bBGuan/_new 2020-01-30 14:51:34.582939990 +0100 @@ -1,8 +1,7 @@ -From f9a23ba5908fb93d25ef702510ea182c220db8aa Mon Sep 17 00:00:00 2001 +From 342795440012a216d4abb9cfb04d2c3bd0fe8f4d Mon Sep 17 00:00:00 2001 From: Giovanni Campagna <gcampagna(a)src.gnome.org> Date: Thu, 31 Mar 2011 15:56:13 +0200 -Subject: [PATCH] NetworkMenu: create private connections if the user is not - authorized +Subject: [PATCH] NetworkMenu: create private connections if the user is not authorized Check polkit setting at startup and add, if needed, the "permissions" setting to the connections we create, so that polkit authentication is @@ -11,99 +10,98 @@ https://bugzilla.gnome.org/show_bug.cgi?id=646187 --- - js/ui/status/network.js | 38 +++++++++++++++++++++++++++++++++----- - 1 file changed, 33 insertions(+), 5 deletions(-) + js/ui/status/network.js | 38 ++++++++++++++++++++++++++++++++------ + 1 file changed, 32 insertions(+), 6 deletions(-) -Index: gnome-shell-3.14.0/js/ui/status/network.js +Index: gnome-shell-3.34.0+94/js/ui/status/network.js =================================================================== ---- gnome-shell-3.14.0.orig/js/ui/status/network.js -+++ gnome-shell-3.14.0/js/ui/status/network.js -@@ -7,6 +7,7 @@ const Gtk = imports.gi.Gtk; - const Mainloop = imports.mainloop; - const NetworkManager = imports.gi.NetworkManager; - const NMClient = imports.gi.NMClient; -+const Polkit = imports.gi.Polkit; - const NMGtk = imports.gi.NMGtk; +--- gnome-shell-3.34.0+94.orig/js/ui/status/network.js ++++ gnome-shell-3.34.0+94/js/ui/status/network.js +@@ -1,6 +1,6 @@ + // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- + /* exported NMApplet */ +-const { Clutter, Gio, GLib, GObject, NM, St } = imports.gi; ++const { Clutter, Gio, GLib, GObject, NM, St, Polkit } = imports.gi; const Signals = imports.signals; - const Shell = imports.gi.Shell; -@@ -369,6 +370,11 @@ const NMConnectionDevice = new Lang.Clas - _autoConnect: function() { - let connection = new NetworkManager.Connection(); -+ if (this._privateConnections) { -+ let connectionSetting = new NetworkManager.SettingConnection(); -+ connectionSetting.add_permission('user', GLib.get_user_name(), null); -+ connection.add_setting(connectionSetting); -+ } - this._client.add_and_activate_connection(connection, this._device, null, null); - }, - -@@ -627,10 +633,12 @@ const NMDeviceBluetooth = new Lang.Class - Extends: NMConnectionDevice, - category: NMConnectionCategory.WWAN, - -- _init: function(client, device, settings) { -+ -+ _init: function(client, device, settings, privateConnections) { - this.parent(client, device, settings); + const Animation = imports.ui.animation; +@@ -326,6 +326,11 @@ var NMConnectionDevice = class NMConnect - this.item.menu.addSettingsAction(_("Bluetooth Settings"), 'gnome-network-panel.desktop'); + _autoConnect() { + let connection = new NM.SimpleConnection(); ++ if (this._privateConnections) { ++ let connectionSetting = new NM.SettingConnection(); ++ connectionSetting.add_permission('user', GLib.get_user_name(), null); ++ connection.add_setting(connectionSetting); ++ } + this._client.add_and_activate_connection_async(connection, this._device, null, null, null); + } + +@@ -462,10 +467,11 @@ var NMConnectionDevice = class NMConnect + }; + + var NMDeviceWired = class extends NMConnectionDevice { +- constructor(client, device) { ++ constructor(client, device, privateConnections) { + super(client, device); + + this.item.menu.addSettingsAction(_("Wired Settings"), 'gnome-network-panel.desktop'); + this._privateConnections = privateConnections; - }, + } + + get category() { +@@ -682,11 +688,12 @@ var NMWirelessDialogItem = GObject.regis - _getDescription: function() { -@@ -727,11 +735,12 @@ const NMWirelessDialog = new Lang.Class( - Name: 'NMWirelessDialog', - Extends: ModalDialog.ModalDialog, - -- _init: function(client, device, settings) { -+ _init: function(client, device, settings, privateConnections) { - this.parent({ styleClass: 'nm-dialog' }); + var NMWirelessDialog = GObject.registerClass( + class NMWirelessDialog extends ModalDialog.ModalDialog { +- _init(client, device) { ++ _init(client, device, privateConnections) { + super._init({ styleClass: 'nm-dialog' }); this._client = client; this._device = device; + this._privateConnections = privateConnections; this._wirelessEnabledChangedId = this._client.connect('notify::wireless-enabled', - Lang.bind(this, this._syncView)); -@@ -964,6 +973,11 @@ const NMWirelessDialog = new Lang.Class( - this._device.get_path(), accessPoints[0].dbus_path]); + this._syncView.bind(this)); +@@ -917,6 +924,11 @@ class NMWirelessDialog extends ModalDial + this._device.get_path(), accessPoints[0].get_path()]); } else { - let connection = new NetworkManager.Connection(); + let connection = new NM.SimpleConnection(); + if (this._privateConnections) { -+ let connectionSetting = new NetworkManager.SettingConnection(); ++ let connectionSetting = new NM.SettingConnection(); + connectionSetting.add_permission('user', GLib.get_user_name(), null); + connection.add_setting(connectionSetting); + } - this._client.add_and_activate_connection(connection, this._device, accessPoints[0].dbus_path, null) + this._client.add_and_activate_connection_async(connection, this._device, accessPoints[0].get_path(), null, null); } } -@@ -1194,10 +1209,11 @@ const NMDeviceWireless = new Lang.Class( - Name: 'NMDeviceWireless', - category: NMConnectionCategory.WIRELESS, +@@ -1153,9 +1165,10 @@ class NMWirelessDialog extends ModalDial + }); -- _init: function(client, device, settings) { -+ _init: function(client, device, settings, privateConnections) { + var NMDeviceWireless = class { +- constructor(client, device) { ++ constructor(client, device, privateConnections) { this._client = client; this._device = device; - this._settings = settings; + this._privateConnections = privateConnections; this._description = ''; -@@ -1280,7 +1295,7 @@ const NMDeviceWireless = new Lang.Class( - }, +@@ -1241,7 +1254,7 @@ var NMDeviceWireless = class { + } - _showDialog: function() { -- this._dialog = new NMWirelessDialog(this._client, this._device, this._settings); -+ this._dialog = new NMWirelessDialog(this._client, this._device, this._settings, this._privateConnections); - this._dialog.connect('closed', Lang.bind(this, this._dialogClosed)); + _showDialog() { +- this._dialog = new NMWirelessDialog(this._client, this._device); ++ this._dialog = new NMWirelessDialog(this._client, this._device, this._privateConnections); + this._dialog.connect('closed', this._dialogClosed.bind(this)); this._dialog.open(); - }, -@@ -1678,6 +1693,19 @@ const NMApplet = new Lang.Class({ - if (!this._client || !this._settings) - return; + } +@@ -1616,6 +1629,19 @@ var NMApplet = class extends PanelMenu.S + _clientGot(obj, result) { + this._client = NM.Client.new_finish(result); ++ + // Check if newly created connections should be private or not + this._privateConnections = true; + let authority = Polkit.Authority.get_sync(null); @@ -116,16 +114,15 @@ + null /* cancellable */); + if (authResult) + this._privateConnections = !authResult.get_is_authorized(); -+ - this._activeConnections = [ ]; - this._connections = [ ]; - this._connectivityQueue = [ ]; -@@ -1807,7 +1835,7 @@ const NMApplet = new Lang.Class({ + + this._activeConnections = []; + this._connections = []; +@@ -1736,7 +1762,7 @@ var NMApplet = class extends PanelMenu.S let wrapperClass = this._dtypes[device.get_device_type()]; if (wrapperClass) { -- let wrapper = new wrapperClass(this._client, device, this._settings); -+ let wrapper = new wrapperClass(this._client, device, this._settings, this._privateConnections); +- let wrapper = new wrapperClass(this._client, device); ++ let wrapper = new wrapperClass(this._client, device, this._privateConnections); device._delegate = wrapper; this._addDeviceWrapper(wrapper); - + \ No newline at end of file ++++++ gnome-shell.obsinfo ++++++ name: gnome-shell version: 3.34.3+0 mtime: 1578226247 commit: f7fe7bc676b0cae37405b941822ba9f2b989add6 ++++++ gs-fate318433-prevent-same-account-multi-logins.patch ++++++ --- /var/tmp/diff_new_pack.bBGuan/_old 2020-01-30 14:51:34.602940001 +0100 +++ /var/tmp/diff_new_pack.bBGuan/_new 2020-01-30 14:51:34.602940001 +0100 @@ -1,17 +1,43 @@ -Index: gnome-shell-3.25.4/js/gdm/loginDialog.js -=================================================================== ---- gnome-shell-3.25.4.orig/js/gdm/loginDialog.js -+++ gnome-shell-3.25.4/js/gdm/loginDialog.js -@@ -926,6 +926,8 @@ var LoginDialog = new Lang.Class({ - this._authPrompt.updateSensitivity(false); - let answer = this._authPrompt.getAnswer(); - this._user = this._userManager.get_user(answer); -+ this._userLoginForbidden = -+ this._user.is_x_logged_in_remotely(); - this._authPrompt.clear(); - this._authPrompt.startSpinning(); - this._authPrompt.begin({ userName: answer }); -@@ -990,6 +992,8 @@ var LoginDialog = new Lang.Class({ +diff -urp gnome-shell-3.33.91.orig/js/gdm/authPrompt.js gnome-shell-3.33.91/js/gdm/authPrompt.js +--- gnome-shell-3.33.91.orig/js/gdm/authPrompt.js 2019-09-04 13:36:37.170279229 -0500 ++++ gnome-shell-3.33.91/js/gdm/authPrompt.js 2019-09-04 15:11:35.568485953 -0500 +@@ -25,7 +25,9 @@ var AuthPromptStatus = { + NOT_VERIFYING: 0, + VERIFYING: 1, + VERIFICATION_FAILED: 2, +- VERIFICATION_SUCCEEDED: 3 ++ VERIFICATION_SUCCEEDED: 3, ++ // NOTE fate#318433 extra state to track multi-login situation ++ VERIFIED_BUT_FORBIDDEN: 4 + }; + + var BeginRequestType = { +@@ -244,7 +246,12 @@ var AuthPrompt = class { + } + + _onVerificationComplete() { ++ // NOTE update the spinning icon + this.setActorInDefaultButtonWell(null); ++ ++ if (this.verificationStatus === AuthPromptStatus.VERIFIED_BUT_FORBIDDEN) { ++ return; ++ } + this.verificationStatus = AuthPromptStatus.VERIFICATION_SUCCEEDED; + this.cancelButton.reactive = false; + } +diff -urp gnome-shell-3.33.91.orig/js/gdm/loginDialog.js gnome-shell-3.33.91/js/gdm/loginDialog.js +--- gnome-shell-3.33.91.orig/js/gdm/loginDialog.js 2019-09-04 12:52:15.396169384 -0500 ++++ gnome-shell-3.33.91/js/gdm/loginDialog.js 2019-09-04 14:47:26.796805978 -0500 +@@ -917,6 +917,8 @@ var LoginDialog = GObject.registerClass( + this._authPrompt.updateSensitivity(false); + let answer = this._authPrompt.getAnswer(); + this._user = this._userManager.get_user(answer); ++ this._userLoginForbidden = ++ this._user.is_x_logged_in_remotely(); + this._authPrompt.clear(); + this._authPrompt.startSpinning(); + this._authPrompt.begin({ userName: answer }); +@@ -984,6 +986,8 @@ var LoginDialog = GObject.registerClass( let answer = this._authPrompt.getAnswer(); let domain_answer = this._domainMenuButton.getDomainUser(answer); this._user = this._userManager.get_user(domain_answer); @@ -20,10 +46,10 @@ this._authPrompt.clear(); this._authPrompt.startSpinning(); this._authPrompt.begin({ userName: domain_answer}); -@@ -1023,6 +1027,28 @@ var LoginDialog = new Lang.Class({ - }, +@@ -1010,6 +1014,28 @@ var LoginDialog = GObject.registerClass( + } - _onSessionOpened: function(client, serviceName) { + _onSessionOpened(client, serviceName) { + if ( this._userLoginForbidden ) { + this._authPrompt.setMessage( + _('Sorry, you have to log out a previous session first. Multiple logins are not supported.'), @@ -46,42 +72,14 @@ + return; + } + - this._authPrompt.finish(Lang.bind(this, function() { - this._startSession(serviceName); - })); -@@ -1206,6 +1232,7 @@ var LoginDialog = new Lang.Class({ + this._authPrompt.finish(() => this._startSession(serviceName)); + } + +@@ -1190,6 +1216,7 @@ var LoginDialog = GObject.registerClass( - _onUserListActivated: function(activatedItem) { + _onUserListActivated(activatedItem) { this._user = activatedItem.user; + this._userLoginForbidden = this._user.is_x_logged_in_remotely(); this._updateCancelButton(); -Index: gnome-shell-3.25.4/js/gdm/authPrompt.js -=================================================================== ---- gnome-shell-3.25.4.orig/js/gdm/authPrompt.js -+++ gnome-shell-3.25.4/js/gdm/authPrompt.js -@@ -30,7 +30,9 @@ var AuthPromptStatus = { - NOT_VERIFYING: 0, - VERIFYING: 1, - VERIFICATION_FAILED: 2, -- VERIFICATION_SUCCEEDED: 3 -+ VERIFICATION_SUCCEEDED: 3, -+ // NOTE fate#318433 extra state to track multi-login situation -+ VERIFIED_BUT_FORBIDDEN: 4 - }; - - var BeginRequestType = { -@@ -261,7 +263,12 @@ var AuthPrompt = new Lang.Class({ - }, - - _onVerificationComplete: function() { -+ // NOTE update the spinning icon - this.setActorInDefaultButtonWell(null); -+ -+ if (this.verificationStatus === AuthPromptStatus.VERIFIED_BUT_FORBIDDEN) { -+ return; -+ } - this.verificationStatus = AuthPromptStatus.VERIFICATION_SUCCEEDED; - this.cancelButton.reactive = false; - },

1 0

commit ibus for openSUSE:Leap:15.2
by root 30 Jan '20

30 Jan '20

Hello community, here is the log from the commit of package ibus for openSUSE:Leap:15.2 checked in at 2020-01-30 14:50:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/ibus (Old) and /work/SRC/openSUSE:Leap:15.2/.ibus.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ibus" Thu Jan 30 14:50:23 2020 rev:29 rq:761560 version:1.5.21 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/ibus/ibus.changes 2020-01-15 15:11:46.286118693 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.ibus.new.26092/ibus.changes 2020-01-30 14:51:30.638937893 +0100 @@ -2 +2 @@ -Wed Sep 11 13:11:22 UTC 2019 - Cliff Zhao <qzhao(a)suse.com> +Fri Sep 20 05:31:52 UTC 2019 - Cliff Zhao <qzhao(a)suse.com> @@ -4,3 +4,90 @@ -- Add ibus-CVE-2019-14822.patch: Fix misconfiguration of the DBus - server allows to unprivileged user could monitor and send method - calls to the ibus bus of another user(CVE-2019-14822 bnc#1150011). +- Update hide-setup-menu.patch: make it can be compile in SLE + (openSUSE-Leap 15). + +------------------------------------------------------------------- +Tue Sep 17 21:51:08 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Add ibus-CVE-2019-14822-GDBusServer-peer-authorization.patch: + bus: Implement GDBusAuthObserver callback, fix CVE-2019-14822. + +------------------------------------------------------------------- +Thu Sep 5 13:17:58 UTC 2019 - Fuminobu Takeyama <ftake(a)geeko.jp> + +- Apply the change on Jun. 22 again, reverted by the previous + change +- Stop exporting OOO_FORCE_DESKTOP (boo#1042136) + * KDE4 LibreOffice VCL plugin was removed from upstream + * New KDE5/Qt5 VCL plugin supporting Qt IM Module will be + available + * Note only LibreOffice KDE5/Qt5 >= 6.3 supports Qt IM module + - For older version, please export OOO_FORCE_DESKTOP=gnome + in ~/.profile + +------------------------------------------------------------------- +Thu Aug 29 16:22:00 UTC 2019 - Fuminobu Takeyama <ftake(a)geeko.jp> + +- Upstream update to 1.5.21 + * Enable to run ibus-setup with a different python + * Update ibusunicodegen.h for Unicode UCD 12.0 + * Add ibus.its for IME's component files + * Make ISO 639 language names with title + * Keep preedit cursor_pos and visible in clearing preedit text + * Support long sequences and multiple output characters for + compose table + - fix boo#1138123 + * Exit ibus-daemon with parent's death + * Update Wayland input-method protocol to unstable v1 + * Indistinguishable address of ibus-daemon + * Update LOCALES_STRING + * Fix typos +- Drop ibus-fix-check-abs-icon-path-support.patch + * not necessary anymore since the current Qt is enough new + +------------------------------------------------------------------- +Sat Jun 22 13:13:33 UTC 2019 - Fuminobu Takeyama <ftake(a)geeko.jp> + +- Stop exporting OOO_FORCE_DESKTOP (boo#1042136) + * KDE4 LibreOffice VCL plugin was removed from upstream + * New KDE5/Qt5 VCL plugin supporting Qt IM Module will be + available + +------------------------------------------------------------------- +Wed May 8 09:40:05 UTC 2019 - Dominique Leuenberger <dimstar(a)opensuse.org> + +- Move RPM macros to %_rpmmacrodir. + +------------------------------------------------------------------- +Mon Mar 4 15:48:52 UTC 2019 - Fuminobu Takeyama <ftake(a)geeko.jp> + +- Fix boo#1127711 + * Remove nodejs-emojione form BuildRequires + +------------------------------------------------------------------- +Sat Mar 2 07:19:12 UTC 2019 - Fuminobu Takeyama <ftake(a)geeko.jp> + +- Upstream update to 1.5.20 + * Support Shift-Space to insert a Space on Emojier preedit + * Do not add emojis in compose category to emoji variants + * Implement mouse click with Hangul in ibus side + * Delete Gconf dependencies and migrate intool to gettext + * Do not delete IBUS_CAP_SURROUNDING_TEXT + * Show compose preedit with custom compose file + * Fix Atom and Slack for Flatpak + * Delete Super-space notification + * Use ISO 639-3 to have names for more languages + * introspection: Tell the GI scanner to include the C headers + * Add Uzbek layouts + * Allow using non-abstract UNIX domain sockets + * Fix minor build problems, bugs, and typos + +------------------------------------------------------------------- +Mon Feb 25 15:33:01 UTC 2019 - ftake(a)geeko.jp + +- Fix boo#1126011: fix unexpected LibreOffice's dependency on IBus + * Remove "Supplements" for libreoffice-gnome + +------------------------------------------------------------------- +Tue Sep 18 09:04:44 UTC 2018 - schwab(a)suse.de + +- Disable emoji support on armv6l, ppc and riscv64, which have no nodejs + support --- /work/SRC/openSUSE:Leap:15.2/ibus/python-ibus.changes 2020-01-15 15:11:46.406118760 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.ibus.new.26092/python-ibus.changes 2020-01-30 14:51:30.678937914 +0100 @@ -1,0 +2,12 @@ +Thu Aug 29 16:22:00 UTC 2019 - Fuminobu Takeyama <ftake(a)geeko.jp> + +- Update version to 1.5.21 + * No update for this subpackage + +------------------------------------------------------------------- +Mon Mar 4 15:58:26 UTC 2019 - Fuminobu Takeyama <ftake(a)geeko.jp> + +- Update version to 1.5.20 + * No update for this subpackage + +------------------------------------------------------------------- Old: ---- ibus-1.5.19.tar.gz ibus-CVE-2019-14822.patch ibus-fix-check-abs-icon-path-support.patch New: ---- ibus-1.5.21.tar.gz ibus-CVE-2019-14822-GDBusServer-peer-authorization.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus.spec ++++++ --- /var/tmp/diff_new_pack.6tqvJL/_old 2020-01-30 14:51:31.266938226 +0100 +++ /var/tmp/diff_new_pack.6tqvJL/_new 2020-01-30 14:51:31.266938226 +0100 @@ -1,7 +1,7 @@ # # spec file for package ibus # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,26 +12,30 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %if 0%{?is_opensuse} %define with_wayland 1 %define with_kde 1 +%ifarch armv6l armv6hl ppc riscv64 +%define with_emoji 0 +%else %define with_emoji 1 +%endif %else %define with_wayland 0 %define with_kde 0 %define with_emoji 0 %endif Name: ibus -Version: 1.5.19 +Version: 1.5.21 Release: 0 Summary: The "Intelligent Input Bus" input method License: LGPL-2.1-or-later Group: System/I18n/Chinese -Url: https://github.com/ibus/ +URL: https://github.com/ibus/ Source: https://github.com/ibus/ibus/releases/download/%{version}/%{name}-%{version… Source2: README.SUSE Source3: xim.ibus.suse.template @@ -47,8 +51,6 @@ # PATCH-FIX-UPSTREAM ftake(a)geeko.jp # Select an IM engine at the first login Patch8: im-engines-precede-xkb.patch -# PATCH-FIX-UPSTREAM ftake(a)geeko.jp -Patch9: ibus-fix-check-abs-icon-path-support.patch # PATCH-FIX-SLE hide-setup-menu.patch bnc#899259 qzhao(a)suse.com # ibus-setup should not launch from main menu. Patch10: hide-setup-menu.patch @@ -58,9 +60,9 @@ # PATCH-FIX-SLE ibus-disable-engines-preload-in-GNOME.patch bnc#1036729 qzhao(a)suse.com # Disable ibus engines preload in GNOME for These works are handled by gnome-shell. Patch12: ibus-disable-engines-preload-in-GNOME.patch -# PATCH-FIX-SLE ibus-CVE-2019-14822.patch CVE-2019-14822 bnc#1150011 qzhao(a)suse.com -# Fix the misconfiguration of the DBus server allows to unprivileged user could monitor and send method calls to the ibus bus of another user. -Patch13: ibus-CVE-2019-14822.patch + +Patch13: ibus-CVE-2019-14822-GDBusServer-peer-authorization.patch + BuildRequires: dbus-1-glib-devel BuildRequires: dconf-devel >= 0.7.5 BuildRequires: fdupes @@ -69,7 +71,6 @@ BuildRequires: gobject-introspection-devel >= 0.9.6 BuildRequires: gtk-doc >= 1.9 BuildRequires: gtk2-devel -BuildRequires: intltool BuildRequires: iso-codes-devel BuildRequires: libnotify-devel >= 0.7 BuildRequires: libtool @@ -97,7 +98,6 @@ # versions to 3.0 only. Requires: typelib-1_0-Gtk-3_0 Recommends: %{name}-lang -Supplements: packageand(libreoffice:libreoffice-gnome) Provides: locale(ja;ko;zh) Obsoletes: ibus-gnome-shell %if %{with_kde} @@ -107,7 +107,6 @@ BuildRequires: pkgconfig(wayland-client) >= 1.2.0 %endif %if %{with_emoji} -BuildRequires: nodejs-emojione BuildRequires: unicode-emoji BuildRequires: pkgconfig(cldr-emoji-annotation) %endif @@ -180,7 +179,6 @@ %patch0 -p1 %patch4 -p1 %patch8 -p1 -%patch9 -p1 cp -r %{SOURCE2} . cp -r %{SOURCE3} . @@ -199,7 +197,6 @@ %build autoreconf -fi -intltoolize -f %configure --disable-static \ --enable-gtk3 \ --enable-vala \ @@ -264,10 +261,10 @@ touch %{buildroot}/%{_sysconfdir}/dconf/db/ibus # install macros -mkdir -p %{buildroot}%{_sysconfdir}/rpm -install -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/rpm +mkdir -p %{buildroot}%{_rpmmacrodir} +install -m 644 %{SOURCE7} %{buildroot}%{_rpmmacrodir} -%suse_update_desktop_file -r %{name}-setup Settings DesktopSettings X-SuSE-Core-System +%suse_update_desktop_file -r org.freedesktop.IBus.Setup Settings DesktopSettings X-SuSE-Core-System %fdupes %{buildroot} @@ -300,14 +297,14 @@ %files %doc AUTHORS README README.SUSE xim.ibus.suse.template %license COPYING -%config %{_sysconfdir}/rpm/macros.ibus +%{_rpmmacrodir}/macros.ibus %config %{_sysconfdir}/X11/xim.d/* %{_bindir}/ibus %{_bindir}/ibus-autostart %{_bindir}/ibus-daemon %{_bindir}/ibus-setup %{_datadir}/ibus/ -%{_datadir}/applications/ibus-setup.desktop +%{_datadir}/applications/org.freedesktop.IBus.Setup.desktop %{_datadir}/GConf/gsettings/ibus.convert %{_datadir}/glib-2.0/schemas/org.freedesktop.ibus.gschema.xml %{_datadir}/icons/hicolor/*/apps/ibus*.* @@ -356,6 +353,7 @@ %{_includedir}/ibus-1.0 %{_datadir}/gtk-doc/html/ibus %{_libdir}/pkgconfig/ibus-1.0.pc +%{_datadir}/gettext/its/ibus.* %{_datadir}/gir-1.0/IBus-1.0.gir %{_datadir}/vala/vapi/ibus-1.0.deps %{_datadir}/vala/vapi/ibus-1.0.vapi ++++++ python-ibus.spec ++++++ --- /var/tmp/diff_new_pack.6tqvJL/_old 2020-01-30 14:51:31.286938237 +0100 +++ /var/tmp/diff_new_pack.6tqvJL/_new 2020-01-30 14:51:31.286938237 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-ibus # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,19 +12,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define _name ibus - Name: python-ibus -Version: 1.5.19 +Version: 1.5.21 Release: 0 Summary: Python2 module for ibus License: LGPL-2.1-or-later Group: System/I18n/Chinese -Url: https://github.com/ibus/ +URL: https://github.com/ibus/ Source: https://github.com/ibus/ibus/releases/download/%{version}/%{_name}-%{versio… # Source: %{_name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE ibus-python-install-dir.patch ftake(a)geeko.jp @@ -42,22 +41,21 @@ BuildRequires: iso-codes-devel BuildRequires: libnotify-devel >= 0.7 BuildRequires: libtool -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: python BuildRequires: python-devel BuildRequires: python-gobject-devel BuildRequires: unicode-ucd BuildRequires: update-desktop-files +# copy_deep method is supported since 0.31.1 +BuildRequires: vala >= 0.31.1 BuildRequires: x11-tools BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(vapigen) BuildRequires: pkgconfig(xkbcommon) -# copy_deep method is supported since 0.31.1 -BuildRequires: vala >= 0.31.1 Requires: %{_name} = %{version} Requires: python-gobject -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description IBus, short for Intelligent Input Bus, is an input framework. IBus @@ -71,7 +69,6 @@ %build autoreconf -fi -intltoolize -f %configure --disable-static \ --enable-gtk3 \ --enable-vala \ ++++++ hide-setup-menu.patch ++++++ --- /var/tmp/diff_new_pack.6tqvJL/_old 2020-01-30 14:51:31.322938256 +0100 +++ /var/tmp/diff_new_pack.6tqvJL/_new 2020-01-30 14:51:31.322938256 +0100 @@ -1,6 +1,6 @@ -diff -Nura ibus-1.5.8_old/setup/ibus-setup.desktop.in ibus-1.5.8_new/setup/ibus-setup.desktop.in ---- ibus-1.5.8_old/setup/ibus-setup.desktop.in 2014-07-24 12:24:25.000000000 +0800 -+++ ibus-1.5.8_new/setup/ibus-setup.desktop.in 2015-10-15 19:12:16.476328652 +0800 +diff -Nura ibus-1.5.21/setup/ibus-setup.desktop ibus-1.5.21_new/setup/ibus-setup.desktop +--- ibus-1.5.21/setup/ibus-setup.desktop 2019-08-23 13:08:34.000000000 +0200 ++++ ibus-1.5.21_new/setup/ibus-setup.desktop 2019-09-20 07:21:33.505022653 +0200 @@ -4,6 +4,7 @@ Exec=ibus-setup Icon=ibus-setup ++++++ ibus-1.5.19.tar.gz -> ibus-1.5.21.tar.gz ++++++ ++++ 340092 lines of diff (skipped) ++++++ ibus-CVE-2019-14822-GDBusServer-peer-authorization.patch ++++++ >From 3d442dbf936d197aa11ca0a71663c2bc61696151 Mon Sep 17 00:00:00 2001 From: fujiwarat <takao.fujiwara1(a)gmail.com> Date: Fri, 13 Sep 2019 15:59:03 +0900 Subject: [PATCH] bus: Implement GDBusAuthObserver callback ibus uses a GDBusServer with G_DBUS_SERVER_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS, and doesn't set a GDBusAuthObserver, which allows anyone who can connect to its AF_UNIX socket to authenticate and be authorized to send method calls. It also seems to use an abstract AF_UNIX socket, which does not have filesystem permissions, so the practical effect might be that a local attacker can connect to another user's ibus service and make arbitrary method calls. BUGS=rhbz#1717958 --- bus/server.c | 89 ++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 73 insertions(+), 16 deletions(-) diff --git a/bus/server.c b/bus/server.c index 3a626230..2439de14 100644 --- a/bus/server.c +++ b/bus/server.c @@ -2,7 +2,8 @@ /* vim:set et sts=4: */ /* bus - The Input Bus * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang(a)gmail.com> - * Copyright (C) 2008-2010 Red Hat, Inc. + * Copyright (C) 2011-2019 Takao Fujiwara <takao.fujiwara1(a)gmail.com> + * Copyright (C) 2008-2019 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -69,17 +70,64 @@ _restart_server (void) exit (-1); } +/** + * bus_allow_mechanism_cb: + * @observer: A #GDBusAuthObserver. + * @mechanism: The name of the mechanism. + * @user_data: always %NULL. + * + * Check if @mechanism can be used to authenticate the other peer. + * Returns: %TRUE if the peer's mechanism is allowed. + */ +static gboolean +bus_allow_mechanism_cb (GDBusAuthObserver *observer, + const gchar *mechanism, + G_GNUC_UNUSED gpointer user_data) +{ + if (g_strcmp0 (mechanism, "EXTERNAL") == 0) + return TRUE; + return FALSE; +} + +/** + * bus_authorize_authenticated_peer_cb: + * @observer: A #GDBusAuthObserver. + * @stream: A #GIOStream. + * @credentials: A #GCredentials. + * @user_data: always %NULL. + * + * Check if a peer who has already authenticated should be authorized. + * Returns: %TRUE if the peer's credential is authorized. + */ +static gboolean +bus_authorize_authenticated_peer_cb (GDBusAuthObserver *observer, + GIOStream *stream, + GCredentials *credentials, + G_GNUC_UNUSED gpointer user_data) +{ + gboolean authorized = FALSE; + if (credentials) { + GCredentials *own_credentials = g_credentials_new (); + if (g_credentials_is_same_user (credentials, own_credentials, NULL)) + authorized = TRUE; + g_object_unref (own_credentials); + } + return authorized; +} + /** * bus_new_connection_cb: - * @user_data: always NULL. - * @returns: TRUE when the function can handle the connection. + * @observer: A #GDBusAuthObserver. + * @dbus_connection: A #GDBusconnection. + * @user_data: always %NULL. * * Handle incoming connections. + * Returns: %TRUE when the function can handle the connection. */ static gboolean -bus_new_connection_cb (GDBusServer *server, - GDBusConnection *dbus_connection, - gpointer user_data) +bus_new_connection_cb (GDBusServer *server, + GDBusConnection *dbus_connection, + G_GNUC_UNUSED gpointer user_data) { BusConnection *connection = bus_connection_new (dbus_connection); bus_dbus_impl_new_connection (dbus, connection); @@ -94,9 +142,9 @@ bus_new_connection_cb (GDBusServer *server, } static void -_server_connect_start_portal_cb (GObject *source_object, - GAsyncResult *res, - gpointer user_data) +_server_connect_start_portal_cb (GObject *source_object, + GAsyncResult *res, + G_GNUC_UNUSED gpointer user_data) { GVariant *result; GError *error = NULL; @@ -113,9 +161,9 @@ _server_connect_start_portal_cb (GObject *source_object, } static void -bus_acquired_handler (GDBusConnection *connection, - const gchar *name, - gpointer user_data) +bus_acquired_handler (GDBusConnection *connection, + const gchar *name, + G_GNUC_UNUSED gpointer user_data) { g_dbus_connection_call (connection, IBUS_SERVICE_PORTAL, @@ -136,14 +184,17 @@ void bus_server_init (void) { GError *error = NULL; + GDBusServerFlags flags = G_DBUS_SERVER_FLAGS_NONE; + gchar *guid; + GDBusAuthObserver *observer; dbus = bus_dbus_impl_get_default (); ibus = bus_ibus_impl_get_default (); bus_dbus_impl_register_object (dbus, (IBusService *)ibus); /* init server */ - GDBusServerFlags flags = G_DBUS_SERVER_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS; - gchar *guid = g_dbus_generate_guid (); + guid = g_dbus_generate_guid (); + observer = g_dbus_auth_observer_new (); if (!g_str_has_prefix (g_address, "unix:tmpdir=") && !g_str_has_prefix (g_address, "unix:path=")) { g_error ("Your socket address does not have the format unix:tmpdir=$DIR " @@ -152,7 +203,7 @@ bus_server_init (void) server = g_dbus_server_new_sync ( g_address, /* the place where the socket file lives, e.g. /tmp, abstract namespace, etc. */ flags, guid, - NULL /* observer */, + observer, NULL /* cancellable */, &error); if (server == NULL) { @@ -162,7 +213,13 @@ bus_server_init (void) } g_free (guid); - g_signal_connect (server, "new-connection", G_CALLBACK (bus_new_connection_cb), NULL); + g_signal_connect (observer, "allow-mechanism", + G_CALLBACK (bus_allow_mechanism_cb), NULL); + g_signal_connect (observer, "authorize-authenticated-peer", + G_CALLBACK (bus_authorize_authenticated_peer_cb), NULL); + g_object_unref (observer); + g_signal_connect (server, "new-connection", + G_CALLBACK (bus_new_connection_cb), NULL); g_dbus_server_start (server); -- 2.21.0 >From 018a0f889d18c41e314f0b1297d1dc559603142b Mon Sep 17 00:00:00 2001 From: fujiwarat <takao.fujiwara1(a)gmail.com> Date: Tue, 5 Feb 2019 18:36:04 +0900 Subject: [PATCH] Fix SEGV in bus_panel_proxy_focus_in() rhbz#1349148, rhbz#1385349 SEGV in BUS_IS_PANEL_PROXY() in bus_panel_proxy_focus_in() Check if GDBusConnect is closed before bus_panel_proxy_new() is called. rhbz#1350291 SEGV in BUS_IS_CONNECTION(skip_connection) in bus_dbus_impl_dispatch_message_by_rule() check if dbus_connection is closed in bus_dbus_impl_connection_filter_cb(). rhbz#1406699 SEGV in new_owner!=NULL in bus_dbus_impl_name_owner_changed() which is called by bus_name_service_remove_owner() If bus_connection_get_unique_name()==NULL, set new_owner="" in bus_name_service_remove_owner() rhbz#1432252 SEGV in old_owner!=NULL in bus_dbus_impl_name_owner_changed() which is called by bus_name_service_set_primary_owner() If bus_connection_get_unique_name()==NULL, set old_owner="" in bus_name_service_set_primary_owner() rhbz#1601577 SEGV in ibus_engine_desc_get_layout() in bus_engine_proxy_new_internal() WIP: Added a GError to get the error message to check why the SEGV happened. rhbz#1663528 SEGV in g_mutex_clear() in bus_dbus_impl_destroy() If the mutex is not unlocked, g_mutex_clear() causes assert. BUG=rhbz#1349148 BUG=rhbz#1385349 BUG=rhbz#1350291 BUG=rhbz#1406699 BUG=rhbz#1432252 BUG=rhbz#1601577 BUG=rhbz#1663528 --- bus/dbusimpl.c | 70 +++++++++++++++++++++++++++++++++++++++++------ bus/engineproxy.c | 9 +++++- bus/ibusimpl.c | 21 ++++++++++++-- 3 files changed, 88 insertions(+), 12 deletions(-) diff --git a/bus/dbusimpl.c b/bus/dbusimpl.c index b54ef817..fb38faf0 100644 --- a/bus/dbusimpl.c +++ b/bus/dbusimpl.c @@ -2,7 +2,8 @@ /* vim:set et sts=4: */ /* ibus - The Input Bus * Copyright (C) 2008-2013 Peng Huang <shawn.p.huang(a)gmail.com> - * Copyright (C) 2008-2013 Red Hat, Inc. + * Copyright (C) 2015-2019 Takao Fujiwara <takao.fujiwara1(a)gmail.com> + * Copyright (C) 2008-2019 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -344,6 +345,8 @@ bus_name_service_set_primary_owner (BusNameService *service, BusConnectionOwner *owner, BusDBusImpl *dbus) { + gboolean has_old_owner = FALSE; + g_assert (service != NULL); g_assert (owner != NULL); g_assert (dbus != NULL); @@ -351,6 +354,13 @@ bus_name_service_set_primary_owner (BusNameService *service, BusConnectionOwner *old = service->owners != NULL ? (BusConnectionOwner *)service->owners->data : NULL; + /* rhbz#1432252 If bus_connection_get_unique_name() == NULL, + * "Hello" method is not received yet. + */ + if (old != NULL && bus_connection_get_unique_name (old->conn) != NULL) { + has_old_owner = TRUE; + } + if (old != NULL) { g_signal_emit (dbus, dbus_signals[NAME_LOST], @@ -370,7 +380,8 @@ bus_name_service_set_primary_owner (BusNameService *service, 0, owner->conn, service->name, - old != NULL ? bus_connection_get_unique_name (old->conn) : "", + has_old_owner ? bus_connection_get_unique_name (old->conn) : + "", bus_connection_get_unique_name (owner->conn)); if (old != NULL && old->do_not_queue != 0) { @@ -427,6 +438,7 @@ bus_name_service_remove_owner (BusNameService *service, BusDBusImpl *dbus) { GSList *owners; + gboolean has_new_owner = FALSE; g_assert (service != NULL); g_assert (owner != NULL); @@ -439,6 +451,13 @@ bus_name_service_remove_owner (BusNameService *service, BusConnectionOwner *_new = NULL; if (owners->next != NULL) { _new = (BusConnectionOwner *)owners->next->data; + /* rhbz#1406699 If bus_connection_get_unique_name() == NULL, + * "Hello" method is not received yet. + */ + if (_new != NULL && + bus_connection_get_unique_name (_new->conn) != NULL) { + has_new_owner = TRUE; + } } if (dbus != NULL) { @@ -447,7 +466,7 @@ bus_name_service_remove_owner (BusNameService *service, 0, owner->conn, service->name); - if (_new != NULL) { + if (has_new_owner) { g_signal_emit (dbus, dbus_signals[NAME_ACQUIRED], 0, @@ -460,7 +479,7 @@ bus_name_service_remove_owner (BusNameService *service, _new != NULL ? _new->conn : NULL, service->name, bus_connection_get_unique_name (owner->conn), - _new != NULL ? bus_connection_get_unique_name (_new->conn) : ""); + has_new_owner ? bus_connection_get_unique_name (_new->conn) : ""); } } @@ -591,6 +610,7 @@ static void bus_dbus_impl_destroy (BusDBusImpl *dbus) { GList *p; + int i; for (p = dbus->objects; p != NULL; p = p->next) { IBusService *object = (IBusService *) p->data; @@ -628,12 +648,39 @@ bus_dbus_impl_destroy (BusDBusImpl *dbus) dbus->unique_names = NULL; dbus->names = NULL; + for (i = 0; g_idle_remove_by_data (dbus); i++) { + if (i > 1000) { + g_warning ("Too many idle threads were generated by " \ + "bus_dbus_impl_forward_message_idle_cb and " \ + "bus_dbus_impl_dispatch_message_by_rule_idle_cb"); + break; + } + } g_list_free_full (dbus->start_service_calls, (GDestroyNotify) bus_method_call_free); dbus->start_service_calls = NULL; - g_mutex_clear (&dbus->dispatch_lock); - g_mutex_clear (&dbus->forward_lock); + /* rhbz#1663528 Call g_mutex_trylock() before g_mutex_clear() + * because if the mutex is not unlocked, g_mutex_clear() causes assert. + */ +#define BUS_DBUS_MUTEX_SAFE_CLEAR(mtex) { \ + int count = 0; \ + while (!g_mutex_trylock ((mtex))) { \ + g_usleep (1); \ + if (count > 60) { \ + g_warning (#mtex " is dead lock"); \ + break; \ + } \ + ++count; \ + } \ + g_mutex_unlock ((mtex)); \ + g_mutex_clear ((mtex)); \ +} + + BUS_DBUS_MUTEX_SAFE_CLEAR (&dbus->dispatch_lock); + BUS_DBUS_MUTEX_SAFE_CLEAR (&dbus->forward_lock); + +#undef BUS_DBUS_MUTEX_SAFE_CLEAR /* FIXME destruct _lock and _queue members. */ IBUS_OBJECT_CLASS(bus_dbus_impl_parent_class)->destroy ((IBusObject *) dbus); @@ -1464,13 +1511,20 @@ bus_dbus_impl_connection_filter_cb (GDBusConnection *dbus_connection, gboolean incoming, gpointer user_data) { + BusDBusImpl *dbus; + BusConnection *connection; + g_assert (G_IS_DBUS_CONNECTION (dbus_connection)); g_assert (G_IS_DBUS_MESSAGE (message)); g_assert (BUS_IS_DBUS_IMPL (user_data)); - BusDBusImpl *dbus = (BusDBusImpl *) user_data; - BusConnection *connection = bus_connection_lookup (dbus_connection); + if (g_dbus_connection_is_closed (dbus_connection)) + return NULL; + + dbus = (BusDBusImpl *) user_data; + connection = bus_connection_lookup (dbus_connection); g_assert (connection != NULL); + g_assert (BUS_IS_CONNECTION (connection)); if (incoming) { /* is incoming message */ diff --git a/bus/engineproxy.c b/bus/engineproxy.c index 2d98995c..2176e0c9 100644 --- a/bus/engineproxy.c +++ b/bus/engineproxy.c @@ -665,6 +665,7 @@ bus_engine_proxy_new_internal (const gchar *path, IBusEngineDesc *desc, GDBusConnection *connection) { + GError *error = NULL; g_assert (path); g_assert (IBUS_IS_ENGINE_DESC (desc)); g_assert (G_IS_DBUS_CONNECTION (connection)); @@ -673,7 +674,7 @@ bus_engine_proxy_new_internal (const gchar *path, BusEngineProxy *engine = (BusEngineProxy *) g_initable_new (BUS_TYPE_ENGINE_PROXY, NULL, - NULL, + &error, "desc", desc, "g-connection", connection, "g-interface-name", IBUS_INTERFACE_ENGINE, @@ -681,6 +682,12 @@ bus_engine_proxy_new_internal (const gchar *path, "g-default-timeout", g_gdbus_timeout, "g-flags", flags, NULL); + /* FIXME: rhbz#1601577 */ + if (error) { + /* show abrt local variable */ + gchar *message = g_strdup (error->message); + g_error ("%s", message); + } const gchar *layout = ibus_engine_desc_get_layout (desc); if (layout != NULL && layout[0] != '\0') { engine->keymap = ibus_keymap_get (layout); diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c index bbbb5770..77fcf42f 100644 --- a/bus/ibusimpl.c +++ b/bus/ibusimpl.c @@ -464,13 +464,16 @@ _dbus_name_owner_changed_cb (BusDBusImpl *dbus, else if (!g_strcmp0 (name, IBUS_SERVICE_PANEL_EXTENSION_EMOJI)) panel_type = PANEL_TYPE_EXTENSION_EMOJI; - if (panel_type != PANEL_TYPE_NONE) { + do { + if (panel_type == PANEL_TYPE_NONE) + break; if (g_strcmp0 (new_name, "") != 0) { /* a Panel process is started. */ BusConnection *connection; BusInputContext *context = NULL; BusPanelProxy **panel = (panel_type == PANEL_TYPE_PANEL) ? &ibus->panel : &ibus->emoji_extension; + GDBusConnection *dbus_connection = NULL; if (*panel != NULL) { ibus_proxy_destroy ((IBusProxy *)(*panel)); @@ -479,9 +482,21 @@ _dbus_name_owner_changed_cb (BusDBusImpl *dbus, g_assert (*panel == NULL); } - connection = bus_dbus_impl_get_connection_by_name (BUS_DEFAULT_DBUS, new_name); + connection = bus_dbus_impl_get_connection_by_name (BUS_DEFAULT_DBUS, + new_name); g_return_if_fail (connection != NULL); + dbus_connection = bus_connection_get_dbus_connection (connection); + /* rhbz#1349148 rhbz#1385349 + * Avoid SEGV of BUS_IS_PANEL_PROXY (ibus->panel) + * This function is called during destroying the connection + * in this case? */ + if (dbus_connection == NULL || + g_dbus_connection_is_closed (dbus_connection)) { + new_name = ""; + break; + } + *panel = bus_panel_proxy_new (connection, panel_type); if (panel_type == PANEL_TYPE_EXTENSION_EMOJI) ibus->enable_emoji_extension = FALSE; @@ -535,7 +550,7 @@ _dbus_name_owner_changed_cb (BusDBusImpl *dbus, } } } - } + } while (0); bus_ibus_impl_component_name_owner_changed (ibus, name, old_name, new_name); } -- 2.20.1 ++++++ xim.d-ibus-121 ++++++ --- /var/tmp/diff_new_pack.6tqvJL/_old 2020-01-30 14:51:32.150938696 +0100 +++ /var/tmp/diff_new_pack.6tqvJL/_new 2020-01-30 14:51:32.154938699 +0100 @@ -30,17 +30,6 @@ ;; esac -# Force OOo to use gtk-immodule -# Only libreoffice-gnome supports IM module -# To fix cursor following problem (on_the_spot), do not use libreoffice-kde4 -if [ -e /usr/lib64/libreoffice/program/libvclplug_gtklo.so ] || - [ -e /usr/lib/libreoffice/program/libvclplug_gtklo.so ] || - [ -e /usr/lib64/libreoffice/program/libvclplug_gtk3lo.so ] || - [ -e /usr/lib/libreoffice/program/libvclplug_gtk3lo.so ]; then - export OOO_FORCE_DESKTOP=gnome -else - echo "libreoffice-gnome is not found. For better IBus support, please install libreoffice-gnome" -fi export XMODIFIERS="@im=ibus" export GTK_IM_MODULE=ibus

1 0

commit gvfs for openSUSE:Leap:15.2
by root 30 Jan '20

30 Jan '20

Hello community, here is the log from the commit of package gvfs for openSUSE:Leap:15.2 checked in at 2020-01-30 14:50:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/gvfs (Old) and /work/SRC/openSUSE:Leap:15.2/.gvfs.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gvfs" Thu Jan 30 14:50:22 2020 rev:65 rq:761559 version:1.42.2 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/gvfs/gvfs.changes 2020-01-15 15:10:24.898072671 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.gvfs.new.26092/gvfs.changes 2020-01-30 14:51:29.246937152 +0100 @@ -1,0 +2,118 @@ +Fri Dec 27 10:02:01 UTC 2019 - Dominique Leuenberger <dimstar(a)opensuse.org> + +- BuildRequire pkgconfig(systemd): meson.build tries to inspect + systemd.pc to find the right unit-directories. + +------------------------------------------------------------------- +Fri Nov 22 10:57:07 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 1.42.2: + + gdbus: Add workaround for deadlocks when cancelling jobs. + +------------------------------------------------------------------- +Tue Nov 19 08:05:54 UTC 2019 - QK ZHU <qkzhu(a)suse.com> + +- Drop fixed upstream patches by version 1.40.2: + + gvfs-CVE-2019-12447.patch. + + gvfs-CVE-2019-12448.patch. + + gvfs-CVE-2019-12449.patch. + + gvfs-CVE-2019-12795.patch. + +------------------------------------------------------------------- +Mon Oct 21 07:45:59 UTC 2019 - QK ZHU <qkzhu(a)suse.com> + +- Rebase SLE patches gvfs-nds.patch and gvfs-nvvfs.patch for version + 1.42.1: + + Add daemon/nds.mount.in. + + Add daemon/nvvfs.mount.in. + + meson porting fixes. + +------------------------------------------------------------------- +Mon Oct 14 07:17:45 UTC 2019 - QK ZHU <qkzhu(a)suse.com> + +- Rebase SLE patches for version 1.42.1: + + gvfs-nds.patch + + gvfs-nvvfs.patch + +------------------------------------------------------------------- +Mon Oct 7 07:47:29 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 1.42.1: + + dav: Fix mounting when 403 is returned for the parent folder. + + Revert "sftp: Always use port 22 if not specified". + + Updated translations. + +------------------------------------------------------------------- +Sun Sep 15 19:24:28 UTC 2019 - Michael Gorse <mgorse(a)suse.com> + +- Fix Requires on -fuse package: now needs fuse3, not fuse. + +------------------------------------------------------------------- +Tue Sep 10 17:40:44 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 1.42.0: + + Updated translations. + +------------------------------------------------------------------- +Fri Aug 30 19:56:41 CDT 2019 - mgorse(a)suse.com + +- Update to version 1.41.91: + + fuse: Remove max_write limit. + + Several smaller bugfixes. + + Updated translations. +- Changes from version 1.41.90: + + udisks2: Change display name for crypto_unknown devices. + + google: Disable deletion of non-empty directories. + + google: Fix crashes when deleting if the file isn't found. + + google: Fix issue with stale entries remaining after rename + operation. + + build: Define gvfs_rpath for libgvfsdaemon.so. + + proxy: Don't leak a GVfsDBusDaemon. + + Updated translations. +- Changes from version 1.41.4: + + google: Do not enumerate volatile entries if title matches id. + + build: Add dependency on gsettings-desktop-schemas. + + daemon/udisks2: Handle lockdown option to disable writing. + + fuse: Define RENAME_* macros when they are not defined. + + google: Check ownership in is_owner() without additional HTTP + request. + + Several smaller bugfixes. + + Updated translations. +- Changes from version 1.41.3: + + Updated translations. +- Changes from version 1.41.2: + + build: Several meson improvements. + + build: Bump required meson version to 0.50.0. + + google: Support deleting shared Google Drive files. + + admin: Prevent core dumps when daemon is manually started. + + Several smaller bugfixes. + + Updated translations. +- Changes from version 1.41.1: + + fuse: Adapt gvfsd-fuse to use fuse 3.x. + + daemon: Unify some translatable strings. + + Updated translations. +- Specify meson version requirement. +- Require fuse >= 3.0.0. +- Require gsettings-desktop-schemas: new dependency. + +------------------------------------------------------------------- +Wed Jul 17 10:07:09 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 1.40.2: + + daemon: + - Only accept EXTERNAL authentication (CVE-2019-12795). + - Check that the connecting client is the same user + (CVE-2019-12795). + + admin: + - Ensure correct ownership when moving to file:// uri + (CVE-2019-12449). + - Use fsuid to ensure correct file ownership (CVE-2019-12447). + - Allow changing file owner (CVE-2019-12447). + - Add query_info_on_read/write functionality (CVE-2019-12448). + + afc: Remove assumptions about length of device UUID to support + new devices. + + gmountsource: Fix deadlocks in synchronous API. + + afp: Fix afp backend crash when no username supplied. + + Updated translations. + +------------------------------------------------------------------- @@ -30 +148 @@ -Fri May 17 17:47:57 UTC 2019 - mgorse(a)suse.com +Fri May 17 09:26:43 UTC 2019 - Dominique Leuenberger <dimstar(a)opensuse.org> @@ -35,0 +154,83 @@ +Tue Apr 9 09:07:24 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 1.40.1: + + Revert "sftp: Always use port 22 if not specified". + + Updated translations. + +------------------------------------------------------------------- +Tue Mar 12 01:40:00 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 1.40.0: + + Stable release version bump. + +------------------------------------------------------------------- +Tue Mar 12 01:39:22 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 1.39.92: + + client: Fix mount info cache invalidation. + + Several smaller bugfixes. + + Updated translations. + +------------------------------------------------------------------- +Tue Mar 12 01:39:19 UTC 2019 - bjorn.lie(a)gmail.com + +- Update to version 1.39.91: + + smb: Do not show password prompt when using winbind ccache. + + Several smaller bugfixes. + + Updated translations. + +------------------------------------------------------------------- +Tue Mar 12 01:39:09 UTC 2019 - bjorn.lie(a)gmail.com + +- Update to version 1.39.90: + + sftp: Always use port 22 if not specified. + + mtp: Don't retry reading an event after failure. + + admin: Prevent access if any authentication agent isn't + available. + + build: Several meson improvements. + + Several smaller bugfixes. + + Updated translations. +- Drop gvfs-CVE-2019-3827.patch: Fixed upstream. + +------------------------------------------------------------------- +Tue Mar 12 01:39:04 UTC 2019 - bjorn.lie(a)gmail.com + +- Update to version 1.39.4: + + keyring: Prefer the most recent item. + + afp: Try to find credentials even if user is not specified. + + dav: Try authenticate again even if 403 was returned. + + Several smaller bugfixes. + + Updated translations. + +------------------------------------------------------------------- +Tue Mar 12 01:39:03 UTC 2019 - bjorn.lie(a)gmail.com + +- Update to version 1.39.3: + + udisks2: + - Improve handling of mounts which doesn't point into fs root. + - Restore support of comment=x-gvfs-* option. + + daemon: Prevent spawning new daemons if outgoing operation + exists. + + common: Prevent crashes on invalid autorun file. + + Several smaller bugfixes. + + Updated translations. +- Changes from version 1.39.1: + + google: + - Rework cache for better performance. + - Add support for files with multiple parents. + + udisks2: Add a new volume class `loop`. + +------------------------------------------------------------------- +Mon Mar 11 15:19:51 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 1.38.2: + + mtp: Don't retry reading an event after failure. + + admin: Prevent access if any authentication agent isn't ++++ 212 more lines (skipped) ++++ between /work/SRC/openSUSE:Leap:15.2/gvfs/gvfs.changes ++++ and /work/SRC/openSUSE:Leap:15.2/.gvfs.new.26092/gvfs.changes Old: ---- gvfs-1.34.2.1.tar.xz gvfs-CVE-2019-12447.patch gvfs-CVE-2019-12448.patch gvfs-CVE-2019-12449.patch gvfs-CVE-2019-12795.patch gvfs-CVE-2019-3827.patch gvfs-smb-Use-O_RDWR-to-fix-fstat-when-writing.patch New: ---- gvfs-1.42.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gvfs.spec ++++++ --- /var/tmp/diff_new_pack.SINwb4/_old 2020-01-30 14:51:29.710937399 +0100 +++ /var/tmp/diff_new_pack.SINwb4/_new 2020-01-30 14:51:29.710937399 +0100 @@ -1,7 +1,7 @@ # # spec file for package gvfs # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,84 +12,71 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define with_udisks2 1 -%define with_cdda 1 +%bcond_without cdda Name: gvfs -Version: 1.34.2.1 +Version: 1.42.2 Release: 0 Summary: Virtual File System functionality for GLib -License: LGPL-2.0+ AND GPL-3.0 +License: LGPL-2.0-or-later AND GPL-3.0-only Group: Development/Libraries/C and C++ -URL: http://www.gnome.org -Source0: http://download.gnome.org/sources/gvfs/1.34/%{name}-%{version}.tar.xz +URL: https://wiki.gnome.org/Projects/gvfs +Source0: https://download.gnome.org/sources/gvfs/1.42/%{name}-%{version}.tar.xz Source99: baselibs.conf -# PATCH-FIX-UPSTREAM gvfs-smb-Use-O_RDWR-to-fix-fstat-when-writing.patch bgo#795805 boo#1096476 fezhang(a)suse.com -- Fix failures copying files on smb mounts -Patch1: gvfs-smb-Use-O_RDWR-to-fix-fstat-when-writing.patch -# PATCH-FIX-UPSTREAM gvfs-CVE-2019-3827.patch glgo#GNOME/gvfs#355 bsc#1125084 CVE-2019-3827 qkzhu(a)suse.com -- Prevent access if any authentication agent isn't available -Patch2: gvfs-CVE-2019-3827.patch -# PATCH-FEATURE-SLE gvfs-nvvfs.patch ksamrat(a)novell.com -- Provides gvfs backend for novell nautilus plugin -Patch5: gvfs-nvvfs.patch + +### NOTE: Please, keep SLE-only patches at bottom (starting on 1000). # PATCH-FEATURE-SLE gvfs-nds.patch ksamrat(a)novell.com -- Provides NDS browsing for nautilus -Patch6: gvfs-nds.patch -# PATCH-FIX-UPSTREAM gvfs-CVE-2019-12449.patch boo#1136992 CVE-2019-12449 qzheng(a)suse.com -- Ensure correct ownership when moving to file:// uri -Patch7: gvfs-CVE-2019-12449.patch -# PATCH-FIX-UPSTREAM gvfs-CVE-2019-12448.patch boo#1136981 CVE-2019-12448 qzheng(a)suse.com -- Add query_info_on_read/write functionality -Patch8: gvfs-CVE-2019-12448.patch -Patch9: gvfs-CVE-2019-12447.patch -Patch10: gvfs-CVE-2019-12795.patch +Patch1000: gvfs-nds.patch +# PATCH-FEATURE-SLE gvfs-nvvfs.patch ksamrat(a)novell.com -- Provides gvfs backend for novell nautilus plugin +Patch1001: gvfs-nvvfs.patch + BuildRequires: docbook-xsl-stylesheets -BuildRequires: fuse-devel -BuildRequires: intltool -BuildRequires: libarchive-devel -BuildRequires: libavahi-glib-devel -BuildRequires: libgcrypt-devel -BuildRequires: libgphoto2-devel -BuildRequires: libimobiledevice-devel >= 1.2 -BuildRequires: libsoup-devel >= 2.34.0 -BuildRequires: libtool +BuildRequires: libgcrypt-devel >= 1.2.2 +BuildRequires: meson >= 0.50.0 +BuildRequires: openssh BuildRequires: pkgconfig +BuildRequires: translation-update-upstream BuildRequires: xsltproc +BuildRequires: pkgconfig(avahi-client) >= 0.6 +BuildRequires: pkgconfig(avahi-glib) >= 0.6 +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(fuse3) >= 3.0.0 BuildRequires: pkgconfig(gcr-base-3) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gio-unix-2.0) -BuildRequires: pkgconfig(glib-2.0) >= 2.51.0 +BuildRequires: pkgconfig(glib-2.0) >= 2.57.2 BuildRequires: pkgconfig(goa-1.0) >= 3.17.1 BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.33.0 BuildRequires: pkgconfig(gudev-1.0) >= 147 +BuildRequires: pkgconfig(libarchive) BuildRequires: pkgconfig(libbluray) BuildRequires: pkgconfig(libcap) BuildRequires: pkgconfig(libgdata) >= 0.17.3 -BuildRequires: pkgconfig(libmtp) >= 1.1.5 +BuildRequires: pkgconfig(libgphoto2) >= 2.4.0 +BuildRequires: pkgconfig(libimobiledevice-1.0) >= 1.2 +BuildRequires: pkgconfig(libmtp) >= 1.1.12 BuildRequires: pkgconfig(libnfs) >= 1.9.8 BuildRequires: pkgconfig(libsecret-unstable) +BuildRequires: pkgconfig(libsoup-2.4) >= 2.42.0 BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libusb-1.0) >= 1.0.21 -BuildRequires: pkgconfig(polkit-gobject-1) +BuildRequires: pkgconfig(polkit-gobject-1) >= 0.114 BuildRequires: pkgconfig(smbclient) +BuildRequires: pkgconfig(systemd) +BuildRequires: pkgconfig(udisks2) >= 1.97 Recommends: %{name}-lang Recommends: gvfs-backends Recommends: gvfs-common Recommends: gvfs-fuse -%glib2_gio_module_requires +%{glib2_gio_module_requires} %{?systemd_requires} -%if !0%{?is_opensuse} -# needed for patches 5 and 6 -BuildRequires: autoconf -%endif -%if %{with_cdda} +%if %{with cdda} BuildRequires: pkgconfig(libcdio_paranoia) >= 0.78.2 %endif -%if !%{with_udisks2} -BuildRequires: libgdu-devel -%endif -BuildRequires: translation-update-upstream -%if %{with_udisks2} -BuildRequires: pkgconfig(udisks2) >= 1.97 -%endif %if !0%{?is_opensuse} # The library gvfscommon was converted to a private library and is not used outside of gvfs Obsoletes: libgvfscommon0 <= %{version} @@ -103,36 +90,36 @@ not using GIO to access the GVfs filesystems. %package backend-afc +%define mobile_device_package %(rpm -q --qf "%%{name}" -f $(readlink -f %{_libdir}/libimobiledevice.so)) Summary: VFS functionality for GLib -- iPod / iPhone Support License: LGPL-2.0-or-later Group: Development/Libraries/C and C++ Requires: %{name} = %{version} -Supplements: packageand(%{name}:%(rpm -q --qf "%%{name}" -f $(readlink -f %{_libdir}/llibimobiledevice.so))) +Supplements: packageand(gvfs:%{mobile_device_package}) %description backend-afc This package provides a gvfs backend that supports iPod / iPhone devices. %package backend-samba +%define smb_client_package %(rpm -q --qf "%%{name}" -f $(readlink -f %{_libdir}/libsmbclient.so)) Summary: VFS functionality for GLib -- Samba Support License: LGPL-2.0-or-later Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: %{name}-backends = %{version} -Supplements: packageand(%{name}:%(rpm -q --qf "%%{name}" -f $(readlink -f %{_libdir}/libsmbclient.so))) -%glib2_gsettings_schema_requires +Supplements: packageand(gvfs:%{smb_client_package}) %description backend-samba This package provides a gvfs backend that supports Samba. %package backends Summary: VFS functionality for GLib -License: LGPL-2.0+ AND GPL-3.0 +License: LGPL-2.0-or-later AND GPL-3.0-only Group: Development/Libraries/C and C++ Requires: %{name} = %{version} -%glib2_gsettings_schema_requires -%if %{with_udisks2} +# FIXME: use proper Requires(pre/post/preun/...) +PreReq: permissions Recommends: udisks2 -%endif %description backends VFS functionality for GLib. @@ -143,7 +130,7 @@ License: LGPL-2.0-or-later Group: System/Filesystems Requires: %{name} = %{version} -Requires: fuse +Requires: fuse3 %description fuse gvfs GNOME's userspace virtual filesystem designed to work with the @@ -173,44 +160,34 @@ %prep %setup -q -translation-update-upstream -%patch1 -p1 -%patch2 -p1 +translation-update-upstream po %{name} + %if !0%{?is_opensuse} -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 +%patch1000 -p1 +%patch1001 -p1 %endif %build -%if !0%{?is_opensuse} -# needed for patches 5 and 6 -autoreconf -%endif -%configure \ +%meson \ --libexecdir=%{_libexecdir}/%{name} \ -%if %{with_udisks2} - --enable-udisks2 \ - --disable-gdu \ -%else - --disable-udisks2 \ - --enable-gdu \ -%endif - --disable-static -make %{?_smp_mflags} + -Dudisks2=true \ + %{!?with_cdda: -Dcdda=false} \ + -Dman=true \ + %{nil} +%meson_build %install -%make_install +%meson_install # drop polkit rules files (for wheel group) - boo#1125433 rm %{buildroot}%{_datadir}/polkit-1/rules.d/org.gtk.vfs.file-operations.rules -find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print +find %{buildroot} -type f -name "*.la" -delete -print %find_lang %{name} +# Rename daemon/trashlib/COPYING +mv daemon/trashlib/COPYING daemon/trashlib/COPYING.trashlib + %post -%glib2_gio_module_post +%{glib2_gio_module_post} %post fuse %tmpfiles_create %{_libexecdir}/tmpfiles.d/gvfsd-fuse-tmpfiles.conf @@ -222,12 +199,11 @@ %verify_permissions -e %{_libexecdir}/%{name}/gvfsd-nfs %postun -%glib2_gio_module_postun +%{glib2_gio_module_postun} %files -%defattr(-, root, root) -%doc AUTHORS NEWS README -%{_bindir}/gvfs-* +%license COPYING daemon/trashlib/COPYING.trashlib +%doc NEWS README.md %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/mounts %dir %{_datadir}/%{name}/remote-volume-monitors @@ -240,7 +216,6 @@ %{_datadir}/dbus-1/services/org.gtk.vfs.Daemon.service %{_libexecdir}/%{name}/gvfsd-metadata %{_datadir}/dbus-1/services/org.gtk.vfs.Metadata.service -%{_mandir}/man1/gvfs-*.1%{?ext_man} %{_mandir}/man1/gvfsd.1%{?ext_man} %{_mandir}/man1/gvfsd-metadata.1%{?ext_man} %{_mandir}/man7/gvfs.7%{?ext_man} @@ -248,14 +223,12 @@ %{_userunitdir}/gvfs-metadata.service %files fuse -%defattr(-, root, root) %{_libexecdir}/%{name}/gvfsd-fuse %dir %{_libexecdir}/tmpfiles.d %{_libexecdir}/tmpfiles.d/gvfsd-fuse-tmpfiles.conf %{_mandir}/man1/gvfsd-fuse.1%{?ext_man} %files backend-afc -%defattr(-, root, root) %{_libexecdir}/%{name}/gvfs-afc-volume-monitor %{_datadir}/dbus-1/services/org.gtk.vfs.AfcVolumeMonitor.service %{_userunitdir}/gvfs-afc-volume-monitor.service @@ -264,7 +237,6 @@ %{_datadir}/%{name}/mounts/afc.mount %files backend-samba -%defattr(-, root, root) %{_libexecdir}/%{name}/gvfsd-smb %{_datadir}/%{name}/mounts/smb.mount %{_libexecdir}/%{name}/gvfsd-smb-browse @@ -275,18 +247,11 @@ %{_datadir}/GConf/gsettings/gvfs-smb.convert %files backends -%defattr(-, root, root) -%if %{with_udisks2} %doc monitor/udisks2/what-is-shown.txt %{_datadir}/dbus-1/services/org.gtk.vfs.UDisks2VolumeMonitor.service %{_datadir}/%{name}/remote-volume-monitors/udisks2.monitor %{_libexecdir}/%{name}/gvfs-udisks2-volume-monitor %{_userunitdir}/gvfs-udisks2-volume-monitor.service -%else -%{_libexecdir}/%{name}/gvfs-gdu-volume-monitor -%{_datadir}/dbus-1/services/org.gtk.Private.GduVolumeMonitor.service -%{_datadir}/%{name}/remote-volume-monitors/gdu.monitor -%endif %{_libexecdir}/%{name}/gvfs-gphoto2-volume-monitor %{_userunitdir}/gvfs-gphoto2-volume-monitor.service %{_datadir}/dbus-1/services/org.gtk.vfs.GPhoto2VolumeMonitor.service @@ -302,7 +267,7 @@ %{_datadir}/%{name}/mounts/archive.mount %{_libexecdir}/%{name}/gvfsd-burn %{_datadir}/%{name}/mounts/burn.mount -%if %{with_cdda} +%if %{with cdda} %{_libexecdir}/%{name}/gvfsd-cdda %{_datadir}/%{name}/mounts/cdda.mount %endif @@ -316,6 +281,7 @@ %{_libexecdir}/%{name}/gvfsd-ftp %{_datadir}/%{name}/mounts/ftp.mount %{_datadir}/%{name}/mounts/ftps.mount +%{_datadir}/%{name}/mounts/ftpis.mount %{_libexecdir}/%{name}/gvfsd-google %{_datadir}/%{name}/mounts/google.mount %{_libexecdir}/%{name}/gvfsd-gphoto2 @@ -336,17 +302,16 @@ %{_datadir}/%{name}/mounts/mtp.mount %if !0%{?is_opensuse} %{_libexecdir}/%{name}/gvfsd-nds +%{_libexecdir}/%{name}/gvfsd-nvvfs %{_datadir}/%{name}/mounts/nds.mount +%{_datadir}/%{name}/mounts/nvvfs.mount %endif %{_libexecdir}/%{name}/gvfsd-network %{_datadir}/%{name}/mounts/network.mount -# allow priv ports for mounting nfs . Otherwise the nfs-service requires insecure (boo#1065864) +# allow priv ports for mounting nfs. Otherwise the nfs-service requires insecure (boo#1065864) %verify(not mode caps) %caps(cap_net_bind_service=+ep) %{_libexecdir}/%{name}/gvfsd-nfs +%{_libexecdir}/%{name}/gvfsd-nfs %{_datadir}/%{name}/mounts/nfs.mount -%if !0%{?is_opensuse} -%{_libexecdir}/%{name}/gvfsd-nvvfs -%{_datadir}/%{name}/mounts/nvvfs.mount -%endif %{_libexecdir}/%{name}/gvfsd-recent %{_datadir}/%{name}/mounts/recent.mount %{_libexecdir}/%{name}/gvfsd-sftp @@ -363,7 +328,7 @@ %{_datadir}/GConf/gsettings/gvfs-dns-sd.convert %files devel -%defattr(-, root, root) +%doc CONTRIBUTING.md NEWS.pre-1-2 %{_includedir}/gvfs-client %files lang -f %{name}.lang ++++++ gvfs-1.34.2.1.tar.xz -> gvfs-1.42.2.tar.xz ++++++ ++++ 262826 lines of diff (skipped) ++++++ gvfs-nds.patch ++++++ --- /var/tmp/diff_new_pack.SINwb4/_old 2020-01-30 14:51:30.338937733 +0100 +++ /var/tmp/diff_new_pack.SINwb4/_new 2020-01-30 14:51:30.338937733 +0100 @@ -1,9 +1,10 @@ -Index: gvfs-1.34.0/daemon/gvfsbackendnds.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gvfs-1.34.0/daemon/gvfsbackendnds.c 2017-09-15 10:53:24.564258329 +0200 +diff --git a/daemon/gvfsbackendnds.c b/daemon/gvfsbackendnds.c +new file mode 100644 +index 0000000..960d457 +--- /dev/null ++++ b/daemon/gvfsbackendnds.c @@ -0,0 +1,747 @@ -+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ ++/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode; nil; -*- */ +/* GIO - GLib Input, Output and Streaming Library + * + * Copyright (C) 2006-2007 Red Hat, Inc. @@ -750,10 +751,11 @@ +{ + g_set_application_name (_("Displaying Embedded Objects")); +} -Index: gvfs-1.34.0/daemon/gvfsbackendnds.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gvfs-1.34.0/daemon/gvfsbackendnds.h 2017-09-15 10:53:56.159989373 +0200 +diff --git a/daemon/gvfsbackendnds.h b/daemon/gvfsbackendnds.h +new file mode 100644 +index 0000000..0b48ad6 +--- /dev/null ++++ b/daemon/gvfsbackendnds.h @@ -0,0 +1,53 @@ +/* GIO - GLib Input, Output and Streaming Library + * @@ -808,48 +810,78 @@ +G_END_DECLS + +#endif /* __G_VFS_BACKEND_NDS_H__ */ -Index: gvfs-1.34.0/daemon/Makefile.am -=================================================================== ---- gvfs-1.34.0.orig/daemon/Makefile.am 2017-09-15 10:15:10.715090208 +0200 -+++ gvfs-1.34.0/daemon/Makefile.am 2017-09-15 10:15:46.554940823 +0200 -@@ -144,6 +144,10 @@ - mount_DATA += nvvfs.mount - libexec_PROGRAMS += gvfsd-nvvfs +diff --git a/daemon/meson.build b/daemon/meson.build +index dffeef3..dabdcb2 100644 +--- a/daemon/meson.build ++++ b/daemon/meson.build +@@ -530,6 +530,22 @@ if enable_afp + mounts += ['afp-browse'] + endif -+mount_in_files += nds.mount.in -+mount_DATA += nds.mount -+libexec_PROGRAMS += gvfsd-nds -+ - EXTRA_DIST = \ - $(service_in_files) \ - $(systemd_user_in_files) \ -@@ -528,6 +532,19 @@ - - gvfsd_http_LDADD = $(libraries) $(HTTP_LIBS) - -+gvfsd_nds_SOURCES = \ -+ gvfsbackendnds.c gvfsbackendnds.h \ -+ daemon-main.c daemon-main.h \ -+ daemon-main-generic.c -+ -+gvfsd_nds_CPPFLAGS = $(flags) \ -+ -DBACKEND_HEADER=gvfsbackendnds.h \ -+ -DDEFAULT_BACKEND_TYPE=nds \ -+ -DMAX_JOB_THREADS=1 \ -+ -DBACKEND_TYPES='"nds", G_VFS_TYPE_BACKEND_NDS,' -+ -+gvfsd_nds_LDADD = $(libraries) -ldl -+ - gvfsd_nvvfs_SOURCES = \ - gvfsbackendnvvfs.c gvfsbackendnvvfs.h \ - daemon-main.c daemon-main.h \ -Index: gvfs-1.34.0/daemon/nds.mount.in -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gvfs-1.34.0/daemon/nds.mount.in 2017-09-15 10:15:46.554940823 +0200 ++if enable_nds ++ sources = daemon_main_sources + files('gvfsbackendnds.c') ++ ++ deps = [libdl_dep] ++ ++ cflags = [ ++ '-DBACKEND_HEADER=gvfsbackendnds.h', ++ '-DDEFAULT_BACKEND_TYPE=nds', ++ '-DBACKEND_TYPES="nds", G_VFS_TYPE_BACKEND_NDS,', ++ '-DMAX_JOB_THREADS=1', ++ ] ++ ++ programs += [['gvfsd-nds', {'sources': sources, 'dependencies': deps, 'c_args': cflags}]] ++ mounts += ['nds'] ++endif ++ + if enable_nfs + cflags = [ + '-DBACKEND_HEADER=gvfsbackendnfs.h', +diff --git a/daemon/nds.mount.in b/daemon/nds.mount.in +new file mode 100644 +index 0000000..1068344 +--- /dev/null ++++ b/daemon/nds.mount.in @@ -0,0 +1,5 @@ +[Mount] +Type=nds +Exec=@libexecdir@/gvfsd-nds +AutoMount=false +Scheme=nds +diff --git a/meson.build b/meson.build +index 080637b..6525b79 100644 +--- a/meson.build ++++ b/meson.build +@@ -449,6 +449,12 @@ config_h.set('HAVE_LIBMTP', enable_mtp) + # *** AFP backend *** + enable_afp = get_option('afp') + ++# *** NDS backend *** ++enable_nds = get_option('nds') ++if enable_nds ++ libdl_dep = cc.find_library('dl') ++endif ++ + # *** NFS backend *** + enable_nfs = get_option('nfs') + if enable_nfs +@@ -507,6 +513,7 @@ output += ' google: ' + enable_google.to_string() + '\n' + output += ' gphoto2: ' + enable_gphoto2.to_string() + '\n' + output += ' http: ' + enable_http.to_string() + '\n' + output += ' mtp: ' + enable_mtp.to_string() + '\n' ++output += ' nds: ' + enable_nds.to_string() + '\n' + output += ' nfs: ' + enable_nfs.to_string() + '\n' + output += ' sftp: ' + enable_sftp.to_string() + '\n' + output += ' smb: ' + enable_samba.to_string() + '\n' +diff --git a/meson_options.txt b/meson_options.txt +index 32f10d4..dced004 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -12,6 +12,7 @@ option('google', type: 'boolean', value: true, description: 'build with google b + option('gphoto2', type: 'boolean', value: true, description: 'build with gphoto2 backend and volume monitor') + option('http', type: 'boolean', value: true, description: 'build with http/dav backends') + option('mtp', type: 'boolean', value: true, description: 'build with mtp backend and volume monitor') ++option('nds', type: 'boolean', value: true, description: 'build with nds backend') + option('nfs', type: 'boolean', value: true, description: 'build with nfs backend') + option('sftp', type: 'boolean', value: true, description: 'build with sftp backend') + option('smb', type: 'boolean', value: true, description: 'build with smb backends') ++++++ gvfs-nvvfs.patch ++++++ --- /var/tmp/diff_new_pack.SINwb4/_old 2020-01-30 14:51:30.346937737 +0100 +++ /var/tmp/diff_new_pack.SINwb4/_new 2020-01-30 14:51:30.350937739 +0100 @@ -1,11 +1,12 @@ -Index: gvfs-1.15.1/daemon/gvfsbackendnvvfs.c -=================================================================== +diff --git a/daemon/gvfsbackendnvvfs.c b/daemon/gvfsbackendnvvfs.c +new file mode 100644 +index 0000000..2e5abdc --- /dev/null -+++ gvfs-1.15.1/daemon/gvfsbackendnvvfs.c ++++ b/daemon/gvfsbackendnvvfs.c @@ -0,0 +1,591 @@ -+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ +/* GIO - GLib Input, Output and Streaming Library -+ * ++ * + * Copyright (C) 2006-2007 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or @@ -85,11 +86,11 @@ + GVolumeMonitor *volume_monitor; + + GVfsMonitor *root_monitor; -+ ++ + GList *files; -+ ++ + guint recompute_idle_tag; -+ ++ + GMountSpec *mount_spec; +}; + @@ -104,7 +105,7 @@ + g_object_unref (file->icon); + if (file->root) + g_object_unref (file->root); -+ ++ + g_slice_free (NovellNautilus, file); +} + @@ -118,7 +119,7 @@ + + if (!g_icon_equal (a->icon, b->icon)) + return FALSE; -+ ++ + if ((a->root != NULL && b->root != NULL && + !g_file_equal (a->root, b->root)) || + (a->root != NULL && b->root == NULL) || @@ -152,7 +153,7 @@ + g_signal_handlers_disconnect_by_func(backend->volume_monitor, object_changed, backend); + g_object_unref (backend->volume_monitor); + } -+ ++ + g_mount_spec_unref (backend->mount_spec); + + if (backend->recompute_idle_tag) @@ -162,7 +163,7 @@ + } + + g_object_unref (backend->root_monitor); -+ ++ + if (G_OBJECT_CLASS (g_vfs_backend_nvvfs_parent_class)->finalize) + (*G_OBJECT_CLASS (g_vfs_backend_nvvfs_parent_class)->finalize) (object); +} @@ -172,7 +173,7 @@ +{ + GVfsBackend *backend = G_VFS_BACKEND (nvvfs_backend); + GMountSpec *mount_spec; -+ ++ + g_vfs_backend_set_display_name (backend, _("Nvvfs")); + g_vfs_backend_set_icon_name (backend, "gnome-fs-client"); + g_vfs_backend_set_user_visible (backend, FALSE); @@ -190,10 +191,10 @@ + while (files != NULL) + { + file = files->data; -+ ++ + if (file->filename == NULL) + return FALSE; -+ ++ + if (strcmp (file->filename, filename) == 0) + return TRUE; + @@ -229,7 +230,7 @@ + + old_files = backend->files; + backend->files = files; -+ ++ + /* Generate change events */ + oldl = old_files; + newl = files; @@ -253,7 +254,7 @@ + old = oldl->data; + cmp = strcmp (old->filename, new->filename); + } -+ ++ + if (cmp == 0) + { + if (!nvvfs_file_equal (old, new)) @@ -265,7 +266,7 @@ + NULL); + g_free (filename); + } -+ ++ + oldl = oldl->next; + newl = newl->next; + } @@ -290,7 +291,7 @@ + newl = newl->next; + } + } -+ ++ + g_list_foreach (old_files, (GFunc)nvvfs_file_free, NULL); +} + @@ -315,11 +316,11 @@ + volume_monitor = backend->volume_monitor; + + files = NULL; -+ ++ + +// Im building the path for Novell Client mounts + user_name = g_get_user_name(); -+ path_ncl = g_strconcat(nclmnt_path,user_name,NULL); ++ path_ncl = g_strconcat(nclmnt_path,user_name,NULL); + + file = g_slice_new0 (NovellNautilus); + file->filename = g_strdup ("root.link"); @@ -327,7 +328,7 @@ + file->icon = g_themed_icon_new("ncl-logo"); + file->root = g_file_new_for_path (path_ncl); + file->prio = 0; -+ ++ + files = g_list_prepend (files, file); + + file = g_slice_new0 (NovellNautilus); @@ -352,7 +353,7 @@ + backend->recompute_idle_tag = 0; + + recompute_files (backend); -+ ++ + return FALSE; +} + @@ -361,7 +362,7 @@ + gpointer object, + GVfsBackendNvvfs *backend) +{ -+ if (backend->recompute_idle_tag == 0) ++ if (backend->recompute_idle_tag == 0) + backend->recompute_idle_tag = + g_idle_add ((GSourceFunc)recompute_files_in_idle, + backend); @@ -401,7 +402,7 @@ + NULL, 0); + + nvvfs_backend->root_monitor = g_vfs_monitor_new (backend); -+ ++ + recompute_files (nvvfs_backend); + + g_vfs_job_succeeded (G_VFS_JOB (job)); @@ -425,10 +426,10 @@ + + if (*filename == 0) + return &root; -+ ++ + if (strchr (filename, '/') != NULL) + goto out; -+ ++ + for (l = backend->files; l != NULL; l = l->next) + { + file = l->data; @@ -471,7 +472,7 @@ + GFileInfo *info) +{ + char *uri; -+ ++ + g_file_info_set_name (info, file->filename); + g_file_info_set_display_name (info, file->display_name); + @@ -513,7 +514,7 @@ + + file = lookup (G_VFS_BACKEND_NVVFS (backend), + G_VFS_JOB (job), filename); -+ ++ + if (file != &root) + { + if (file != NULL) @@ -524,21 +525,21 @@ + } + + g_vfs_job_succeeded (G_VFS_JOB (job)); -+ ++ + /* Enumerate root */ + for (l = G_VFS_BACKEND_NVVFS (backend)->files; l != NULL; l = l->next) + { + file = l->data; -+ ++ + info = g_file_info_new (); -+ ++ + file_info_from_file (file, info); + g_vfs_job_enumerate_add_info (job, info); + g_object_unref (info); + } + + g_vfs_job_enumerate_done (job); -+ ++ + return TRUE; +} + @@ -558,7 +559,7 @@ + if (file == &root) + { + GIcon *icon; -+ ++ + g_file_info_set_name (info, "/"); + g_file_info_set_file_type (info, G_FILE_TYPE_DIRECTORY); + g_file_info_set_display_name (info, _("Nvvfs")); @@ -577,7 +578,7 @@ + file_info_from_file (file, info); + g_vfs_job_succeeded (G_VFS_JOB (job)); + } -+ ++ + return TRUE; +} + @@ -586,7 +587,7 @@ +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + GVfsBackendClass *backend_class = G_VFS_BACKEND_CLASS (klass); -+ ++ + gobject_class->finalize = g_vfs_backend_nvvfs_finalize; + + backend_class->try_mount = try_mount; @@ -594,13 +595,14 @@ + backend_class->try_query_info = try_query_info; + backend_class->try_enumerate = try_enumerate; +} -Index: gvfs-1.15.1/daemon/gvfsbackendnvvfs.h -=================================================================== +diff --git a/daemon/gvfsbackendnvvfs.h b/daemon/gvfsbackendnvvfs.h +new file mode 100644 +index 0000000..eebf062 --- /dev/null -+++ gvfs-1.15.1/daemon/gvfsbackendnvvfs.h ++++ b/daemon/gvfsbackendnvvfs.h @@ -0,0 +1,50 @@ +/* GIO - GLib Input, Output and Streaming Library -+ * ++ * + * Copyright (C) 2006-2007 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or @@ -649,49 +651,73 @@ +G_END_DECLS + +#endif /* __G_VFS_BACKEND_NVVFS_H__ */ -Index: gvfs-1.15.1/daemon/Makefile.am -=================================================================== ---- gvfs-1.15.1.orig/daemon/Makefile.am -+++ gvfs-1.15.1/daemon/Makefile.am -@@ -139,6 +139,10 @@ endif - - noinst_DATA = $(mount_DATA:.mount=.localmount) - -+mount_in_files += nvvfs.mount.in -+mount_DATA += nvvfs.mount -+libexec_PROGRAMS += gvfsd-nvvfs -+ - EXTRA_DIST = \ - $(service_in_files) \ - $(systemd_user_in_files) \ -@@ -521,6 +525,20 @@ gvfsd_http_CPPFLAGS = \ +diff --git a/daemon/meson.build b/daemon/meson.build +index dabdcb2..81e219a 100644 +--- a/daemon/meson.build ++++ b/daemon/meson.build +@@ -558,6 +558,20 @@ if enable_nfs + mounts += ['nfs'] + endif - gvfsd_http_LDADD = $(libraries) $(HTTP_LIBS) - -+gvfsd_nvvfs_SOURCES = \ -+ gvfsbackendnvvfs.c gvfsbackendnvvfs.h \ -+ daemon-main.c daemon-main.h \ -+ daemon-main-generic.c -+ -+gvfsd_nvvfs_CPPFLAGS = $(flags) \ -+ -DBACKEND_HEADER=gvfsbackendnvvfs.h \ -+ -DDEFAULT_BACKEND_TYPE=nvvfs \ -+ -DMAX_JOB_THREADS=1 \ -+ -DBACKEND_TYPES='"nvvfs", G_VFS_TYPE_BACKEND_NVVFS,' -+ -+gvfsd_nvvfs_LDADD = $(libraries) -+ -+ - gvfsd_dav_SOURCES = \ - gvfshttpinputstream.c gvfshttpinputstream.h \ - gvfsbackendhttp.c gvfsbackendhttp.h \ -Index: gvfs-1.15.1/daemon/nvvfs.mount.in -=================================================================== ++if enable_nvvfs ++ sources = daemon_main_sources + files('gvfsbackendnvvfs.c') ++ ++ cflags = [ ++ '-DBACKEND_HEADER=gvfsbackendnvvfs.h', ++ '-DDEFAULT_BACKEND_TYPE=nvvfs', ++ '-DBACKEND_TYPES="nvvfs", G_VFS_TYPE_BACKEND_NVVFS,', ++ '-DMA_JOB_THREADS=1', ++ ] ++ ++ programs += [['gvfsd-nvvfs', {'sources': sources, 'dependencies': [gio_unix_dep], 'c_args': cflags}]] ++ mounts += ['nvvfs'] ++endif ++ + foreach program: programs + options = program[1] + kwargs = { +diff --git a/daemon/nvvfs.mount.in b/daemon/nvvfs.mount.in +new file mode 100644 +index 0000000..c5d6f8e --- /dev/null -+++ gvfs-1.15.1/daemon/nvvfs.mount.in ++++ b/daemon/nvvfs.mount.in @@ -0,0 +1,5 @@ +[Mount] +Type=nvvfs +Exec=@libexecdir@/gvfsd-nvvfs +AutoMount=false +Scheme=nvvfs +diff --git a/meson.build b/meson.build +index 6525b79..016d4c7 100644 +--- a/meson.build ++++ b/meson.build +@@ -461,6 +461,9 @@ if enable_nfs + libnfs_dep = dependency('libnfs', version: '>= 1.9.8') + endif + ++# *** NVVFS backend *** ++enable_nvvfs = get_option('nvvfs') ++ + # *** SFTP backend *** + enable_sftp = get_option('sftp') + if enable_sftp +@@ -514,6 +517,7 @@ output += ' gphoto2: ' + enable_gphoto2.to_string() + '\n' + output += ' http: ' + enable_http.to_string() + '\n' + output += ' mtp: ' + enable_mtp.to_string() + '\n' + output += ' nds: ' + enable_nds.to_string() + '\n' ++output += ' nvvfs: ' + enable_nvvfs.to_string() + '\n' + output += ' nfs: ' + enable_nfs.to_string() + '\n' + output += ' sftp: ' + enable_sftp.to_string() + '\n' + output += ' smb: ' + enable_samba.to_string() + '\n' +diff --git a/meson_options.txt b/meson_options.txt +index dced004..e7a9398 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -14,6 +14,7 @@ option('http', type: 'boolean', value: true, description: 'build with http/dav b + option('mtp', type: 'boolean', value: true, description: 'build with mtp backend and volume monitor') + option('nds', type: 'boolean', value: true, description: 'build with nds backend') + option('nfs', type: 'boolean', value: true, description: 'build with nfs backend') ++option('nvvfs', type: 'boolean', value: true, description: 'build with nvvfs backend') + option('sftp', type: 'boolean', value: true, description: 'build with sftp backend') + option('smb', type: 'boolean', value: true, description: 'build with smb backends') + option('udisks2', type: 'boolean', value: true, description: 'build with udisks2 volume monitor')

1 0

commit gtk2 for openSUSE:Leap:15.2
by root 30 Jan '20

30 Jan '20

Hello community, here is the log from the commit of package gtk2 for openSUSE:Leap:15.2 checked in at 2020-01-30 14:50:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/gtk2 (Old) and /work/SRC/openSUSE:Leap:15.2/.gtk2.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gtk2" Thu Jan 30 14:50:21 2020 rev:37 rq:761558 version:2.24.32+67 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/gtk2/gtk2.changes 2020-01-15 15:09:46.102050733 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.gtk2.new.26092/gtk2.changes 2020-01-30 14:51:28.094936539 +0100 @@ -1,0 +2,77 @@ +Tue Dec 17 10:00:32 UTC 2019 - Frederic Crozat <fcrozat(a)suse.com> + +- Add Obsoletes/Provides to baselibs.conf to ensure + gtk2-immodule-tigrigna-32bit can be upgraded from old version. + +------------------------------------------------------------------- +Tue Dec 10 11:07:08 UTC 2019 - Michael Vetter <mvetter(a)suse.com> + +- bsc#1158897: Remove dependency on jasper (due to planned removal) + Removes JPEG2000 support. + +------------------------------------------------------------------- +Tue Nov 19 12:17:29 UTC 2019 - dimstar(a)opensuse.org + +- Update to version 2.24.32+67: + * Do not use VIQR input method for vi locale by default + * Add CI for gtk-2-24 + * win32: Remove extraneous changes + +------------------------------------------------------------------- +Wed Sep 11 10:16:49 UTC 2019 - dimstar(a)opensuse.org + +- Update to version 2.24.32+62 (boo#1147106): + * gtk-builder-convert: Update bug report URL. + * gtk-builder-convert: Remove compat code for Python 2.3 and + * below. + * Make gtk-builder-convert compatible with Python 3. + * Fix use-after-free due to unexpected unref of context->default_style. + * Visual Studio builds: Fix previous commit. + * Visual Studio builds: "Add" Visual Studio 2019 projects. +- Drop gtk2-converter-python3.patch: fixed upstream. +- Replace shebang in ./gtk/gtk-builder-convert using sed (use + python3). + +------------------------------------------------------------------- +Wed May 8 09:32:03 UTC 2019 - Dominique Leuenberger <dimstar(a)opensuse.org> + +- Move RPM macros to %_rpmmacrodir. + +------------------------------------------------------------------- +Tue Apr 16 19:24:13 UTC 2019 - bjorn.lie(a)gmail.com + +- Update to version 2.24.32+54: + + Force redraw on Mojave and later when processing updates. + + Fix UAC manifest RC file + + atk key: Always convert control character events into key names + + icontheme: Fix annotations on array arguments + + MSVC introspection: Make more robust and avoid confusion + + Revert "gdk: deactivation/activate window on keyboard grabs" + + gtk/gtkiconcache.c: Fix running on GLib-2.57.3 or later on + Windows + + MSVC builds: Fix pkg-config file generation + + MSVC builds: Improve pkg-config files generation + + [gdk|gtk]/Makefile.am: Fix CFlags passed to introspecion on + MSVC +- Switch to gitcheckout of stable branch again, upstream is not + making releases. +- Drop 0001-build-support-automake-1.16.patch: Fixed upstream. + +------------------------------------------------------------------- +Thu Aug 9 11:33:37 UTC 2018 - tchvatal(a)suse.com + +- Fix package name to be uniform immodules -> immodule bsc#1104264 + +------------------------------------------------------------------- +Wed Apr 18 19:01:07 UTC 2018 - bjorn.lie(a)gmail.com + +- Update _service to point to new + https://gitlab.gnome.org/GNOME/gtk.git home. + +------------------------------------------------------------------- +Tue Mar 27 14:29:49 UTC 2018 - dimstar(a)opensuse.org + +- Add 0001-build-support-automake-1.16.patch: Support automake + 1.16. + +------------------------------------------------------------------- Old: ---- gtk+-2.24.32.tar.xz gtk2-converter-python3.patch New: ---- gtk-2.24.32+67.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk2.spec ++++++ --- /var/tmp/diff_new_pack.2h8bqp/_old 2020-01-30 14:51:28.586936801 +0100 +++ /var/tmp/diff_new_pack.2h8bqp/_new 2020-01-30 14:51:28.586936801 +0100 @@ -1,7 +1,7 @@ # # spec file for package gtk2 # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,15 +12,15 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # # When updating the binary version, do not forget to also update baselibs.conf %define gtk_binary_version 2.10.0 -%define _name gtk+ +%define _name gtk Name: gtk2 -Version: 2.24.32 +Version: 2.24.32+67 Release: 0 # FIXME: when updating to next version, check whether we can remove the workaround for bgo#596977 below (removing -fomit-frame-pointer) Summary: The GTK+ toolkit library (version 2) @@ -39,7 +39,7 @@ Patch1: bugzilla-129753-gtk+-2.8.9-localize-font-style-name.diff # PATCH-FIX-UPSTREAM gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.diff bnc130159 bgo319483 federico(a)novell.com - Load fonts asynchronously in GtkFontSelection to make it appear faster for CJK languages Patch2: gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.diff -# PATCH-FIX-OPENSUSE gtk-path-local.patch Search in /usr/local/%{_lib} by default. bnc369696 bgo534474 +# PATCH-FIX-OPENSUSE gtk-path-local.patch Search in /usr/local/%%{_lib} by default. bnc369696 bgo534474 Patch3: gtk-path-local.patch # PATCH-FIX-UPSTREAM gtk2-default-printer.patch bgo#577642 mgorse(a)suse.com -- Save selected printer as default Patch4: gtk2-default-printer.patch @@ -47,8 +47,6 @@ Patch5: gtk2-bgo625202-30-bit-drawables-remain-black.patch # PATCH-FIX-UPSTREAM gtk2-bgo743166-remember-printing-authentication.patch bgo#674264 joschibrauchle(a)gmx.de -- Credentials from gnome-keyring is not used while printing in GTK 2 Patch6: gtk2-bgo743166-remember-printing-authentication.patch -# PATCH-FEATURE-OPENSUSE gtk2-converter-python3.patch dimstar(a)opensuse.org -- Use python3 for gtk-build-converter -Patch7: gtk2-converter-python3.patch # PATCH-FEATURE-OPENSUSE gtk2-updateiconcache_sort.patch olh(a)opensuse.org -- Have gtp-update-icon-cache sort the file list before producing a cache Patch8: gtk2-updateiconcache_sort.patch BuildRequires: atk-devel @@ -60,7 +58,6 @@ BuildRequires: gnome-patch-translation BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc -BuildRequires: libjasper-devel BuildRequires: libtiff-devel # Needed for patches touching the build system / bootstrapping BuildRequires: libtool @@ -86,11 +83,11 @@ %package -n libgtk-2_0-0 Summary: The GTK+ toolkit library (version 2) -Group: System/Libraries # While hicolor is not a Requires strictly speaking, we put it as # such instead of as a Recommends because many applications just # assume it's there and we need to have a low-level package to # bring it in. +Group: System/Libraries Requires: hicolor-icon-theme Requires(post): %{name}-tools >= 2.24.20 # gtk+ can work without branding/data/translations. Built in defaults will be used then. @@ -104,7 +101,7 @@ Recommends: %{name}-immodule-vietnamese = %{version} Recommends: %{name}-lang Recommends: gvfs -# Provide %{name} to make the lang and immodules packages installable +# Provide %%{name} to make the lang and immodules packages installable Provides: %{name} = %{version} Obsoletes: %{name} < %{version} # gail is part of gtk+ as of 2.13.x @@ -189,15 +186,17 @@ This package provides an input method for Thai-Lao. -%package immodules-tigrigna +%package immodule-tigrigna Summary: Tigrigna input methods for the GTK+ toolkit library v2 Group: System/Libraries Requires: %{name} = %{version} Requires(post): %{name}-tools >= 2.24.20 Requires(postun): %{name}-tools >= 2.24.20 +Provides: %{name}-immodules-tigrigna = %{version} Provides: locale(%{name}:ti) +Obsoletes: %{name}-immodules-tigrigna < %{version} -%description immodules-tigrigna +%description immodule-tigrigna GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites. @@ -324,8 +323,8 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 %patch8 -p1 +sed -i "s|/usr/bin/env python|%{_bindir}/python3|" ./gtk/gtk-builder-convert gnome-patch-translation-update %build @@ -365,8 +364,8 @@ mv %{buildroot}%{_mandir}/man1/gtk-update-icon-cache.1 %{buildroot}%{_mandir}/man1/gtk-update-icon-cache-2.0.1 ln -s -f %{_sysconfdir}/alternatives/gtk-update-icon-cache.1%{ext_man} %{buildroot}%{_mandir}/man1/gtk-update-icon-cache.1%{ext_man} # Install rpm macros -mkdir -p %{buildroot}%{_sysconfdir}/rpm -cp %{SOURCE5} %{buildroot}%{_sysconfdir}/rpm +mkdir -p %{buildroot}%{_rpmmacrodir} +cp %{SOURCE5} %{buildroot}%{_rpmmacrodir} %fdupes %{buildroot}%{_datadir} %fdupes %{buildroot}%{_libdir} @@ -374,7 +373,7 @@ # Note: when updating scriptlets, don't forget to also update baselibs.conf ########################################################################### -# Convenient %define for the scriplets +# Convenient %%define for the scriplets %if "%{_lib}" == "lib64" %define _gtk_query_immodules %{_bindir}/gtk-query-immodules-2.0-64 %else @@ -387,7 +386,7 @@ %if 0 # In case libgtk-2_0-0 gets installed before gtk2-tools, we don't want to fail. # So we make the call to gtk-query-immodules-2.0 dependent on the existence of -# the binary. This is why we also have a %post for gtk2-tools. +# the binary. This is why we also have a %%post for gtk2-tools. %endif if test -f %{_gtk_query_immodules}; then %{_gtk_query_immodules_update_cache} @@ -405,7 +404,7 @@ %post immodule-thai %{_gtk_query_immodules_update_cache} -%post immodules-tigrigna +%post immodule-tigrigna %{_gtk_query_immodules_update_cache} %post immodule-vietnamese @@ -418,7 +417,7 @@ %if 0 # If we install gtk2-tools for the first time, then we should run it in case # libgtk-2_0-0 was installed first (ie, if -# %{_libdir}/gtk-2.0/%{gtk_binary_version} already exists) which means +# %%{_libdir}/gtk-2.0/%%{gtk_binary_version} already exists) which means # gtk-query-immodules-2.0 couldn't run there. %endif if [ $1 = 1 ]; then @@ -471,7 +470,7 @@ %postun immodule-thai %{_gtk_query_immodules_update_cache} -%postun immodules-tigrigna +%postun immodule-tigrigna %{_gtk_query_immodules_update_cache} %postun immodule-vietnamese @@ -532,7 +531,7 @@ %files immodule-thai %{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-thai.so -%files immodules-tigrigna +%files immodule-tigrigna %{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ti-er.so %{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ti-et.so @@ -582,6 +581,6 @@ %{_libdir}/libgailutil.so %{_libdir}/libgdk-x11-2.0.so %{_libdir}/libgtk-x11-2.0.so -%{_sysconfdir}/rpm/macros.gtk2 +%{_rpmmacrodir}/macros.gtk2 %changelog ++++++ _service ++++++ --- /var/tmp/diff_new_pack.2h8bqp/_old 2020-01-30 14:51:28.618936818 +0100 +++ /var/tmp/diff_new_pack.2h8bqp/_new 2020-01-30 14:51:28.618936818 +0100 @@ -1,9 +1,9 @@ <services> <service mode="disabled" name="tar_scm"> - <param name="url">git://git.gnome.org/gtk+</param> + <param name="url">https://gitlab.gnome.org/GNOME/gtk.git</param> <param name="scm">git</param> - <param name="revision">2.24.32</param> - <param name="versionformat">@PARENT_TAG@</param> + <param name="revision">gtk-2-24</param> + <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param> <param name="changesgenerate">enable</param> </service> <service mode="disabled" name="recompress"> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.2h8bqp/_old 2020-01-30 14:51:28.634936827 +0100 +++ /var/tmp/diff_new_pack.2h8bqp/_new 2020-01-30 14:51:28.634936827 +0100 @@ -1,4 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">git://git.gnome.org/gtk+</param> - <param name="changesrevision">ed7d3e25f8b6debae6ccc8b50d1329155338cab8</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">ed7d3e25f8b6debae6ccc8b50d1329155338cab8</param></service><service name="tar_scm"> + <param name="url">https://gitlab.gnome.org/GNOME/gtk.git</param> + <param name="changesrevision">88ac9188a30346672731c4336ae92186f21cf3a0</param></service></servicedata> \ No newline at end of file ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.2h8bqp/_old 2020-01-30 14:51:28.650936835 +0100 +++ /var/tmp/diff_new_pack.2h8bqp/_new 2020-01-30 14:51:28.654936837 +0100 @@ -66,7 +66,7 @@ postun "%else" postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 --update-cache" postun "%endif" -gtk2-immodules-tigrigna +gtk2-immodule-tigrigna requires "gtk2-<targettype>" post "%if "%_lib" == "lib64"" post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 --update-cache" @@ -78,6 +78,8 @@ postun "%else" postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 --update-cache" postun "%endif" + provides "gtk2-immodules-tigrigna-<targettype> = <version>" + obsoletes "gtk2-immodules-tigrigna-<targettype> = <version>" gtk2-immodule-vietnamese requires "gtk2-<targettype>" post "%if "%_lib" == "lib64""

1 0

commit Mesa for openSUSE:Leap:15.2
by root 30 Jan '20

30 Jan '20

Hello community, here is the log from the commit of package Mesa for openSUSE:Leap:15.2 checked in at 2020-01-30 14:50:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/Mesa (Old) and /work/SRC/openSUSE:Leap:15.2/.Mesa.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "Mesa" Thu Jan 30 14:50:20 2020 rev:80 rq:761225 version:unknown Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/Mesa/Mesa-drivers.changes 2020-01-15 14:45:21.373204721 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.Mesa.new.26092/Mesa-drivers.changes 2020-01-30 14:51:24.694934731 +0100 @@ -2 +2,371 @@ -Thu Sep 19 12:02:59 UTC 2019 - Michael Gorse <mgorse(a)suse.com> +Sun Jan 5 20:16:13 UTC 2020 - Stefan Dirsch <sndirsch(a)suse.com> + +- n_drirc-disable-rgb10-for-chromium-on-amd.patch + * fixes patch (boo#1145188) + +------------------------------------------------------------------- +Fri Nov 22 11:06:45 UTC 2019 - Stefan Dirsch <sndirsch(a)suse.com> + +- Update to version 19.2.6 + * fixes build on PPC + * couple of additional stable patches + +------------------------------------------------------------------- +Thu Nov 21 11:40:59 UTC 2019 - Stefan Dirsch <sndirsch(a)suse.com> + +- Update to version 19.2.5 + * There's a little bit over everything in here, with anv and + radeonsi standing out as the two biggest components getting + changes, but core mesa, core gallium, llvmpipe, nir, egl, + i965, tgsi, st/mesa, spirv, and the Intel compiler also + fixes in this release. +- supersedes u_call-shmget-with-permission-0600-instead-of-0777.patch + +------------------------------------------------------------------- +Thu Nov 14 14:36:08 UTC 2019 - Stefan Dirsch <sndirsch(a)suse.com> + +- u_call-shmget-with-permission-0600-instead-of-0777.patch + * CVE-2019-5068 (bsc#1156015) + +------------------------------------------------------------------- +Thu Nov 14 10:15:13 UTC 2019 - Stefan Dirsch <sndirsch(a)suse.com> + +- Update to version 19.2.4 + * This is an emergency release, to fix a critical bug found in + the 19.2.3 release which causes incomplete rendering on all + mesa drivers. This release contains a single patch to fix + that bug. + +------------------------------------------------------------------- +Wed Nov 13 14:01:29 UTC 2019 - Frederic Crozat <fcrozat(a)suse.com> + +- Update _contraints, Mesa-drivers needs 7GB of disk to build + safely. + +------------------------------------------------------------------- +Thu Nov 7 11:20:41 UTC 2019 - Stefan Dirsch <sndirsch(a)suse.com> + +- Update to version 19.2.3 + In this release: iris, meson, radv, anv, turnip, 965, svga, + utils, core mesa, glsl, etanviv, and gallium/rbug +- This Mesa release includes support for latest GPUs including Intel + (jsc#SLE-7962, jsc#SLE-8024, jsc#SLE-8022, jsc#SLE-10182, jsc#SLE-4983, + bsc#1137515) and fixes for boo#1127672, bsc#1117365 + +------------------------------------------------------------------- +Tue Nov 5 07:45:37 UTC 2019 - Martin Pluskal <mpluskal(a)suse.com> + +- Dont conflict with vulkan-devel anymore as there is no file + conflict + +------------------------------------------------------------------- +Fri Nov 1 17:07:44 UTC 2019 - Aaron Puchert <aaronpuchert(a)alice-dsl.net> + +- Use %pkg_vcmp macro instead of llvm-config to detect LLVM 9. + +------------------------------------------------------------------- +Fri Oct 25 19:35:23 UTC 2019 - Stefan Dirsch <sndirsch(a)suse.com> + +- Update to version 19.2.2 + * assortment of fixes in this release, notably a bunch of work + to get Solaris and illumos working with mesa, as well as more + work fixing issues in the migration of package-config and + headers being handled by libglvnd instead of mesa when mesa + is built with support for glvnd. + There's bunch of other changes here, with radv and intel + leading the pack, otherwise just a few things here and there. +- n_add-Mesa-headers-again.patch + * add Mesa headers again despite of building it against libglvnd; + those headers turned out not to be usable; in addition packaging + headers with libglvnd make dependancies problematic ... + +------------------------------------------------------------------- +Mon Oct 14 10:23:51 UTC 2019 - Stefan Dirsch <sndirsch(a)suse.com> + +- let Mesa-libEGL-devel require libX11 devel via "pkgconfig(x11)" + since EGL/eglplatform.h includes X11/Xlib.h + +------------------------------------------------------------------- +Wed Oct 9 22:16:18 UTC 2019 - Stefan Dirsch <sndirsch(a)suse.com> + +- Update to version 19.2.1 + * fixes all over the tree: intel, amd, nine, nir, egl, gallium, + scons, meson, glsl, haiku, android, and nouveau all got fixes. + +------------------------------------------------------------------- +Mon Oct 7 21:50:32 UTC 2019 - Stefan Dirsch <sndirsch(a)suse.com> + +- pickup gl, egl, glesv1_cm and glesv2 pkgconfig files from + libglvnd build and add them to the appropriate devel subpackages + +------------------------------------------------------------------- +Mon Oct 7 16:20:49 UTC 2019 - Stefan Dirsch <sndirsch(a)suse.com> + +- reintroduce GL, EGL, GLES* devel subpackages since corresponding + header and pkgconfig files from libglvnd didn't work out ... + +------------------------------------------------------------------- +Mon Sep 30 11:42:12 UTC 2019 - Aaron Puchert <aaronpuchert(a)alice-dsl.net> + +- Rebase n_opencl_dep_libclang.patch after update. + +------------------------------------------------------------------- +Mon Sep 30 09:02:03 UTC 2019 - Stefan Dirsch <sndirsch(a)suse.com> + +- Update to version 19.2.0 including changes to + * release-infastructure + * the build + * drivers: turnip, radv, android, intel and amd common code + * new features: check Phoronix + https://www.phoronix.com/scan.php?page=news_item&px=Mesa-19.2-Released +- supersedes U_llvmpipe-Don-t-use-u_ringbuffer-for-lp_scene_queue.patch +- adjusted n_drirc-disable-rgb10-for-chromium-on-amd.patch +- supersedes n_glesv1_cm-glesv2.patch + +------------------------------------------------------------------- +Sat Sep 28 13:42:30 UTC 2019 - Stefan Dirsch <sndirsch(a)suse.com> + +- no longer build + * Mesa-libGL-devel + * Mesa-libEGL-devel + * Mesa-libGLESv1_CM-devel + * Mesa-libGLESv2-devel + * Mesa-libGLESv3-devel + Instead of requiring these let Mesa-devel package require + libglvnd-devel >= 1.2.0, which provides the contents of these + packages now (header files for OpenGL, GLES, EGL, and GLX). + Adjusted baselibs.conf accordingly. +- modified check for llvm version in a way so it works also with + older llvm packages (by making use of "llvm-config -version"), + where there is %{_llvm_sonum} macro defined yet +- moved manual pages to Mesa-devel package + +------------------------------------------------------------------- +Wed Sep 25 18:34:34 UTC 2019 - Aaron Puchert <aaronpuchert(a)alice-dsl.net> + +- n_opencl_dep_libclang.patch + * Link OpenCL library with libclang-cpp.so instead of the + component libraries for LLVM >= 9. + +------------------------------------------------------------------- +Wed Sep 18 06:59:29 UTC 2019 - Stefan Dirsch <sndirsch(a)suse.com> + +- Update to version 19.1.7 + * another bugfix release .... + +------------------------------------------------------------------- +Mon Sep 9 10:51:49 UTC 2019 - Michel Normand <normand(a)linux.vnet.ibm.com> + +- Add ppc64 for radeonsi to avoid build error + +------------------------------------------------------------------- +Wed Sep 4 09:08:57 UTC 2019 - Stefan Dirsch <sndirsch(a)suse.com> + +- Update to version 19.1.6 + * bugfix release + +------------------------------------------------------------------- +Mon Aug 26 08:12:29 UTC 2019 - Stefan Dirsch <sndirsch(a)suse.com> + +- Update to version 19.1.5 + * bugfix release + +------------------------------------------------------------------- +Wed Aug 14 18:51:18 UTC 2019 - Jonathan Brielmaier <jbrielmaier(a)suse.de> + +- Build radeonsi and libvdpau_radeonsi on ppc64le + +------------------------------------------------------------------- +Mon Aug 12 08:42:27 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 19.1.4: + * Mostly, as usual, in fixes for different drivers (anv, radv, + radeon, nv50, nvc0) as well as in backend parts (egl, spirv, + nir, ...). + * Of those fixes, we could highlight several ones: + - Vulkan 24/48 bit formats are now not supported on Ivybridge. + - R8G8B8_UNORM_SRGB is not supported on Haswell. + - A fix for hair artifacts in Max Payne 3 on AMD/RADV. + - Vulkan transform feedback extension is disabled on Intel + gen7. + +------------------------------------------------------------------- +Tue Jul 23 19:50:48 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 19.1.3: + * Mostly fixes for ANV and RADV drivers, as well as NIR backend ++++ 259 more lines (skipped) ++++ between /work/SRC/openSUSE:Leap:15.2/Mesa/Mesa-drivers.changes ++++ and /work/SRC/openSUSE:Leap:15.2/.Mesa.new.26092/Mesa-drivers.changes Mesa.changes: same change Old: ---- U_intel-Add-support-for-Comet-Lake.patch archlinux_0001-Fix-linkage-against-shared-glapi.patch mesa-18.3.2.tar.xz mesa-18.3.2.tar.xz.sig n_Disable-Xshm-for-now-since-it-results-in-render-erro.patch n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch u_wayland_egl-Ensure-EGL-surface.patch New: ---- mesa-19.2.6.tar.xz mesa-19.2.6.tar.xz.sig n_add-Mesa-headers-again.patch n_opencl_dep_libclang.patch u_dep_xcb.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa-drivers.spec ++++++ --- /var/tmp/diff_new_pack.sMNUgS/_old 2020-01-30 14:51:26.662935778 +0100 +++ /var/tmp/diff_new_pack.sMNUgS/_new 2020-01-30 14:51:26.662935778 +0100 @@ -1,7 +1,7 @@ # # spec file for package Mesa-drivers # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 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 @@ -42,12 +42,12 @@ %define glamor 1 %define _name_archive mesa -%define _version 18.3.2 +%define _version 19.2.6 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 -%ifarch %{ix86} x86_64 %{arm} aarch64 ppc ppc64 ppc64le s390x +%ifarch %{ix86} x86_64 %{arm} aarch64 ppc64 ppc64le %define gallium_loader 1 %else %define gallium_loader 0 @@ -68,9 +68,7 @@ %endif %if 0%{gallium_loader} - %ifnarch ppc %define with_opencl 1 - %endif %ifarch %{ix86} x86_64 %define with_vulkan 1 %endif @@ -112,42 +110,33 @@ %endif Name: Mesa-drivers -Version: 18.3.2 +Version: 19.2.6 Release: 0 Summary: System for rendering 3-D graphics License: MIT Group: System/Libraries URL: http://www.mesa3d.org #Git-Clone: git://anongit.freedesktop.org/mesa/mesa -# For now directory structure of Mesa's ftp changed -# Source: ftp://ftp.freedesktop.org/pub/mesa/%%{version}/%%{_name_archive}-%%{_versio… -Source: ftp://ftp.freedesktop.org/pub/mesa/%{_name_archive}-%{_version}.tar.xz -# Source1: ftp://ftp.freedesktop.org/pub/mesa/%%{version}/%%{_name_archive}-%%{_versio… -Source1: ftp://ftp.freedesktop.org/pub/mesa/%{_name_archive}-%{_version}.tar.xz.sig -# Source1: %%{_name_archive}-%%{_version}.tar.xz.sha1sum +Source: https://mesa.freedesktop.org/archive/%{_name_archive}-%{_version}.tar.xz +Source1: https://mesa.freedesktop.org/archive/%{_name_archive}-%{_version}.tar.xz.sig Source2: baselibs.conf Source3: README.updates Source4: manual-pages.tar.bz2 Source6: %{name}-rpmlintrc Source7: Mesa.keyring +Patch1: n_opencl_dep_libclang.patch +Patch2: n_add-Mesa-headers-again.patch # never to be upstreamed -Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch -# currently needed for libglvnd support -Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch - Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch -Patch57: u_wayland_egl-Ensure-EGL-surface.patch - -Patch60: n_Disable-Xshm-for-now-since-it-results-in-render-erro.patch +Patch58: u_dep_xcb.patch -Patch61: U_intel-Add-support-for-Comet-Lake.patch - -BuildRequires: autoconf >= 2.60 -BuildRequires: automake +BuildRequires: bison BuildRequires: fdupes +BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: imake BuildRequires: libtool +BuildRequires: meson BuildRequires: pkgconfig BuildRequires: python3-base %if 0%{?suse_version} > 1320 @@ -221,7 +210,7 @@ BuildRequires: pkgconfig(wayland-server) >= 1.11 %endif %if 0%{with_llvm} -BuildRequires: llvm-devel >= 6.0.0 +BuildRequires: llvm-devel >= 7.0.0 %endif %if 0%{with_opencl} @@ -272,6 +261,7 @@ Requires: libgbm-devel Provides: Mesa-devel-static = %{version} Provides: xorg-x11-Mesa-devel = %{version} +Requires: libglvnd-devel >= 1.2.0 Obsoletes: Mesa-devel-static < %{version} Obsoletes: xorg-x11-Mesa-devel < %{version} Provides: Mesa-libIndirectGL-devel = %{version} @@ -320,6 +310,7 @@ Group: Development/Libraries/C and C++ Requires: Mesa-KHR-devel = %{version} Requires: Mesa-libEGL1 = %{version} +Requires: pkgconfig(x11) %if 0%{?libglvnd} Requires: libglvnd-devel >= 0.1.0 %endif @@ -594,7 +585,7 @@ Summary: Mesa Direct3D9 state tracker # Manually provide d3d library (bnc#918294) Group: System/Libraries -%ifarch x86_64 s390x ppc64le aarch64 riscv64 +%ifarch x86_64 s390x ppc64 ppc64le aarch64 riscv64 Provides: d3dadapter9.so.1()(64bit) %else Provides: d3dadapter9.so.1 @@ -699,7 +690,6 @@ Group: Development/Libraries/C and C++ Requires: libvulkan_intel = %{version} Requires: libvulkan_radeon = %{version} -Conflicts: vulkan-devel %description -n Mesa-libVulkan-devel This package contains the development files for Mesa's Vulkan implementation. @@ -736,17 +726,15 @@ %setup -q -n %{_name_archive}-%{_version} -b4 # remove some docs rm -rf docs/README.{VMS,WIN32,OS2} -%patch18 -p1 -%if 0%{?libglvnd} -%patch31 -p1 +%if 0%{with_llvm} +%if %{pkg_vcmp llvm-devel >= 9.0} +%patch1 -p1 %endif - +%endif +%patch2 -p1 %patch54 -p1 -%patch57 -p1 -%patch60 -p1 - -%patch61 -p1 +%patch58 -p1 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when # disabling libglvnd build; ugly ... @@ -768,83 +756,84 @@ %else egl_platforms=x11,drm,surfaceless %endif -autoreconf -fvi -export PYTHON2=%{_bindir}/python3 -%configure \ +%meson \ + --auto-features=disabled \ %if %{drivers} - --disable-gles1 \ - --disable-gles2 \ - --disable-egl \ - --disable-glx \ - --disable-osmesa \ + -Dgles1=false \ + -Dgles2=false \ + -Degl=true \ + -Dglx=disabled \ + -Dosmesa=none \ %else %if 0%{?libglvnd} - --enable-libglvnd \ + -Dglvnd=true \ %endif - --enable-gles1 \ - --enable-gles2 \ - --enable-egl \ - --enable-osmesa \ -%endif - --with-platforms=$egl_platforms \ - --enable-dri \ - --enable-texture-float \ - --enable-dri3 \ - --enable-shared-glapi \ + -Dgles1=true \ + -Dgles2=true \ + -Degl=true \ + -Dosmesa=classic \ + -Dglx=auto \ + -Dllvm=false \ + -Dvulkan-drivers= \ +%endif + -Dplatforms=$egl_platforms \ + -Ddri3=true \ + -Dshared-glapi=true \ %if 0%{?with_nine} - --enable-nine \ + -Dgallium-nine=true \ %endif %if %{glamor} - --enable-gbm \ - --enable-glx-tls \ + -Dgbm=true \ %endif %if 0%{with_opencl} - --enable-opencl \ - --enable-opencl-icd \ + -Dgallium-opencl=icd \ %endif - --with-dri-searchpath=%{_libdir}/dri \ + -Ddri-search-path=%{_libdir}/dri \ %if 0%{with_llvm} - --enable-llvm \ - --enable-llvm-shared-libs \ + -Dllvm=true \ + -Dshared-llvm=true \ %endif %if %{drivers} - --enable-vdpau \ +%if %{gallium_loader} + -Dgallium-vdpau=true \ + -Dgallium-xvmc=true \ + -Dgallium-va=true \ + -Dgallium-xa=true \ %endif - --enable-va \ - --enable-xvmc \ %if 0%{with_vulkan} - --with-vulkan-drivers=intel,radeon \ + -Dvulkan-drivers=intel,amd \ +%else + -Dvulkan-drivers= \ %endif -%if %{drivers} %ifarch %{ix86} x86_64 - --enable-xa \ - --with-dri-drivers=i915,i965,nouveau,r200,radeon \ - --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl \ - %endif + -Ddri-drivers=i915,i965,nouveau,r100,r200 \ + -Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl,iris \ + %else %ifarch %{arm} aarch64 - --enable-xa \ - --with-dri-drivers=nouveau \ - --with-gallium-drivers=r300,r600,nouveau,swrast,virgl,freedreno,vc4,etnaviv,imx \ - %endif + -Ddri-drivers=nouveau \ + -Dgallium-drivers=r300,r600,nouveau,swrast,virgl,freedreno,vc4,etnaviv,lima,panfrost,kmsro,v3d \ + %else %ifarch ppc64 ppc64le - --enable-xa \ - --with-dri-drivers=nouveau \ - --with-gallium-drivers=r300,r600,nouveau,swrast \ + -Ddri-drivers=nouveau \ + -Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast \ + %else + -Ddri-drivers=swrast \ + -Dgallium-drivers= \ + %endif %endif - %ifarch ia64 ppc hppa s390 s390x riscv64 - --with-dri-drivers=swrast \ - --with-gallium-drivers=swrast \ %endif %else - --with-dri-drivers= \ - --with-gallium-drivers= \ + -Ddri-drivers=swrast \ + -Dgallium-drivers= \ %endif - CFLAGS="%{optflags} -DNDEBUG" -make %{?_smp_mflags} V=1 + -Db_ndebug=true \ + -Dc_args="%{optflags}" + +%meson_build %install -%make_install +%meson_install find %{buildroot} -type f -name "*.la" -delete -print # libwayland-egl is provided by wayland itself @@ -858,6 +847,15 @@ # in Mesa rm -rf %{buildroot}/%{_datadir}/drirc.d +rm -f %{buildroot}/%{_libdir}/libEGL.so* +# in Mesa-libEGL-devel +rm %{buildroot}/%{_includedir}/EGL/egl.h +rm %{buildroot}/%{_includedir}/EGL/eglext.h +rm %{buildroot}/%{_includedir}/EGL/eglextchromium.h +rm %{buildroot}/%{_includedir}/EGL/eglmesaext.h +rm %{buildroot}/%{_includedir}/EGL/eglplatform.h +rm %{buildroot}/%{_libdir}/pkgconfig/egl.pc + # in Mesa-libGL-devel rm -rf %{buildroot}/%{_includedir}/GL @@ -879,7 +877,13 @@ # in KHR-devel rm -rf %{buildroot}/%{_includedir}/KHR +# workaround needed since Mesa 19.0.2 +rm -f %{buildroot}/%{_libdir}/vdpau/libvdpau_gallium.so + %else + +rm -rf %{buildroot}/%{_libdir}/dri/swrast_dri.so + %if 0%{?libglvnd} == 0 # Make a symlink to libGL.so.1.2 for compatibility (bnc#809359, bnc#831306) test -f %{buildroot}%{_libdir}/libGL.so.1.2 || \ @@ -891,6 +895,11 @@ ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0 %endif +# pickup pkgconfig files from libglvnd build +rm -f %{buildroot}/%{_libdir}/pkgconfig/{gl,egl,glesv1_cm,glesv2}.pc +install -m 0644 /usr/share/doc/packages/libglvnd/pkgconfig/{gl,egl,glesv1_cm,glesv2}.pc \ + %{buildroot}/%{_libdir}/pkgconfig/ + for dir in ../xc/doc/man/{GL/gl,GL/glx}; do pushd $dir xmkmf -a @@ -1019,8 +1028,6 @@ %files libGLESv3-devel %{_includedir}/GLES3 -#%%_libdir/libGLESv3.so -#%%_libdir/pkgconfig/glesv3.pc %files -n libOSMesa8 %{_libdir}/libOSMesa.so.8.0.0 @@ -1054,15 +1061,9 @@ %if %{xvmc_support} %files -n libXvMC_nouveau %{_libdir}/libXvMCnouveau.so -%{_libdir}/libXvMCnouveau.so.1 -%{_libdir}/libXvMCnouveau.so.1.0 -%{_libdir}/libXvMCnouveau.so.1.0.0 %files -n libXvMC_r600 %{_libdir}/libXvMCr600.so -%{_libdir}/libXvMCr600.so.1 -%{_libdir}/libXvMCr600.so.1.0 -%{_libdir}/libXvMCr600.so.1.0.0 %endif %if %{vdpau_nouveau} @@ -1087,7 +1088,7 @@ %{_libdir}/vdpau/libvdpau_r600.so.1.0.0 %endif -%ifarch %{ix86} x86_64 +%ifarch %{ix86} x86_64 ppc64 ppc64le %files -n libvdpau_radeonsi %{_libdir}/vdpau/libvdpau_radeonsi.so %{_libdir}/vdpau/libvdpau_radeonsi.so.1 @@ -1144,6 +1145,9 @@ %files devel %doc docs/*.html +%if 0%{?libglvnd} >= 120 +/usr/share/man/man3/* +%endif # !drivers %endif @@ -1152,7 +1156,6 @@ %files -n Mesa-libd3d %dir %{_libdir}/d3d/ %{_libdir}/d3d/*.so.* -#%%{_sysconfdir}/OpenCL/vendors/mesa.icd %files -n Mesa-libd3d-devel %{_libdir}/pkgconfig/d3d.pc ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.sMNUgS/_old 2020-01-30 14:51:26.678935786 +0100 +++ /var/tmp/diff_new_pack.sMNUgS/_new 2020-01-30 14:51:26.678935786 +0100 @@ -1,7 +1,7 @@ # # spec file for package Mesa # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 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 @@ -41,12 +41,12 @@ %define glamor 1 %define _name_archive mesa -%define _version 18.3.2 +%define _version 19.2.6 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 -%ifarch %{ix86} x86_64 %{arm} aarch64 ppc ppc64 ppc64le s390x +%ifarch %{ix86} x86_64 %{arm} aarch64 ppc64 ppc64le %define gallium_loader 1 %else %define gallium_loader 0 @@ -67,9 +67,7 @@ %endif %if 0%{gallium_loader} - %ifnarch ppc %define with_opencl 1 - %endif %ifarch %{ix86} x86_64 %define with_vulkan 1 %endif @@ -111,42 +109,33 @@ %endif Name: Mesa -Version: 18.3.2 +Version: 19.2.6 Release: 0 Summary: System for rendering 3-D graphics License: MIT Group: System/Libraries URL: http://www.mesa3d.org #Git-Clone: git://anongit.freedesktop.org/mesa/mesa -# For now directory structure of Mesa's ftp changed -# Source: ftp://ftp.freedesktop.org/pub/mesa/%%{version}/%%{_name_archive}-%%{_versio… -Source: ftp://ftp.freedesktop.org/pub/mesa/%{_name_archive}-%{_version}.tar.xz -# Source1: ftp://ftp.freedesktop.org/pub/mesa/%%{version}/%%{_name_archive}-%%{_versio… -Source1: ftp://ftp.freedesktop.org/pub/mesa/%{_name_archive}-%{_version}.tar.xz.sig -# Source1: %%{_name_archive}-%%{_version}.tar.xz.sha1sum +Source: https://mesa.freedesktop.org/archive/%{_name_archive}-%{_version}.tar.xz +Source1: https://mesa.freedesktop.org/archive/%{_name_archive}-%{_version}.tar.xz.sig Source2: baselibs.conf Source3: README.updates Source4: manual-pages.tar.bz2 Source6: %{name}-rpmlintrc Source7: Mesa.keyring +Patch1: n_opencl_dep_libclang.patch +Patch2: n_add-Mesa-headers-again.patch # never to be upstreamed -Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch -# currently needed for libglvnd support -Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch - Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch -Patch57: u_wayland_egl-Ensure-EGL-surface.patch - -Patch60: n_Disable-Xshm-for-now-since-it-results-in-render-erro.patch +Patch58: u_dep_xcb.patch -Patch61: U_intel-Add-support-for-Comet-Lake.patch - -BuildRequires: autoconf >= 2.60 -BuildRequires: automake +BuildRequires: bison BuildRequires: fdupes +BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: imake BuildRequires: libtool +BuildRequires: meson BuildRequires: pkgconfig BuildRequires: python3-base %if 0%{?suse_version} > 1320 @@ -220,7 +209,7 @@ BuildRequires: pkgconfig(wayland-server) >= 1.11 %endif %if 0%{with_llvm} -BuildRequires: llvm-devel >= 6.0.0 +BuildRequires: llvm-devel >= 7.0.0 %endif %if 0%{with_opencl} @@ -271,6 +260,7 @@ Requires: libgbm-devel Provides: Mesa-devel-static = %{version} Provides: xorg-x11-Mesa-devel = %{version} +Requires: libglvnd-devel >= 1.2.0 Obsoletes: Mesa-devel-static < %{version} Obsoletes: xorg-x11-Mesa-devel < %{version} Provides: Mesa-libIndirectGL-devel = %{version} @@ -319,6 +309,7 @@ Group: Development/Libraries/C and C++ Requires: Mesa-KHR-devel = %{version} Requires: Mesa-libEGL1 = %{version} +Requires: pkgconfig(x11) %if 0%{?libglvnd} Requires: libglvnd-devel >= 0.1.0 %endif @@ -593,7 +584,7 @@ Summary: Mesa Direct3D9 state tracker # Manually provide d3d library (bnc#918294) Group: System/Libraries -%ifarch x86_64 s390x ppc64le aarch64 riscv64 +%ifarch x86_64 s390x ppc64 ppc64le aarch64 riscv64 Provides: d3dadapter9.so.1()(64bit) %else Provides: d3dadapter9.so.1 @@ -698,7 +689,6 @@ Group: Development/Libraries/C and C++ Requires: libvulkan_intel = %{version} Requires: libvulkan_radeon = %{version} -Conflicts: vulkan-devel %description -n Mesa-libVulkan-devel This package contains the development files for Mesa's Vulkan implementation. @@ -735,17 +725,15 @@ %setup -q -n %{_name_archive}-%{_version} -b4 # remove some docs rm -rf docs/README.{VMS,WIN32,OS2} -%patch18 -p1 -%if 0%{?libglvnd} -%patch31 -p1 +%if 0%{with_llvm} +%if %{pkg_vcmp llvm-devel >= 9.0} +%patch1 -p1 %endif - +%endif +%patch2 -p1 %patch54 -p1 -%patch57 -p1 -%patch60 -p1 - -%patch61 -p1 +%patch58 -p1 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when # disabling libglvnd build; ugly ... @@ -767,83 +755,84 @@ %else egl_platforms=x11,drm,surfaceless %endif -autoreconf -fvi -export PYTHON2=%{_bindir}/python3 -%configure \ +%meson \ + --auto-features=disabled \ %if %{drivers} - --disable-gles1 \ - --disable-gles2 \ - --disable-egl \ - --disable-glx \ - --disable-osmesa \ + -Dgles1=false \ + -Dgles2=false \ + -Degl=true \ + -Dglx=disabled \ + -Dosmesa=none \ %else %if 0%{?libglvnd} - --enable-libglvnd \ + -Dglvnd=true \ %endif - --enable-gles1 \ - --enable-gles2 \ - --enable-egl \ - --enable-osmesa \ -%endif - --with-platforms=$egl_platforms \ - --enable-dri \ - --enable-texture-float \ - --enable-dri3 \ - --enable-shared-glapi \ + -Dgles1=true \ + -Dgles2=true \ + -Degl=true \ + -Dosmesa=classic \ + -Dglx=auto \ + -Dllvm=false \ + -Dvulkan-drivers= \ +%endif + -Dplatforms=$egl_platforms \ + -Ddri3=true \ + -Dshared-glapi=true \ %if 0%{?with_nine} - --enable-nine \ + -Dgallium-nine=true \ %endif %if %{glamor} - --enable-gbm \ - --enable-glx-tls \ + -Dgbm=true \ %endif %if 0%{with_opencl} - --enable-opencl \ - --enable-opencl-icd \ + -Dgallium-opencl=icd \ %endif - --with-dri-searchpath=%{_libdir}/dri \ + -Ddri-search-path=%{_libdir}/dri \ %if 0%{with_llvm} - --enable-llvm \ - --enable-llvm-shared-libs \ + -Dllvm=true \ + -Dshared-llvm=true \ %endif %if %{drivers} - --enable-vdpau \ +%if %{gallium_loader} + -Dgallium-vdpau=true \ + -Dgallium-xvmc=true \ + -Dgallium-va=true \ + -Dgallium-xa=true \ %endif - --enable-va \ - --enable-xvmc \ %if 0%{with_vulkan} - --with-vulkan-drivers=intel,radeon \ + -Dvulkan-drivers=intel,amd \ +%else + -Dvulkan-drivers= \ %endif -%if %{drivers} %ifarch %{ix86} x86_64 - --enable-xa \ - --with-dri-drivers=i915,i965,nouveau,r200,radeon \ - --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl \ - %endif + -Ddri-drivers=i915,i965,nouveau,r100,r200 \ + -Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl,iris \ + %else %ifarch %{arm} aarch64 - --enable-xa \ - --with-dri-drivers=nouveau \ - --with-gallium-drivers=r300,r600,nouveau,swrast,virgl,freedreno,vc4,etnaviv,imx \ - %endif + -Ddri-drivers=nouveau \ + -Dgallium-drivers=r300,r600,nouveau,swrast,virgl,freedreno,vc4,etnaviv,lima,panfrost,kmsro,v3d \ + %else %ifarch ppc64 ppc64le - --enable-xa \ - --with-dri-drivers=nouveau \ - --with-gallium-drivers=r300,r600,nouveau,swrast \ + -Ddri-drivers=nouveau \ + -Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast \ + %else + -Ddri-drivers=swrast \ + -Dgallium-drivers= \ + %endif %endif - %ifarch ia64 ppc hppa s390 s390x riscv64 - --with-dri-drivers=swrast \ - --with-gallium-drivers=swrast \ %endif %else - --with-dri-drivers= \ - --with-gallium-drivers= \ + -Ddri-drivers=swrast \ + -Dgallium-drivers= \ %endif - CFLAGS="%{optflags} -DNDEBUG" -make %{?_smp_mflags} V=1 + -Db_ndebug=true \ + -Dc_args="%{optflags}" + +%meson_build %install -%make_install +%meson_install find %{buildroot} -type f -name "*.la" -delete -print # libwayland-egl is provided by wayland itself @@ -857,6 +846,15 @@ # in Mesa rm -rf %{buildroot}/%{_datadir}/drirc.d +rm -f %{buildroot}/%{_libdir}/libEGL.so* +# in Mesa-libEGL-devel +rm %{buildroot}/%{_includedir}/EGL/egl.h +rm %{buildroot}/%{_includedir}/EGL/eglext.h +rm %{buildroot}/%{_includedir}/EGL/eglextchromium.h +rm %{buildroot}/%{_includedir}/EGL/eglmesaext.h +rm %{buildroot}/%{_includedir}/EGL/eglplatform.h +rm %{buildroot}/%{_libdir}/pkgconfig/egl.pc + # in Mesa-libGL-devel rm -rf %{buildroot}/%{_includedir}/GL @@ -878,7 +876,13 @@ # in KHR-devel rm -rf %{buildroot}/%{_includedir}/KHR +# workaround needed since Mesa 19.0.2 +rm -f %{buildroot}/%{_libdir}/vdpau/libvdpau_gallium.so + %else + +rm -rf %{buildroot}/%{_libdir}/dri/swrast_dri.so + %if 0%{?libglvnd} == 0 # Make a symlink to libGL.so.1.2 for compatibility (bnc#809359, bnc#831306) test -f %{buildroot}%{_libdir}/libGL.so.1.2 || \ @@ -890,6 +894,11 @@ ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0 %endif +# pickup pkgconfig files from libglvnd build +rm -f %{buildroot}/%{_libdir}/pkgconfig/{gl,egl,glesv1_cm,glesv2}.pc +install -m 0644 /usr/share/doc/packages/libglvnd/pkgconfig/{gl,egl,glesv1_cm,glesv2}.pc \ + %{buildroot}/%{_libdir}/pkgconfig/ + for dir in ../xc/doc/man/{GL/gl,GL/glx}; do pushd $dir xmkmf -a @@ -1018,8 +1027,6 @@ %files libGLESv3-devel %{_includedir}/GLES3 -#%%_libdir/libGLESv3.so -#%%_libdir/pkgconfig/glesv3.pc %files -n libOSMesa8 %{_libdir}/libOSMesa.so.8.0.0 @@ -1053,15 +1060,9 @@ %if %{xvmc_support} %files -n libXvMC_nouveau %{_libdir}/libXvMCnouveau.so -%{_libdir}/libXvMCnouveau.so.1 -%{_libdir}/libXvMCnouveau.so.1.0 -%{_libdir}/libXvMCnouveau.so.1.0.0 %files -n libXvMC_r600 %{_libdir}/libXvMCr600.so -%{_libdir}/libXvMCr600.so.1 -%{_libdir}/libXvMCr600.so.1.0 -%{_libdir}/libXvMCr600.so.1.0.0 %endif %if %{vdpau_nouveau} @@ -1086,7 +1087,7 @@ %{_libdir}/vdpau/libvdpau_r600.so.1.0.0 %endif -%ifarch %{ix86} x86_64 +%ifarch %{ix86} x86_64 ppc64 ppc64le %files -n libvdpau_radeonsi %{_libdir}/vdpau/libvdpau_radeonsi.so %{_libdir}/vdpau/libvdpau_radeonsi.so.1 @@ -1143,6 +1144,9 @@ %files devel %doc docs/*.html +%if 0%{?libglvnd} >= 120 +/usr/share/man/man3/* +%endif # !drivers %endif @@ -1151,7 +1155,6 @@ %files -n Mesa-libd3d %dir %{_libdir}/d3d/ %{_libdir}/d3d/*.so.* -#%%{_sysconfdir}/OpenCL/vendors/mesa.icd %files -n Mesa-libd3d-devel %{_libdir}/pkgconfig/d3d.pc ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.sMNUgS/_old 2020-01-30 14:51:26.734935816 +0100 +++ /var/tmp/diff_new_pack.sMNUgS/_new 2020-01-30 14:51:26.734935816 +0100 @@ -7,7 +7,7 @@ </conditions> <hardware> <disk> - <size unit="G">6</size> + <size unit="G">7</size> </disk> </hardware> </overwrite> ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.sMNUgS/_old 2020-01-30 14:51:26.750935824 +0100 +++ /var/tmp/diff_new_pack.sMNUgS/_new 2020-01-30 14:51:26.750935824 +0100 @@ -78,13 +78,11 @@ targetarch aarch64 +/usr/share/vulkan/icd.d/intel_icd.*.json targetarch ppc64 +/usr/share/vulkan/icd.d/intel_icd.*.json targetarch ppc64le +/usr/share/vulkan/icd.d/intel_icd.*.json - targetarch s390x +/usr/share/vulkan/icd.d/intel_icd.*.json targetarch x86_64 +/usr/share/vulkan/icd.d/intel_icd.*.json libvulkan_radeon targetarch aarch64 +/usr/share/vulkan/icd.d/radeon_icd.*.json targetarch ppc64 +/usr/share/vulkan/icd.d/radeon_icd.*.json targetarch ppc64le +/usr/share/vulkan/icd.d/radeon_icd.*.json - targetarch s390x +/usr/share/vulkan/icd.d/radeon_icd.*.json targetarch x86_64 +/usr/share/vulkan/icd.d/radeon_icd.*.json Mesa-libVulkan-devel targetarch aarch64 requires "libvulkan_intel-<targettype> = <version>" @@ -93,8 +91,6 @@ targetarch ppc64 requires "libvulkan_radeon-<targettype> = <version>" targetarch ppc64le requires "libvulkan_intel-<targettype> = <version>" targetarch ppc64le requires "libvulkan_radeon-<targettype> = <version>" - targetarch s390x requires "libvulkan_intel-<targettype> = <version>" - targetarch s390x requires "libvulkan_radeon-<targettype> = <version>" targetarch x86_64 requires "libvulkan_intel-<targettype> = <version>" targetarch x86_64 requires "libvulkan_radeon-<targettype> = <version>" libXvMC_nouveau ++++++ mesa-18.3.2.tar.xz -> mesa-19.2.6.tar.xz ++++++ /work/SRC/openSUSE:Leap:15.2/Mesa/mesa-18.3.2.tar.xz /work/SRC/openSUSE:Leap:15.2/.Mesa.new.26092/mesa-19.2.6.tar.xz differ: char 25, line 1 ++++++ n_add-Mesa-headers-again.patch ++++++ diff -u -r mesa-19.2.2.orig/include/meson.build mesa-19.2.2/include/meson.build --- mesa-19.2.2.orig/include/meson.build 2019-10-25 21:55:51.441084000 +0200 +++ mesa-19.2.2/include/meson.build 2019-10-25 21:58:07.781272000 +0200 @@ -22,7 +22,6 @@ inc_d3d9 = include_directories('D3D9') inc_haikugl = include_directories('HaikuGL') -if not glvnd_has_headers_and_pc_files if with_gles1 or with_gles2 or with_opengl or with_egl install_headers('KHR/khrplatform.h', subdir : 'KHR') endif @@ -78,7 +77,6 @@ subdir : 'EGL', ) endif -endif # Non-upstream headers if with_egl ++++++ n_drirc-disable-rgb10-for-chromium-on-amd.patch ++++++ --- /var/tmp/diff_new_pack.sMNUgS/_old 2020-01-30 14:51:26.774935837 +0100 +++ /var/tmp/diff_new_pack.sMNUgS/_new 2020-01-30 14:51:26.774935837 +0100 @@ -1,15 +1,19 @@ -Index: mesa-18.3.0-rc2/src/util/00-mesa-defaults.conf +Index: mesa-19.3.1/src/util/00-mesa-defaults.conf =================================================================== ---- mesa-18.3.0-rc2.orig/src/util/00-mesa-defaults.conf -+++ mesa-18.3.0-rc2/src/util/00-mesa-defaults.conf -@@ -334,5 +334,10 @@ TODO: document the other workarounds. - <application name="No Mans Sky" executable="NMS.exe"> - <option name="radeonsi_zerovram" value="true" /> +--- mesa-19.3.1.orig/src/util/00-mesa-defaults.conf ++++ mesa-19.3.1/src/util/00-mesa-defaults.conf +@@ -523,6 +523,14 @@ TODO: document the other workarounds. + <application name="DiRT Rally" executable="DirtRally"> + <option name="radeonsi_prim_restart_tri_strips_only" value="true"/> </application> -+ +  + <application name="Chromium" executable="chromium"> + <option name="allow_rgb10_configs" value="false" /> + </application> ++  ++ <application name="Totem" executable="totem"> ++ <option name="allow_rgb10_configs" value="false" /> ++ </application> </device> - </driconf> + <device driver="virtio_gpu"> + <!-- Some Valve games do a final blit to a BRGA_sRGB surface. On a GLES ++++++ n_opencl_dep_libclang.patch ++++++ >From d63e1627c0ead6165f382765ea3b9a4eba6aa8d7 Mon Sep 17 00:00:00 2001 From: Aaron Puchert <aaronpuchert(a)alice-dsl.net> Date: Wed, 25 Sep 2019 18:34:34 +0000 Subject: [PATCH] Link with clang-cpp instead of Clang component libraries Since LLVM 9, the Clang C++ API is exposed via the new clang-cpp target, and the component libraries need no longer be packaged [1]. [1] https://releases.llvm.org/9.0.0/tools/clang/docs/ReleaseNotes.html#build-sy… --- src/gallium/targets/opencl/meson.build | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build index 907cc74337d..031d35b9716 100644 --- a/src/gallium/targets/opencl/meson.build +++ b/src/gallium/targets/opencl/meson.build @@ -43,19 +43,7 @@ libopencl = shared_library( dependencies : [ idep_mesautil, dep_clock, dep_dl, dep_unwind, dep_elf, - cpp.find_library('clangCodeGen', dirs : llvm_libdir), - cpp.find_library('clangFrontendTool', dirs : llvm_libdir), - cpp.find_library('clangFrontend', dirs : llvm_libdir), - cpp.find_library('clangDriver', dirs : llvm_libdir), - cpp.find_library('clangSerialization', dirs : llvm_libdir), - cpp.find_library('clangParse', dirs : llvm_libdir), - cpp.find_library('clangSema', dirs : llvm_libdir), - cpp.find_library('clangAnalysis', dirs : llvm_libdir), - cpp.find_library('clangAST', dirs : llvm_libdir), - cpp.find_library('clangASTMatchers', dirs : llvm_libdir), - cpp.find_library('clangEdit', dirs : llvm_libdir), - cpp.find_library('clangLex', dirs : llvm_libdir), - cpp.find_library('clangBasic', dirs : llvm_libdir), + cpp.find_library('clang-cpp', dirs : llvm_libdir), ], version : '@0@.0.0'.format(opencl_version), install : true, -- 2.23.0 ++++++ u_dep_xcb.patch ++++++ Index: mesa-19.2.1/meson.build =================================================================== --- mesa-19.2.1.orig/meson.build +++ mesa-19.2.1/meson.build @@ -1422,10 +1422,12 @@ if with_platform_x11 endif endif if with_any_vk or with_egl or (with_glx == 'dri' and with_dri_platform == 'drm') + dep_x11_xcb = dependency('x11-xcb') dep_xcb_dri2 = dependency('xcb-dri2', version : '>= 1.8') if with_dri3 pre_args += '-DHAVE_DRI3' + dep_xcb = dependency('xcb') dep_xcb_dri3 = dependency('xcb-dri3') dep_xcb_present = dependency('xcb-present') # until xcb-dri3 has been around long enough to make a hard-dependency: Index: mesa-19.2.1/src/loader/meson.build =================================================================== --- mesa-19.2.1.orig/src/loader/meson.build +++ mesa-19.2.1/src/loader/meson.build @@ -28,6 +28,7 @@ if with_platform_x11 and with_dri3 include_directories : [inc_include, inc_src], dependencies : [ dep_libdrm, dep_xcb_dri3, dep_xcb_present, dep_xcb_sync, dep_xshmfence, + dep_xcb, ], build_by_default : false, )

1 0

commit SDL2 for openSUSE:Leap:15.2
by root 30 Jan '20

30 Jan '20

Hello community, here is the log from the commit of package SDL2 for openSUSE:Leap:15.2 checked in at 2020-01-30 14:50:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/SDL2 (Old) and /work/SRC/openSUSE:Leap:15.2/.SDL2.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "SDL2" Thu Jan 30 14:50:19 2020 rev:33 rq:761224 version:2.0.8 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/SDL2/SDL2.changes 2020-01-15 14:46:03.449236128 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.SDL2.new.26092/SDL2.changes 2020-01-30 14:51:23.998934361 +0100 @@ -1,0 +2,6 @@ +Sun Jan 5 19:34:20 UTC 2020 - Stefan Dirsch <sndirsch(a)suse.com> + +- sdl2-khronos.patch + * fixes build on i586 (boo#1158176) + +------------------------------------------------------------------- New: ---- sdl2-khronos.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SDL2.spec ++++++ --- /var/tmp/diff_new_pack.9NS0tf/_old 2020-01-30 14:51:24.526934642 +0100 +++ /var/tmp/diff_new_pack.9NS0tf/_new 2020-01-30 14:51:24.526934642 +0100 @@ -35,6 +35,7 @@ Patch9: CVE-2019-7636.patch Patch10: CVE-2019-13616.patch Patch11: CVE-2019-13626.patch +Patch12: sdl2-khronos.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: dos2unix @@ -118,6 +119,7 @@ %patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 dos2unix WhatsNew.txt dos2unix TODO.txt dos2unix BUGS.txt ++++++ sdl2-khronos.patch ++++++ From: sndirsch(a)suse.com Date: 2019-10-09 14:00:03+0000 References: https://bugzilla.opensuse.org/show_bug.cgi?id=1153455 diff -u -r SDL2-2.0.10.orig/include/SDL_opengl_glext.h SDL2-2.0.10/include/SDL_opengl_glext.h --- SDL2-2.0.10.orig/include/SDL_opengl_glext.h 2019-10-09 15:30:46.237981000 +0200 +++ SDL2-2.0.10/include/SDL_opengl_glext.h 2019-10-09 15:31:37.783940000 +0200 @@ -469,8 +469,9 @@ typedef long GLsizeiptr; typedef long GLintptr; #else -typedef ptrdiff_t GLsizeiptr; -typedef ptrdiff_t GLintptr; +#include <KHR/khrplatform.h> +typedef khronos_ssize_t GLsizeiptr; +typedef khronos_intptr_t GLintptr; #endif #define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_USAGE 0x8765

1 0

commit glu for openSUSE:Leap:15.2
by root 30 Jan '20

30 Jan '20

Hello community, here is the log from the commit of package glu for openSUSE:Leap:15.2 checked in at 2020-01-30 14:50:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/glu (Old) and /work/SRC/openSUSE:Leap:15.2/.glu.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "glu" Thu Jan 30 14:50:18 2020 rev:12 rq:761152 version:9.0.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/glu/glu.changes 2020-01-15 15:04:10.213864721 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.glu.new.26092/glu.changes 2020-01-30 14:51:23.142933906 +0100 @@ -1,0 +2,6 @@ +Sun Jan 5 18:42:27 UTC 2020 - Stefan Dirsch <sndirsch(a)suse.com> + +- U_build-fix.patch + * build fix for sle15-sp2 (bsc#1158161) + +------------------------------------------------------------------- New: ---- U_build-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glu.spec ++++++ --- /var/tmp/diff_new_pack.71AKBf/_old 2020-01-30 14:51:23.870934293 +0100 +++ /var/tmp/diff_new_pack.71AKBf/_new 2020-01-30 14:51:23.874934295 +0100 @@ -31,6 +31,7 @@ Source1: baselibs.conf Patch0: U_Add-D-N-DEBUG-to-CFLAGS-dependent-on-enable-debug.patch Patch1: u_autoconf-Don-t-modify-CFLAGS-in-configure-scripts.patch +Patch2: U_build-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ BuildRequires: libtool @@ -90,6 +91,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build if [ ! -e configure ]; then ++++++ U_build-fix.patch ++++++ --- glu-9.0.0.orig/src/libutil/error.c 2020-01-05 19:35:08.141802000 +0100 +++ glu-9.0.0/src/libutil/error.c 2020-01-05 19:37:01.707186000 +0100 @@ -30,6 +30,7 @@ #include "gluos.h" #include "gluint.h" +#include <stddef.h> #include <GL/glu.h>

1 0

commit systemtap for openSUSE:Leap:15.2
by root 30 Jan '20

30 Jan '20

Hello community, here is the log from the commit of package systemtap for openSUSE:Leap:15.2 checked in at 2020-01-30 14:50:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/systemtap (Old) and /work/SRC/openSUSE:Leap:15.2/.systemtap.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "systemtap" Thu Jan 30 14:50:16 2020 rev:33 rq:758648 version:4.2 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/systemtap/systemtap-docs.changes 2020-01-15 16:05:08.579980239 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.systemtap.new.26092/systemtap-docs.changes 2020-01-30 14:51:19.886932174 +0100 @@ -1,0 +2,11 @@ +Fri Dec 6 17:33:04 UTC 2019 - Tony Jones <tonyj(a)suse.com> + +- Upgrade to version 4.2. See systemtap.spec for changelog + +------------------------------------------------------------------- +Wed Nov 6 18:09:13 UTC 2019 - Tony Jones <tonyj(a)suse.com> + +- Upgrade to version 4.1. See systemtap.spec for changelog +- Remove systemtap-exporter files (built due to BuildRequires: python3-devel) + +------------------------------------------------------------------- New Changes file: --- /dev/null 2019-12-19 10:12:34.003146842 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.systemtap.new.26092/systemtap-dtrace.changes 2020-01-30 14:51:19.942932204 +0100 @@ -0,0 +1,15 @@ +------------------------------------------------------------------- +Fri Dec 6 17:32:23 UTC 2019 - Tony Jones <tonyj(a)suse.com> + +- Upgrade to version 4.2. See systemtap.spec for changelog + +------------------------------------------------------------------- +Wed Nov 6 18:09:13 UTC 2019 - Tony Jones <tonyj(a)suse.com> + +- Upgrade to version 4.1. See systemtap.spec for changelog + +------------------------------------------------------------------- +Thu Sep 26 18:39:41 UTC 2019 - Michael Gorse <mgorse(a)suse.com> + +- Moved the dtrace binary into a separate package to resolve build + cycle with glib2 (bsc#1145438). --- /work/SRC/openSUSE:Leap:15.2/systemtap/systemtap-headers.changes 2020-01-15 16:05:08.639980271 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.systemtap.new.26092/systemtap-headers.changes 2020-01-30 14:51:19.998932233 +0100 @@ -1,0 +2,10 @@ +Fri Dec 6 17:32:56 UTC 2019 - Tony Jones <tonyj(a)suse.com> + +- Upgrade to version 4.2. See systemtap.spec for changelog + +------------------------------------------------------------------- +Wed Nov 6 18:09:13 UTC 2019 - Tony Jones <tonyj(a)suse.com> + +- Upgrade to version 4.1. See systemtap.spec for changelog + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Leap:15.2/systemtap/systemtap.changes 2020-01-15 16:05:08.735980321 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.systemtap.new.26092/systemtap.changes 2020-01-30 14:51:20.130932303 +0100 @@ -1,0 +2,48 @@ +Fri Dec 6 17:29:35 UTC 2019 - Tony Jones <tonyj(a)suse.com> + +- Update to version 4.2 + Release notes: https://sourceware.org/ml/systemtap/2019-q4/msg00044.html + + Delete patch: systemtap-support-wimplicit-fallthrough-vsprintf.patch + Delete patch: systemtap-support-wimplicit-fallthrough-gen_map.patch + +------------------------------------------------------------------- +Thu Nov 7 18:18:07 UTC 2019 - Tony Jones <tonyj(a)suse.com> + +- Add support for gcc -Wimplicit-fallthrough to resolve compilation errors + of the form "this statement may fall through" + New patch: systemtap-support-wimplicit-fallthrough-vsprintf.patch + New patch: systemtap-support-wimplicit-fallthrough-gen_map.patch + +------------------------------------------------------------------- +Wed Nov 6 18:09:13 UTC 2019 - Tony Jones <tonyj(a)suse.com> + +- Update to version 4.1 (jsc#SLE-9336) + Do not package systemtap-exporter. + 4.1 release notes: https://sourceware.org/ml/systemtap/2019-q2/msg00043.html + 4.0 release notes: https://sourceware.org/ml/systemtap/2018-q4/msg00018.html + + Delete patch: systemtap-change-extra_cflags-escape-processing.patch + +- Force autoreconf of configure to match systemtap-docs (tarball configure + is stale). + +------------------------------------------------------------------- +Mon Oct 14 07:32:43 UTC 2019 - Martin Pluskal <mpluskal(a)suse.com> + +- Do not require exact version of systemtap-dtrace as build + counters are not same for different packages + +------------------------------------------------------------------- +Thu Sep 26 18:41:20 UTC 2019 - Michael Gorse <mgorse(a)suse.com> + +- Moved the dtrace binary into a separate package to resolve build + cycle with glib2 (bsc#1145438). + +------------------------------------------------------------------- +Tue Apr 16 10:01:59 UTC 2019 - jlee(a)suse.com + +- Add BuildRequire libavahi-devel, otherwise that the systemstap-server + and systemstap client do not work. (bsc#1132538) + +------------------------------------------------------------------- Old: ---- systemtap-3.2.tar.gz systemtap-3.2.tar.gz.asc systemtap-change-extra_cflags-escape-processing.patch New: ---- systemtap-4.2.tar.gz systemtap-4.2.tar.gz.asc systemtap-dtrace.changes systemtap-dtrace.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemtap-docs.spec ++++++ --- /var/tmp/diff_new_pack.SqPfNj/_old 2020-01-30 14:51:21.322932937 +0100 +++ /var/tmp/diff_new_pack.SqPfNj/_new 2020-01-30 14:51:21.326932940 +0100 @@ -17,7 +17,7 @@ Name: systemtap-docs -Version: 3.2 +Version: 4.2 Release: 0 Summary: Documents and examples for systemtap License: GPL-2.0+ @@ -75,10 +75,13 @@ cp README AUTHORS NEWS %{buildroot}%{_docdir}/systemtap/ # remove binaries and runtime stuff rm -rf %{buildroot}%{_bindir} +rm -rf %{buildroot}%{_sbindir} rm -rf %{buildroot}%{_libdir} rm -rf %{buildroot}%{_libexecdir} rm -rf %{buildroot}%{_datadir}/systemtap rm -rf %{buildroot}%{_includedir} +rm -rf %{buildroot}%{_sysconfdir} +rm -rf %{buildroot}%{_unitdir} # these man pages are in each sub package rm -rf %{buildroot}%{_mandir}/man[178] rm -rf %{buildroot}%{_mandir}/cs/man[178] ++++++ systemtap-dtrace.spec ++++++ # # spec file for package systemtap-dtrace # # 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %if ! %{defined _rundir} %define _rundir %{_localstatedir}/run %endif Name: systemtap-dtrace Version: 4.2 Release: 0 Summary: SystemTap dtrace utility License: GPL-2.0+ Group: Development/Tools/Debuggers Url: http://sourceware.org/systemtap/ Source0: http://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz Source1: http://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz.asc Source2: systemtap.keyring Source3: README-BEFORE-ADDING-PATCHES Source4: README-KEYRING BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description SystemTap is an instrumentation system for systems running Linux. This package contains the dtrace utility to build provider and probe definitions. %prep %setup -q -n systemtap-%{version} %build # Our binutils always support '?' in the section characters on all # architectures, no need for configure tests sed s=@preferred_python@=%{_bindir}/python3= dtrace.in |sed s=@prefix@=%{_prefix}= >dtrace %install mkdir -p %{buildroot}%{_bindir} install -m 755 dtrace %{buildroot}%{_bindir} %files %defattr(-,root,root) %{_bindir}/dtrace %changelog ++++++ systemtap-headers.spec ++++++ --- /var/tmp/diff_new_pack.SqPfNj/_old 2020-01-30 14:51:21.362932959 +0100 +++ /var/tmp/diff_new_pack.SqPfNj/_new 2020-01-30 14:51:21.366932961 +0100 @@ -25,7 +25,7 @@ %define _rundir %{_localstatedir}/run %endif Name: systemtap-headers -Version: 3.2 +Version: 4.2 Release: 0 Summary: SystemTap headers License: GPL-2.0+ @@ -41,7 +41,6 @@ Source4: README-KEYRING Source5: stap-server.conf Patch1: systemtap-build-source-dir.patch -Patch2: systemtap-change-extra_cflags-escape-processing.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -53,7 +52,6 @@ %prep %setup -q -n systemtap-%{version} %patch1 -p1 -%patch2 -p1 %build # Our binutils always support '?' in the section characters on all ++++++ systemtap.spec ++++++ --- /var/tmp/diff_new_pack.SqPfNj/_old 2020-01-30 14:51:21.382932970 +0100 +++ /var/tmp/diff_new_pack.SqPfNj/_new 2020-01-30 14:51:21.382932970 +0100 @@ -20,7 +20,7 @@ %define _rundir %{_localstatedir}/run %endif Name: systemtap -Version: 3.2 +Version: 4.2 Release: 0 Summary: Instrumentation System License: GPL-2.0+ @@ -33,8 +33,10 @@ Source4: README-KEYRING Source5: stap-server.conf Patch1: systemtap-build-source-dir.patch -Patch2: systemtap-change-extra_cflags-escape-processing.patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: gcc-c++ +BuildRequires: libavahi-devel BuildRequires: libcap-devel BuildRequires: libebl-devel BuildRequires: mozilla-nspr-devel @@ -44,6 +46,7 @@ BuildRequires: python3-base BuildRequires: sqlite-devel BuildRequires: pkgconfig(systemd) +Requires: %{name}-dtrace = %{version} Requires: %{name}-runtime = %{version}-%{release} Requires: libebl1 Obsoletes: systemtap-client < 1.5 @@ -95,9 +98,9 @@ %prep %setup -q %patch1 -p1 -%patch2 -p1 %build +autoreconf -fi %configure \ --disable-docs \ --with-python3 \ @@ -106,7 +109,7 @@ %install %make_install -# XXX +rm -f %{buildroot}%{_bindir}/dtrace rm -f %{buildroot}%{_libexecdir}/systemtap/stap-server-request # README, AUTHORS, NEWS, man3 and all examples packaged by systemtap-docs # COPYING needs to stay in main for GPL @@ -152,7 +155,7 @@ %{_libexecdir}/%{name}/stap-env %{_libexecdir}/%{name}/stap-authorize-cert %{_mandir}/man8/staprun.8* -%{_mandir}/man8/systemtap.8* +%{_mandir}/man8/systemtap-service.8* %{_mandir}/cs/man8/systemtap.8* %{_mandir}/man8/stapsh.8* %{_mandir}/cs/man8/stapsh.8* @@ -176,6 +179,5 @@ %files sdt-devel %defattr(-,root,root) %{_includedir}/sys/*.h -%{_bindir}/dtrace %changelog ++++++ systemtap-3.2.tar.gz -> systemtap-4.2.tar.gz ++++++ ++++ 220243 lines of diff (skipped) ++++++ systemtap-build-source-dir.patch ++++++ --- /var/tmp/diff_new_pack.SqPfNj/_old 2020-01-30 14:51:22.626933631 +0100 +++ /var/tmp/diff_new_pack.SqPfNj/_new 2020-01-30 14:51:22.626933631 +0100 @@ -26,7 +26,7 @@ --- a/session.cxx +++ b/session.cxx -@@ -105,6 +105,7 @@ systemtap_session::systemtap_session (): +@@ -108,6 +108,7 @@ systemtap_session::systemtap_session (): kernel_release = string (buf.release); release = kernel_release; kernel_build_tree = "/lib/modules/" + kernel_release + "/build"; @@ -34,7 +34,7 @@ architecture = machine = normalize_machine(buf.machine); for (unsigned i=0; i<5; i++) perpass_verbose[i]=0; -@@ -291,6 +292,7 @@ systemtap_session::systemtap_session (co +@@ -298,6 +299,7 @@ systemtap_session::systemtap_session (co { release = kernel_release = kern; kernel_build_tree = "/lib/modules/" + kernel_release + "/build"; @@ -42,7 +42,7 @@ kernel_extra_cflags = other.kernel_extra_cflags; architecture = machine = normalize_machine(arch); setup_kernel_release(kern.c_str()); -@@ -2027,21 +2029,39 @@ systemtap_session::setup_kernel_release +@@ -2218,21 +2220,39 @@ systemtap_session::setup_kernel_release // normal search in tapsets.cxx. Without CONFIG_DEBUG_INFO, we'd // need heuristics such as this one: @@ -77,7 +77,7 @@ else { update_release_sysroot = true; - kernel_release = string (kstr); + kernel_release = kstr; - if (!kernel_release.empty()) + if (!kernel_release.empty()) { kernel_build_tree = "/lib/modules/" + kernel_release + "/build"; ++++++ systemtap.keyring ++++++ --- /var/tmp/diff_new_pack.SqPfNj/_old 2020-01-30 14:51:22.646933642 +0100 +++ /var/tmp/diff_new_pack.SqPfNj/_new 2020-01-30 14:51:22.646933642 +0100 @@ -7,66 +7,36 @@ BM7HCnzLdsTFX3I7ia1yTVPgIRvFkcv566hez5VGT5TtqeteYStNFkjxkwfdxo+B 6wEAb17XZm3afRDnR7U2KgoOLQl5p4QoIUvxABEBAAG0I0ZyYW5rIENoLiBFaWds ZXIgPGZjaGVAZWxhc3RpYy5vcmc+iEYEEBEIAAYFAlJWr1AACgkQ49d+H5UWGZF4 -sgCeLMK4QyyrEpBKJt06vER+7ar1j5EAoJqit2XuoW+vqditZj6l6AaOzQmQiEYE -EBEIAAYFAlJWsmAACgkQVZbdDOm/ZT23rwCdE748uzP7LHiSWl/OcmaGCW9ax6sA -oIc8kdndJB6BTLueLhWeBLlYFkXwiQEcBBABCAAGBQJSVycIAAoJEOPXoNjsqbL1 -hOMIANFHKNnTjgoYWNMPOfxHfm4xPccVDRSfNXLevy4cH1BqvRNKhWK1Gl3uLEqg -rqkIqcbiHuoSk6BpfFSeoaEfsS3Gnhe7L3YaZZLB0EnVm9IMdCJmvxw+/P/26UkR -5nCf1CnCnu7BOkx4plrYciv4rQUHxOoWtTs2Ye4muupbHGqcvymN2pmhltw6SHGy -4GooiUmvb7WowFHLCbuGQCfQHJbwIA8vb/eA8mwxyaeMPO1HBYqFc8Pzbe7zkGVF -5b8vaEWqgdhTUqb2Lcbgwf6Zry+WB/HWlcilrIoGaBRDPNox7PtLd/8p0hqK3bfc -9ad0CMEl/dNOulxtnBrJDf4mVoqJATcEEwEIACEFAlJWrakCGwMFCwkIBwMFFQoJ -CAsFFgIDAQACHgECF4AACgkQfoNhASbcwug4pwgAij9c1h8SngrMs8+WXWJxtXX2 -DHnLibuagSiXJyJtDzIfkBJwqRQ82sPj0T/m8pNQcDRMOVj5NPSTrNC+a5RQoWIs -QzAcaTn53dBBzdlhsxiaPPmXcjBBQ9+rd9/JnVfbN28awbNFiaVUMlTsidLpgGLN -tTI7PNtcaYRDtq1WduIFtPbNp6tfBEc80G76uUJiJffPxyNTUKe1Nmj8IAr9l5mI -Y1Jux+WbiXAQm3CFT6bhLH3H7CEdYk1YB6pNjlCxIryVGVtJ157VJdxjiwYyMkpR -SiA0KnxxbTiacT6i0D5UTDzgCf1rSSuDYI/92Jd5HLjxnF5rRrz0+ZLtE3kU8IkC -HAQQAQIABgUCUlb4LAAKCRDQ63YoZfxeNtDEEACLQ4JUkT5JiF3lidsGHs/00t9H -iSSd4ObMXhjLyyOh04Wefp/9/EP5m+XMphphujw357o0FRTSXhP04EB60ifRSTws -HeVletOimXm1dHOXRibQkHDAQMpp2Ya12wOd/6CNLnsBadevPlRMy7U7qQAd59cJ -6c1GTOvO2hJVKs5Wk5EeX+oIMivaSg4uiX5jMNQ4XvLHg/tcbgPrPu4LavnLXOEf -7J7OUWN2KmcwI0hqX11naTOVKGjh+moeeBBGWOaB5escmcKTc7UJNuf1EJNrmDQb -K7OaOyDAXwolVTzqxAw7GYvIwGCeFeDeKpxm5hg4AS9l1k37T3amkPvNllsAeWMf -vf4XSHDd2qQmry2uqVo1gACU+qS7c6RiFAxyZwWeFL53gRlMm1h0x2SgHSUfm0/q -OAvMGqc18SnLWc0DVhXuOdsFQny3em66UA9QlzA5BS+Q0FqokSWH3nCQ6ntfcB8g -3el1WTRrRRebVgOeWgbFBK2KqYrhu6XO4mFH/ai4NEws7dG/IkMRTbzXPnKN9V6S -L8D3Z6uAfXT4FfCWKUtLsx9m9qhQHCQGXv3YAi750WtAEDbXoOuMAVtTD/laNje7 -wDCj+Py28Gcwfwz6UdZenbGs7fHXcgdzM11AIPx61wiw/Bj/fplaFJeZkLhfDsLa -PsdpGv/dVXVNpM5aBIkCHAQQAQIABgUCUlb7pQAKCRAGkQnJcfpMCQO6EACW2Yfn -5zFdBR+m1nWgMwbsrfxwrvwK4Dll2KC7OFBT0a5kFIgQ/Bc60jTfMCJxKSQp7JBH -6hPG4XfUqRjPeXRzeDS6KEhSFSfqpn/B3Ut5Rzz9pxoIml/98j95VYZialk1n7Ny -2XFZgPqSFMw5VYWg5VaPATULc/nBr0absZ0Y8HyGYnTTjZfXsVsFYt1c324UjqOK -b2vhsOd/+2RHF48OipYWkyTZMRcoA3T/nPmek/yl1Ih5vP+lNq9wMYN1iH6oKkve -TrfZ9l2lwc7UdKr+vWgRUCFOuuihFTMUkWRGni5F+M1/RowEyOIu7rWf5BEkTCuz -vWy7Ar2zkdrPUjUG5CzZAbclxDp1WzGQYKEqY6Hd1Po2iirPrs0NS1fIvKuH4h+I -a4EryHxA6BvRI0NZ6YHgZ6t0+7WZ/GyxnaBDwrYOd3BBEAjgaKj8OHF16VAxhJoc -02nUBTyTP2GKi26xSwYWv/zTgApVFVagTRyEYBX9PiqUy8rjdQdcYOods6zQwlve -BU84pv5c76aPW8exSy6Xux1Tt6vm5Dtrd/7njhBKVGbAFJxjRNpzg+3AOluzN3nG -mTBmki5t2tMOEICPWEL1A2AJzRW6vE+vyOOQ5Jwz0RCwc2/2N5E4v5nPI0WfUfJz -k7c9hVtYGCcY2jAYk5beljB/q3bAyYz2OvYZ2LkBDQRSVq2pAQgAwDZVgNepe5jS -LSNgERWTyYsHrSUEwUfWhH01f1r7vDsCOnBP/IuawqKHZQ+JaokCx2JyK1GZd2Vo -wVyVJZzFC3+30hBany76ZzgYlHKgvBX8FPLi48F+k9GKUFZYEK+uoj4mjTVyP2zb -pLP7VjjJtRkR2R6MbnT6AQQKXbae4DrwUr1Na05o2LmWVd7Mp+JvP4ac+HPm4ROL -b2/HIohrvYrEQ++ks5sqgATsVEnDT0vROdp4Vf8eAjDhlJ7WBtuV1f/m1zusC2VY -grG0QmbmKM1G4sHbXIguc3nj8CPBrjC76m7Muk94LgaIJvSpAksWkMEp787sNSx+ -oDzuzGbdAQARAQABiQEfBBgBCAAJBQJSVq2pAhsMAAoJEH6DYQEm3MLo32wH/1zk -8LctYxfUUnAGXh9sAXf8UJ4Xd0yFejohKbYfqSfh7L0448DB0jN+drDEdetoFP6b -4OBqn6R/cp25DAZkKYJT5r+D4Qd9mph/Avtsjyhun7L4QH0HLDkE3zNnq5dyfQMk -YG8h/fa6zLhsRfHciRut88TCvuOxNE+amQSzYr80GY6yQl77ErG/BKnnTeYntIEV -bWVFv8ekfDdaYHzP+TiLFlMtNWXtemor+fBDKVWzTc528YBluKWoj4SQjo6qfnN8 -hCiP2iT8GeoVGtmYKUcF/Ck8g+zrdziURWjJ04/qilWh2YtiHVJW8oi5pfuVB9Ww -fD7eIrK5WXZ3pT7zst25AQ0EUlatqQEIANylDcsXqGtJGzU0qyeAhQWcFAnM0xkX -adKXSvamIM5AGr6YShXNNBrTAsgiM8M4mYw3EnAZ+Ql09WZGsmnQMmlElNt7yFmF -OEzV6J+xgBqxc433A66jaVIGrSvq8yEPHgAbTFBSk6ZXht5+d6Ew+sbvd0aRtIAY -lvSmTotkqCCLkMWRMlrFpVRPdeeCl5OVWKaqZ37YaKj8bux9KLqappWkjPe1MYk9 -CWbhdOu04Iic7rouslKXiCH1qGGQQtbkIK68A3KkBTuzY7K5LgNfIikI94jlWTc+ -PCMc4ZC8k4tHoUilf029jyPwgqihEadO4jTRNhGyRA0UpGh2YztuOtEAEQEAAYkB -HwQYAQgACQUCUlatqQIbIAAKCRB+g2EBJtzC6H76B/0SNdULNUt2BzLjDPe0YG1g -9+KWIDh2ST5dy0hn5qvHCKLpHxAnfda1QanNhlP74pqVw6VZUSRvyGULH/0wO6t6 -9RgiPxdDdB5ySlgGNRYPTeqCtKsRChML0CM7HHyhNpxD/x8Qo2SgcF1Ir/cddlTJ -UG9hLDySLPeJkiW5YlZ/qgf3lb1yxGYj3zWgGXhRZVV85LOj3g1uxtxZXLcx9kFC -07xwd2N3hgX6PlvcS/Whr8F4f0AjPo4vFXe39pziqo/0jh2Z6+A67/+xl04Vy+CV -1wrX4e3+gUQkro6pEd6XOj7D9FASebMyN4hMbhJqTwA58Z/ROTJaWfFE9T8tGvtm -=ZzTJ +sgCeLMK4QyyrEpBKJt06vER+7ar1j5EAoJqit2XuoW+vqditZj6l6AaOzQmQiQE3 +BBMBCAAhBQJSVq2pAhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEH6DYQEm +3MLoOKcIAIo/XNYfEp4KzLPPll1icbV19gx5y4m7moEolycibQ8yH5AScKkUPNrD +49E/5vKTUHA0TDlY+TT0k6zQvmuUUKFiLEMwHGk5+d3QQc3ZYbMYmjz5l3IwQUPf +q3ffyZ1X2zdvGsGzRYmlVDJU7InS6YBizbUyOzzbXGmEQ7atVnbiBbT2zaerXwRH +PNBu+rlCYiX3z8cjU1CntTZo/CAK/ZeZiGNSbsflm4lwEJtwhU+m4Sx9x+whHWJN +WAeqTY5QsSK8lRlbSdee1SXcY4sGMjJKUUogNCp8cW04mnE+otA+VEw84An9a0kr +g2CP/diXeRy48Zxea0a89PmS7RN5FPC5AQ0EUlatqQEIAMA2VYDXqXuY0i0jYBEV +k8mLB60lBMFH1oR9NX9a+7w7AjpwT/yLmsKih2UPiWqJAsdicitRmXdlaMFclSWc +xQt/t9IQWp8u+mc4GJRyoLwV/BTy4uPBfpPRilBWWBCvrqI+Jo01cj9s26Sz+1Y4 +ybUZEdkejG50+gEECl22nuA68FK9TWtOaNi5llXezKfibz+GnPhz5uETi29vxyKI +a72KxEPvpLObKoAE7FRJw09L0TnaeFX/HgIw4ZSe1gbbldX/5tc7rAtlWIKxtEJm +5ijNRuLB21yILnN54/Ajwa4wu+puzLpPeC4GiCb0qQJLFpDBKe/O7DUsfqA87sxm +3QEAEQEAAYkBHwQYAQgACQUCUlatqQIbDAAKCRB+g2EBJtzC6N9sB/9c5PC3LWMX +1FJwBl4fbAF3/FCeF3dMhXo6ISm2H6kn4ey9OOPAwdIzfnawxHXraBT+m+Dgap+k +f3KduQwGZCmCU+a/g+EHfZqYfwL7bI8obp+y+EB9Byw5BN8zZ6uXcn0DJGBvIf32 +usy4bEXx3IkbrfPEwr7jsTRPmpkEs2K/NBmOskJe+xKxvwSp503mJ7SBFW1lRb/H +pHw3WmB8z/k4ixZTLTVl7XpqK/nwQylVs03OdvGAZbilqI+EkI6Oqn5zfIQoj9ok +/BnqFRrZmClHBfwpPIPs63c4lEVoydOP6opVodmLYh1SVvKIuaX7lQfVsHw+3iKy +uVl2d6U+87LduQENBFJWrakBCADcpQ3LF6hrSRs1NKsngIUFnBQJzNMZF2nSl0r2 +piDOQBq+mEoVzTQa0wLIIjPDOJmMNxJwGfkJdPVmRrJp0DJpRJTbe8hZhThM1eif +sYAasXON9wOuo2lSBq0r6vMhDx4AG0xQUpOmV4befnehMPrG73dGkbSAGJb0pk6L +ZKggi5DFkTJaxaVUT3XngpeTlVimqmd+2Gio/G7sfSi6mqaVpIz3tTGJPQlm4XTr +tOCInO66LrJSl4gh9ahhkELW5CCuvANypAU7s2OyuS4DXyIpCPeI5Vk3PjwjHOGQ +vJOLR6FIpX9NvY8j8IKooRGnTuI00TYRskQNFKRodmM7bjrRABEBAAGJAR8EGAEI +AAkFAlJWrakCGyAACgkQfoNhASbcwuh++gf9EjXVCzVLdgcy4wz3tGBtYPfiliA4 +dkk+XctIZ+arxwii6R8QJ33WtUGpzYZT++KalcOlWVEkb8hlCx/9MDurevUYIj8X +Q3QeckpYBjUWD03qgrSrEQoTC9AjOxx8oTacQ/8fEKNkoHBdSK/3HXZUyVBvYSw8 +kiz3iZIluWJWf6oH95W9csRmI981oBl4UWVVfOSzo94NbsbcWVy3MfZBQtO8cHdj +d4YF+j5b3Ev1oa/BeH9AIz6OLxV3t/ac4qqP9I4dmevgOu//sZdOFcvgldcK1+Ht +/oFEJK6OqRHelzo+w/RQEnmzMjeITG4Sak8AOfGf0TkyWlnxRPU/LRr7Zg== +=q6uB -----END PGP PUBLIC KEY BLOCK-----

1 0

commit libmbim for openSUSE:Leap:15.2
by root 30 Jan '20

30 Jan '20

Hello community, here is the log from the commit of package libmbim for openSUSE:Leap:15.2 checked in at 2020-01-30 14:50:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/libmbim (Old) and /work/SRC/openSUSE:Leap:15.2/.libmbim.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libmbim" Thu Jan 30 14:50:15 2020 rev:27 rq:758552 version:1.20.2 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/libmbim/libmbim.changes 2020-01-15 15:21:58.250460964 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.libmbim.new.26092/libmbim.changes 2020-01-30 14:51:19.162931789 +0100 @@ -1,0 +2,84 @@ +Wed Nov 6 20:34:29 UTC 2019 - Martin Hauke <mardnh(a)gmx.de> + +- Update to version 1.20.2: + + mbim-proxy: + - Fixed device control port management when using symlinks. + + libmbim-glib: + - Fixed handling of fragmented indication messages. + + Several other minor improvements and fixes. + +------------------------------------------------------------------- +Sat Sep 14 13:31:28 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 1.20.0: + + Build updated with several fixes: + - Explicitly define max allowed GLib version. + - Fix issues with -Werror=type-limits. + - Made compiler warning options compatible with clang. + + mbim-proxy: + - Fixed client subscription to service indications using + wildcard. + - Fixed client subscription update logic when services/cids are + being removed. + - New '--empty-timeout=[SECS}' option to specify the empty + lifetime duration. + - New '--no-exit' option to avoid the proxy from exiting. + + Several other minor improvements and fixes. +- Drop libmbim-fix-build-commits.patch: Fixed upstream. Follwing + this, drop libtool BuildRequires and autoreconf call. + +------------------------------------------------------------------- +Mon Sep 2 22:48:36 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Add libmbim-fix-build-commits.patch: Fix build with new glib2. +- Follwing the above patch, add libtool BuildRequires and pass + autoreconf as the patch touches the buildsystem. +- Use modern macros and url's. + +------------------------------------------------------------------- +Sun Apr 14 11:01:24 UTC 2019 - Martin Hauke <mardnh(a)gmx.de> + +- Update to version 1.18.2: + + mbim-proxy: Increased empty lifetime to 300s. +- Fix wording in the package summary. + +------------------------------------------------------------------- +Tue Jan 8 20:40:43 UTC 2019 - mardnh(a)gmx.de + +- Update to version 1.18.0 + + New Microsoft Basic Connect Extensions service, that includes + new commands to manage Protocol Configuration Operations (PCO) + as well as LTE attach status and settings. + + libmbim-glib: + - Added support to fully print all message contents, including + all fields, when traces are enabled. + - Added support for QMI indications over MBIM. + - Added additional cause codes to MbimNwError. + - Fixed signal emission in device, so that it's done before + completing transaction task. + + mbim-proxy: Fixed the management of subscribed events, so that + the lists are maintained per-device. + + mbimcli: + - New '--ms-query-pco' action. + - New '--ms-query-lte-attach-configuration' action. + - New '--ms-query-lte-attach-status' action. + + Several other minor improvements and fixes. + +------------------------------------------------------------------- +Sat Aug 25 19:54:09 UTC 2018 - mardnh(a)gmx.de + +- Update to version 1.16.2: + + mbimcli: + - Fix SNR reporting in --atds-query-signal output. + - Longer timeout (60s) in --disconnect. + - Add "ip-type" property to --connect. + + libmbim-glib: + - Fix printing message in Intel Firmware Update service. + - Fix error reporting when unknown status. + +------------------------------------------------------------------- +Wed Feb 28 16:35:35 UTC 2018 - dimstar(a)opensuse.org + +- Modernize spec-file by calling spec-cleaner + +------------------------------------------------------------------- Old: ---- libmbim-1.16.0.tar.xz New: ---- libmbim-1.20.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmbim.spec ++++++ --- /var/tmp/diff_new_pack.lvphg6/_old 2020-01-30 14:51:19.426931929 +0100 +++ /var/tmp/diff_new_pack.lvphg6/_new 2020-01-30 14:51:19.430931932 +0100 @@ -1,7 +1,7 @@ # # spec file for package libmbim # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2013 Dominique Leuenberger, Amsterdam, The Netherlands # # All modifications and additions to the file contributed by third parties @@ -13,18 +13,19 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: libmbim -Version: 1.16.0 +Version: 1.20.2 Release: 0 -Summary: Mobile Interface Broadband Model (MBIM) protocol -License: GPL-2.0+ AND LGPL-2.0+ +Summary: Mobile Broadband Interface Model (MBIM) protocol +License: GPL-2.0-or-later AND LGPL-2.0-or-later Group: Productivity/Networking/System -Url: http://www.freedesktop.org/wiki/Software/libmbim/ -Source: http://www.freedesktop.org/software/libmbim/%{name}-%{version}.tar.xz +URL: https://www.freedesktop.org/wiki/Software/libmbim/ +Source: https://www.freedesktop.org/software/libmbim/%{name}-%{version}.tar.xz + BuildRequires: pkgconfig BuildRequires: python3 BuildRequires: pkgconfig(gio-2.0) @@ -39,7 +40,7 @@ %package -n libmbim-glib4 Summary: Mobile Interface Broadband Model (MBIM) protocol -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries %description -n libmbim-glib4 @@ -48,7 +49,7 @@ %package devel Summary: Mobile Interface Broadband Model (MBIM) protocol - Development files -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Languages/C and C++ Requires: libmbim-glib4 = %{version} @@ -58,7 +59,7 @@ %package -n mbimcli-bash-completion Summary: Bash completion for mbimcli -License: GPL-2.0+ AND LGPL-2.0+ +License: GPL-2.0-or-later AND LGPL-2.0-or-later Group: Productivity/Networking/System BuildRequires: bash-completion Requires: bash-completion @@ -68,28 +69,30 @@ This package contain de bash completion command for mbimcli tools. %prep -%setup -q +%autosetup -p1 %build # Do not rely on env for choosing python sed -i "s|env python|python3|g" build-aux/mbim-codegen/* %configure \ --with-udev \ - --disable-static -make %{?_smp_mflags} + --disable-static \ + %{nil} +%make_build %install %make_install find %{buildroot} -type f -name "*.la" -delete -print %check -make %{?_smp_mflags} check +%make_build check %post -n libmbim-glib4 -p /sbin/ldconfig %postun -n libmbim-glib4 -p /sbin/ldconfig %files -%doc COPYING NEWS +%license COPYING +%doc NEWS %{_bindir}/mbim-network %{_bindir}/mbimcli %{_libexecdir}/mbim-proxy @@ -97,7 +100,8 @@ %{_mandir}/man1/mbimcli.1%{?ext_man} %files -n libmbim-glib4 -%doc COPYING.LIB +%license COPYING.LIB + %{_libdir}/libmbim-glib.so.* %files devel ++++++ libmbim-1.16.0.tar.xz -> libmbim-1.20.2.tar.xz ++++++ ++++ 26681 lines of diff (skipped)

1 0