Hello community, here is the log from the commit of package caja for openSUSE:Factory checked in at 2016-03-17 16:35:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/caja (Old) and /work/SRC/openSUSE:Factory/.caja.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "caja" Changes: -------- --- /work/SRC/openSUSE:Factory/caja/caja.changes 2016-02-22 08:58:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.caja.new/caja.changes 2016-03-17 16:48:39.000000000 +0100 @@ -1,0 +2,14 @@ +Tue Mar 15 19:41:43 UTC 2016 - [email protected] + +- Update to 1.12.6: + * Really fix loading multiple python extensions. + +------------------------------------------------------------------- +Mon Mar 14 15:17:41 UTC 2016 - [email protected] + +- Update to 1.12.5: + * Fix loading multiple Python extensions. + * GTK+3: fix crash on Ctrl + scroll wheel. +- Rename caja-gsettings-schemas package to caja-gschemas. + +------------------------------------------------------------------- Old: ---- caja-1.12.4.tar.xz New: ---- caja-1.12.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ caja.spec ++++++ --- /var/tmp/diff_new_pack.6Ygtgb/_old 2016-03-17 16:48:40.000000000 +0100 +++ /var/tmp/diff_new_pack.6Ygtgb/_new 2016-03-17 16:48:40.000000000 +0100 @@ -20,7 +20,7 @@ %define typelib typelib-1_0-Caja-2_0 %define _version 1.12 Name: caja -Version: 1.12.4 +Version: 1.12.6 Release: 0 Summary: File manager for the MATE desktop License: GPL-2.0 and LGPL-2.0 @@ -55,6 +55,8 @@ with them. It is also responsible for handling the icons on the MATE desktop. It works on local and remote filesystems. +%lang_package + %package devel Summary: Caja development files License: GPL-2.0 and LGPL-2.0 @@ -75,7 +77,7 @@ Summary: Caja shared libraries License: GPL-2.0 and LGPL-2.0 Group: System/Libraries -Requires: %{name}-gsettings-schemas = %{version} +Requires: %{name}-gschemas = %{version} %description -n %{lname} Caja is the official file manager for the MATE desktop. It allows to @@ -85,20 +87,23 @@ # Needed for using pluma as standalone from MATE. -%package gsettings-schemas -Summary: Caja schemas +%package gschemas +Summary: Caja GSchemas License: LGPL-2.0+ Group: System/Libraries Obsoletes: mate-file-manager < %{version} +# caja-gsettings-schemas was last used in openSUSE Leap 42.1. +Obsoletes: %{name}-gsettings-schemas < %{version} +Provides: %{name}-gsettings-schemas = %{version} %glib2_gsettings_schema_requires -%description gsettings-schemas +%description gschemas Caja is the official file manager for the MATE desktop. It allows to browse directories, preview files and launch applications associated with them. It is also responsible for handling the icons on the MATE desktop. It works on local and remote filesystems. -This package provides the gsettings schemas for Caja. +This package provides the GSettings schemas for Caja. %package -n %{typelib} Summary: MATE file manager typelib @@ -111,12 +116,11 @@ with them. It is also responsible for handling the icons on the MATE desktop. It works on local and remote filesystems. -%lang_package - %prep %setup -q %build +NOCONFIGURE=1 mate-autogen %configure \ --libexecdir=%{_libexecdir}/%{name} \ --disable-update-mimedb \ @@ -158,13 +162,11 @@ %icon_theme_cache_postun %post -n %{lname} -p /sbin/ldconfig - %postun -n %{lname} -p /sbin/ldconfig - -%post gsettings-schemas +%post gschemas %glib2_gsettings_schema_post -%postun gsettings-schemas +%postun gschemas %glib2_gsettings_schema_postun %files @@ -197,6 +199,9 @@ %dir %{_datadir}/caja/extensions/ %dir %{_datadir}/caja-extensions/ +%files lang -f caja.lang +%defattr(-,root,root) + %files -n %{typelib} %defattr(-,root,root) %{_libdir}/girepository-1.0/Caja-2.0.typelib @@ -205,7 +210,7 @@ %defattr(-,root,root) %{_libdir}/*.so.* -%files gsettings-schemas +%files gschemas %defattr(-,root,root) %{_datadir}/glib-2.0/schemas/*.xml @@ -217,7 +222,4 @@ %{_libdir}/pkgconfig/libcaja-extension.pc %{_datadir}/gir-1.0/Caja-2.0.gir -%files lang -f caja.lang -%defattr(-,root,root) - %changelog ++++++ caja-1.12.4.tar.xz -> caja-1.12.6.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.4/NEWS new/caja-1.12.6/NEWS --- old/caja-1.12.4/NEWS 2016-02-15 15:03:23.000000000 +0100 +++ new/caja-1.12.6/NEWS 2016-03-14 15:59:28.000000000 +0100 @@ -1,3 +1,13 @@ +Major changes in 1.12.6 are: +* Really fix loading multiple python extensions: revert the commit + that proved to broke the fix. NOTE: as a side effect, the extensions + list will now have duplicate Python entries if more than one Python + extension is loaded. + +Major changes in 1.12.5 are: +* Fix loading multiple python extensions +* GTK+3: fix crash on Ctrl + scroll wheel + Major changes in 1.12.4 are: * Fix random crash on startup when python-caja extension is enabled * Fix crash when restoring file with special characters from trash diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.4/configure new/caja-1.12.6/configure --- old/caja-1.12.4/configure 2016-02-15 15:07:15.000000000 +0100 +++ new/caja-1.12.6/configure 2016-03-14 16:02:37.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for caja 1.12.4. +# Generated by GNU Autoconf 2.69 for caja 1.12.6. # # Report bugs to <http://www.mate-desktop.org>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='caja' PACKAGE_TARNAME='caja' -PACKAGE_VERSION='1.12.4' -PACKAGE_STRING='caja 1.12.4' +PACKAGE_VERSION='1.12.6' +PACKAGE_STRING='caja 1.12.6' PACKAGE_BUGREPORT='http://www.mate-desktop.org' PACKAGE_URL='' @@ -1475,7 +1475,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures caja 1.12.4 to adapt to many kinds of systems. +\`configure' configures caja 1.12.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1545,7 +1545,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of caja 1.12.4:";; + short | recursive ) echo "Configuration of caja 1.12.6:";; esac cat <<\_ACEOF @@ -1696,7 +1696,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -caja configure 1.12.4 +caja configure 1.12.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2065,7 +2065,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by caja $as_me 1.12.4, which was +It was created by caja $as_me 1.12.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2975,7 +2975,7 @@ # Define the identity of the package. PACKAGE='caja' - VERSION='1.12.4' + VERSION='1.12.6' cat >>confdefs.h <<_ACEOF @@ -17169,7 +17169,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by caja $as_me 1.12.4, which was +This file was extended by caja $as_me 1.12.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17235,7 +17235,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -caja config.status 1.12.4 +caja config.status 1.12.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.4/configure.ac new/caja-1.12.6/configure.ac --- old/caja-1.12.4/configure.ac 2016-02-15 15:02:17.000000000 +0100 +++ new/caja-1.12.6/configure.ac 2016-03-14 15:53:44.000000000 +0100 @@ -19,7 +19,7 @@ m4_define(caja_extension_current, 5) m4_define(caja_extension_revision, 0) -AC_INIT([caja], [1.12.4], [http://www.mate-desktop.org]) +AC_INIT([caja], [1.12.6], [http://www.mate-desktop.org]) # GLib min/max required versions AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_36], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.4/data/caja-autorun-software.desktop.in new/caja-1.12.6/data/caja-autorun-software.desktop.in --- old/caja-1.12.4/data/caja-autorun-software.desktop.in 2016-02-15 15:07:21.000000000 +0100 +++ new/caja-1.12.6/data/caja-autorun-software.desktop.in 2016-03-14 16:02:44.000000000 +0100 @@ -11,4 +11,4 @@ X-MATE-Bugzilla-Bugzilla=MATE X-MATE-Bugzilla-Product=caja X-MATE-Bugzilla-Component=general -X-MATE-Bugzilla-Version=1.12.4 +X-MATE-Bugzilla-Version=1.12.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.4/data/caja-browser.desktop.in new/caja-1.12.6/data/caja-browser.desktop.in --- old/caja-1.12.4/data/caja-browser.desktop.in 2016-02-15 15:07:21.000000000 +0100 +++ new/caja-1.12.6/data/caja-browser.desktop.in 2016-03-14 16:02:44.000000000 +0100 @@ -14,4 +14,4 @@ X-MATE-Bugzilla-Bugzilla=MATE X-MATE-Bugzilla-Product=caja X-MATE-Bugzilla-Component=general -X-MATE-Bugzilla-Version=1.12.4 +X-MATE-Bugzilla-Version=1.12.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.4/data/caja-computer.desktop.in new/caja-1.12.6/data/caja-computer.desktop.in --- old/caja-1.12.4/data/caja-computer.desktop.in 2016-02-15 15:07:21.000000000 +0100 +++ new/caja-1.12.6/data/caja-computer.desktop.in 2016-03-14 16:02:44.000000000 +0100 @@ -14,4 +14,4 @@ X-MATE-Bugzilla-Bugzilla=MATE X-MATE-Bugzilla-Product=caja X-MATE-Bugzilla-Component=general -X-MATE-Bugzilla-Version=1.12.4 +X-MATE-Bugzilla-Version=1.12.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.4/data/caja-file-management-properties.desktop.in new/caja-1.12.6/data/caja-file-management-properties.desktop.in --- old/caja-1.12.4/data/caja-file-management-properties.desktop.in 2016-02-15 15:07:21.000000000 +0100 +++ new/caja-1.12.6/data/caja-file-management-properties.desktop.in 2016-03-14 16:02:44.000000000 +0100 @@ -12,4 +12,4 @@ X-MATE-Bugzilla-Bugzilla=MATE X-MATE-Bugzilla-Product=caja X-MATE-Bugzilla-Component=Preferences -X-MATE-Bugzilla-Version=1.12.4 +X-MATE-Bugzilla-Version=1.12.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.4/data/caja-folder-handler.desktop.in new/caja-1.12.6/data/caja-folder-handler.desktop.in --- old/caja-1.12.4/data/caja-folder-handler.desktop.in 2016-02-15 15:07:21.000000000 +0100 +++ new/caja-1.12.6/data/caja-folder-handler.desktop.in 2016-03-14 16:02:44.000000000 +0100 @@ -13,4 +13,4 @@ X-MATE-Bugzilla-Bugzilla=MATE X-MATE-Bugzilla-Product=caja X-MATE-Bugzilla-Component=general -X-MATE-Bugzilla-Version=1.12.4 +X-MATE-Bugzilla-Version=1.12.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.4/data/caja.desktop new/caja-1.12.6/data/caja.desktop --- old/caja-1.12.4/data/caja.desktop 2016-02-15 15:08:30.000000000 +0100 +++ new/caja-1.12.6/data/caja.desktop 2016-03-14 16:03:22.000000000 +0100 @@ -229,7 +229,7 @@ X-MATE-Bugzilla-Bugzilla=MATE X-MATE-Bugzilla-Product=caja X-MATE-Bugzilla-Component=general -X-MATE-Bugzilla-Version=1.12.4 +X-MATE-Bugzilla-Version=1.12.6 X-MATE-Autostart-Phase=Desktop X-MATE-Autostart-Notify=true X-MATE-AutoRestart=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.4/data/caja.desktop.in new/caja-1.12.6/data/caja.desktop.in --- old/caja-1.12.4/data/caja.desktop.in 2016-02-15 15:07:21.000000000 +0100 +++ new/caja-1.12.6/data/caja.desktop.in 2016-03-14 16:02:44.000000000 +0100 @@ -11,7 +11,7 @@ X-MATE-Bugzilla-Bugzilla=MATE X-MATE-Bugzilla-Product=caja X-MATE-Bugzilla-Component=general -X-MATE-Bugzilla-Version=1.12.4 +X-MATE-Bugzilla-Version=1.12.6 X-MATE-Autostart-Phase=Desktop X-MATE-Autostart-Notify=true X-MATE-AutoRestart=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.4/libcaja-private/caja-module.c new/caja-1.12.6/libcaja-private/caja-module.c --- old/caja-1.12.4/libcaja-private/caja-module.c 2016-02-15 15:00:37.000000000 +0100 +++ new/caja-1.12.6/libcaja-private/caja-module.c 2016-03-14 15:37:41.000000000 +0100 @@ -153,11 +153,13 @@ add_module_objects (CajaModule *module) { GObject *object = NULL; + gchar *filename = NULL; const GType *types = NULL; int num_types = 0; int i; module->list_types (&types, &num_types); + filename = g_path_get_basename (module->path); for (i = 0; i < num_types; i++) { @@ -166,9 +168,8 @@ break; } object = caja_module_add_type (types[i]); + caja_extension_register (filename, object); } - gchar *filename = g_path_get_basename (module->path); - caja_extension_register (filename, object); } static CajaModule * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caja-1.12.4/src/file-manager/fm-directory-view.c new/caja-1.12.6/src/file-manager/fm-directory-view.c --- old/caja-1.12.4/src/file-manager/fm-directory-view.c 2016-02-15 14:41:51.000000000 +0100 +++ new/caja-1.12.6/src/file-manager/fm-directory-view.c 2016-03-14 15:37:42.000000000 +0100 @@ -10827,6 +10827,11 @@ fm_directory_view_handle_scroll_event (FMDirectoryView *directory_view, GdkEventScroll *event) { +#if GTK_CHECK_VERSION (3, 0, 0) + static gdouble total_delta_y = 0; + gdouble delta_x, delta_y; +#endif + if (event->state & GDK_CONTROL_MASK) { switch (event->direction) { case GDK_SCROLL_UP: @@ -10839,6 +10844,29 @@ fm_directory_view_bump_zoom_level (directory_view, -1); return TRUE; +#if GTK_CHECK_VERSION (3, 0, 0) + case GDK_SCROLL_SMOOTH: + gdk_event_get_scroll_deltas ((const GdkEvent *) event, + &delta_x, &delta_y); + + /* try to emulate a normal scrolling event by summing deltas */ + total_delta_y += delta_y; + + if (total_delta_y >= 1) { + total_delta_y = 0; + /* emulate scroll down */ + fm_directory_view_bump_zoom_level (directory_view, -1); + return TRUE; + } else if (total_delta_y <= - 1) { + total_delta_y = 0; + /* emulate scroll up */ + fm_directory_view_bump_zoom_level (directory_view, 1); + return TRUE; + } else { + /* eat event */ + return TRUE; + } +#endif case GDK_SCROLL_LEFT: case GDK_SCROLL_RIGHT: break;
