amigadave pushed to nautilus (master). "Add patch to fix misplaced style element"

notifications at fedoraproject.org notifications at fedoraproject.org
Mon May 4 12:24:20 UTC 2015


>From 7e876ccdfaa2ff15437ef2a3a10b8612ac7cbf19 Mon Sep 17 00:00:00 2001
From: David King <amigadave at amigadave.com>
Date: Mon, 4 May 2015 13:09:20 +0100
Subject: Add patch to fix misplaced style element


diff --git a/nautilus-3.16.1-fix-style-element.patch b/nautilus-3.16.1-fix-style-element.patch
new file mode 100644
index 0000000..24e0819
--- /dev/null
+++ b/nautilus-3.16.1-fix-style-element.patch
@@ -0,0 +1,28 @@
+From 60da77d82287e302d00d523b5bef9803db7a273d Mon Sep 17 00:00:00 2001
+From: Carlos Soriano <csoriano at gnome.org>
+Date: Wed, 29 Apr 2015 16:46:08 +0200
+Subject: window: fix style tag outside <object>
+
+The style tag needs to be inside the <object> scope
+
+diff --git a/src/nautilus-window.ui b/src/nautilus-window.ui
+index 47100ad..105fe2a 100644
+--- a/src/nautilus-window.ui
++++ b/src/nautilus-window.ui
+@@ -89,10 +89,10 @@
+                                 <property name="receives_default">True</property>
+                                 <property name="no_show_all">True</property>
+                                 <property name="margin_end">6</property>
++                                <style>
++                                  <class name="text-button"/>
++                                </style>
+                               </object>
+-                              <style>
+-                                <class name="text-button"/>
+-                              </style>
+                             </child>
+                             <child>
+                               <object class="GtkButton" id="notification_delete_close">
+-- 
+cgit v0.10.2
+
diff --git a/nautilus.spec b/nautilus.spec
index 2f63fbc..58e0ef8 100644
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -10,10 +10,11 @@
 Name:           nautilus
 Summary:        File manager for GNOME
 Version:        3.16.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 Group:          User Interface/Desktops
 Source:         https://download.gnome.org/sources/%{name}/3.16/%{name}-%{version}.tar.xz
+Patch0:         nautilus-3.16.1-fix-style-element.patch
 
 URL:            https://wiki.gnome.org/Apps/Nautilus
 
@@ -89,7 +90,7 @@ for developing nautilus extensions.
 
 %prep
 %setup -q -n %{name}-%{version}
-
+%patch0 -p1 -b .style
 #%%patch4 -p1 -b .selinux
 
 %build
@@ -179,6 +180,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
 %doc %{_datadir}/gtk-doc/html/libnautilus-extension/
 
 %changelog
+* Mon May 04 2015 David King <amigadave at amigadave.com> - 3.16.1-2
+- Add patch to fix misplaced style element
+
 * Wed Apr 15 2015 Kalev Lember <kalevlember at gmail.com> - 3.16.1-1
 - Update to 3.16.1
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/nautilus.git/commit/?h=master&id=7e876ccdfaa2ff15437ef2a3a10b8612ac7cbf19


More information about the scm-commits mailing list