Hello community, here is the log from the commit of package libmatekbd for openSUSE:Factory checked in at 2018-03-20 21:59:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmatekbd (Old) and /work/SRC/openSUSE:Factory/.libmatekbd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libmatekbd" Tue Mar 20 21:59:19 2018 rev:14 rq:587914 version:1.20.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libmatekbd/libmatekbd.changes 2017-04-11 09:49:00.308517390 +0200 +++ /work/SRC/openSUSE:Factory/.libmatekbd.new/libmatekbd.changes 2018-03-20 21:59:51.374770362 +0100 @@ -1,0 +2,22 @@ +Fri Mar 16 14:33:02 UTC 2018 - crrodrig...@opensuse.org + +- Package should buildrequire pkgconfig(x11, pango, cairo) + to have a complete list of requirements. + +------------------------------------------------------------------- +Fri Mar 9 19:10:07 UTC 2018 - sor.ale...@meowr.ru + +- Update to version 1.20.0: + * Require GTK+ 3.22 and GLib 2.50. + * matekbd-status: Fix the Gdk-CRITICAL warning on creating the + status bar icon. + * Avoid deprecated gdk_screen_get_monitor_(), + gdk_screen_get_width/height(), gdk_screen_get_number() + functions. + * matekbd-indicator: Don't expand. + * An implementation of WidthOfScreen and HeightOfScreen. + * Update translations. +- Add libmatekbd-gtk-3.20.patch: Restore GLib 2.48 and GTK+ 3.20 + support. + +------------------------------------------------------------------- Old: ---- libmatekbd-1.18.2.tar.xz New: ---- libmatekbd-1.20.0.tar.xz libmatekbd-gtk-3.20.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmatekbd.spec ++++++ --- /var/tmp/diff_new_pack.M6g6C9/_old 2018-03-20 21:59:52.082744872 +0100 +++ /var/tmp/diff_new_pack.M6g6C9/_new 2018-03-20 21:59:52.086744728 +0100 @@ -1,7 +1,7 @@ # # spec file for package libmatekbd # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,26 +17,30 @@ %define typelib typelib-1_0-Matekbd-1_0 -%define _version 1.18 +%define _version 1.20 %define sover 4 Name: libmatekbd -Version: 1.18.2 +Version: 1.20.0 Release: 0 Summary: MATE Desktop keyboard configuration libraries -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/GUI/Other Url: https://mate-desktop.org/ Source: http://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz Source1: baselibs.conf +# PATCH-FEATURE-OPENSUSE libmatekbd-gtk-3.20.patch -- Restore GLib 2.48 and GTK+ 3.20 support. +Patch0: libmatekbd-gtk-3.20.patch BuildRequires: mate-common >= %{_version} BuildRequires: pkgconfig BuildRequires: update-desktop-files -BuildRequires: pkgconfig(gdk-3.0) >= 3.14 -BuildRequires: pkgconfig(gio-2.0) -BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(gio-2.0) >= 2.48 +BuildRequires: pkgconfig(glib-2.0) >= 2.48 BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.14 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.20 BuildRequires: pkgconfig(libxklavier) >= 5.2 +BuildRequires: pkgconfig(pango) +BuildRequires: pkgconfig(x11) %glib2_gsettings_schema_requires %description @@ -86,6 +90,7 @@ %prep %setup -q +%patch0 -p1 %build NOCONFIGURE=1 mate-autogen @@ -98,39 +103,46 @@ %find_lang %{name} %{?no_lang_C} find %{buildroot} -type f -name "*.la" -delete -print +%if 0%{?suse_version} < 1500 %post -n matekbd-common %glib2_gsettings_schema_post %postun -n matekbd-common %glib2_gsettings_schema_postun +%endif %post -n %{name}%{sover} -p /sbin/ldconfig %postun -n %{name}%{sover} -p /sbin/ldconfig %files -n %{name}%{sover} -%defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING +%if 0%{?suse_version} >= 1500 +%license COPYING +%else +%doc COPYING +%endif +%doc AUTHORS ChangeLog %{_libdir}/*.so.%{sover}* %files -n matekbd-common -%defattr(-,root,root) %{_datadir}/glib-2.0/schemas/*.xml %{_datadir}/libmatekbd/ %files -n %{typelib} -%defattr(-,root,root) %{_libdir}/girepository-1.0/Matekbd-1.0.typelib %files devel -%defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING +%if 0%{?suse_version} >= 1500 +%license COPYING +%else +%doc COPYING +%endif +%doc AUTHORS ChangeLog %{_includedir}/%{name}/ %{_datadir}/gir-1.0/Matekbd-1.0.gir %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %files lang -f %{name}.lang -%defattr(-,root,root) %changelog ++++++ libmatekbd-1.18.2.tar.xz -> libmatekbd-1.20.0.tar.xz ++++++ ++++ 7881 lines of diff (skipped) ++++++ libmatekbd-gtk-3.20.patch ++++++ --- a/configure.ac +++ b/configure.ac @@ -17,10 +17,10 @@ AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist- m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) AC_CONFIG_MACRO_DIR(m4) -GLIB_REQUIRED=2.50.0 +GLIB_REQUIRED=2.48.0 GIO_REQUIRED=2.25.0 -GTK_REQUIRED=3.22.0 -GDK_REQUIRED=3.22.0 +GTK_REQUIRED=3.20.0 +GDK_REQUIRED=3.20.0 LIBXKLAVIER_REQUIRED=5.2 AC_SUBST([GIO_REQUIRED]) --- a/test/matekbd-keyboard-drawing-test.c +++ b/test/matekbd-keyboard-drawing-test.c @@ -161,7 +161,11 @@ main (gint argc, gchar ** argv) GtkWidget *window; GtkWidget *matekbd_keyboard_drawing; GdkScreen *screen; +#if GTK_CHECK_VERSION (3, 22, 0) GdkMonitor *monitor; +#else + int monitor; +#endif GdkRectangle rect; GOptionContext *context; GError *error = NULL; @@ -204,8 +208,13 @@ main (gint argc, gchar ** argv) G_CALLBACK (gtk_main_quit), NULL); screen = gtk_window_get_screen (GTK_WINDOW (window)); +#if GTK_CHECK_VERSION (3, 22, 0) monitor = gdk_display_get_monitor_at_point (gdk_screen_get_display (screen), 0, 0); gdk_monitor_get_geometry (monitor, &rect); +#else + monitor = gdk_screen_get_monitor_at_point (screen, 0, 0); + gdk_screen_get_monitor_geometry (screen, monitor, &rect); +#endif gtk_window_set_default_size (GTK_WINDOW (window), rect.width * 4 / 5, rect.height * 1 / 2);
