Accepting request 97052 from home:dimstar:branches:GNOME:Factory
Update to 0.3.0 OBS-URL: https://build.opensuse.org/request/show/97052 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/sushi?expand=0&rev=18
This commit is contained in:
parent
d794aa6bf4
commit
b1ab0fbd99
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:5f1fa2fd037e965c81d6c48bab1f1afdfec09f43054a291a2828c3ecd36f1983
|
|
||||||
size 368778
|
|
3
sushi-0.3.0.tar.xz
Normal file
3
sushi-0.3.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:befcda1a0896a21a2d2c0a368a90299cd566ab8a0c50112688116cd6d6ab0007
|
||||||
|
size 295984
|
@ -1,48 +0,0 @@
|
|||||||
commit e5c7dbe9e4d258bc1aca0c91335da12e759b8a38
|
|
||||||
Author: Vincent Untz <vuntz@gnome.org>
|
|
||||||
Date: Wed Oct 19 16:09:55 2011 +0200
|
|
||||||
|
|
||||||
pdf-loader: quote the file path before passing it to unoconv
|
|
||||||
|
|
||||||
This fixes unoconv crashing on files with spaces in their names.
|
|
||||||
|
|
||||||
https://bugzilla.gnome.org/show_bug.cgi?id=662197
|
|
||||||
|
|
||||||
diff --git a/src/libsushi/sushi-pdf-loader.c b/src/libsushi/sushi-pdf-loader.c
|
|
||||||
index 9730375..b8f822d 100644
|
|
||||||
--- a/src/libsushi/sushi-pdf-loader.c
|
|
||||||
+++ b/src/libsushi/sushi-pdf-loader.c
|
|
||||||
@@ -101,7 +101,7 @@ unoconv_child_watch_cb (GPid pid,
|
|
||||||
static void
|
|
||||||
load_openoffice (SushiPdfLoader *self)
|
|
||||||
{
|
|
||||||
- gchar *doc_path, *pdf_path, *tmp_name, *tmp_path;
|
|
||||||
+ gchar *doc_path, *pdf_path, *tmp_name, *tmp_path, *quoted_path;
|
|
||||||
GFile *file;
|
|
||||||
gboolean res;
|
|
||||||
gchar *cmd;
|
|
||||||
@@ -113,7 +113,10 @@ load_openoffice (SushiPdfLoader *self)
|
|
||||||
|
|
||||||
file = g_file_new_for_uri (self->priv->uri);
|
|
||||||
doc_path = g_file_get_path (file);
|
|
||||||
+ quoted_path = g_shell_quote (doc_path);
|
|
||||||
+
|
|
||||||
g_object_unref (file);
|
|
||||||
+ g_free (doc_path);
|
|
||||||
|
|
||||||
tmp_name = g_strdup_printf ("sushi-%d.pdf", getpid ());
|
|
||||||
tmp_path = g_build_filename (g_get_user_cache_dir (), "sushi", NULL);
|
|
||||||
@@ -121,11 +124,11 @@ load_openoffice (SushiPdfLoader *self)
|
|
||||||
g_build_filename (tmp_path, tmp_name, NULL);
|
|
||||||
g_mkdir_with_parents (tmp_path, 0700);
|
|
||||||
|
|
||||||
- cmd = g_strdup_printf ("unoconv -f pdf -o %s %s", pdf_path, doc_path);
|
|
||||||
+ cmd = g_strdup_printf ("unoconv -f pdf -o %s %s", pdf_path, quoted_path);
|
|
||||||
|
|
||||||
- g_free (doc_path);
|
|
||||||
g_free (tmp_name);
|
|
||||||
g_free (tmp_path);
|
|
||||||
+ g_free (quoted_path);
|
|
||||||
|
|
||||||
res = g_shell_parse_argv (cmd, &argc, &argv, &error);
|
|
||||||
g_free (cmd);
|
|
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Dec 19 12:39:40 UTC 2011 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
- Update to version 0.3.0:
|
||||||
|
+ Quote the file path before passing it to unoconv
|
||||||
|
+ Build with latest clutter-gtk
|
||||||
|
+ Updated translations.
|
||||||
|
- Drop sushi-quote-unoconv.patch: fixed upstream.
|
||||||
|
- Add xz BuildRequires because we can't build a package for a
|
||||||
|
xz-compressed tarball without explicitly specifying that... See
|
||||||
|
bnc#697467 for more details.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Dec 7 21:02:58 UTC 2011 - dimstar@opensuse.org
|
Wed Dec 7 21:02:58 UTC 2011 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
@ -18,18 +18,18 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: sushi
|
Name: sushi
|
||||||
Version: 0.2.1
|
Version: 0.3.0
|
||||||
Release: 1
|
Release: 1
|
||||||
License: GPL-2.0+
|
License: GPL-2.0+
|
||||||
Summary: Quick Previewer for Nautilus
|
Summary: Quick Previewer for Nautilus
|
||||||
Url: http://www.gnome.org
|
Url: http://www.gnome.org
|
||||||
Group: Productivity/File utilities
|
Group: Productivity/File utilities
|
||||||
Source0: http://download.gnome.org/sources/sushi/0.2/%{name}-%{version}.tar.bz2
|
Source0: http://download.gnome.org/sources/sushi/0.3/%{name}-%{version}.tar.xz
|
||||||
# PATCH-FIX-UPSTREAM sushi-quote-unoconv.patch bgo#662197 vuntz@opensuse.org -- quote the file path before passing it to unoconv
|
|
||||||
Patch0: sushi-quote-unoconv.patch
|
|
||||||
BuildRequires: gobject-introspection-devel
|
BuildRequires: gobject-introspection-devel
|
||||||
BuildRequires: intltool
|
BuildRequires: intltool
|
||||||
BuildRequires: unoconv
|
BuildRequires: unoconv
|
||||||
|
# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
|
||||||
|
BuildRequires: xz
|
||||||
BuildRequires: pkgconfig(clutter-1.0)
|
BuildRequires: pkgconfig(clutter-1.0)
|
||||||
BuildRequires: pkgconfig(clutter-gst-1.0)
|
BuildRequires: pkgconfig(clutter-gst-1.0)
|
||||||
BuildRequires: pkgconfig(clutter-gtk-1.0)
|
BuildRequires: pkgconfig(clutter-gtk-1.0)
|
||||||
@ -73,7 +73,6 @@ Sushi is a quick previewer for Nautilus, the GNOME desktop file manager.
|
|||||||
%lang_package
|
%lang_package
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure
|
%configure
|
||||||
|
Loading…
Reference in New Issue
Block a user