Author: arekm Date: Sun May 27 15:12:02 2012 GMT Module: packages Tag: HEAD ---- Log message: - rel 9; fix glib/poppler build
---- Files affected: packages/inkscape: inkscape.spec (1.108 -> 1.109) , inkscape-0.48.2-glib.patch (NONE -> 1.1) (NEW), inkscape-poppler.patch (1.3 -> 1.4) ---- Diffs: ================================================================ Index: packages/inkscape/inkscape.spec diff -u packages/inkscape/inkscape.spec:1.108 packages/inkscape/inkscape.spec:1.109 --- packages/inkscape/inkscape.spec:1.108 Thu May 24 14:58:59 2012 +++ packages/inkscape/inkscape.spec Sun May 27 17:11:57 2012 @@ -17,7 +17,7 @@ Summary(pl.UTF-8): Edytor skalowalnej grafiki wektorowej Name: inkscape Version: 0.48.2 -Release: 8 +Release: 9 License: GPL v2+, LGPL v2.1+ Group: X11/Applications/Graphics Source0: http://downloads.sourceforge.net/inkscape/%{name}-%{version}%{beta}.tar.bz2 @@ -25,6 +25,8 @@ # workaround for https://bugs.launchpad.net/inkscape/+bug/487038 Patch0: %{name}-ldl.patch Patch1: %{name}-0.48.1-libpng15.patch +Patch2: inkscape-0.48.2-glib.patch +Patch3: inkscape-poppler.patch URL: http://www.inkscape.org/ BuildRequires: ImageMagick-c++-devel BuildRequires: aspell-devel @@ -80,6 +82,8 @@ %setup -q -n %{name}-%{version}%{beta} %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %{__rm} po/en...@piglatin.po %{__sed} -i -e 's|en_US@piglatin||' configure.ac @@ -167,6 +171,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.109 2012/05/27 15:11:57 arekm +- rel 9; fix glib/poppler build + Revision 1.108 2012/05/24 12:58:59 arekm - release 8 ================================================================ Index: packages/inkscape/inkscape-0.48.2-glib.patch diff -u /dev/null packages/inkscape/inkscape-0.48.2-glib.patch:1.1 --- /dev/null Sun May 27 17:12:02 2012 +++ packages/inkscape/inkscape-0.48.2-glib.patch Sun May 27 17:11:57 2012 @@ -0,0 +1,2445 @@ +Adjust for new glib.h include rules. + +diff --git a/src/application/application.h b/src/application/application.h +index fce6bd4..749790a 100644 +--- a/src/application/application.h ++++ b/src/application/application.h +@@ -13,7 +13,7 @@ + #ifndef INKSCAPE_APPLICATION_APPLICATION_H + #define INKSCAPE_APPLICATION_APPLICATION_H + +-#include <glib/gtypes.h> ++#include <glib.h> + + namespace Gtk { + class Main; +diff --git a/src/application/editor.h b/src/application/editor.h +index 4545022..6a11ec9 100644 +--- a/src/application/editor.h ++++ b/src/application/editor.h +@@ -16,7 +16,7 @@ + #define INKSCAPE_APPLICATION_EDITOR_H + + #include <sigc++/sigc++.h> +-#include <glib/gslist.h> ++#include <glib.h> + #include <glibmm/ustring.h> + #include <set> + #include "app-prototype.h" +diff --git a/src/attributes-test.h b/src/attributes-test.h +index 6677294..2621f93 100644 +--- a/src/attributes-test.h ++++ b/src/attributes-test.h +@@ -6,7 +6,6 @@ + + #include <vector> + #include <glib.h> +-#include <glib/gprintf.h> + #include "attributes.h" + #include "streq.h" + +diff --git a/src/attributes.cpp b/src/attributes.cpp +index 5d3a008..97b23c6 100644 +--- a/src/attributes.cpp ++++ b/src/attributes.cpp +@@ -17,8 +17,7 @@ + # include "config.h" + #endif + +-#include <glib.h> // g_assert() +-#include <glib/ghash.h> ++#include <glib.h> + #include "attributes.h" + + typedef struct { +diff --git a/src/attributes.h b/src/attributes.h +index 82ac962..4cd3459 100644 +--- a/src/attributes.h ++++ b/src/attributes.h +@@ -13,8 +13,7 @@ + * + * Released under GNU GPL, read the file 'COPYING' for more information + */ +-#include <glib/gtypes.h> +-#include <glib/gmessages.h> ++#include <glib.h> + + unsigned int sp_attribute_lookup(gchar const *key); + unsigned char const *sp_attribute_name(unsigned int id); +diff --git a/src/bind/javabind.cpp b/src/bind/javabind.cpp +index 6dc8c9a..36d55f6 100644 +--- a/src/bind/javabind.cpp ++++ b/src/bind/javabind.cpp +@@ -52,7 +52,7 @@ + #include "javabind-private.h" + #include <path-prefix.h> + #include <prefix.h> +-#include <glib/gmessages.h> ++#include <glib.h> + + //For repr and document + #include <document.h> +diff --git a/src/color-profile-fns.h b/src/color-profile-fns.h +index c8c51b5..41d8fc6 100644 +--- a/src/color-profile-fns.h ++++ b/src/color-profile-fns.h +@@ -6,7 +6,7 @@ + */ + + #include <glib-object.h> +-#include <glib/gtypes.h> ++#include <glib.h> + #if ENABLE_LCMS + #include <vector> + #include <glibmm/ustring.h> +diff --git a/src/color-profile.h b/src/color-profile.h +index fa8f353..029b232 100644 +--- a/src/color-profile.h ++++ b/src/color-profile.h +@@ -5,7 +5,7 @@ + * SPColorProfile: SVG <color-profile> implementation + */ + +-#include <glib/gtypes.h> ++#include <glib.h> + #include <sp-object.h> + #include <glibmm/ustring.h> + #if ENABLE_LCMS +diff --git a/src/color-rgba.h b/src/color-rgba.h +index fc52b19..39b2975 100644 +--- a/src/color-rgba.h ++++ b/src/color-rgba.h +@@ -12,8 +12,7 @@ + #ifndef SEEN_COLOR_RGBA_H + #define SEEN_COLOR_RGBA_H + +-#include <glib.h> // g_assert() +-#include <glib/gmessages.h> ++#include <glib.h> + #include "libnr/nr-pixops.h" + #include "decimal-round.h" + +diff --git a/src/conn-avoid-ref.h b/src/conn-avoid-ref.h +index 653b1d7..f276634 100644 +--- a/src/conn-avoid-ref.h ++++ b/src/conn-avoid-ref.h +@@ -13,7 +13,7 @@ + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +-#include <glib/gslist.h> ++#include <glib.h> + #include <stddef.h> + #include <sigc++/connection.h> + +diff --git a/src/debug/logger.cpp b/src/debug/logger.cpp +index f28d275..27c6d19 100644 +--- a/src/debug/logger.cpp ++++ b/src/debug/logger.cpp +@@ -11,7 +11,7 @@ + + #include <fstream> + #include <vector> +-#include <glib/gmessages.h> ++#include <glib.h> + #include "inkscape-version.h" + #include "debug/logger.h" + #include "debug/simple-event.h" +diff --git a/src/debug/simple-event.h b/src/debug/simple-event.h +index 74301a6..ea28cf5 100644 +--- a/src/debug/simple-event.h ++++ b/src/debug/simple-event.h +@@ -14,9 +14,7 @@ + + #include <stdarg.h> + #include <vector> +-#include <glib.h> // g_assert() +-#include <glib/gstrfuncs.h> +-#include <glib/gmessages.h> ++#include <glib.h> + + #include "gc-alloc.h" + #include "debug/event.h" +diff --git a/src/debug/timestamp.cpp b/src/debug/timestamp.cpp +index 8814f37..26a9ce0 100644 +--- a/src/debug/timestamp.cpp ++++ b/src/debug/timestamp.cpp +@@ -10,8 +10,7 @@ + */ + + +-#include <glib/gtypes.h> +-#include <glib/gmain.h> ++#include <glib.h> + #include <glibmm/ustring.h> + #include "debug/simple-event.h" + +diff --git a/src/desktop-style.h b/src/desktop-style.h +index e1ca5b3..95b3bf9 100644 +--- a/src/desktop-style.h ++++ b/src/desktop-style.h +@@ -13,7 +13,7 @@ + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +-#include <glib/gtypes.h> ++#include <glib.h> + + class ColorRGBA; + struct SPCSSAttr; +diff --git a/src/dialogs/clonetiler.cpp b/src/dialogs/clonetiler.cpp +index 55884fe..b846f48 100644 +--- a/src/dialogs/clonetiler.cpp ++++ b/src/dialogs/clonetiler.cpp +@@ -12,7 +12,7 @@ + #ifdef HAVE_CONFIG_H + # include "config.h" + #endif +-#include <glib/gmem.h> ++#include <glib.h> + #include <gtk/gtk.h> + #include <glibmm/i18n.h> + +diff --git a/src/dir-util.cpp b/src/dir-util.cpp +index 67db036..8fe1315 100644 +--- a/src/dir-util.cpp ++++ b/src/dir-util.cpp +@@ -7,11 +7,7 @@ + #include <errno.h> + #include <string> + #include <cstring> +-#include <glib/gutils.h> +-#include <glib/gmem.h> +-#include <glib/gerror.h> +-#include <glib/gconvert.h> +-#include <glib/gstrfuncs.h> ++#include <glib.h> + + /** Returns a form of \a path relative to \a base if that is easy to construct (e.g. if \a path + appears to be in the directory specified by \a base), otherwise returns \a path. +diff --git a/src/dir-util.h b/src/dir-util.h +index 9bdfafa..6b16fcc 100644 +--- a/src/dir-util.h ++++ b/src/dir-util.h +@@ -10,7 +10,7 @@ + */ + + #include <stdlib.h> +-#include <glib/gtypes.h> ++#include <glib.h> + + char const *sp_relative_path_from_path(char const *path, char const *base); + char const *sp_extension_from_path(char const *path); +diff --git a/src/display/canvas-bpath.h b/src/display/canvas-bpath.h +index b97bbcc..6db6fa3 100644 +--- a/src/display/canvas-bpath.h ++++ b/src/display/canvas-bpath.h +@@ -13,7 +13,7 @@ + * + */ + +-#include <glib/gtypes.h> ++#include <glib.h> + + #include <display/sp-canvas.h> + +diff --git a/src/display/curve.cpp b/src/display/curve.cpp +index 73b8dc3..b17ef51 100644 +--- a/src/display/curve.cpp ++++ b/src/display/curve.cpp +@@ -19,7 +19,7 @@ + + #include "display/curve.h" + +-#include <glib/gmessages.h> ++#include <glib.h> + #include <2geom/pathvector.h> + #include <2geom/sbasis-geometric.h> + #include <2geom/sbasis-to-bezier.h> +diff --git a/src/display/curve.h b/src/display/curve.h +index fe07201..64731c4 100644 +--- a/src/display/curve.h ++++ b/src/display/curve.h +@@ -15,8 +15,7 @@ + * Released under GNU GPL + */ + +-#include <glib/gtypes.h> +-#include <glib/gslist.h> ++#include <glib.h> + + #include <2geom/forward.h> + +diff --git a/src/display/gnome-canvas-acetate.h b/src/display/gnome-canvas-acetate.h +index 40574e1..2f84931 100644 +--- a/src/display/gnome-canvas-acetate.h ++++ b/src/display/gnome-canvas-acetate.h +@@ -15,7 +15,7 @@ + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +-#include <glib/gtypes.h> ++#include <glib.h> + #include "display/sp-canvas.h" + + +diff --git a/src/display/nr-3dutils.cpp b/src/display/nr-3dutils.cpp +index 89c2194..db8800f 100644 +--- a/src/display/nr-3dutils.cpp ++++ b/src/display/nr-3dutils.cpp +@@ -9,7 +9,7 @@ + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +-#include <glib/gmessages.h> ++#include <glib.h> + + #include "libnr/nr-pixblock.h" + #include "display/nr-3dutils.h" +diff --git a/src/display/nr-arena.h b/src/display/nr-arena.h +index 76b071e..1d23511 100644 +--- a/src/display/nr-arena.h ++++ b/src/display/nr-arena.h +@@ -13,7 +13,7 @@ + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +-#include <glib/gmacros.h> ++#include <glib.h> + + #include "display/rendermode.h" + +diff --git a/src/display/nr-filter-diffuselighting.cpp b/src/display/nr-filter-diffuselighting.cpp +index 0fe4c59..1e08e11 100644 +--- a/src/display/nr-filter-diffuselighting.cpp ++++ b/src/display/nr-filter-diffuselighting.cpp +@@ -10,7 +10,7 @@ + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +-#include <glib/gmessages.h> ++#include <glib.h> + + #include "display/nr-3dutils.h" + #include "display/nr-arena-item.h" +diff --git a/src/display/nr-filter-specularlighting.cpp b/src/display/nr-filter-specularlighting.cpp +index 6a6ce38..dbe6764 100644 +--- a/src/display/nr-filter-specularlighting.cpp ++++ b/src/display/nr-filter-specularlighting.cpp +@@ -10,7 +10,7 @@ + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +-#include <glib/gmessages.h> ++#include <glib.h> + #include <cmath> + + #include "display/nr-3dutils.h" +diff --git a/src/display/nr-plain-stuff.cpp b/src/display/nr-plain-stuff.cpp +index 62a6110..e37ad96 100644 +--- a/src/display/nr-plain-stuff.cpp ++++ b/src/display/nr-plain-stuff.cpp +@@ -11,7 +11,7 @@ + * Released under GNU GPL + */ + +-#include <glib/gmessages.h> ++#include <glib.h> + #include <libnr/nr-pixops.h> + #include "nr-plain-stuff.h" + +diff --git a/src/display/nr-plain-stuff.h b/src/display/nr-plain-stuff.h +index c568f38..99176a3 100644 +--- a/src/display/nr-plain-stuff.h ++++ b/src/display/nr-plain-stuff.h +@@ -12,7 +12,7 @@ + * Released under GNU GPL + */ + +-#include <glib/gtypes.h> ++#include <glib.h> + + void nr_render_checkerboard_rgb (guchar *px, gint w, gint h, gint rs, gint xoff, gint yoff); + void nr_render_checkerboard_rgb_custom (guchar *px, gint w, gint h, gint rs, gint xoff, gint yoff, guint32 c0, guint32 c1, gint sizep2); +diff --git a/src/display/sodipodi-ctrlrect.h b/src/display/sodipodi-ctrlrect.h +index 7e5f515..7e00565 100644 +--- a/src/display/sodipodi-ctrlrect.h ++++ b/src/display/sodipodi-ctrlrect.h +@@ -16,7 +16,7 @@ + * + */ + +-#include <glib/gtypes.h> ++#include <glib.h> + #include "sp-canvas.h" + + #define SP_TYPE_CTRLRECT (sp_ctrlrect_get_type ()) +diff --git a/src/display/sp-canvas.h b/src/display/sp-canvas.h +index 3d23bf0..14c1410 100644 +--- a/src/display/sp-canvas.h ++++ b/src/display/sp-canvas.h +@@ -27,7 +27,7 @@ + # endif + #endif + +-#include <glib/gtypes.h> ++#include <glib.h> + #include <gdk/gdk.h> + #include <gtk/gtk.h> + +diff --git a/src/document-subset.cpp b/src/document-subset.cpp +index 1988865..020e6af 100644 +--- a/src/document-subset.cpp ++++ b/src/document-subset.cpp +@@ -12,7 +12,7 @@ + #include "document.h" + #include "sp-object.h" + +-#include <glib/gmessages.h> ++#include <glib.h> + + #include <sigc++/signal.h> + #include <sigc++/functors/mem_fun.h> +diff --git a/src/draw-anchor.h b/src/draw-anchor.h +index 0277616..af281d3 100644 +--- a/src/draw-anchor.h ++++ b/src/draw-anchor.h +@@ -5,7 +5,7 @@ + * Drawing anchors. + */ + +-#include <glib/gtypes.h> ++#include <glib.h> + #include <2geom/point.h> + + struct SPDrawContext; +diff --git a/src/dyna-draw-context.cpp b/src/dyna-draw-context.cpp +index bb8e690..7a61a88 100644 +--- a/src/dyna-draw-context.cpp ++++ b/src/dyna-draw-context.cpp +@@ -38,7 +38,7 @@ + #include <2geom/pathvector.h> + #include <2geom/bezier-utils.h> + #include "display/curve.h" +-#include <glib/gmem.h> ++#include <glib.h> + #include "macros.h" + #include "document.h" + #include "selection.h" +diff --git a/src/eraser-context.cpp b/src/eraser-context.cpp +index c198d93..c0bdec6 100644 +--- a/src/eraser-context.cpp ++++ b/src/eraser-context.cpp +@@ -36,7 +36,7 @@ + #include "display/canvas-bpath.h" + #include <2geom/bezier-utils.h> + +-#include <glib/gmem.h> ++#include <glib.h> + #include "macros.h" + #include "document.h" + #include "selection.h" +diff --git a/src/extension/internal/bitmap/imagemagick.cpp b/src/extension/internal/bitmap/imagemagick.cpp +index e907612..9a5a506 100644 +--- a/src/extension/internal/bitmap/imagemagick.cpp ++++ b/src/extension/internal/bitmap/imagemagick.cpp +@@ -15,6 +15,7 @@ + #include <gtkmm/spinbutton.h> + #include <gtkmm.h> + ++#include <glib.h> + #include <glib/gstdio.h> + + #include "desktop.h" +diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp +index 596f1fe..d65722b 100644 +--- a/src/extension/internal/cairo-render-context.cpp ++++ b/src/extension/internal/cairo-render-context.cpp +@@ -29,7 +29,7 @@ + #include <errno.h> + #include <2geom/pathvector.h> + +-#include <glib/gmem.h> ++#include <glib.h> + + #include <glibmm/i18n.h> + #include "display/nr-arena.h" +diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp +index 7060251..489af18 100644 +--- a/src/extension/internal/cairo-renderer.cpp ++++ b/src/extension/internal/cairo-renderer.cpp +@@ -33,7 +33,7 @@ + #include <2geom/transforms.h> + #include <2geom/pathvector.h> + +-#include <glib/gmem.h> ++#include <glib.h> + + #include <glibmm/i18n.h> + #include "display/nr-arena.h" +diff --git a/src/extension/internal/gdkpixbuf-input.cpp b/src/extension/internal/gdkpixbuf-input.cpp +index df7f348..a999c43 100644 +--- a/src/extension/internal/gdkpixbuf-input.cpp ++++ b/src/extension/internal/gdkpixbuf-input.cpp +@@ -1,7 +1,7 @@ + #ifdef HAVE_CONFIG_H + # include <config.h> + #endif +-#include <glib/gprintf.h> ++#include <glib.h> + #include <glibmm/i18n.h> + #include "document-private.h" + #include <dir-util.h> +diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h +index f0062bb..7f19151 100644 +--- a/src/extension/internal/pdfinput/svg-builder.h ++++ b/src/extension/internal/pdfinput/svg-builder.h +@@ -49,7 +49,7 @@ class XRef; + class SPCSSAttr; + + #include <vector> +-#include <glib/gtypes.h> ++#include <glib.h> + + namespace Inkscape { + namespace Extension { +diff --git a/src/extension/internal/win32.cpp b/src/extension/internal/win32.cpp +index 21f2788..18855b2 100644 +--- a/src/extension/internal/win32.cpp ++++ b/src/extension/internal/win32.cpp +@@ -13,7 +13,7 @@ + # include "config.h" + #endif + +-#include <glib/gmem.h> ++#include <glib.h> + #include <libnr/nr-macros.h> + #include <2geom/transforms.h> + +diff --git a/src/extract-uri.h b/src/extract-uri.h +index 1975d9b..884b43a 100644 +--- a/src/extract-uri.h ++++ b/src/extract-uri.h +@@ -1,7 +1,7 @@ + #ifndef SEEN_EXTRACT_URI_H + #define SEEN_EXTRACT_URI_H + +-#include <glib/gtypes.h> ++#include <glib.h> + + gchar *extract_uri(gchar const *s, gchar const** endptr = 0); + +diff --git a/src/file.cpp b/src/file.cpp +index 1128a5a..3714560 100644 +--- a/src/file.cpp ++++ b/src/file.cpp +@@ -27,7 +27,7 @@ + #endif + + #include <gtk/gtk.h> +-#include <glib/gmem.h> ++#include <glib.h> + #include <glibmm/i18n.h> + #include <libnr/nr-pixops.h> + +diff --git a/src/file.h b/src/file.h +index dec7e3f..88d0fa0 100644 +--- a/src/file.h ++++ b/src/file.h +@@ -16,7 +16,7 @@ <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/packages/inkscape/inkscape.spec?r1=1.108&r2=1.109 http://cvs.pld-linux.org/packages/inkscape/inkscape-poppler.patch?r1=1.3&r2=1.4 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit