Hello community, here is the log from the commit of package xfce4-panel-plugin-clipman for openSUSE:Factory checked in at 2012-01-09 21:44:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-panel-plugin-clipman (Old) and /work/SRC/openSUSE:Factory/.xfce4-panel-plugin-clipman.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-panel-plugin-clipman", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-panel-plugin-clipman/xfce4-panel-plugin-clipman.changes 2011-10-28 15:29:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-panel-plugin-clipman.new/xfce4-panel-plugin-clipman.changes 2012-01-09 21:44:24.000000000 +0100 @@ -1,0 +2,32 @@ +Mon Jan 9 09:37:30 UTC 2012 - [email protected] + +- remove hardcoded version dependency of + xfce4-panel-plugin-clipman-doc on xfce4-panel-plugin-clipman + +------------------------------------------------------------------- +Sun Nov 13 18:51:38 UTC 2011 - [email protected] + +- update to version 1.2.2 + - new options in the settings dialog under the tab "Tweaks": + - reorder-items: push or not the last copied text to the top of + history, default is set to true + - skip-action-on-key-down: ignore matched actions when Ctrl is + pressed down at the end of the selection, default is set to + false + - include existing hidden options in the "Tweaks" tab + - use new Xfce Panel plugin installation location +- added + xfce4-clipman-plugin-1.2.2-fix-non-void-function-not-returning-value.patch + which fixes a non-void function not returning a value (bxo#8106) +- added + xfce4-clipman-plugin-1.2.2-fix-gtk_message_dialog_new_with_markup-usage.patch + which fixes the usage of gtk_message_dialog_new_with_markup + (bxo#8147) +- dropped obsolete + xfce4-panel-plugin-clipman-1.1.3-use-docdir.patch, + xfce4-panel-plugin-clipman-1.1.3-fix-exo-version.patch, + xfce4-panel-plugin-clipman-1.1.3-fix-missing-return-value.patch, + xfce4-panel-plugin-clipman-1.1.3-catch-null-value.patch, + xfce4-panel-plugin-clipman-1.1.3-fix-memory-leak.patch + +------------------------------------------------------------------- Old: ---- xfce4-clipman-plugin-1.1.3.tar.bz2 xfce4-panel-plugin-clipman-1.1.3-catch-null-value.patch xfce4-panel-plugin-clipman-1.1.3-fix-exo-version.patch xfce4-panel-plugin-clipman-1.1.3-fix-memory-leak.patch xfce4-panel-plugin-clipman-1.1.3-fix-missing-return-value.patch xfce4-panel-plugin-clipman-1.1.3-use-docdir.patch New: ---- xfce4-clipman-plugin-1.2.2-fix-gtk_message_dialog_new_with_markup-usage.patch xfce4-clipman-plugin-1.2.2-fix-non-void-function-not-returning-value.patch xfce4-clipman-plugin-1.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-panel-plugin-clipman.spec ++++++ --- /var/tmp/diff_new_pack.x9iyrU/_old 2012-01-09 21:44:25.000000000 +0100 +++ /var/tmp/diff_new_pack.x9iyrU/_new 2012-01-09 21:44:25.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xfce4-panel-plugin-clipman # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,37 +15,30 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %define panel_version 4.8.0 %define plugin_name xfce4-clipman-plugin Name: xfce4-panel-plugin-clipman -License: GPLv2+ -Version: 1.1.3 -Release: 19 +Version: 1.2.2 +Release: 0 Summary: Clipboard manager plugin for the Xfce panel -Url: http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin -Source0: xfce4-clipman-plugin-1.1.3.tar.bz2 -# PATCH-FIX-UPSTREAM xfce4-panel-plugin-clipman-1.1.3-fix-exo-version.patch [email protected] -- Fixes build with exo >= 0.5.0 -Patch0: xfce4-panel-plugin-clipman-1.1.3-fix-exo-version.patch -# PATCH-FIX-UPSTREAM xfce4-panel-plugin-clipman-1.1.3-fix-missing-return-value.patch [email protected] -- Fixes missing return value -Patch1: xfce4-panel-plugin-clipman-1.1.3-fix-missing-return-value.patch -# PATCH-FIX-UPSTREAM xfce4-panel-plugin-clipman-1.1.3-catch-null-value.patch [email protected] -- Fix a crash due to dereferencing a NULL pointer (backported from upstream git) -Patch2: xfce4-panel-plugin-clipman-1.1.3-catch-null-value.patch -# PATCH-FIX-UPSTREAM xfce4-panel-plugin-clipman-1.1.3-fix-memory-leak.patch [email protected] -- Fix a memory leak (backported from upstream git) -Patch3: xfce4-panel-plugin-clipman-1.1.3-fix-memory-leak.patch -# PATCH-FIX-UPSTREAM xfce4-panel-plugin-clipman-1.1.3-use-docdir.patch [email protected] -- Use docdir correctly -Patch4: xfce4-panel-plugin-clipman-1.1.3-use-docdir.patch +License: GPL-2.0+ Group: System/GUI/XFCE -BuildRequires: intltool +Url: http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin +Source0: xfce4-clipman-plugin-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM xfce4-clipman-plugin-1.2.2-fix-non-void-function-not-returning-value.patch bxo#8106 [email protected] -- Fixes non-void function not returning a value (backported from upstream git) +Patch0: xfce4-clipman-plugin-1.2.2-fix-non-void-function-not-returning-value.patch +# PATCH-FIX-UPSTREAM xfce4-clipman-plugin-1.2.2-fix-gtk_message_dialog_new_with_markup-usage.patch bxo#8147 [email protected] -- Fix gtk_message_dialog_new_with_markup usage which is a variadic function +Patch1: xfce4-clipman-plugin-1.2.2-fix-gtk_message_dialog_new_with_markup-usage.patch BuildRequires: fdupes -BuildRequires: pkgconfig(libxfce4panel-1.0) +BuildRequires: intltool +BuildRequires: update-desktop-files BuildRequires: pkgconfig(exo-1) BuildRequires: pkgconfig(libglade-2.0) +BuildRequires: pkgconfig(libxfce4panel-1.0) +BuildRequires: pkgconfig(libxfce4ui-1) BuildRequires: pkgconfig(libxfconf-0) BuildRequires: pkgconfig(unique-1.0) -BuildRequires: update-desktop-files -BuildRequires: xfce4-dev-tools Requires: xfce4-panel >= 4.8.0 Recommends: %{name}-doc = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -59,10 +52,9 @@ %package doc -License: GPLv2+ Summary: Documentation for xfce4-panel-plugin-clipman Group: Documentation/HTML -Requires: xfce4-panel-plugin-clipman = 1.1.3 +Requires: xfce4-panel-plugin-clipman = %{version} %description doc This is a clipboard manager which comes with a plugin for the Xfce Panel. It @@ -78,20 +70,17 @@ %setup -q -n %{plugin_name}-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build -xdt-autogen %configure \ - --docdir=%{_datadir}/xfce4/xfce4-clipman-plugin \ - --disable-static + --disable-static \ + --docdir=%{_datadir}/xfce4/%{plugin_name} make %{_smp_mflags} V=1 %install %make_install -%suse_update_desktop_file %{plugin_name} +rm -f %{buildroot}%{_libdir}/xfce4/panel/plugins/libclipman.la +%suse_update_desktop_file xfce4-clipman %suse_update_desktop_file %{plugin_name}-autostart rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} %find_lang %{plugin_name} %{name}.lang @@ -114,15 +103,15 @@ %files -f %{name}.lang %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README TODO -%{_datadir}/xfce4/panel-plugins/xfce4-clipman-plugin.desktop +%{_datadir}/xfce4/panel/plugins/xfce4-clipman-plugin.desktop %{_sysconfdir}/xdg/autostart/xfce4-clipman-plugin-autostart.desktop %config %{_sysconfdir}/xdg/xfce4/panel/xfce4-clipman-actions.xml %dir %{_sysconfdir}/xdg/xfce4/panel -%{_libexecdir}/xfce4/panel-plugins/xfce4-clipman-plugin +%{_libdir}/xfce4/panel/plugins/libclipman.so %{_bindir}/xfce4-clipman %{_bindir}/xfce4-clipman-settings %{_bindir}/xfce4-popup-clipman -%{_datadir}/applications/xfce4-clipman-plugin.desktop +%{_datadir}/applications/xfce4-clipman.desktop %{_datadir}/icons/hicolor/16x16/apps/xfce4-clipman-plugin.png %{_datadir}/icons/hicolor/22x22/apps/xfce4-clipman-plugin.png %{_datadir}/icons/hicolor/24x24/apps/xfce4-clipman-plugin.png @@ -132,7 +121,7 @@ %files doc %defattr(-,root,root) %dir %{_datadir}/xfce4 -%dir %{_datadir}/xfce4/xfce4-clipman-plugin -%doc %{_datadir}/xfce4/xfce4-clipman-plugin/html/ +%dir %{_datadir}/xfce4/%{plugin_name} +%doc %{_datadir}/xfce4/%{plugin_name}/html %changelog ++++++ xfce4-clipman-plugin-1.2.2-fix-gtk_message_dialog_new_with_markup-usage.patch ++++++ Index: xfce4-clipman-plugin-1.2.2/panel-plugin/xfce4-clipman-settings.c =================================================================== --- xfce4-clipman-plugin-1.2.2.orig/panel-plugin/xfce4-clipman-settings.c +++ xfce4-clipman-plugin-1.2.2/panel-plugin/xfce4-clipman-settings.c @@ -514,7 +514,7 @@ cb_reset_actions (GtkButton *button) GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, - _("<b>Reset actions</b>"), NULL); + _("<b>Reset actions</b>")); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), _("Are you sure you want to reset the actions to the system default values?")); res = gtk_dialog_run (GTK_DIALOG (dialog)); ++++++ xfce4-clipman-plugin-1.2.2-fix-non-void-function-not-returning-value.patch ++++++ Index: xfce4-clipman-plugin-1.2.2/panel-plugin/collector.c =================================================================== --- xfce4-clipman-plugin-1.2.2.orig/panel-plugin/collector.c +++ xfce4-clipman-plugin-1.2.2/panel-plugin/collector.c @@ -154,7 +154,7 @@ cb_check_primary_clipboard (ClipmanColle gchar *text; static gchar *prev_text = NULL; - g_return_if_fail (GTK_IS_CLIPBOARD (collector->priv->default_clipboard) && GTK_IS_CLIPBOARD (collector->priv->primary_clipboard)); + g_return_val_if_fail (GTK_IS_CLIPBOARD (collector->priv->default_clipboard) && GTK_IS_CLIPBOARD (collector->priv->primary_clipboard), FALSE); /* Postpone until the selection is done */ gdk_window_get_pointer (NULL, NULL, NULL, &state); ++++++ xfce4-clipman-plugin-1.1.3.tar.bz2 -> xfce4-clipman-plugin-1.2.2.tar.bz2 ++++++ ++++ 86035 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
