forked from pool/bijiben
Accepting request 502910 from home:Zaitor
Add upstream bug fix patches, note that this will actually break the build in GN in a new place, but we'll cross that bridge later. OBS-URL: https://build.opensuse.org/request/show/502910 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/bijiben?expand=0&rev=67
This commit is contained in:
Bjørn Lie
Git OBS Bridge
parent
bdedbbf3e1
commit
a965b692cb
30
bijiben-fix-missing-break-in-case-statement.patch
Normal file
30
bijiben-fix-missing-break-in-case-statement.patch
Normal file
@ -0,0 +1,30 @@
|
||||
From 5cbfeec214509b97d67877cfb0e52c6c37c6f6d4 Mon Sep 17 00:00:00 2001
|
||||
From: Isaque Galdino <igaldino@gmail.com>
|
||||
Date: Sun, 11 Jun 2017 15:30:09 -0300
|
||||
Subject: main-toolbar: Missing break in case statement
|
||||
|
||||
gcc7 is complainting about an implicit-fallthrough situation: a missing
|
||||
break in a case statement.
|
||||
|
||||
This commit adds that to the code.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=783465
|
||||
---
|
||||
src/bjb-main-toolbar.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/bjb-main-toolbar.c b/src/bjb-main-toolbar.c
|
||||
index b44f68e..4e49dc2 100644
|
||||
--- a/src/bjb-main-toolbar.c
|
||||
+++ b/src/bjb-main-toolbar.c
|
||||
@@ -1131,6 +1131,7 @@ bjb_main_toolbar_get_property (GObject *object,
|
||||
{
|
||||
case PROP_PARENT:
|
||||
g_value_set_object (value, self->priv->parent);
|
||||
+ break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
||||
break;
|
||||
--
|
||||
cgit v0.12
|
||||
|
||||
34
bijiben-remove-warning-about-Trash-folder.patch
Normal file
34
bijiben-remove-warning-about-Trash-folder.patch
Normal file
@ -0,0 +1,34 @@
|
||||
From efcabf00020fe01fee75a3f55ae7a48e83de37d6 Mon Sep 17 00:00:00 2001
|
||||
From: Isaque Galdino <igaldino@gmail.com>
|
||||
Date: Sun, 11 Jun 2017 15:10:31 -0300
|
||||
Subject: local-provider: Remove warning about .Trash folder
|
||||
|
||||
When $HOME/.local/share/bijiben directory doesn't exist, application
|
||||
creates it, but it also complaints about another directory that doesn't
|
||||
exist: $HOME/.local/share/bijiben/.Trash.
|
||||
|
||||
This patch removes that warning message because the .Trash directory
|
||||
will be created anyway.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=783471
|
||||
---
|
||||
src/libbiji/provider/biji-local-provider.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/libbiji/provider/biji-local-provider.c b/src/libbiji/provider/biji-local-provider.c
|
||||
index 72c41df..733df70 100644
|
||||
--- a/src/libbiji/provider/biji-local-provider.c
|
||||
+++ b/src/libbiji/provider/biji-local-provider.c
|
||||
@@ -79,7 +79,8 @@ load_location_error (GFile *location,
|
||||
gchar *path;
|
||||
|
||||
path = g_file_get_path (location);
|
||||
- g_printerr ("Unable to load location %s: %s", path, error->message);
|
||||
+ if (!g_strrstr (path, ".Trash"))
|
||||
+ g_printerr ("Unable to load location %s: %s", path, error->message);
|
||||
g_free (path);
|
||||
g_error_free (error);
|
||||
}
|
||||
--
|
||||
cgit v0.12
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Jun 11 19:39:56 UTC 2017 - zaitor@opensuse.org
|
||||
|
||||
- Add bijiben-fix-missing-break-in-case-statement.patch:
|
||||
main-toolbar: Missing break in case statement. Stop passing
|
||||
--disable-Werror to configure (bgo#783465).
|
||||
- Add bijiben-remove-warning-about-Trash-folder.patch:
|
||||
local-provider: Remove warning about .Trash folder (bgo#783471).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 6 07:59:10 UTC 2017 - zaitor@opensuse.org
|
||||
|
||||
|
||||
10
bijiben.spec
10
bijiben.spec
@ -19,7 +19,6 @@
|
||||
%define with_zeitgeist 0
|
||||
|
||||
Name: bijiben
|
||||
### FIXME on version update, please check if --disable-Werror can be removed (bgo#783465)
|
||||
Version: 3.24.0
|
||||
Release: 0
|
||||
Summary: Note editor for GNOME
|
||||
@ -27,6 +26,10 @@ License: GPL-3.0+ and CC-BY-SA-3.0
|
||||
Group: Productivity/Text/Editors
|
||||
Url: https://live.gnome.org/Bijiben
|
||||
Source: http://download.gnome.org/sources/bijiben/3.24/%{name}-%{version}.tar.xz
|
||||
# PATCH-FIX-UPSTREAM bijiben-fix-missing-break-in-case-statement.patch bgo#783465 zaitor@opensuse.org -- main-toolbar: Missing break in case statement
|
||||
Patch0: bijiben-fix-missing-break-in-case-statement.patch
|
||||
# PATCH-FIX-UPSTREAM bijiben-remove-warning-about-Trash-folder.patch bgo#783471 zaitor@opensuse.org -- local-provider: Remove warning about .Trash folder
|
||||
Patch1: bijiben-remove-warning-about-Trash-folder.patch
|
||||
BuildRequires: intltool >= 0.50.1
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: yelp-tools
|
||||
@ -68,12 +71,13 @@ search results from documents.
|
||||
%lang_package
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
%configure \
|
||||
--disable-static \
|
||||
--disable-update-mimedb \
|
||||
--disable-Werror
|
||||
--disable-update-mimedb
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
|
||||
Loading…
Reference in New Issue
Block a user