Hello community, here is the log from the commit of package inkscape checked in at Sun Mar 30 12:03:02 CEST 2008. -------- --- GNOME/inkscape/inkscape.changes 2008-03-06 19:24:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/inkscape/inkscape.changes 2008-03-28 23:17:32.335873000 +0100 @@ -1,0 +2,12 @@ +Fri Mar 28 23:18:56 CET 2008 - maw@suse.de + +- Update to version 0.46: + + Many new features and bugfeatures + + For a detailed account of what's new, see the NEWS file +- Remove stale patches: inkscape-invalid-conversion.patch, + inkscape-0.45.1-gcc43.patch, inkscape-g_assert.patch +- Respin inkscape-bug-189159.patch +- Add inkscape-warnings.patch +- Rename sr@latin to sr@Latn. + +------------------------------------------------------------------- Old: ---- inkscape-0.45.1-gcc43.patch inkscape-0.45.1.tar.bz2 inkscape-g_assert.patch inkscape-invalid-conversion.patch New: ---- inkscape-0.46.tar.bz2 inkscape-warnings.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inkscape.spec ++++++ --- /var/tmp/diff_new_pack.zIM684/_old 2008-03-30 12:02:13.000000000 +0200 +++ /var/tmp/diff_new_pack.zIM684/_new 2008-03-30 12:02:13.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package inkscape (Version 0.45.1) +# spec file for package inkscape (Version 0.46) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,14 +12,14 @@ Name: inkscape -BuildRequires: cairomm docbook-toys fdupes gcc-c++ gtkmm24-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel liblcms-devel libwnck-devel libxslt-devel loudmouth-devel perl python-devel python-gtk-devel sgml-skel update-desktop-files +BuildRequires: boost-devel cairomm docbook-toys fdupes gcc-c++ gtkmm24-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel liblcms-devel libwnck-devel libxslt-devel loudmouth-devel perl python-devel python-gtk-devel sgml-skel update-desktop-files License: GPL v2 or later Group: Productivity/Graphics/Vector Editors Requires: cairomm ghostscript-fonts-std python-gtk python-numeric pstoedit libwmf gzip skencil /usr/bin/gs AutoReqProv: on Summary: Inkscape Vector Illustration Program -Version: 0.45.1 -Release: 148 +Version: 0.46 +Release: 1 Provides: sodipodi Obsoletes: sodipodi PreReq: /bin/rm /bin/ln /bin/sh /usr/bin/perl @@ -28,14 +28,13 @@ Source1: gc6.4.tar.bz2 Patch: %{name}-boehm-gc.patch Patch4: %{name}-swigfix.patch -Patch6: %{name}-invalid-conversion.patch Patch7: %{name}-bug-189159.patch Patch8: %{name}-configure.patch Patch10: gc6.4.patch Patch13: %{name}-polyutil-newpoly.patch Patch14: %{name}-buffer-overrun.patch -Patch15: inkscape-0.45.1-gcc43.patch -Patch16: inkscape-g_assert.patch +# PATCH-FIX-UPSTREAM inkscape-warnings.patch +Patch15: inkscape-warnings.patch Url: http://www.inkscape.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} @@ -95,13 +94,11 @@ %setup -q -b 1 %patch %patch4 -%patch6 %patch7 %patch8 %patch13 %patch14 -p1 -%patch15 -p1 -%patch16 +%patch15 -p0 pushd ../gc* %patch10 popd @@ -112,6 +109,9 @@ -AC_DEFINE_UNQUOTED([INKSCAPE_LIBDIR], "\${prefix}/lib", +AC_DEFINE_UNQUOTED([INKSCAPE_LIBDIR], "\${prefix}/%_lib", EOF +# Change sr@latin to sr@Latn +rename sr@latin sr@Latn po/sr@latin.* +sed -i "/^ALL_LINGUAS/s/ sr@latin / sr@Latn /" configure.ac chmod -x README.ca.txt %build @@ -171,6 +171,7 @@ %dir %{_datadir}/inkscape/extensions %{_datadir}/inkscape/extensions/[a-ce-zA-Z]* %{_datadir}/inkscape/extensions/dia2* +%{_datadir}/inkscape/extensions/dimension.* %{_datadir}/inkscape/extensions/dots* %{_datadir}/inkscape/extensions/dx* %ghost %{_datadir}/inkscape/extensions/dia.inx @@ -184,6 +185,15 @@ %files lang -f %{name}.lang %changelog +* Sat Mar 29 2008 maw@suse.de +- Update to version 0.46: + + Many new features and bugfeatures + + For a detailed account of what's new, see the NEWS file +- Remove stale patches: inkscape-invalid-conversion.patch, + inkscape-0.45.1-gcc43.patch, inkscape-g_assert.patch +- Respin inkscape-bug-189159.patch +- Add inkscape-warnings.patch +- Rename sr@latin to sr@Latn. * Thu Mar 06 2008 maw@suse.de - Fix the build when against newer versions of intltool. * Tue Feb 05 2008 maw@suse.de ++++++ inkscape-0.45.1.tar.bz2 -> inkscape-0.46.tar.bz2 ++++++ GNOME/inkscape/inkscape-0.45.1.tar.bz2 /mounts/work_src_done/STABLE/inkscape/inkscape-0.46.tar.bz2 differ: byte 11, line 1 ++++++ inkscape-bug-189159.patch ++++++ --- /var/tmp/diff_new_pack.zIM684/_old 2008-03-30 12:02:14.000000000 +0200 +++ /var/tmp/diff_new_pack.zIM684/_new 2008-03-30 12:02:14.000000000 +0200 @@ -1,9 +1,11 @@ ---- src/desktop-style.cpp +Index: src/desktop-style.cpp +=================================================================== +--- src/desktop-style.cpp.orig +++ src/desktop-style.cpp -@@ -474,7 +474,7 @@ - - if (paint_res->set && paint_effectively_set && paint->type == SP_PAINT_TYPE_COLOR) { +@@ -500,7 +500,7 @@ objects_query_fillstroke (GSList *object + // 2. Sum color, copy server from paint to paint_res + if (paint_res->set && paint_effectively_set && paint->isColor()) { - gfloat d[3]; + gfloat d[4]; sp_color_get_rgb_floatv (&paint->value.color, d); ++++++ inkscape-warnings.patch ++++++ === modified file 'src/display/nr-filter-specularlighting.cpp' --- src/display/nr-filter-specularlighting.cpp 2008-03-28 20:56:04 +0000 +++ src/display/nr-filter-specularlighting.cpp 2008-03-28 20:58:43 +0000 @@ -108,8 +108,9 @@ data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_RED]); data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_GREEN]); data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_BLUE]); - data_o[j++] = MAX(MAX(data_o[j-3], data_o[j-2]), data_o[j-1]); - } + data_o[j] = MAX(MAX(data_o[j-3], data_o[j-2]), data_o[j-1]); + j++; + } out->empty = FALSE; delete dl; } @@ -135,7 +136,8 @@ data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_RED]); data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_GREEN]); data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_BLUE]); - data_o[j++] = MAX(MAX(data_o[j-3], data_o[j-2]), data_o[j-1]); + data_o[j] = MAX(MAX(data_o[j-3], data_o[j-2]), data_o[j-1]); + j++; } out->empty = FALSE; delete pl; @@ -162,7 +164,8 @@ data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_RED]); data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_GREEN]); data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_BLUE]); - data_o[j++] = MAX(MAX(data_o[j-3], data_o[j-2]), data_o[j-1]); + data_o[j] = MAX(MAX(data_o[j-3], data_o[j-2]), data_o[j-1]); + j++; } out->empty = FALSE; delete sl; === modified file 'src/extension/internal/pov-out.cpp' --- src/extension/internal/pov-out.cpp 2008-03-28 20:56:04 +0000 +++ src/extension/internal/pov-out.cpp 2008-03-28 20:58:43 +0000 @@ -133,9 +133,9 @@ void PovOutput::vec2(double a, double b) { out("<"); - out(dstr(a).c_str()); + out("%s", dstr(a).c_str()); out(", "); - out(dstr(b).c_str()); + out("%s", dstr(b).c_str()); out(">"); } @@ -147,11 +147,11 @@ void PovOutput::vec3(double a, double b, double c) { out("<"); - out(dstr(a).c_str()); - out(", "); - out(dstr(b).c_str()); - out(", "); - out(dstr(c).c_str()); + out("%s", dstr(a).c_str()); + out(", "); + out("%s", dstr(b).c_str()); + out(", "); + out("%s", dstr(c).c_str()); out(">"); } @@ -163,13 +163,13 @@ void PovOutput::vec4(double a, double b, double c, double d) { out("<"); - out(dstr(a).c_str()); - out(", "); - out(dstr(b).c_str()); - out(", "); - out(dstr(c).c_str()); - out(", "); - out(dstr(d).c_str()); + out("%s", dstr(a).c_str()); + out(", "); + out("%s", dstr(b).c_str()); + out(", "); + out("%s", dstr(c).c_str()); + out(", "); + out("%s", dstr(d).c_str()); out(">"); } === modified file 'src/libgdl/gdl-dock-placeholder.c' --- src/libgdl/gdl-dock-placeholder.c 2008-03-28 20:56:04 +0000 +++ src/libgdl/gdl-dock-placeholder.c 2008-03-28 21:19:25 +0000 @@ -491,7 +491,7 @@ GdlDockObject *toplevel; if (!gdl_dock_object_is_bound (GDL_DOCK_OBJECT (ph))) { - g_warning (_("Attempt to dock a dock object to an unbound placeholder")); + g_warning ("%s", _("Attempt to dock a dock object to an unbound placeholder")); return; } === modified file 'src/libgdl/gdl-stock.c' --- src/libgdl/gdl-stock.c 2008-03-28 20:56:04 +0000 +++ src/libgdl/gdl-stock.c 2008-03-28 20:58:43 +0000 @@ -60,7 +60,7 @@ pixbuf = gdk_pixbuf_new_from_inline (data_size, icon_data, FALSE, &err); if (err) { - g_warning (err->message); + g_warning ("%s", err->message); g_error_free (err); err = NULL; g_object_unref (source); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de