SHA256
1
0
forked from pool/nemo

Accepting request 498031 from X11:Cinnamon:Factory

OBS-URL: https://build.opensuse.org/request/show/498031
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nemo?expand=0&rev=12
This commit is contained in:
Dominique Leuenberger 2017-05-27 11:13:13 +00:00 committed by Git OBS Bridge
commit 2ce759fc9f
5 changed files with 205 additions and 22 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c0bd62719fcdf8cb4c66cf37dc3ff8bf7b788ce13cb683827e86a80c890d01fc
size 1366150

3
nemo-3.4.2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d4d0ad41085c3a4e6c4cf367b5dae67b80645f6e13fb00407187bf4eee18d6bd
size 1416330

View File

@ -10,20 +10,11 @@
static gboolean static gboolean
--- a/libnemo-private/nemo-desktop-utils.c --- a/libnemo-private/nemo-desktop-utils.c
+++ b/libnemo-private/nemo-desktop-utils.c +++ b/libnemo-private/nemo-desktop-utils.c
@@ -82,15 +82,7 @@ nemo_desktop_utils_get_primary_monitor ( @@ -92,6 +92,7 @@ nemo_desktop_utils_get_primary_monitor (
#if GTK_CHECK_VERSION (3, 22, 0) return i;
ensure_display (); }
}
- gint n_mon = gdk_display_get_n_monitors (default_display); + return -1;
- gint i;
-
- for (i = 0; i < n_mon; i ++) {
- GdkMonitor *monitor = gdk_display_get_monitor (default_display, i);
- if (gdk_monitor_is_primary (monitor)) {
- return i;
- }
- }
+ return gdk_display_get_primary_monitor (default_display);
#else #else
ensure_screen (); ensure_screen ();

View File

