[cinnamon-screensaver] readd revert 58a522e commit
leigh123linux
leigh123linux at fedoraproject.org
Fri Oct 3 12:33:39 UTC 2014
commit 028eea34950875d8a0e1d3fa4c4ed87a45004256
Author: leigh123linux <leigh123linux at googlemail.com>
Date: Fri Oct 3 13:33:25 2014 +0100
readd revert 58a522e commit
cinnamon-screensaver.spec | 7 ++++++-
revert_58a522e.patch | 12 ++++++++++++
2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/cinnamon-screensaver.spec b/cinnamon-screensaver.spec
index aef006b..48d621a 100644
--- a/cinnamon-screensaver.spec
+++ b/cinnamon-screensaver.spec
@@ -7,7 +7,7 @@
Summary: Cinnamon Screensaver
Name: cinnamon-screensaver
Version: 2.4.0
-Release: 0.2.git%{_internal_version}%{?dist}
+Release: 0.3.git%{_internal_version}%{?dist}
License: GPLv2+ and LGPLv2+
URL: http://cinnamon.linuxmint.com
@@ -19,6 +19,7 @@ Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-screensaver/source/%
#Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-screensaver/source/%{name}-%{version}.tar.gz
Patch0: cinnamon-screensaver-2.20.0-selinux-permit.patch
+Patch1: revert_58a522e.patch
BuildRequires: pkgconfig(dbus-glib-1) >= %{dbus_glib_version}
BuildRequires: pkgconfig(cinnamon-desktop) >= 2.3.0
@@ -50,6 +51,7 @@ cinnamon-screensaver is a screen saver and locker.
%prep
%setup -q -n linuxmint-%{name}-%{_internal_version}
%patch0 -p1
+%patch1 -p1
echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am
echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac
@@ -79,6 +81,9 @@ desktop-file-install \
%{_mandir}/man1/cinnamon-screensaver*.1.*
%changelog
+* Fri Oct 03 2014 Leigh Scott <leigh123linux at googlemail.com> - 2.4.0-0.3.git8de7ff0
+- readd revert 58a522e commit
+
* Wed Oct 01 2014 Leigh Scott <leigh123linux at googlemail.com> - 2.4.0-0.2.git8de7ff0
- update to latest git
diff --git a/revert_58a522e.patch b/revert_58a522e.patch
new file mode 100644
index 0000000..a143367
--- /dev/null
+++ b/revert_58a522e.patch
@@ -0,0 +1,12 @@
+--- a/src/gs-window-x11.c 2014-09-23 09:49:24.000000000 +0100
++++ b/src/gs-window-x11.c 2014-10-03 13:28:57.914902237 +0100
+@@ -2215,9 +2215,6 @@ gs_window_init (GSWindow *window)
+
+ GtkWidget *grid = gtk_grid_new();
+
+- GdkColor transparentColor = { 0, 0, 0, 0 };
+-
+- gtk_widget_override_background_color(grid, GTK_STATE_NORMAL, &transparentColor);
+ gtk_widget_show (grid);
+
+ window->priv->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
More information about the scm-commits
mailing list