commit 345eb385af62241ff11cfba85ebf23853fd12fdc
Author: Jan Rękorajski <[email protected]>
Date: Tue Mar 31 23:24:15 2015 +0200
- up to 1.0.1
ac-fix.patch | 14 -------
format-security.patch | 11 +++++
xfce4-verve-plugin-ui.patch | 98 ---------------------------------------------
xfce4-verve-plugin.spec | 22 +++++-----
4 files changed, 21 insertions(+), 124 deletions(-)
---
diff --git a/xfce4-verve-plugin.spec b/xfce4-verve-plugin.spec
index b6ce0b7..f24def3 100644
--- a/xfce4-verve-plugin.spec
+++ b/xfce4-verve-plugin.spec
@@ -1,27 +1,26 @@
Summary: Verve plugin for Xfce panel
Summary(pl.UTF-8): Wtyczka Verve dla panelu Xfce
Name: xfce4-verve-plugin
-Version: 1.0.0
-Release: 5
+Version: 1.0.1
+Release: 1
License: GPL v2
Group: X11/Applications
Source0:
http://archive.xfce.org/src/panel-plugins/xfce4-verve-plugin/1.0/%{name}-%{version}.tar.bz2
-# Source0-md5: ed7039c40d6e560ed8bcf9a324d2ae86
-Patch0: %{name}-ui.patch
-Patch1: ac-fix.patch
+# Source0-md5: b5dbe88b2bea2c35785961d68fe446e4
+Patch0: format-security.patch
URL: http://goodies.xfce.org/projects/panel-plugins/verve-plugin
BuildRequires: autoconf >= 2.50
BuildRequires: automake
BuildRequires: dbus-glib-devel >= 0.34
-BuildRequires: exo-devel >= 0.5.0
+BuildRequires: exo-devel >= 0.10.4
BuildRequires: intltool
BuildRequires: libtool
BuildRequires: libxfce4ui-devel
BuildRequires: pcre-devel
BuildRequires: pkgconfig
-BuildRequires: xfce4-dev-tools >= 4.4.0
-BuildRequires: xfce4-panel-devel >= 4.4.0
-Requires: xfce4-panel >= 4.4.0
+BuildRequires: xfce4-dev-tools >= 4.12.0
+BuildRequires: xfce4-panel-devel >= 4.12.0
+Requires: xfce4-panel >= 4.12.0
Obsoletes: xfce4-minicmd-plugin
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -46,7 +45,6 @@ Obsługuje kilka przyjemnych elementów, takich jak:
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
%{__intltoolize}
@@ -76,5 +74,5 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog README THANKS
%attr(755,root,root) %{_bindir}/verve-focus
-%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/xfce4-verve-plugin
-%{_datadir}/xfce4/panel-plugins/xfce4-verve-plugin.desktop
+%attr(755,root,root) %{_libdir}/xfce4/panel/plugins/libverve.so
+%{_datadir}/xfce4/panel/plugins/xfce4-verve-plugin.desktop
diff --git a/ac-fix.patch b/ac-fix.patch
deleted file mode 100644
index c47baf0..0000000
--- a/ac-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- xfce4-verve-plugin-1.0.0/configure.ac~ 2010-12-23 16:56:19.000000000
+0100
-+++ xfce4-verve-plugin-1.0.0/configure.ac 2012-05-18 13:41:34.939322639
+0200
-@@ -79,11 +79,6 @@
- AC_DEFINE([HAVE_DBUS_NEW_FLAGS], [1], [Define if D-BUS version >= 0.60])
- fi
-
--dnl ***********************************
--dnl *** Check for debugging support ***
--dnl ***********************************
--BM_DEBUG_SUPPORT()
--
- AC_OUTPUT([
- Makefile
- panel-plugin/Makefile
diff --git a/format-security.patch b/format-security.patch
new file mode 100644
index 0000000..ed81343
--- /dev/null
+++ b/format-security.patch
@@ -0,0 +1,11 @@
+--- xfce4-verve-plugin-1.0.1/panel-plugin/verve-plugin.c~ 2015-01-25
12:08:09.000000000 +0100
++++ xfce4-verve-plugin-1.0.1/panel-plugin/verve-plugin.c 2015-03-31
23:22:42.393312630 +0200
+@@ -407,7 +407,7 @@
+ gchar *msg = g_strconcat (_("Could not execute command:"), " ",
command, NULL);
+
+ /* Display error message dialog */
+- xfce_dialog_show_error (NULL, NULL, msg);
++ xfce_dialog_show_error (NULL, NULL, "%s", msg);
+
+ /* Free message */
+ g_free (msg);
diff --git a/xfce4-verve-plugin-ui.patch b/xfce4-verve-plugin-ui.patch
deleted file mode 100644
index 96f7752..0000000
--- a/xfce4-verve-plugin-ui.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff -ur xfce4-verve-plugin-1.0.0-orig/configure.ac
xfce4-verve-plugin-1.0.0/configure.ac
---- xfce4-verve-plugin-1.0.0-orig/configure.ac 2010-12-23 16:56:19.000000000
+0100
-+++ xfce4-verve-plugin-1.0.0/configure.ac 2011-03-01 13:45:54.039063513
+0100
-@@ -60,7 +60,7 @@
- [XDT_CHECK_PACKAGE([LIBEXO], [exo-1], [0.5.0])])
- XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0])
- XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
--XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
-+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
- XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.6.4])
- XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.4])
- XDT_CHECK_PACKAGE([LIBPCRE], [libpcre], [5.0])
-diff -ur xfce4-verve-plugin-1.0.0-orig/panel-plugin/Makefile.am
xfce4-verve-plugin-1.0.0/panel-plugin/Makefile.am
---- xfce4-verve-plugin-1.0.0-orig/panel-plugin/Makefile.am 2010-12-20
17:13:00.000000000 +0100
-+++ xfce4-verve-plugin-1.0.0/panel-plugin/Makefile.am 2011-03-01
13:45:54.039063513 +0100
-@@ -19,7 +19,7 @@
- @LIBEXO_CFLAGS@ \
- @LIBXFCE4PANEL_CFLAGS@ \
- @LIBXFCE4UTIL_CFLAGS@ \
-- @LIBXFCEGUI4_CFLAGS@ \
-+ @LIBXFCE4UI_CFLAGS@ \
- @LIBPCRE_CFLAGS@ \
- @GLIB_CFLAGS@ \
- @GTHREAD_CFLAGS@
-@@ -28,7 +28,7 @@
- @LIBEXO_LIBS@ \
- @LIBXFCE4PANEL_LIBS@ \
- @LIBXFCE4UTIL_LIBS@ \
-- @LIBXFCEGUI4_LIBS@ \
-+ @LIBXFCE4UI_LIBS@ \
- @LIBPCRE_LIBS@ \
- @GLIB_LIBS@ \
- @GTHREAD_LIBS@
-diff -ur xfce4-verve-plugin-1.0.0-orig/panel-plugin/verve.c
xfce4-verve-plugin-1.0.0/panel-plugin/verve.c
---- xfce4-verve-plugin-1.0.0-orig/panel-plugin/verve.c 2010-12-20
17:13:00.000000000 +0100
-+++ xfce4-verve-plugin-1.0.0/panel-plugin/verve.c 2011-03-01
13:45:54.043063514 +0100
-@@ -25,7 +25,7 @@
-
- #include <glib-object.h>
-
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
-
- #include "verve.h"
- #include "verve-env.h"
-diff -ur xfce4-verve-plugin-1.0.0-orig/panel-plugin/verve-dbus-service.c
xfce4-verve-plugin-1.0.0/panel-plugin/verve-dbus-service.c
---- xfce4-verve-plugin-1.0.0-orig/panel-plugin/verve-dbus-service.c
2010-12-20 17:13:00.000000000 +0100
-+++ xfce4-verve-plugin-1.0.0/panel-plugin/verve-dbus-service.c 2011-03-01
13:45:54.043063514 +0100
-@@ -34,7 +34,7 @@
- #include <dbus/dbus-glib-lowlevel.h>
- #include <dbus/dbus.h>
-
--#include <libxfce4panel/xfce-panel-plugin.h>
-+#include <libxfce4panel/libxfce4panel.h>
-
- #include "verve-dbus-service.h"
-
-diff -ur xfce4-verve-plugin-1.0.0-orig/panel-plugin/verve-plugin.c
xfce4-verve-plugin-1.0.0/panel-plugin/verve-plugin.c
---- xfce4-verve-plugin-1.0.0-orig/panel-plugin/verve-plugin.c 2010-12-20
17:13:00.000000000 +0100
-+++ xfce4-verve-plugin-1.0.0/panel-plugin/verve-plugin.c 2011-03-01
13:47:44.616063515 +0100
-@@ -33,8 +33,8 @@
- #include <gtk/gtk.h>
-
- #include <libxfce4util/libxfce4util.h>
--#include <libxfce4panel/xfce-panel-plugin.h>
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4panel/libxfce4panel.h>
-+#include <libxfce4ui/libxfce4ui.h>
-
- #include "verve.h"
- #include "verve-env.h"
-@@ -411,7 +411,7 @@
- gchar *msg = g_strconcat (_("Could not execute command:"), " ",
command, NULL);
-
- /* Display error message dialog */
-- xfce_err (msg);
-+ xfce_dialog_show_error (NULL, NULL, msg);
-
- /* Free message */
- g_free (msg);
-@@ -804,7 +804,7 @@
- gtk_container_set_border_width (GTK_CONTAINER (dialog), 2);
-
- /* Frame for appearance settings */
-- frame = xfce_create_framebox (_("Appearance"), &bin1);
-+ frame = xfce_gtk_frame_box_new (_("Appearance"), &bin1);
- gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), frame, TRUE, TRUE,
0);
- gtk_widget_show (frame);
-@@ -835,7 +835,7 @@
- g_signal_connect (size_spin, "value-changed", G_CALLBACK
(verve_plugin_size_changed), verve);
-
- /* Frame for behaviour settings */
-- frame = xfce_create_framebox (_("Behaviour"), &bin2);
-+ frame = xfce_gtk_frame_box_new (_("Behaviour"), &bin2);
- gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), frame, TRUE, TRUE,
0);
- gtk_widget_show (frame);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xfce4-verve-plugin.git/commitdiff/345eb385af62241ff11cfba85ebf23853fd12fdc
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