@ -1,3 +1,195 @@
-------------------------------------------------------------------
Wed May 24 14:40:01 UTC 2017 - sor.alexei@meowr.ru
- Update to version 3.4.2:
* nemo-icon-container.c: don't force a native window for the
desktop - fixes prelight hover sticking on the desktop when
leaving an icon to pass into another window.
* nemo-icon-view-grid-container: Don't show bracketed empty
spots, it's tacky.
* nemo-main.c: Remove back end requirement (only needed for the
desktop).
* icon view/desktop: Fix hidpi scaling on the desktop.
This also fixes compact view mode in hidpi, which was
semi-broken since hidpi was implemented, and very broken since
the desktop grid was added.
* nemo-icon-dnd.c: Depopulate the dnd grid of the selected icons
so insertion marks aren't drawn in the icon's source position.
* nemo-window-manager-views.c: Simply close the window if the
current view has no backward history, instead of jumping home
or to the parent directory. The most common time for this to
occur is a directory opened from the desktop - if you delete
that directory, the window showing it then shows the desktop in
a directory, which doesn't make much sense.
* nemo-window-manage-views.c: Invalidate file info before
reloading the view, not after.
This fixes mount permissions being incorrect.
* dnd: Restore capability of "moving" files from and to the
desktop via drag'n'drop.
* Fetch file-roller mimetype info from a GDesktopAppInfo at
startup, instead of a static (and woefully out of date) list.
* nemo-file.c: Add EFAULT as a valid exception to the access_ok
function. This can throw when the file has just been moved or
is in the midst of being moved and the internal asynch updates
have not completed yet (usually during a fairly large transfer).
As a result, the icon cache problem bar appears needlessly.
* desktop: Size thumbnails more appropriately - scale them to our
icon size in height only, and allow the width to increase as
much as our max text width while maintaining the image aspect
ratio.
* desktop thumbnails: Pad the thumbnail height when it ends up
smaller than the desired height due to aspect ratio and width
restrictions.
This ensures a nice alignment when keep-aligned is active.
* nemo-icon-view-grid-container.c: Highlight the current dnd
rectangle in debug mode.
* desktop grid: Use the layout size for determining constraint to
the canvas bounds instead of max size - this prevents files
with very long names from being pushed out of the grid alignment.
* misc: Clean up minor leaks, other issues.
* desktop grid: Include additional text (Icon Captions) in
calculations for the ellipsis limit, and update the desktop
when these change - instead of forcing the user to reload or
restart to see changes.
* nemo-style-application: Remove drop shadow from the selection
and pre-light states of desktop icons. The shadows are drawn
outside the calculated bounds of these items, and are
problematic to account for without doing frequent full screen
repaints.
* DnD: Draw the highlight box around the entire text when an item
is prelit and highlighted as a drop target. The highlight box
was only drawing as if to surround only the normal, ellipsised
text, rather than the full, unellipsised height.
* Set a default font for the desktop - this is overridden by
distributions in most cases, but having something is better
than leaving it blank - you could set it to "Foo Sans 15"
and it would still show the labels, even though you lack that
actual font.
* Add a default to our theme - Using the default font was always
supposed to be a fallback option, however the check in various
places for whether the gsettings key is empty or not is incorrect:
GSettings::get_string() will always return a string, never
NULL, so we need to check if the string is not empty instead
(boo#1040024).
* desktop: Fix missing icons when "show orphans" is disabled
(we were incorrectly interpreting a monitor number of -1 (which
means, no previous location) and a missing monitor).
* Fix visual sort function - sort function was incorrect for the
new grid, and the new order was never set after a sort when
running the alignment routine.
* nemo-places-sidebar: Use folder-recents for the recent icon.
* grid view: Don't re-enable auto-arrange when changing zoom
levels.
* Desktop dnd - Use more sensible behaviour when keep-aligned is
active.
* Fix dnd for netscape url drops.
* nemo-mime-actions.c: Don't fail for non-local links (like
dragged website links) - the check here is for the foreign url,
not the local desktop file (link), so it will never succeed,
and is not necessary.
* DnD: Fix some positioning issues with auto-align local moves,
and non-local icon moves (like nemo->nemo-desktop transfers).
* nemo-icon-view-grid-container.c: Keep the icon list synched
with the visual order of the desktop.
* dnd: Split out some container-specific code that had bled over a
bit.
* Modify desktop icon order.
* nemo-file-operations.c: store the desktop location during a
duplicate job, to fix DnD duplicate positioning on the desktop.
-------------------------------------------------------------------
Sun May 7 11:23:03 UTC 2017 - sor.alexei@meowr.ru
- Update to version 3.4.1 (changes since 3.2.2):
* Nemo-Icon-View: Fix missing cast warning.
* restore prototype lost in Nemo 3.2.0.
* Add a missing include.
* Fix quirks with tabs and search widgets.
* Don't reload while a reload is ongoing.
* Wildcard search for search-engine-simple.
* Fix a crash when attempting to delete an empty selection on
the desktop.
* Update polkit pkexec support.
* Fix search never resolving.
* nemo-dbus-manager.c: Add MoveURIs method.
* Improve date display.
* Use 24-hour date format when requested.
* Translate date formats.
* nautilus-file: Implement smarter dates.
* nautilus-list-view: Add a modified column with time.
* nautilus-file: Clarify translators comments.
* nautilus-file: Fix a memory leak.
* nautilus-file: Fix code style.
* Mark time format with xgettext:no-c-format.
* file: Fix date string day difference calculation.
* Use long day and month names if space allows.
* Make libselinux dependency controllable by configure switch.
* Raise tracker version.
* autogen.sh: Don't run aclocal.
* location-bar: Use a GFile in location-changed signal.
* l10n: Generate desktop file via generate_aditional_file.
* Add Cinnamon panel shortcuts (trash, computer, etc.) to the
launcher.
* Fix compiler warnings in the eel/ directory.
* nemo-desktop-window, nemo-blank-desktop-window: Clean
delete-event handling up.
* window: Make NemoWindow a GtkApplicationWindow.
* nemo-file-operations.c: Use only template filenames for new
files.
* nemo-navigation-action.c: Add new_tab_action.
* configure.ac: Remove CFLAGS line - the optimisation is
dangerous, and the fatal warnings for unused stuff was just
annoying when trying to refactor - warnings are enough.
* Use GTimer for tracking startup speed, and also use one to
track view loads.
* nemo-view.c: Add idle timer for benchmarking.
* Split off desktop handling into new process.
* Split off old icon container into the existing subclass
NemoIconViewContainer and set up a new subclass -
NemoIconViewGridContainer to match with a new
NemoDesktopIconGridView class. The old style is accessible via
the org.nemo.desktop 'use-desktop-grid' setting.
* Fix autostart file name so cinnamon session doesn't fail.
* Remove a bunch of comments, fix auto-layout not sticking.
* nemo-icon-container: Move debug drawing to the grid container
subclass. Trigger it using NEMO_DEBUG=Desktop when running
nemo-desktop.
* Implement horizontal layout.
* General fixes, icons, metadata issues between monitors. Provide
per-monitor metadata for desktop containers.
* Improve DND during keep-aligned, allow for insertion of items.
Implement zoom scaling and allow adjustment.
* Improve highlighting of hovered items
* Fix desktop folder launching - xdg-open was never intended to be
the final answer.
* Fix ellipses change listening - the is_desktop flag was being
set too late in the view construction process to connect to the
correct gsettings key.
* Fix regression causing metadata to be inconsistent in nemo
client window when navigating to and away from the Desktop
directory.
* Add some gsettings listeners for grid stuff.
* Fix dnd between monitors - clamp grid values, and ensure we
have a grid on the target monitor.
* Fix zoom switching, dnd placement, snapping.
* nemo-desktop-utils.c: Improve how we store the monitor number
for a desktop window.
* Use black instead of theme colour for pre-light label
highlighting.
* nemo-icon-canvas-item.c: Extend redraw area slightly for canvas
items. This ensures any small shadow we have is cleaned up
after an item is de-selected.
* nemo-desktop-icon-grid-view.c: Don't trigger a real update
while updating menus.
* Disable zoom for the desktop window (allow it only via context
menu).
* nemo-desktop-application: Clean some commented lines up.
* Fix desktop file error (gh#linuxmint#nemo#1477).
* nemo-navigation-action.c: Extend, Fix Middle-Click
(gh#linuxmint#nemo#1478).
* l10n: Update POT file.
- Rebase nemo-void-return-no-return.patch.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Dec 15 19:24:15 UTC 2016 - sor.alexei@meowr.ru Thu Dec 15 19:24:15 UTC 2016 - sor.alexei@meowr.ru

View File

@ -1,7 +1,7 @@
# #
# spec file for package nemo # spec file for package nemo
# #
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -20,7 +20,7 @@
%define sover 1 %define sover 1
%define typelib typelib-1_0-Nemo-3_0 %define typelib typelib-1_0-Nemo-3_0
Name: nemo Name: nemo
Version: 3.2.2 Version: 3.4.2
Release: 0 Release: 0
Summary: File browser for Cinnamon Summary: File browser for Cinnamon
License: GPL-2.0+ License: GPL-2.0+
@ -28,9 +28,9 @@ Group: System/GUI/Other
Url: https://github.com/linuxmint/nemo Url: https://github.com/linuxmint/nemo
Source: https://github.com/linuxmint/%{name}/archive/%{version}/%{name}-%{version}.tar.gz Source: https://github.com/linuxmint/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM nemo-implicit-pointer-decl.patch marguerite@opensuse.org -- OBS gcc checks. # PATCH-FIX-UPSTREAM nemo-implicit-pointer-decl.patch marguerite@opensuse.org -- OBS gcc checks.
Patch1: %{name}-implicit-pointer-decl.patch Patch0: %{name}-implicit-pointer-decl.patch
# PATCH-FIX-UPSTREAM nemo-void-return-no-return.patch margueirte@opensuse.org -- Fix OBS gcc checks. # PATCH-FIX-UPSTREAM nemo-void-return-no-return.patch margueirte@opensuse.org -- Fix OBS gcc checks.
Patch2: %{name}-void-return-no-return.patch Patch1: %{name}-void-return-no-return.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: autoconf-archive BuildRequires: autoconf-archive
BuildRequires: automake BuildRequires: automake
@ -111,8 +111,8 @@ This package provides the GObject Introspection bindings for Nemo.
%prep %prep
%setup -q %setup -q
%patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1
%build %build
NOCONFIGURE=1 ./autogen.sh NOCONFIGURE=1 ./autogen.sh