[audacious-plugins] Merge post-3.4.3 patch for fixing a font rendering problem in the

[Michael Schwendt]

commit 163c772dbb188b79c6334e2b283da2f06bdf4c52
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Wed Jan 8 13:35:21 2014 +0100

    Merge post-3.4.3 patch for fixing a font rendering problem in the
    
      skinned ui.
    - Update to 3.4.3 (a few bug-fixes and translation updates). An update
      of 3rd party plugin packages to 3.4.3 is needed to get all fixes.

 .gitignore                                       |    1 +
 audacious-plugins-3.4.3-skins-vector-fonts.patch |   29 ++++++++++++++++++++++
 audacious-plugins.spec                           |   15 +++++++++--
 sources                                          |    2 +-
 4 files changed, 43 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f8881b7..b125915 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /audacious-plugins-3.4.tar.bz2
 /audacious-plugins-3.4.1.tar.bz2
 /audacious-plugins-3.4.2.tar.bz2
+/audacious-plugins-3.4.3.tar.bz2
diff --git a/audacious-plugins-3.4.3-skins-vector-fonts.patch b/audacious-plugins-3.4.3-skins-vector-fonts.patch
new file mode 100644
index 0000000..70092ee
--- /dev/null
+++ b/audacious-plugins-3.4.3-skins-vector-fonts.patch
@@ -0,0 +1,29 @@
+diff -Nurb --strip-trailing-cr audacious-plugins-3.4.3-orig/src/skins/ui_skinned_textbox.c audacious-plugins-3.4.3/src/skins/ui_skinned_textbox.c
+--- audacious-plugins-3.4.3-orig/src/skins/ui_skinned_textbox.c	2014-01-04 01:57:03.000000000 +0100
++++ audacious-plugins-3.4.3/src/skins/ui_skinned_textbox.c	2014-01-06 11:05:04.000000000 +0100
+@@ -110,21 +110,20 @@
+     pango_layout_set_font_description (layout, data->font);
+ 
+     PangoRectangle rect;
+-    pango_layout_get_pixel_extents (layout, NULL, & rect);
+-    gint crop = (rect.height + 2) / 5;
++    pango_layout_get_pixel_extents (layout, & rect, NULL);
+ 
+-    gtk_widget_set_size_request (textbox, data->width, rect.height - crop);
++    gtk_widget_set_size_request (textbox, data->width, rect.height);
+ 
+     data->buf_width = MAX (rect.width, data->width);
+     data->buf = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
+-     data->buf_width, rect.height - crop);
++     data->buf_width, rect.height);
+ 
+     cairo_t * cr = cairo_create (data->buf);
+ 
+     set_cairo_color (cr, active_skin->colors[SKIN_TEXTBG]);
+     cairo_paint (cr);
+ 
+-    cairo_move_to (cr, 0, -crop);
++    cairo_move_to (cr, -rect.x, -rect.y);
+     set_cairo_color (cr, active_skin->colors[SKIN_TEXTFG]);
+     pango_cairo_show_layout (cr, layout);
+ 
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index 892a7f0..25df79f 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -4,14 +4,14 @@
 %endif
 %{?aud_plugin_dep}
 
-%global tar_ver 3.4.2
+%global tar_ver 3.4.3
 
 # Minimum audacious/audacious-plugins version in inter-package dependencies.
 %global aud_ver 3.4-0.1.beta2
 
 Name: audacious-plugins
-Version: 3.4.2
-Release: 2%{?dist}
+Version: 3.4.3
+Release: 1%{?dist}
 Summary: Plugins for the Audacious audio player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -28,6 +28,8 @@ Patch0: audacious-plugins-3.0-alpha1-xmms-skindir.patch
 Patch1: audacious-plugins-3.4-beta2-enable-gnomeshortcuts.patch
 # Fedora customization: add default system-wide module_path
 Patch2: audacious-plugins-3.1-beta1-ladspa.patch
+# from upstream git
+Patch3: audacious/audacious-plugins-3.4.3-skins-vector-fonts.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: gettext-devel
@@ -121,6 +123,7 @@ input plugin for Audacious.
 %patch0 -p1 -b .xmms-skindir
 %patch1 -p1 -b .enable-gnomeshortcuts
 %patch2 -p1 -b .ladspa
+%patch3 -p1 -b .skins-vector-fonts
 
 for i in src/ladspa/plugin.c
 do
@@ -233,6 +236,12 @@ make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p"
 
 
 %changelog
+* Wed Jan  8 2014 Michael Schwendt <mschwendt at fedoraproject.org> - 3.4.3-1
+- Merge post-3.4.3 patch for fixing a font rendering problem in the
+  skinned ui.
+- Update to 3.4.3 (a few bug-fixes and translation updates). An update
+  of 3rd party plugin packages to 3.4.3 is needed to get all fixes.
+
 * Mon Dec 16 2013 Adrian Reber <adrian at lisas.de> - 3.4.2-2
 - Rebuilt for libcdio-0.92
 
diff --git a/sources b/sources
index b8d1102..05e4cf4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ac105d093eb819e6346abe19134a40e9  audacious-plugins-3.4.2.tar.bz2
+a52e1ec2f37e9269e26ee67b41153d73  audacious-plugins-3.4.3.tar.bz2