kevin pushed to xfce4-notes-plugin (master). "Update to 1.8.0"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sun Apr 19 23:53:07 UTC 2015
>From 76c780efbf3fa9fbece49b1de170219239481a48 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin at scrye.com>
Date: Sun, 19 Apr 2015 17:52:55 -0600
Subject: Update to 1.8.0
diff --git a/.gitignore b/.gitignore
index 2225241..f0a780e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
xfce4-notes-plugin-1.7.6.tar.bz2
/xfce4-notes-plugin-1.7.7.tar.bz2
+/xfce4-notes-plugin-1.8.0.tar.bz2
diff --git a/sources b/sources
index 449a26f..4ff68ac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-42b924b23f2fec6a1099e9b7a87db4a3 xfce4-notes-plugin-1.7.7.tar.bz2
+569341bc27e2e46d23b6bffc14bff41a xfce4-notes-plugin-1.8.0.tar.bz2
diff --git a/xfce4-notes-plugin-1.8.0-format-security.patch b/xfce4-notes-plugin-1.8.0-format-security.patch
new file mode 100644
index 0000000..dff52fa
--- /dev/null
+++ b/xfce4-notes-plugin-1.8.0-format-security.patch
@@ -0,0 +1,51 @@
+diff -Nur xfce4-notes-plugin-1.8.0.orig/lib/application.c xfce4-notes-plugin-1.8.0/lib/application.c
+--- xfce4-notes-plugin-1.8.0.orig/lib/application.c 2015-03-27 12:56:20.000000000 -0600
++++ xfce4-notes-plugin-1.8.0/lib/application.c 2015-04-19 17:19:25.064534543 -0600
+@@ -352,7 +352,7 @@
+ XfconfChannel* _tmp16_;
+ const gchar* _tmp17_;
+ _tmp9_ = _ ("Select notes path");
+- _tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _tmp9_);
++ _tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", _tmp9_);
+ g_object_ref_sink (_tmp10_);
+ error_dialog = _tmp10_;
+ _tmp11_ = error_dialog;
+@@ -419,7 +419,7 @@
+ XfconfChannel* _tmp35_;
+ const gchar* _tmp36_;
+ _tmp27_ = _ ("Select notes path");
+- _tmp28_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _tmp27_);
++ _tmp28_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", _tmp27_);
+ g_object_ref_sink (_tmp28_);
+ error_dialog = _tmp28_;
+ _tmp29_ = error_dialog;
+@@ -2082,7 +2082,7 @@
+ gint _tmp9_;
+ _tmp3_ = window;
+ _tmp4_ = _ ("Are you sure you want to delete this group?");
+- _tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) _tmp3_, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _tmp4_);
++ _tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) _tmp3_, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", _tmp4_);
+ g_object_ref_sink (_tmp5_);
+ dialog = _tmp5_;
+ _tmp6_ = dialog;
+@@ -2721,7 +2721,7 @@
+ e = _inner_error_;
+ _inner_error_ = NULL;
+ _tmp0_ = _ ("Unable to open the settings dialog");
+- _tmp1_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _tmp0_);
++ _tmp1_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", _tmp0_);
+ g_object_ref_sink (_tmp1_);
+ error_dialog = _tmp1_;
+ _tmp2_ = error_dialog;
+diff -Nur xfce4-notes-plugin-1.8.0.orig/lib/window.c xfce4-notes-plugin-1.8.0/lib/window.c
+--- xfce4-notes-plugin-1.8.0.orig/lib/window.c 2015-03-27 12:56:20.000000000 -0600
++++ xfce4-notes-plugin-1.8.0/lib/window.c 2015-04-19 17:20:12.759699192 -0600
+@@ -3542,7 +3542,7 @@
+ GtkMessageDialog* _tmp13_;
+ gint _tmp14_;
+ _tmp9_ = _ ("Are you sure you want to delete this note?");
+- _tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _tmp9_);
++ _tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", _tmp9_);
+ g_object_ref_sink (_tmp10_);
+ dialog = _tmp10_;
+ _tmp11_ = dialog;
diff --git a/xfce4-notes-plugin.spec b/xfce4-notes-plugin.spec
index 65d0836..2275f0e 100644
--- a/xfce4-notes-plugin.spec
+++ b/xfce4-notes-plugin.spec
@@ -1,19 +1,21 @@
# Review
-%global minor_version 1.7
+%global minor_version 1.8
Name: xfce4-notes-plugin
-Version: 1.7.7
-Release: 12%{?dist}
+Version: 1.8.0
+Release: 1%{?dist}
Summary: Notes plugin for the Xfce panel
Group: User Interface/Desktops
License: GPLv2+
URL: http://goodies.xfce.org/projects/panel-plugins/%{name}
-Source0: http://archive.xfce.org/src/panel-plugins/%{name}/1.7/%{name}-%{version}.tar.bz2
+Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2
+
+Patch1: xfce4-notes-plugin-1.8.0-format-security.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: xfce4-panel-devel >= 4.4.0, libxfcegui4-devel >= 4.4.0
+BuildRequires: xfce4-panel-devel >= 4.4.0, libxfce4ui-devel >= 4.4.0
BuildRequires: xfconf-devel >= 4.6.0
BuildRequires: unique-devel
BuildRequires: gettext, intltool, desktop-file-utils
@@ -29,6 +31,7 @@ background color and much more.
%prep
%setup -q
+%patch1 -p1
%build
%configure --disable-static
@@ -74,14 +77,16 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_bindir}/xfce4-notes
%{_bindir}/xfce4-popup-notes
%{_bindir}/xfce4-notes-settings
-%{_libdir}/xfce4/panel-plugins/*.so*
+%{_libdir}/xfce4/panel/plugins/libnotes.so
%{_datadir}/applications/xfce4-notes.desktop
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/xfce4/panel-plugins/*.desktop
%{_datadir}/%{name}/
-
%changelog
+* Mon Apr 13 2015 Kevin Fenzi <kevin at scrye.com> 1.8.0-1
+- Update to 1.8.0
+
* Sat Feb 28 2015 Kevin Fenzi <kevin at scrye.com> 1.7.7-12
- Rebuild for Xfce 4.12
@@ -125,7 +130,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
* Fri Jan 14 2011 Adam Williamson <awilliam at redhat.com> - 1.7.6-2
- adjust file list for new location of plugin, remove .la file
-* Tue Mar 31 2010 Christoph Wickert <cwickert at fedoraproject.org> - 1.7.6-1
+* Wed Mar 31 2010 Christoph Wickert <cwickert at fedoraproject.org> - 1.7.6-1
- Update to 1.7.6
- Drop DSO linking patch, fixed upstream
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/xfce4-notes-plugin.git/commit/?h=master&id=76c780efbf3fa9fbece49b1de170219239481a48
More information about the scm-commits
mailing list