Hello community, here is the log from the commit of package nemo for openSUSE:Factory checked in at 2016-05-13 09:24:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nemo (Old) and /work/SRC/openSUSE:Factory/.nemo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nemo" Changes: -------- --- /work/SRC/openSUSE:Factory/nemo/nemo.changes 2016-04-30 23:29:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nemo.new/nemo.changes 2016-05-13 09:24:25.000000000 +0200 @@ -1,0 +2,30 @@ +Thu May 12 09:54:43 UTC 2016 - sor.ale...@meowr.ru + +- Update to version 3.0.1: + * pathbar: Always show the pathbar up and down arrows. + Dynamically adding and removing these buttons was causing the + visual style of buttons in the pathbar to break. + * Fix segfault on changing the number of colums when in list view. + * Fix uninitialised is_desktop flag. + * Port Python scripts to Python 3.x: /data/extract_action_strings, + /data/merge_action_strings, + /files/usr/share/nemo/actions/myaction.py. + * nemo-list-view.c: Fix initial column sizing: expand the + filename column only to fill available space. + Other columns will start with their natural size. + * nemo-view: Switch to nemo_get_file_by_uri so we don't get a null + pointer if the file isn't already loaded internally. + * Add desktop settings action. + * nemo-places-sidebar.c: Ensure a minimum usable sidebar width + when resizing windows or panes. + * Set minimum size for File Management Preferences window. + * Increase default width of File Management Preferences window. + * nemo-list-view.c: Clean up column changes: only add columns and + connect to them once, remove some unnecessary checks. + * nemo-list-view.c: Give the name column a default width that + the column-double-click autosize action can use. Otherwise it + makes the name column as small as possible (the opposite what + it's supposed to do, or what the other columns do). + * Update m4 files. + +------------------------------------------------------------------- Old: ---- nemo-3.0.0.tar.gz New: ---- nemo-3.0.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nemo.spec ++++++ --- /var/tmp/diff_new_pack.mavT70/_old 2016-05-13 09:24:26.000000000 +0200 +++ /var/tmp/diff_new_pack.mavT70/_new 2016-05-13 09:24:26.000000000 +0200 @@ -20,7 +20,7 @@ %define sover 1 %define typelib typelib-1_0-Nemo-3_0 Name: nemo -Version: 3.0.0 +Version: 3.0.1 Release: 0 Summary: File browser for Cinnamon License: GPL-2.0+ @@ -36,8 +36,8 @@ BuildRequires: gtk-doc BuildRequires: hicolor-icon-theme BuildRequires: pkg-config -BuildRequires: python-gobject-devel -BuildRequires: python-polib +BuildRequires: python3-gobject +BuildRequires: python3-polib BuildRequires: shared-mime-info BuildRequires: tracker-devel BuildRequires: update-desktop-files @@ -61,7 +61,7 @@ Requires: glib2-tools Requires: gvfs >= 1.3.2 Requires: libcinnamon-desktop-data -Requires: python +Requires: python3 Requires: shared-mime-info >= 0.50 Recommends: gdk-pixbuf-loader-rsvg Recommends: gvfs-backends ++++++ nemo-3.0.0.tar.gz -> nemo-3.0.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.0/config.h.in new/nemo-3.0.1/config.h.in --- old/nemo-3.0.0/config.h.in 2016-04-24 13:43:06.000000000 +0200 +++ new/nemo-3.0.1/config.h.in 2016-05-10 17:37:13.000000000 +0200 @@ -103,8 +103,7 @@ /* path for translations */ #undef LOCALEDIR -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* Name of package */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.0/configure.ac new/nemo-3.0.1/configure.ac --- old/nemo-3.0.0/configure.ac 2016-04-24 13:43:06.000000000 +0200 +++ new/nemo-3.0.1/configure.ac 2016-05-10 17:37:13.000000000 +0200 @@ -18,7 +18,7 @@ m4_define(nemo_extension_current, 5) m4_define(nemo_extension_revision, 0) -AC_INIT(nemo, 3.0.0, https://github.com/linuxmint/nemo) +AC_INIT(nemo, 3.0.1, https://github.com/linuxmint/nemo) dnl =========================================================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.0/data/action_i18n_strings.py new/nemo-3.0.1/data/action_i18n_strings.py --- old/nemo-3.0.0/data/action_i18n_strings.py 2016-04-24 13:43:06.000000000 +0200 +++ new/nemo-3.0.1/data/action_i18n_strings.py 2016-05-10 17:37:13.000000000 +0200 @@ -1,22 +1,24 @@ This is a dummy file for translating Nemo Action files - It was generated by the extract_action_strings script on 2016-04-24 11:31:38.621435 UTC. + It was generated by the extract_action_strings script on 2016-04-30 21:36:25.839711 UTC. -add-desklets_nemo_action_in_Name = _("Add Desklets") -add-desklets_nemo_action_in_Tooltip = _("Add Cinamon desklets") +mount-archive_nemo_action_in_Name = _("Mount archive") +mount-archive_nemo_action_in_Tooltip = _("Mount %f to browse its contents") +91_delete-workspace_nemo_action_in_Name = _("Remove workspace") +91_delete-workspace_nemo_action_in_Tooltip = _("Remove the currently active workspace") set-as-background_nemo_action_in_Name = _("Set as Wallpaper...") set-as-background_nemo_action_in_Tooltip = _("Set the selected image as your Cinnamon desktop wallpaper") -change-background_nemo_action_in_Name = _("Change Desktop _Background") -change-background_nemo_action_in_Tooltip = _("Change the Cinnamon desktop background") new-launcher_nemo_action_in_Name = _("Create a new l_auncher here...") new-launcher_nemo_action_in_Tooltip = _("Create a new launcher in this folder") +add-desklets_nemo_action_in_Name = _("Add Desklets") +add-desklets_nemo_action_in_Tooltip = _("Add Cinamon desklets") 92_show-expo_nemo_action_in_Name = _("Manage workspaces (Expo)") 92_show-expo_nemo_action_in_Tooltip = _("Open Expo to add, remove, or organize workspaces") -mount-archive_nemo_action_in_Name = _("Mount archive") -mount-archive_nemo_action_in_Tooltip = _("Mount %f to browse its contents") +desktop-settings_nemo_action_in_Name = _("Desktop _Settings") +desktop-settings_nemo_action_in_Tooltip = _("Change how your desktop works") 90_new-workspace_nemo_action_in_Name = _("Jump to new workspace") 90_new-workspace_nemo_action_in_Tooltip = _("Create a new workspace and activate it") -91_delete-workspace_nemo_action_in_Name = _("Remove workspace") -91_delete-workspace_nemo_action_in_Tooltip = _("Remove the currently active workspace") +change-background_nemo_action_in_Name = _("Change Desktop _Background") +change-background_nemo_action_in_Tooltip = _("Change the Cinnamon desktop background") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.0/data/desktop-settings.nemo_action.in new/nemo-3.0.1/data/desktop-settings.nemo_action.in --- old/nemo-3.0.0/data/desktop-settings.nemo_action.in 1970-01-01 01:00:00.000000000 +0100 +++ new/nemo-3.0.1/data/desktop-settings.nemo_action.in 2016-05-10 17:37:13.000000000 +0200 @@ -0,0 +1,18 @@ +[Nemo Action] + +Name=Desktop _Settings + +Comment=Change how your desktop works + +Exec=cinnamon-settings desktop + +Selection=None + +Icon-Name=cs-desktop + +Extensions=any; + +Dependencies=cinnamon-settings; + +Conditions=desktop;dbus org.Cinnamon; + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.0/data/extract_action_strings new/nemo-3.0.1/data/extract_action_strings --- old/nemo-3.0.0/data/extract_action_strings 2016-04-24 13:43:06.000000000 +0200 +++ new/nemo-3.0.1/data/extract_action_strings 2016-05-10 17:37:13.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 import os import glob @@ -50,7 +50,7 @@ outfile = open(outfilename, 'w') outfile.write(outstring) outfile.close() - print "Extraction complete. Run makepot now" + print("Extraction complete. Run makepot now") if __name__ == "__main__": Main() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.0/data/merge_action_strings new/nemo-3.0.1/data/merge_action_strings --- old/nemo-3.0.0/data/merge_action_strings 2016-04-24 13:43:06.000000000 +0200 +++ new/nemo-3.0.1/data/merge_action_strings 2016-05-10 17:37:13.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 import os import glob @@ -28,7 +28,7 @@ try: self.mo_files[locale] = polib.mofile(os.path.join(root, file)) except: - print "merge_action_strings - Failed to load .mo file: %s" % (os.path.join(root, file)) + print("merge_action_strings - Failed to load .mo file: %s" % (os.path.join(root, file))) if len(self.mo_files) > 0: for locale in self.mo_files.keys(): @@ -48,7 +48,7 @@ outfile.write(outstring) outfile.close() - print "Merge complete - .nemo_action files in ../files/usr/share/nemo/actions should contain translations now." + print("Merge complete - .nemo_action files in ../files/usr/share/nemo/actions should contain translations now.") def check_name(self, locale, entry): if entry.msgstr != '': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.0/debian/changelog new/nemo-3.0.1/debian/changelog --- old/nemo-3.0.0/debian/changelog 2016-04-24 13:43:06.000000000 +0200 +++ new/nemo-3.0.1/debian/changelog 2016-05-10 17:37:13.000000000 +0200 @@ -1,3 +1,39 @@ +nemo (3.0.1) sarah; urgency=medium + + [ JosephMcc ] + * pathbar: Always show the pathbar up and down arrows. Dynamically adding and removing these buttons was causing the visual style of buttons in the pathbar to break + + [ Igor ] + * Fix segfault on changing the number of colums when in list view + * Fix uninitialized is_desktop flag + + [ Michal Cyprian ] + * Port python scripts to Python 3 - /data/extract_action_strings - /data/merge_action_strings - /files/usr/share/nemo/actions/myaction.py - all Python 2-3 compatible + + [ Michael Webster ] + * nemo-list-view.c: Fix initial column sizing - expand the filename column only to fill available space. Other columns will start with their natural size. + * update m4 files + + [ itzexor ] + * nemo-view: switch to nemo_get_file_by_uri so we don't get a NULL pointer if the file isn't already loaded internally. + + [ Michael Webster ] + * Add desktop settings action + * nemo-places-sidebar.c: ensure a minimum useable sidebar width when resizing windows or panes. + + [ Igor ] + * Set minimum size for File Management Preferences window + * Increase default width of File Management Preferences window + + [ Michael Webster ] + * nemo-list-view.c: Clean up column changes - only add columns and connect to them once, remove some unnecessary checks. + * nemo-list-view.c: give the name column a default width that the column-double-click autosize action can use. Otherwise it makes the name column as small as possible (the opposite what it's supposed to do, or what the other columns do) + + [ Igor ] + * Update suggested.gitignore + + -- Clement Lefebvre <r...@linuxmint.com> Tue, 10 May 2016 16:36:23 +0100 + nemo (3.0.0) sarah; urgency=medium [ lukefromdc ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.0/files/usr/share/nemo/actions/myaction.py new/nemo-3.0.1/files/usr/share/nemo/actions/myaction.py --- old/nemo-3.0.0/files/usr/share/nemo/actions/myaction.py 2016-04-24 13:43:06.000000000 +0200 +++ new/nemo-3.0.1/files/usr/share/nemo/actions/myaction.py 2016-05-10 17:37:13.000000000 +0200 @@ -1,13 +1,13 @@ -#! /usr/bin/python2 -OOt +#! /usr/bin/python3 -OOt import sys command = sys.argv[0] -print "Running " + command -print "With the following arguments:" +print("Running " + command) +print("With the following arguments:") for arg in sys.argv: if command == arg: continue else: - print arg + print(arg) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.0/libnemo-private/nemo-action.c new/nemo-3.0.1/libnemo-private/nemo-action.c --- old/nemo-3.0.0/libnemo-private/nemo-action.c 2016-04-24 13:43:06.000000000 +0200 +++ new/nemo-3.0.1/libnemo-private/nemo-action.c 2016-05-10 17:37:13.000000000 +0200 @@ -437,7 +437,7 @@ KEY_WHITESPACE, NULL); - gboolean is_desktop; + gboolean is_desktop = FALSE; if (conditions && condition_count > 0) { int j; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.0/m4/ltoptions.m4 new/nemo-3.0.1/m4/ltoptions.m4 --- old/nemo-3.0.0/m4/ltoptions.m4 2016-04-24 13:43:06.000000000 +0200 +++ new/nemo-3.0.1/m4/ltoptions.m4 2016-05-10 17:37:13.000000000 +0200 @@ -1,14 +1,14 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 7 ltoptions.m4 +# serial 8 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) @@ -29,7 +29,7 @@ [m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), _LT_MANGLE_DEFUN([$1], [$2]), - [m4_warning([Unknown $1 option `$2'])])[]dnl + [m4_warning([Unknown $1 option '$2'])])[]dnl ]) @@ -75,13 +75,15 @@ dnl dnl If no reference was made to various pairs of opposing options, then dnl we run the default mode handler for the pair. For example, if neither - dnl `shared' nor `disable-shared' was passed, we enable building of shared + dnl 'shared' nor 'disable-shared' was passed, we enable building of shared dnl archives by default: _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], - [_LT_ENABLE_FAST_INSTALL]) + [_LT_ENABLE_FAST_INSTALL]) + _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4], + [_LT_WITH_AIX_SONAME([aix])]) ]) ])# _LT_SET_OPTIONS @@ -112,7 +114,7 @@ [_LT_SET_OPTION([LT_INIT], [dlopen]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `dlopen' option into LT_INIT's first parameter.]) +put the 'dlopen' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -148,7 +150,7 @@ _LT_SET_OPTION([LT_INIT], [win32-dll]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `win32-dll' option into LT_INIT's first parameter.]) +put the 'win32-dll' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -157,9 +159,9 @@ # _LT_ENABLE_SHARED([DEFAULT]) # ---------------------------- -# implement the --enable-shared flag, and supports the `shared' and -# `disable-shared' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-shared flag, and supports the 'shared' and +# 'disable-shared' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_SHARED], [m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([shared], @@ -172,14 +174,14 @@ *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) @@ -211,9 +213,9 @@ # _LT_ENABLE_STATIC([DEFAULT]) # ---------------------------- -# implement the --enable-static flag, and support the `static' and -# `disable-static' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-static flag, and support the 'static' and +# 'disable-static' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_STATIC], [m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([static], @@ -226,14 +228,14 @@ *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_static=]_LT_ENABLE_STATIC_DEFAULT) @@ -265,9 +267,9 @@ # _LT_ENABLE_FAST_INSTALL([DEFAULT]) # ---------------------------------- -# implement the --enable-fast-install flag, and support the `fast-install' -# and `disable-fast-install' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-fast-install flag, and support the 'fast-install' +# and 'disable-fast-install' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_FAST_INSTALL], [m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([fast-install], @@ -280,14 +282,14 @@ *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) @@ -304,14 +306,14 @@ [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `fast-install' option into LT_INIT's first parameter.]) +the 'fast-install' option into LT_INIT's first parameter.]) ]) AU_DEFUN([AC_DISABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], [disable-fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `disable-fast-install' option into LT_INIT's first parameter.]) +the 'disable-fast-install' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -319,11 +321,64 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) +# _LT_WITH_AIX_SONAME([DEFAULT]) +# ---------------------------------- +# implement the --with-aix-soname flag, and support the `aix-soname=aix' +# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT +# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'. +m4_define([_LT_WITH_AIX_SONAME], +[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl +shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[[5-9]]*,yes) + AC_MSG_CHECKING([which variant of shared library versioning to provide]) + AC_ARG_WITH([aix-soname], + [AS_HELP_STRING([--with-aix-soname=aix|svr4|both], + [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])], + [case $withval in + aix|svr4|both) + ;; + *) + AC_MSG_ERROR([Unknown argument to --with-aix-soname]) + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname], + [AC_CACHE_VAL([lt_cv_with_aix_soname], + [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT) + with_aix_soname=$lt_cv_with_aix_soname]) + AC_MSG_RESULT([$with_aix_soname]) + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + +_LT_DECL([], [shared_archive_member_spec], [0], + [Shared archive member basename, for filename based shared library versioning on AIX])dnl +])# _LT_WITH_AIX_SONAME + +LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])]) + + # _LT_WITH_PIC([MODE]) # -------------------- -# implement the --with-pic flag, and support the `pic-only' and `no-pic' +# implement the --with-pic flag, and support the 'pic-only' and 'no-pic' # LT_INIT options. -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], @@ -334,19 +389,17 @@ *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], - [pic_mode=default]) - -test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) + [pic_mode=m4_default([$1], [default])]) _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl ])# _LT_WITH_PIC @@ -359,7 +412,7 @@ [_LT_SET_OPTION([LT_INIT], [pic-only]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `pic-only' option into LT_INIT's first parameter.]) +put the 'pic-only' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.0/m4/ltsugar.m4 new/nemo-3.0.1/m4/ltsugar.m4 --- old/nemo-3.0.0/m4/ltsugar.m4 2016-04-24 13:43:06.000000000 +0200 +++ new/nemo-3.0.1/m4/ltsugar.m4 2016-05-10 17:37:13.000000000 +0200 @@ -1,6 +1,7 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives @@ -33,7 +34,7 @@ # ------------ # Manipulate m4 lists. # These macros are necessary as long as will still need to support -# Autoconf-2.59 which quotes differently. +# Autoconf-2.59, which quotes differently. m4_define([lt_car], [[$1]]) m4_define([lt_cdr], [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], @@ -44,7 +45,7 @@ # lt_append(MACRO-NAME, STRING, [SEPARATOR]) # ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. +# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'. # Note that neither SEPARATOR nor STRING are expanded; they are appended # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). # No SEPARATOR is output if MACRO-NAME was previously undefined (different diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.0/m4/ltversion.m4 new/nemo-3.0.1/m4/ltversion.m4 --- old/nemo-3.0.0/m4/ltversion.m4 2016-04-24 13:43:06.000000000 +0200 +++ new/nemo-3.0.1/m4/ltversion.m4 2016-05-10 17:37:13.000000000 +0200 @@ -1,6 +1,6 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -9,15 +9,15 @@ # @configure_input@ -# serial 3337 ltversion.m4 +# serial 4179 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.2]) -m4_define([LT_PACKAGE_REVISION], [1.3337]) +m4_define([LT_PACKAGE_VERSION], [2.4.6]) +m4_define([LT_PACKAGE_REVISION], [2.4.6]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.2' -macro_revision='1.3337' +[macro_version='2.4.6' +macro_revision='2.4.6' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.0/m4/lt~obsolete.m4 new/nemo-3.0.1/m4/lt~obsolete.m4 --- old/nemo-3.0.0/m4/lt~obsolete.m4 2016-04-24 13:43:06.000000000 +0200 +++ new/nemo-3.0.1/m4/lt~obsolete.m4 2016-05-10 17:37:13.000000000 +0200 @@ -1,6 +1,7 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives @@ -11,7 +12,7 @@ # These exist entirely to fool aclocal when bootstrapping libtool. # -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN), # which have later been changed to m4_define as they aren't part of the # exported API, or moved to Autoconf or Automake where they belong. # @@ -25,7 +26,7 @@ # included after everything else. This provides aclocal with the # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything # because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. # # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. # Yes, that means every name once taken will need to remain here until diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.0/src/nemo-file-management-properties.c new/nemo-3.0.1/src/nemo-file-management-properties.c --- old/nemo-3.0.0/src/nemo-file-management-properties.c 2016-04-24 13:43:06.000000000 +0200 +++ new/nemo-3.0.1/src/nemo-file-management-properties.c 2016-05-10 17:37:13.000000000 +0200 @@ -1009,6 +1009,10 @@ gtk_window_set_screen (GTK_WINDOW (dialog), gtk_window_get_screen(window)); } + gint width, height; + gtk_window_get_default_size (GTK_WINDOW (dialog), &width, &height); + gtk_widget_set_size_request (dialog, width, height); + preferences_dialog = dialog; g_object_add_weak_pointer (G_OBJECT (dialog), (gpointer *) &preferences_dialog); gtk_widget_show (dialog); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.0/src/nemo-file-management-properties.glade new/nemo-3.0.1/src/nemo-file-management-properties.glade --- old/nemo-3.0.0/src/nemo-file-management-properties.glade 2016-04-24 13:43:06.000000000 +0200 +++ new/nemo-3.0.1/src/nemo-file-management-properties.glade 2016-05-10 17:37:13.000000000 +0200 @@ -251,7 +251,7 @@ <property name="can_focus">False</property> <property name="title" translatable="yes">File Management Preferences</property> <property name="window_position">center</property> - <property name="default_width">800</property> + <property name="default_width">850</property> <property name="default_height">600</property> <style> <class name="nemo-properties-dialog"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.0/src/nemo-list-view.c new/nemo-3.0.1/src/nemo-list-view.c --- old/nemo-3.0.0/src/nemo-list-view.c 2016-04-24 13:43:06.000000000 +0200 +++ new/nemo-3.0.1/src/nemo-list-view.c 2016-05-10 17:37:13.000000000 +0200 @@ -1924,6 +1924,29 @@ return TRUE; } +#if !GTK_CHECK_VERSION(3, 12, 0) +ellipsize_columns (GList *list) +{ + g_printerr ("ellipse\n"); + GList *l = list; + while (l != NULL) { + GtkWidget *child = GTK_IS_WIDGET (l->data) ? + GTK_WIDGET (l->data) : + gtk_tree_view_column_get_button (GTK_TREE_VIEW_COLUMN (l->data)); + + if (GTK_IS_LABEL (child)) { + gtk_label_set_ellipsize (GTK_LABEL (child), PANGO_ELLIPSIZE_END); + } else if (GTK_IS_CONTAINER (child)) { + GList *child_list = gtk_container_get_children (GTK_CONTAINER (child)); + ellipsize_columns (child_list); + g_list_free (child_list); + } + + l = l->next; + } +} +#endif + static void apply_columns_settings (NemoListView *list_view, char **column_order, @@ -1985,24 +2008,15 @@ old_view_columns = gtk_tree_view_get_columns (list_view->details->tree_view); for (l = old_view_columns; l != NULL; l = l->next) { if (g_list_find (view_columns, l->data) == NULL) { - gtk_tree_view_remove_column (list_view->details->tree_view, l->data); + gtk_tree_view_column_set_visible (l->data, FALSE); } } g_list_free (old_view_columns); - - old_view_columns = gtk_tree_view_get_columns (list_view->details->tree_view); /* show new columns from the configuration */ for (l = view_columns; l != NULL; l = l->next) { - if (g_list_find (old_view_columns, l->data) == NULL) { - gtk_tree_view_append_column (list_view->details->tree_view, l->data); - g_signal_connect (gtk_tree_view_column_get_button (l->data), - "button-press-event", - G_CALLBACK (column_header_clicked), - list_view); - } + gtk_tree_view_column_set_visible (l->data, TRUE); } - g_list_free (old_view_columns); /* place columns in the correct order */ prev_view_column = NULL; @@ -2010,6 +2024,11 @@ gtk_tree_view_move_column_after (list_view->details->tree_view, l->data, prev_view_column); prev_view_column = l->data; } + +#if !GTK_CHECK_VERSION(3, 12, 0) + ellipsize_columns (view_columns); +#endif + g_list_free (view_columns); } @@ -2086,8 +2105,6 @@ (GDestroyNotify) g_free, (GDestroyNotify) g_object_unref); - gtk_scrollable_set_hscroll_policy (GTK_SCROLLABLE (view->details->tree_view), GTK_SCROLL_NATURAL); - gtk_tree_view_set_enable_search (view->details->tree_view, TRUE); /* Don't handle backspace key. It's used to open the parent folder. */ @@ -2198,22 +2215,26 @@ view->details->pixbuf_cell = (GtkCellRendererPixbuf *)cell; view->details->file_name_column = gtk_tree_view_column_new (); - g_object_ref_sink (view->details->file_name_column); + gtk_tree_view_append_column (view->details->tree_view, + view->details->file_name_column); view->details->file_name_column_num = column_num; g_hash_table_insert (view->details->columns, g_strdup ("name"), view->details->file_name_column); + g_signal_connect (gtk_tree_view_column_get_button (view->details->file_name_column), + "button-press-event", + G_CALLBACK (column_header_clicked), + view); + gtk_tree_view_set_search_column (view->details->tree_view, column_num); gtk_tree_view_column_set_sort_column_id (view->details->file_name_column, column_num); gtk_tree_view_column_set_title (view->details->file_name_column, _("Name")); gtk_tree_view_column_set_resizable (view->details->file_name_column, TRUE); - gtk_tree_view_column_set_min_width (view->details->file_name_column, 125); - gtk_tree_view_column_set_sizing (view->details->file_name_column, GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_min_width (view->details->file_name_column, 100); gtk_tree_view_column_set_reorderable (view->details->file_name_column, TRUE); - gtk_tree_view_column_set_expand (view->details->file_name_column, TRUE); gtk_tree_view_column_pack_start (view->details->file_name_column, cell, FALSE); @@ -2227,6 +2248,7 @@ g_object_set (cell, "xpad", 5, "ellipsize", PANGO_ELLIPSIZE_END, + "width-chars", 40, NULL); g_signal_connect (cell, "edited", G_CALLBACK (cell_renderer_edited), view); g_signal_connect (cell, "editing-canceled", G_CALLBACK (cell_renderer_editing_canceled), view); @@ -2240,6 +2262,9 @@ cell = gtk_cell_renderer_text_new (); g_object_set (cell, "xalign", xalign, +#if !GTK_CHECK_VERSION(3, 12, 0) + "ellipsize", PANGO_ELLIPSIZE_END, +#endif "xpad", 5, NULL); view->details->cells = g_list_append (view->details->cells, @@ -2248,18 +2273,20 @@ cell, "text", column_num, NULL); - gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_min_width (column, 10); - g_object_ref_sink (column); + gtk_tree_view_append_column (view->details->tree_view, column); + gtk_tree_view_column_set_min_width (column, 30); gtk_tree_view_column_set_sort_column_id (column, column_num); g_hash_table_insert (view->details->columns, g_strdup (name), column); + g_signal_connect (gtk_tree_view_column_get_button (column), + "button-press-event", + G_CALLBACK (column_header_clicked), + view); + gtk_tree_view_column_set_resizable (column, TRUE); - gtk_tree_view_column_set_visible (column, TRUE); gtk_tree_view_column_set_reorderable (column, TRUE); - gtk_tree_view_column_set_expand (column, TRUE); } g_free (name); g_free (label); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.0/src/nemo-pathbar.c new/nemo-3.0.1/src/nemo-pathbar.c --- old/nemo-3.0.0/src/nemo-pathbar.c 2016-04-24 13:43:06.000000000 +0200 +++ new/nemo-3.0.1/src/nemo-pathbar.c 2016-05-10 17:37:13.000000000 +0200 @@ -599,7 +599,7 @@ gboolean needs_reorder = FALSE; gint button_count = 0; - need_sliders = FALSE; + need_sliders = TRUE; up_slider_offset = 0; down_slider_offset = 0; path_bar = NEMO_PATH_BAR (widget); @@ -636,7 +636,7 @@ largest_width = allocation->width; - if (width <= allocation->width) { + if (width <= allocation->width && !need_sliders) { if (path_bar->priv->fake_root) { pathbar_root_button = path_bar->priv->fake_root; } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.0/src/nemo-places-sidebar.c new/nemo-3.0.1/src/nemo-places-sidebar.c --- old/nemo-3.0.0/src/nemo-places-sidebar.c 2016-04-24 13:43:06.000000000 +0200 +++ new/nemo-3.0.1/src/nemo-places-sidebar.c 2016-05-10 17:37:13.000000000 +0200 @@ -3992,6 +3992,8 @@ sidebar->network_expanded = g_settings_get_boolean (nemo_window_state, NEMO_WINDOW_STATE_NETWORK_EXPANDED); + gtk_widget_set_size_request (GTK_WIDGET (sidebar), 140, -1); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sidebar), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.0/src/nemo-view.c new/nemo-3.0.1/src/nemo-view.c --- old/nemo-3.0.0/src/nemo-view.c 2016-04-24 13:43:06.000000000 +0200 +++ new/nemo-3.0.1/src/nemo-view.c 2016-05-10 17:37:13.000000000 +0200 @@ -5144,7 +5144,7 @@ GtkAction *action; mount_uri = nemo_get_home_directory_uri (); - file = nemo_file_get_existing_by_uri (mount_uri); + file = nemo_file_get_by_uri (mount_uri); g_free (mount_uri); action = gtk_action_group_get_action (view->details->dir_action_group, NEMO_ACTION_COPY_TO_HOME); @@ -5154,7 +5154,7 @@ g_object_unref (file); mount_uri = nemo_get_desktop_directory_uri (); - file = nemo_file_get_existing_by_uri (mount_uri); + file = nemo_file_get_by_uri (mount_uri); g_free (mount_uri); action = gtk_action_group_get_action (view->details->dir_action_group, NEMO_ACTION_COPY_TO_DESKTOP); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nemo-3.0.0/suggested.gitignore new/nemo-3.0.1/suggested.gitignore --- old/nemo-3.0.0/suggested.gitignore 2016-04-24 13:43:06.000000000 +0200 +++ new/nemo-3.0.1/suggested.gitignore 2016-05-10 17:37:13.000000000 +0200 @@ -13,6 +13,7 @@ aclocal.m4 config.guess config.h +config.h.in~ config.log config.status config.sub @@ -60,7 +61,7 @@ po/stamp-it data/org.Nemo.service -data/org.freedesktop.NemoFileManager1.service +data/org.nemo.freedesktop.FileManager1.service data/nemo.xml data/nemo.desktop.in data/nemo.desktop @@ -74,11 +75,19 @@ src/nemo-autorun-software src/nemo-connect-server src/nemo-convert-metadata +src/nemo-extensions-list src/nemo-freedesktop-generated.c src/nemo-freedesktop-generated.h +src/nemo-open-with src/nemo-resources.c src/nemo-resources.h +src/org.nemo.root.policy test/test-eel-editable-label test/test-nemo-copy test/test-nemo-directory-async test/test-nemo-search-engine + +compile +install-sh +missing +test-driver
