[xfce4-screenshooter] Update to 1.8.1

Christoph Wickert cwickert at fedoraproject.org
Sat May 18 22:57:26 UTC 2013 

commit 90cece7ea6994c04b8f3404fa28d692475d32d6a
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sun May 19 00:57:20 2013 +0200

    Update to 1.8.1
    
    - Build fixes: Build as module, no versioned libs, only export needed symbols
    - Add aarch64 support (#926787)
    - Increase transparency of selection background (bugzilla.xfce.org #9592)

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 xfce4-screenshooter-1.8.1-fix-build.patch          |   38 +++++++++++++
 ...screenshooter-1.8.1-increase-transparency.patch |   30 ++++++++++
 xfce4-screenshooter.spec                           |   57 +++++++++++++++-----
 5 files changed, 113 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1be601d..6612ead 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 xfce4-screenshooter-1.7.9.tar.bz2
 /xfce4-screenshooter-1.8.0.tar.bz2
+/xfce4-screenshooter-1.8.1.tar.bz2
diff --git a/sources b/sources
index 6314237..608c05d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b51ab5725418e7258273c4a6402adb02  xfce4-screenshooter-1.8.0.tar.bz2
+d0ffea2052a8e70154cf13789070711f  xfce4-screenshooter-1.8.1.tar.bz2
diff --git a/xfce4-screenshooter-1.8.1-fix-build.patch b/xfce4-screenshooter-1.8.1-fix-build.patch
new file mode 100644
index 0000000..718572d
--- /dev/null
+++ b/xfce4-screenshooter-1.8.1-fix-build.patch
@@ -0,0 +1,38 @@
+From 08053be7adc6d4a83191efed735c3f565bcbcf1f Mon Sep 17 00:00:00 2001
+From: Samuli Suominen <ssuominen at gentoo.org>
+Date: Sat, 05 May 2012 15:13:45 +0000
+Subject: Fix panel plugin build.
+
+- Don't use a versioned library.
+- Build as a module.
+- Only export needed symbols.
+---
+diff --git a/Makefile.am b/Makefile.am
+index 45100fd..d0c0adb 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -132,13 +132,19 @@ panel_plugin_libscreenshooterplugin_la_CFLAGS =	\
+ 	@SOUP_CFLAGS@
+ 
+ panel_plugin_libscreenshooterplugin_la_LDFLAGS = \
++	-avoid-version \
++	-module \
++	-no-undefined \
++	-export-symbols-regex '^xfce_panel_module_(preinit|init|construct)' \
++	$(PLATFORM_LDFLAGS)
++
++panel_plugin_libscreenshooterplugin_la_LIBADD = \
+ 	@EXO_LIBS@ \
+ 	@LIBXFCE4PANEL_LIBS@ \
+ 	@GTHREAD_LIBS@ \
+ 	@SOUP_LIBS@ \
+-	@LIBXFCE4UI_LIBS@
+-
+-panel_plugin_libscreenshooterplugin_la_LIBADD = lib/libscreenshooter.la
++	@LIBXFCE4UI_LIBS@ \
++	lib/libscreenshooter.la
+ 
+ panel_plugin_libscreenshooterplugin_la_SOURCES = \
+ 	panel-plugin/screenshooter-plugin.c
+--
+cgit v0.9.1
diff --git a/xfce4-screenshooter-1.8.1-increase-transparency.patch b/xfce4-screenshooter-1.8.1-increase-transparency.patch
new file mode 100644
index 0000000..4b482be
--- /dev/null
+++ b/xfce4-screenshooter-1.8.1-increase-transparency.patch
@@ -0,0 +1,30 @@
+From 0b22517f1ea788ba5b71872e980034051921ab0e Mon Sep 17 00:00:00 2001
+From: Sergio Cipolla <secipolla at gmail.com>
+Date: Thu, 06 Dec 2012 09:54:51 +0000
+Subject: Increase transparency of selection background (bug #9592).
+
+---
+diff --git a/lib/screenshooter-capture.c b/lib/screenshooter-capture.c
+index 52f7b5c..92e6f1b 100644
+--- a/lib/screenshooter-capture.c
++++ b/lib/screenshooter-capture.c
+@@ -523,7 +523,7 @@ static gboolean cb_expose (GtkWidget *widget,
+       for (i = 0; i < n_rects; ++i)
+         {
+           /* Restore the transparent background */
+-          cairo_set_source_rgba (cr, 0, 0, 0, 0.8);
++          cairo_set_source_rgba (cr, 0, 0, 0, 0.4);
+           gdk_cairo_rectangle (cr, &rects[i]);
+           cairo_fill (cr);
+ 
+@@ -548,7 +548,7 @@ static gboolean cb_expose (GtkWidget *widget,
+ 
+       /* Draw the transparent background */
+       cr = gdk_cairo_create (GDK_DRAWABLE (widget->window));
+-      cairo_set_source_rgba (cr, 0, 0, 0, 0.8);
++      cairo_set_source_rgba (cr, 0, 0, 0, 0.4);
+       cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+ 
+       for (i = 0; i < n_rects; ++i)
+--
+cgit v0.9.1
diff --git a/xfce4-screenshooter.spec b/xfce4-screenshooter.spec
index 71e56bf..060b35d 100644
--- a/xfce4-screenshooter.spec
+++ b/xfce4-screenshooter.spec
@@ -4,19 +4,27 @@
 
 %global minorversion 1.8
 
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 6
+    %global xfceversion 4.10
+%else
+    %global xfceversion 4.8
+%endif
+
 Name:           xfce4-screenshooter
-Version:        1.8.0
-Release:        8%{?dist}
+Version:        1.8.1
+Release:        1%{?dist}
 Summary:        Screenshot utility for the Xfce desktop
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/%{name}
 Source0:        http://archive.xfce.org/src/apps/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2
-#VCS git:git://git.xfce.org/apps/xfce4-screenshooter
-Patch0:         %{name}-1.8.0-dsofix.patch
-# http://git.xfce.org/apps/xfce4-screenshooter/commit/?id=5dbf2373
-Patch1:         xfce4-screenshooter-1.8.0-manpage.patch
+#VCS            git:git://git.xfce.org/apps/xfce4-screenshooter
+
+# http://git.xfce.org/apps/xfce4-screenshooter/commit/?id=08053be7
+Patch0:         xfce4-screenshooter-1.8.1-fix-build.patch
+# http://git.xfce.org/apps/xfce4-screenshooter/commit/?id=0b22517f
+Patch1:         xfce4-screenshooter-1.8.1-increase-transparency.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,7 +34,9 @@ BuildRequires:  xfce4-panel-devel >= 4.4.0
 BuildRequires:  libsoup-devel >= 2.26.0
 BuildRequires:  libXext-devel >= 1.0.0
 BuildRequires:  libXfixes-devel >= 4.0.0
-BuildRequires:  gettext intltool desktop-file-utils
+BuildRequires:  gettext
+BuildRequires:  intltool
+BuildRequires:  desktop-file-utils
 
 %description
 The Xfce Screenshooter utility allows you to capture the entire screen, the 
@@ -38,8 +48,8 @@ application.
 %package        plugin
 Summary:        Screenshot utility for the Xfce panel
 Group:          User Interface/Desktops
-Requires:       %{name} = %{version}-%{release}
-Requires:       xfce4-panel >= 4.4.0
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       xfce4-panel >= %{xfceversion}
 
 %description    plugin
 The Xfce Screenshooter plugin allows you to take screenshots from the Xfce 
@@ -48,21 +58,33 @@ panel.
 
 %prep
 %setup -q
-%patch0 -p1 -b .dsofix
-%patch1 -p1 -b .manpage
+%patch0 -p1 -b .fix-build
+%patch1 -p1 -b .increase-transparency
 
 # KDE and GNOME have their own screenshot utils
 echo "NotShowIn=KDE;GNOME;" >> src/xfce4-screenshooter.desktop.in.in
 
+
 %build
+# FIXME: For patch0 and aarch64 support; remove when no longer necessary
+NOCONFIGURE=yes xdt-autogen
+
 %configure --disable-static
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL='install -p'
+
+# remove la file
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+
+# make sure debuginfo is generated properly
+chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so
+
 %find_lang %{name}
+
 desktop-file-install \
         --dir %{buildroot}%{_datadir}/applications \
         --delete-original \
@@ -96,16 +118,23 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/*/apps/applets-screenshooter.png
 %{_datadir}/icons/hicolor/scalable/apps/applets-screenshooter.svg
 %{_datadir}/xfce4/doc/
+%{_docdir}/%{name}/
 %{_mandir}/man1/*.1.*
 
 
 %files plugin
 %defattr(-,root,root,-)
-%{_libexecdir}/xfce4/panel-plugins/%{name}-plugin
-%{_datadir}/xfce4/panel-plugins/*.desktop
+%{_libdir}/xfce4/panel/plugins/*.so
+%{_datadir}/xfce4/panel/plugins/*.desktop
 
 
 %changelog
+* Sun May 19 2013 Christoph Wickert <cwickert at fedoraproject.org> - 1.8.1-1
+- Update to 1.8.1
+- Build fixes: Build as module, no versioned libs, only export needed symbols
+- Add aarch64 support (#926787)
+- Increase transparency of selection background (bugzilla.xfce.org #9592)
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

More information about the scm-commits mailing list