commit 53ebc04afdbabd6835094e7b0b57c2bfa4178973
Author: Jan Rękorajski <[email protected]>
Date: Sun Jun 10 21:11:34 2018 +0000
- up to 1.8.1
format-security.patch | 173 ++++++++++++++++++++++++++++++++++++++++++++
xfce4-notes-plugin-ui.patch | 75 -------------------
xfce4-notes-plugin.spec | 16 ++--
3 files changed, 181 insertions(+), 83 deletions(-)
---
diff --git a/xfce4-notes-plugin.spec b/xfce4-notes-plugin.spec
index 80e8b91..66aa1fc 100644
--- a/xfce4-notes-plugin.spec
+++ b/xfce4-notes-plugin.spec
@@ -1,13 +1,13 @@
Summary: Notes plugin for the Xfce panel
Summary(pl.UTF-8): Notatki dla panelu Xfce
Name: xfce4-notes-plugin
-Version: 1.7.7
-Release: 5
+Version: 1.8.1
+Release: 1
License: GPL
Group: X11/Applications
-Source0:
http://archive.xfce.org/src/panel-plugins/xfce4-notes-plugin/1.7/%{name}-%{version}.tar.bz2
-# Source0-md5: 42b924b23f2fec6a1099e9b7a87db4a3
-Patch0: %{name}-ui.patch
+Source0:
http://archive.xfce.org/src/panel-plugins/xfce4-notes-plugin/1.8/%{name}-%{version}.tar.bz2
+# Source0-md5: 31cb9520b01512a94344770b4befdb3b
+Patch0: format-security.patch
URL:
http://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin
BuildRequires: Thunar-devel >= 1.2.0
BuildRequires: autoconf >= 2.63
@@ -57,7 +57,7 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/xfce4/panel-plugins/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/xfce4/panel/plugins/*.la
%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK
@@ -79,8 +79,8 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/xfce4-notes
%attr(755,root,root) %{_bindir}/xfce4-popup-notes
%attr(755,root,root) %{_bindir}/xfce4-notes-settings
-%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/libnotes.so*
+%attr(755,root,root) %{_libdir}/xfce4/panel/plugins/libnotes.so*
%{_datadir}/xfce4-notes-plugin
-%{_datadir}/xfce4/panel-plugins/xfce4-notes-plugin-47.desktop
+%{_datadir}/xfce4/panel-plugins/xfce4-notes-plugin.desktop
%{_iconsdir}/hicolor/*/apps/*.*
%{_desktopdir}/xfce4-notes.desktop
diff --git a/format-security.patch b/format-security.patch
new file mode 100644
index 0000000..7e198e3
--- /dev/null
+++ b/format-security.patch
@@ -0,0 +1,173 @@
+--- xfce4-notes-plugin-1.8.1/lib/application.c.orig 2015-06-24
21:29:20.000000000 +0000
++++ xfce4-notes-plugin-1.8.1/lib/application.c 2018-06-10 21:06:59.540406849
+0000
+@@ -341,7 +341,6 @@
+ _tmp7_ = dir;
+ _tmp8_ = g_dir_read_name (_tmp7_);
+ if (_tmp8_ != NULL) {
+- const gchar* _tmp9_ = NULL;
+ GtkMessageDialog* _tmp10_;
+ GtkMessageDialog* error_dialog;
+ GtkMessageDialog* _tmp11_;
+@@ -351,8 +350,7 @@
+ GtkMessageDialog* _tmp15_;
+ 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, _("Select notes path"));
+ g_object_ref_sink (_tmp10_);
+ error_dialog = _tmp10_;
+ _tmp11_ = error_dialog;
+@@ -407,7 +405,6 @@
+ }
+ _tmp26_ = _tmp20_;
+ if (_tmp26_) {
+- const gchar* _tmp27_ = NULL;
+ GtkMessageDialog* _tmp28_;
+ GtkMessageDialog* error_dialog;
+ GtkMessageDialog* _tmp29_;
+@@ -418,8 +415,7 @@
+ GtkMessageDialog* _tmp34_;
+ 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, _("Select notes path"));
+ g_object_ref_sink (_tmp28_);
+ error_dialog = _tmp28_;
+ _tmp29_ = error_dialog;
+@@ -1964,16 +1960,12 @@
+ _tmp28_ = xnp_application_window_name_exists (self, _tmp27_);
+ if (_tmp28_) {
+ XnpWindow* _tmp29_;
+- const gchar* _tmp30_ = NULL;
+- const gchar* _tmp31_;
+ GtkMessageDialog* _tmp32_;
+ GtkMessageDialog* error_dialog;
+ GtkMessageDialog* _tmp33_;
+ GtkMessageDialog* _tmp34_;
+ _tmp29_ = window;
+- _tmp30_ = _ ("The name %s is already in use");
+- _tmp31_ = name;
+- _tmp32_ = (GtkMessageDialog*) gtk_message_dialog_new
((GtkWindow*) _tmp29_, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE, _tmp30_, _tmp31_);
++ _tmp32_ = (GtkMessageDialog*) gtk_message_dialog_new
((GtkWindow*) _tmp29_, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE, _("The name %s is already in use"), name);
+ g_object_ref_sink (_tmp32_);
+ error_dialog = _tmp32_;
+ _tmp33_ = error_dialog;
+@@ -2072,7 +2064,6 @@
+ _tmp2_ = _tmp1_;
+ if (_tmp2_ >= 1) {
+ XnpWindow* _tmp3_;
+- const gchar* _tmp4_ = NULL;
+ GtkMessageDialog* _tmp5_;
+ GtkMessageDialog* dialog;
+ GtkMessageDialog* _tmp6_;
+@@ -2081,8 +2072,7 @@
+ GtkMessageDialog* _tmp8_;
+ 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, _("Are you sure you want to delete this group?"));
+ g_object_ref_sink (_tmp5_);
+ dialog = _tmp5_;
+ _tmp6_ = dialog;
+@@ -2220,10 +2210,7 @@
+ */
+ static void xnp_application_refresh_notes (XnpApplication* self, XnpWindow*
window) {
+ XnpWindow* _tmp0_;
+- const gchar* _tmp1_ = NULL;
+ XnpWindow* _tmp2_;
+- const gchar* _tmp3_;
+- const gchar* _tmp4_;
+ GtkMessageDialog* _tmp5_;
+ GtkMessageDialog* dialog;
+ GtkMessageDialog* _tmp6_;
+@@ -2241,11 +2228,8 @@
+ g_return_if_fail (self != NULL);
+ g_return_if_fail (window != NULL);
+ _tmp0_ = window;
+- _tmp1_ = _ ("The group \"%s\" has been modified on the disk");
+ _tmp2_ = window;
+- _tmp3_ = xnp_window_get_name (_tmp2_);
+- _tmp4_ = _tmp3_;
+- _tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*)
_tmp0_, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION,
GTK_BUTTONS_YES_NO, _tmp1_, _tmp4_);
++ _tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*)
_tmp0_, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION,
GTK_BUTTONS_YES_NO, _("The group \"%s\" has been modified on the disk"),
xnp_window_get_name (_tmp2_));
+ g_object_ref_sink (_tmp5_);
+ dialog = _tmp5_;
+ _tmp6_ = dialog;
+@@ -2559,8 +2543,6 @@
+ res = _tmp1_;
+ _tmp2_ = res;
+ if (!_tmp2_) {
+- const gchar* _tmp3_ = NULL;
+- const gchar* _tmp4_;
+ GtkMessageDialog* _tmp5_;
+ GtkMessageDialog* error_dialog;
+ GtkMessageDialog* _tmp6_;
+@@ -2569,9 +2551,7 @@
+ gchar* _tmp9_;
+ GtkMessageDialog* _tmp10_;
+ GtkMessageDialog* _tmp11_;
+- _tmp3_ = _ ("The name \"%s\" is invalid.");
+- _tmp4_ = name;
+- _tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0,
GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _tmp3_, _tmp4_);
++ _tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0,
GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("The name \"%s\" is invalid."), name);
+ g_object_ref_sink (_tmp5_);
+ error_dialog = _tmp5_;
+ _tmp6_ = error_dialog;
+@@ -2710,7 +2690,6 @@
+ __catch10_g_error:
+ {
+ GError* e = NULL;
+- const gchar* _tmp0_ = NULL;
+ GtkMessageDialog* _tmp1_;
+ GtkMessageDialog* error_dialog;
+ GtkMessageDialog* _tmp2_;
+@@ -2720,8 +2699,7 @@
+ GtkMessageDialog* _tmp6_;
+ 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, _("Unable
to open the settings dialog"));
+ g_object_ref_sink (_tmp1_);
+ error_dialog = _tmp1_;
+ _tmp2_ = error_dialog;
+--- xfce4-notes-plugin-1.8.1/lib/window.c~ 2015-06-24 21:29:20.000000000
+0000
++++ xfce4-notes-plugin-1.8.1/lib/window.c 2018-06-10 21:08:16.583650155
+0000
+@@ -3533,7 +3533,6 @@
+ _tmp7_ = _tmp6_;
+ _tmp8_ = gtk_text_buffer_get_char_count (_tmp7_);
+ if (_tmp8_ > 0) {
+- const gchar* _tmp9_ = NULL;
+ GtkMessageDialog* _tmp10_;
+ GtkMessageDialog* dialog;
+ GtkMessageDialog* _tmp11_;
+@@ -3541,8 +3540,7 @@
+ gint res;
+ 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, _("Are you sure you want to delete this note?"));
+ g_object_ref_sink (_tmp10_);
+ dialog = _tmp10_;
+ _tmp11_ = dialog;
+@@ -3687,15 +3685,11 @@
+ _tmp34_ = name;
+ _tmp35_ = xnp_window_note_name_exists (self, _tmp34_);
+ if (_tmp35_) {
+- const gchar* _tmp36_ = NULL;
+- const gchar* _tmp37_;
+ GtkMessageDialog* _tmp38_;
+ GtkMessageDialog* error_dialog;
+ GtkMessageDialog* _tmp39_;
+ GtkMessageDialog* _tmp40_;
+- _tmp36_ = _ ("The name %s is already in use");
+- _tmp37_ = name;
+- _tmp38_ = (GtkMessageDialog*) gtk_message_dialog_new
((GtkWindow*) self, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE, _tmp36_, _tmp37_);
++ _tmp38_ = (GtkMessageDialog*) gtk_message_dialog_new
((GtkWindow*) self, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE, _("The name %s is already in use"), name);
+ g_object_ref_sink (_tmp38_);
+ error_dialog = _tmp38_;
+ _tmp39_ = error_dialog;
diff --git a/xfce4-notes-plugin-ui.patch b/xfce4-notes-plugin-ui.patch
deleted file mode 100644
index 54353a8..0000000
--- a/xfce4-notes-plugin-ui.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -ur xfce4-notes-plugin-1.7.7-orig/configure.ac
xfce4-notes-plugin-1.7.7/configure.ac
---- xfce4-notes-plugin-1.7.7-orig/configure.ac 2010-11-07 12:26:47.000000000
+0100
-+++ xfce4-notes-plugin-1.7.7/configure.ac 2011-03-01 13:10:56.177331237
+0100
-@@ -53,7 +53,7 @@
- XDT_CHECK_LIBX11_REQUIRE()
- XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.16.0])
- XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0])
--XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
-+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
- XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
- XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0])
- XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
-diff -ur xfce4-notes-plugin-1.7.7-orig/src/main-panel-plugin.c
xfce4-notes-plugin-1.7.7/src/main-panel-plugin.c
---- xfce4-notes-plugin-1.7.7-orig/src/main-panel-plugin.c 2010-11-07
12:28:41.000000000 +0100
-+++ xfce4-notes-plugin-1.7.7/src/main-panel-plugin.c 2011-03-01
13:10:56.177331237 +0100
-@@ -28,7 +28,7 @@
- #include <libxfce4util/libxfce4util.h>
- #include <config.h>
- #include <glib/gi18n-lib.h>
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
- #include <gdk-pixbuf/gdk-pixdata.h>
- #include <popup.h>
- #include <gdk/gdk.h>
-diff -ur xfce4-notes-plugin-1.7.7-orig/src/Makefile.am
xfce4-notes-plugin-1.7.7/src/Makefile.am
---- xfce4-notes-plugin-1.7.7-orig/src/Makefile.am 2010-11-05
19:15:23.000000000 +0100
-+++ xfce4-notes-plugin-1.7.7/src/Makefile.am 2011-03-01 13:10:56.181333237
+0100
-@@ -36,7 +36,7 @@
- xfce4_notes_settings_CFLAGS = \
- @LIBX11_CFLAGS@ \
- @GTK_CFLAGS@ \
-- @LIBXFCEGUI4_CFLAGS@ \
-+ @LIBXFCE4UI_CFLAGS@ \
- @XFCONF_CFLAGS@ \
- @UNIQUE_CFLAGS@
-
-@@ -44,7 +44,7 @@
- $(top_builddir)/lib/libnotes.la \
- @LIBX11_LIBS@ \
- @GTK_LIBS@ \
-- @LIBXFCEGUI4_LIBS@ \
-+ @LIBXFCE4UI_LIBS@ \
- @XFCONF_LIBS@ \
- @UNIQUE_LIBS@
-
-diff -ur xfce4-notes-plugin-1.7.7-orig/src/xfce4-notes-settings.c
xfce4-notes-plugin-1.7.7/src/xfce4-notes-settings.c
---- xfce4-notes-plugin-1.7.7-orig/src/xfce4-notes-settings.c 2010-11-06
21:39:34.000000000 +0100
-+++ xfce4-notes-plugin-1.7.7/src/xfce4-notes-settings.c 2011-03-01
13:11:49.832145237 +0100
-@@ -25,7 +25,7 @@
- #include <xfconf/xfconf.h>
- #include <gtk/gtk.h>
- #include <libxfce4util/libxfce4util.h>
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
-
- #include "defines.h"
- #include "color.h"
-@@ -115,7 +115,7 @@
-
- /* === Global settings === */
- box = gtk_vbox_new (FALSE, BORDER);
-- frame = xfce_create_framebox_with_content (_("Global settings"), box);
-+ frame = xfce_gtk_frame_box_new_with_content (_("Global settings"), box);
- gtk_container_set_border_width (GTK_CONTAINER (frame), BORDER);
- gtk_container_add (GTK_CONTAINER (vbox), frame);
-
-@@ -163,7 +163,7 @@
-
- /* === New window settings === */
- box = gtk_vbox_new (FALSE, BORDER);
-- frame = xfce_create_framebox_with_content (_("New group settings"), box);
-+ frame = xfce_gtk_frame_box_new_with_content (_("New group settings"), box);
- gtk_container_set_border_width (GTK_CONTAINER (frame), BORDER);
- gtk_container_add (GTK_CONTAINER (vbox), frame);
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xfce4-notes-plugin.git/commitdiff/53ebc04afdbabd6835094e7b0b57c2bfa4178973
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
