!3 upgrade to 1.9.0 for xfce 4.16
From: @zhang__3125 Reviewed-by: @dwl301 Signed-off-by: @dwl301
This commit is contained in:
commit
86956648ba
@ -1,51 +0,0 @@
|
|||||||
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;
|
|
||||||
Binary file not shown.
BIN
xfce4-notes-plugin-1.9.0.tar.bz2
Normal file
BIN
xfce4-notes-plugin-1.9.0.tar.bz2
Normal file
Binary file not shown.
@ -1,22 +1,23 @@
|
|||||||
%global xfceversion 4.14
|
%global minorversion 1.9
|
||||||
|
%global xfceversion 4.16
|
||||||
%global _hardened_build 1
|
%global _hardened_build 1
|
||||||
|
|
||||||
Name: xfce4-notes-plugin
|
Name: xfce4-notes-plugin
|
||||||
Version: 1.8.1
|
Version: 1.9.0
|
||||||
Release: 1
|
Release: 1
|
||||||
Summary: Notes plugin for the Xfce panel
|
Summary: Notes plugin for the Xfce panel
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://goodies.xfce.org/projects/panel-plugins/%{name}
|
URL: http://goodies.xfce.org/projects/panel-plugins/%{name}
|
||||||
Source0: http://archive.xfce.org/src/panel-plugins/%{name}/1.8/%{name}-%{version}.tar.bz2
|
Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2
|
||||||
Patch1: xfce4-notes-plugin-1.8.0-format-security.patch
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
#BuildArch: noarch
|
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: libxfce4ui-devel >= %{xfceversion}
|
BuildRequires: libxfce4ui-devel >= %{xfceversion}
|
||||||
BuildRequires: unique-devel
|
BuildRequires: unique-devel
|
||||||
BuildRequires: xfconf-devel >= %{xfceversion}
|
BuildRequires: xfconf-devel >= %{xfceversion}
|
||||||
BuildRequires: xfce4-panel-devel >= %{xfceversion}
|
BuildRequires: xfce4-panel-devel >= %{xfceversion}
|
||||||
BuildRequires: gettext, intltool, desktop-file-utils
|
BuildRequires: gettext, intltool, desktop-file-utils
|
||||||
|
|
||||||
Requires: xfce4-panel >= %{xfceversion}
|
Requires: xfce4-panel >= %{xfceversion}
|
||||||
Requires: xfconf >= %{xfceversion}
|
Requires: xfconf >= %{xfceversion}
|
||||||
Requires: exo
|
Requires: exo
|
||||||
@ -28,7 +29,7 @@ show/hide the notes using the left one, edit the titlebar, change the notes
|
|||||||
background color and much more.
|
background color and much more.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1
|
%autosetup
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --disable-static
|
%configure --disable-static
|
||||||
@ -40,9 +41,6 @@ background color and much more.
|
|||||||
# remove la file
|
# remove la file
|
||||||
find %{buildroot} -name '*.la' -exec rm -f {} ';'
|
find %{buildroot} -name '*.la' -exec rm -f {} ';'
|
||||||
|
|
||||||
# make sure debuginfo is generated properly
|
|
||||||
chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so
|
|
||||||
|
|
||||||
%find_lang %{name}
|
%find_lang %{name}
|
||||||
|
|
||||||
desktop-file-validate \
|
desktop-file-validate \
|
||||||
@ -51,19 +49,21 @@ desktop-file-validate \
|
|||||||
$RPM_BUILD_ROOT/%{_datadir}/applications/xfce4-notes.desktop
|
$RPM_BUILD_ROOT/%{_datadir}/applications/xfce4-notes.desktop
|
||||||
|
|
||||||
%files -f %{name}.lang
|
%files -f %{name}.lang
|
||||||
%doc AUTHORS ChangeLog NEWS README
|
%doc AUTHORS ChangeLog NEWS
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%config(noreplace) %{_sysconfdir}/xdg/autostart/xfce4-notes-autostart.desktop
|
%config(noreplace) %{_sysconfdir}/xdg/autostart/xfce4-notes-autostart.desktop
|
||||||
%{_bindir}/xfce4-notes
|
%{_bindir}/xfce4-notes
|
||||||
%{_bindir}/xfce4-popup-notes
|
%{_bindir}/xfce4-popup-notes
|
||||||
%{_bindir}/xfce4-notes-settings
|
%{_bindir}/xfce4-notes-settings
|
||||||
%{_libdir}/xfce4/panel/plugins/*.so
|
%{_libdir}/xfce4/panel/plugins/libnotes.so
|
||||||
%{_datadir}/applications/xfce4-notes.desktop
|
%{_datadir}/applications/xfce4-notes.desktop
|
||||||
%{_datadir}/icons/hicolor/*/*/*
|
%{_datadir}/icons/hicolor/*/*/*
|
||||||
%{_datadir}/xfce4/panel-plugins/*.desktop
|
%{_datadir}/xfce4/panel/plugins/*.desktop
|
||||||
%{_datadir}/%{name}/
|
%{_datadir}/%{name}/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
%changelog
|
* Fri Jun 18 2021 zhanglin <lin.zhang@turbolinux.com.cn> - 1.9.0-1
|
||||||
|
- Update to 1.9.0
|
||||||
|
|
||||||
* Wed Jul 15 2020 <dillon.chen@turbolinux.com.cn> - 1.8.1-1
|
* Wed Jul 15 2020 <dillon.chen@turbolinux.com.cn> - 1.8.1-1
|
||||||
- Init package
|
- Init package
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user