Hello community,
here is the log from the commit of package xfce4-screenshooter for
openSUSE:Factory checked in at 2012-04-19 10:42:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xfce4-screenshooter (Old)
and /work/SRC/openSUSE:Factory/.xfce4-screenshooter.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-screenshooter", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/xfce4-screenshooter/xfce4-screenshooter.changes
2012-03-16 13:27:42.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.xfce4-screenshooter.new/xfce4-screenshooter.changes
2012-04-19 10:42:21.000000000 +0200
@@ -1,0 +2,9 @@
+Tue Apr 3 11:32:33 UTC 2012 - g...@opensuse.org
+
+- specfile cleanup
+- added xfce4-screenshooter-fix-crash-with-some-wms.patch which
+ fixes a crash when taking a screenshot of a window with some
+ window managers (bxo#8080)
+- correct dependencies
+
+-------------------------------------------------------------------
New:
----
xfce4-screenshooter-fix-crash-with-some-wms.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfce4-screenshooter.spec ++++++
--- /var/tmp/diff_new_pack.jaEss6/_old 2012-04-19 10:42:23.000000000 +0200
+++ /var/tmp/diff_new_pack.jaEss6/_new 2012-04-19 10:42:23.000000000 +0200
@@ -22,23 +22,30 @@
Name: xfce4-screenshooter
Version: 1.8.0
Release: 0
-Summary: Screenshot Tool
+Summary: Screenshot Tool for the Xfce Desktop
License: GPL-2.0+
Group: Productivity/Graphics/Other
Url:
http://goodies.xfce.org/projects/applications/xfce4-screenshooter
-Source: %{name}-%{version}.tar.bz2
+Source:
http://archive.xfce.org/src/apps/xfce4-screenshooter/1.8/%{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM xfce4-screenshooter-fix-libm-underlinking.patch bxo#7985
g...@opensuse.org -- Link explicitly against libm
Patch0: xfce4-screenshooter-fix-libm-underlinking.patch
# PATCH-FIX-UPSTREAM xfce4-screenshooter-1.8.0-use-docdir.patch
g...@opensuse.org -- Allow installation of documentation under docdir
Patch1: xfce4-screenshooter-1.8.0-use-docdir.patch
+# PATCH-FIX-UPSTREAM xfce4-screenshooter-fix-crash-with-some-wms.patch
bxo#8080 g...@opensuse.org -- Fixes a crash when taking a screenshot of a
window with some window managers (backported from upstream git)
+Patch2: xfce4-screenshooter-fix-crash-with-some-wms.patch
BuildRequires: fdupes
BuildRequires: intltool
BuildRequires: update-desktop-files
BuildRequires: xfce4-dev-tools
BuildRequires: pkgconfig(exo-1)
+BuildRequires: pkgconfig(gdk-pixbuf-2.0)
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(gthread-2.0)
+BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(libsoup-2.4)
BuildRequires: pkgconfig(libxfce4panel-1.0)
BuildRequires: pkgconfig(libxfce4ui-1)
+BuildRequires: pkgconfig(libxfce4util-1.0)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xfixes)
Recommends: %{name}-doc = %{version}
@@ -56,43 +63,39 @@
%package -n xfce4-panel-plugin-screenshooter
Summary: Screenshot Plugin for the Xfce Panel
Group: System/GUI/XFCE
-Requires: xfce4-panel >= %panel_version
-Requires: xfce4-screenshooter = %version
+Requires: xfce4-panel >= %{panel_version}
+Requires: xfce4-screenshooter = %{version}
%description -n xfce4-panel-plugin-screenshooter
-Xfce4 Screenshooter is a tool for taking screenshots, it can capture the entire
-screen, the active window or a selected region. Screenshots may be taken with a
-user-specified delay and the resulting images can be saved to a PNG file,
-copied it to the clipboard, opened with another application, or uploaded to
-ZimageZ, a free online image hosting service.
-
-This package contains the Xfce panel plugin.
+This package contains the xfce4-screenshooter Xfce panel plugin.
%package doc
-Summary: Documentation for Xfce Screenshooter
+Summary: Documentation for xfce4-screenshooter
Group: Documentation/HTML
-Requires: %name = %version
%description doc
-This package contains the HTML documentation for Xfce4 Screenshooter.
-
+This package contains the HTML documentation for xfce4-screenshooter.
%lang_package
+
%prep
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
xdt-autogen
-%configure \
- --docdir=%{_datadir}/xfce4/xfce4-screenshooter
+%configure --docdir=%{_datadir}/xfce4/xfce4-screenshooter
make %{?_smp_mflags} V=1
%install
-%makeinstall
-%find_lang xfce4-screenshooter
+%make_install
+
+%find_lang xfce4-screenshooter %{?no_lang_C}
+
%suse_update_desktop_file -r xfce4-screenshooter -G 'Screenshot Tool' Utility
X-SuSE-DesktopUtility GTK
+
%fdupes %{buildroot}%{_datadir}
%clean
@@ -109,16 +112,13 @@
%files
%defattr(-,root,root,-)
%doc COPYING NEWS README TODO
-%doc %{_mandir}/man1/xfce4-screenshooter.1*
%{_bindir}/xfce4-screenshooter
-%{_datadir}/icons/hicolor/48x48/apps/applets-screenshooter.png
-%{_datadir}/icons/hicolor/scalable/apps/applets-screenshooter.svg
+%{_datadir}/icons/hicolor/*/apps/applets-screenshooter.*
%{_datadir}/applications/xfce4-screenshooter.desktop
+%doc %{_mandir}/man1/xfce4-screenshooter.1*
%files -n xfce4-panel-plugin-screenshooter
%defattr(-,root,root,-)
-%dir %{_libexecdir}/xfce4
-%dir %{_libexecdir}/xfce4/panel-plugins
%{_libexecdir}/xfce4/panel-plugins/xfce4-screenshooter-plugin
%{_datadir}/xfce4/panel-plugins/screenshooter.desktop
++++++ xfce4-screenshooter-fix-crash-with-some-wms.patch ++++++
>From d99765f43d36af5edf60277f5043eb7ae9c97088 Mon Sep 17 00:00:00 2001
From: Bruno Ramos <brunoramos...@gmail.com>
Date: Mon, 02 Jan 2012 22:20:09 +0000
Subject: Fix crash with some WM (bug #8080).
---
diff --git a/lib/screenshooter-capture.c b/lib/screenshooter-capture.c
index 830d460..52f7b5c 100644
--- a/lib/screenshooter-capture.c
+++ b/lib/screenshooter-capture.c
@@ -381,6 +381,18 @@ static GdkPixbuf
rec_height += rectangle.y;
}
+ if (rec_x < 0)
+ {
+ rec_width = rec_width + rec_x;
+ rec_x = 0;
+ }
+
+ if (rec_y < 0)
+ {
+ rec_height = rec_height + rec_y;
+ rec_y = 0;
+ }
+
if (x_orig + rec_x + rec_width > gdk_screen_width ())
rec_width = gdk_screen_width () - x_orig - rec_x;
--
cgit v0.9.0.2
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
