Author: fernando Date: Sat Nov 30 09:25:41 2013 New Revision: 2784 Log: Two patches for gimp-2.8.10: one is to fix build with FreeType-2.5.1.
Added: trunk/gimp/gimp-2.8.10-device_info-1.patch trunk/gimp/gimp-2.8.10-freetype-1.patch Added: trunk/gimp/gimp-2.8.10-device_info-1.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/gimp/gimp-2.8.10-device_info-1.patch Sat Nov 30 09:25:41 2013 (r2784) @@ -0,0 +1,33 @@ +Submitted By: Fernando de Oliveira <famobr at yahoo dot com dot br> +Date: 2013-11-30 +Initial Package Version: 2.8.10 +Upstream Status: Unknown +Origin: ubuntuforums +URL: http://ubuntuforums.org/showthread.php?t=1984743&page=8&p=12273558#post12273558 +Description: Fixes "Gimp-Widgets-CRITICAL **: gimp_device_info_set_device ..." annoying message by making "sure the configure input device dialog displays all of the devices" and fixes tests + +--- gimp-2.8.10/app/widgets/gimpdevicemanager.c.orig 2012-11-22 21:21:24.000000000 -0300 ++++ gimp-2.8.10/app/widgets/gimpdevicemanager.c 2013-11-30 11:54:30.275906582 -0300 +@@ -321,19 +321,19 @@ + GIMP_DEVICE_INFO (gimp_container_get_child_by_name (GIMP_CONTAINER (manager), + device->name)); + +- if (device_info) ++ /* if (device_info) + { + gimp_device_info_set_device (device_info, device, gdk_display); + } + else +- { ++ {*/ + device_info = gimp_device_info_new (private->gimp, device, gdk_display); + + gimp_device_info_set_default_tool (device_info); + + gimp_container_add (GIMP_CONTAINER (manager), GIMP_OBJECT (device_info)); + g_object_unref (device_info); +- } ++ //} + } + + static void Added: trunk/gimp/gimp-2.8.10-freetype-1.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/gimp/gimp-2.8.10-freetype-1.patch Sat Nov 30 09:25:41 2013 (r2784) @@ -0,0 +1,22 @@ +Submitted By: Fernando de Oliveira <famobr at yahoo dot com dot br> +Date: 2013-11-30 +Initial Package Version: 2.8.10 +Upstream Status: Committed +Origin: gnome +URL: http://osdir.com/ml/commits.gnome/2013-11/msg07247.html +Description: Fixes build with FreeType-2.5.1 + +diff -Naur gimp-2.8.10/app/text/gimpfont.c.orig gimp-2.8.10/app/text/gimpfont.c +--- gimp-2.8.10/app/text/gimpfont.c.orig 2012-05-08 03:05:46.000000000 -0300 ++++ gimp-2.8.10/app/text/gimpfont.c 2013-11-30 10:44:21.996609469 -0300 +@@ -27,7 +27,9 @@ + + #define PANGO_ENABLE_ENGINE 1 /* Argh */ + #include <pango/pango-ot.h> +-#include <freetype/tttables.h> ++ ++#include <ft2build.h> ++#include FT_TRUETYPE_TABLES_H + + #include "text-types.h" + -- http://linuxfromscratch.org/mailman/listinfo/patches FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
