Hello community, here is the log from the commit of package dia for openSUSE:Factory checked in at Wed May 20 23:10:56 CEST 2009. -------- --- GNOME/dia/dia.changes 2009-04-03 11:38:57.000000000 +0200 +++ dia/dia.changes 2009-05-06 04:03:57.000000000 +0200 @@ -1,0 +2,61 @@ +Wed May 6 00:42:20 CEST 2009 - vuntz@novell.com + +- Update to version 0.97: + + Many build fixes. + + Updated translations. + + Improved rendering with cairo (PS, PDF, SVG, PNG, EMF) and also + default print through Gtk+/cairo support. + + Simple Find & Replace for diagram objects names + + Dedicated text editing mode finally allows to use 'Del' while + editing text and/or for whole object removal + + Custom lines plug-in + + Shapes can now have sub-shapes that can be scaled or not when + the main shape is scaled. Also, it is now possible to specify + that shapes are created with their stated sizes. + + Much decreased start-up time and memory usage by delay loading + custom shapes. + + Rotated text by "Standard - Outline" object (based on cairo) + + Overhaul of the DXF plug-in (import and export) + + With the help of libEMF dia now can write EMF on Linux(x86), + too. + + New database table relation shapes + + A huge step forward regarding properties of grouped objects + bgo#60331 + + Antialiased rendering done with cairo if the plug-in is loaded + + Improvements on arrow bounding box calculations + + The "UML - Class" dialog fits again 800x600 screen again + + There is an optional 'integrated' UI for people otherwise + loosing their toolbox ;) + + Experimental stand-alone bindings with the help of SWIG/C++ +- Rename dia-0.92.2-callbrowser.patch to dia-xdg-open.patch, and + update the patch to use xdg-open. +- Respin dia-0.92.2-no-strict-aliasing.patch. +- Replace dia-create-user-files.patch with dia-diagtkrc.patch. This + last one is simpler and doesn't do things we don't want it to do. +- Drop dia-group-props-size.patch: doesn't seem to be needed + anymore. +- Drop dia-64bit-clean.patch: fixed upstream. +- Drop dia-help.patch: the use of --enable-gnome is enough for + this. +- Drop dia-0.96-pre3-docs.patch: fixed upstream. +- Add dia-build-errors.patch to fix compilation warnings. +- Remove unneeded BuildRequires: docbook-toys, libgnomeprint-devel +- Add BuildRequires: libEMF-devel (only for ix86), swig. +- Remove workaround for bnc#186174: I don't see how it could still + be needed. +- Remove --with-gnomeprint from configure: this doesn't exist + anymore. +- Pass --with-swig to configure. +- Pass --disable-static to configure and remove .la files. +- Do not add the GNOME category to the desktop file: it's already + there. +- Add a workaround for bgo#581537: rename the en help to C. +- Reorganize file list a bit. + +------------------------------------------------------------------- +Fri May 1 03:26:28 CEST 2009 - vuntz@novell.com + +- Remove AutoReqProv: it's default now. +- Remove checks for old versions of openSUSE. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- dia-0.92.2-callbrowser.patch dia-0.96.1.tar.bz2 dia-0.96-pre3-docs.patch dia-64bit-clean.patch dia-create-user-files.patch dia-group-props-size.patch dia-help.patch New: ---- dia-0.97.tar.bz2 dia-build-errors.patch dia-diagtkrc.patch dia-xdg-open.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dia.spec ++++++ --- /var/tmp/diff_new_pack.H13595/_old 2009-05-20 23:04:46.000000000 +0200 +++ /var/tmp/diff_new_pack.H13595/_new 2009-05-20 23:04:46.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package dia (Version 0.96.1) +# spec file for package dia (Version 0.97) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,46 +19,51 @@ Name: dia -BuildRequires: docbook-toys docbook-xsl-stylesheets fdupes gcc-c++ intltool libgnomeprint-devel libgnomeui-devel libxslt-devel python-devel python-gtk-devel scrollkeeper sgml-skel translation-update-upstream update-desktop-files +BuildRequires: docbook-xsl-stylesheets +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: intltool +%ifarch %ix86 +# libEMF is not on x86_64 +BuildRequires: libEMF-devel +%endif +BuildRequires: libgnomeui-devel +BuildRequires: libxslt-devel +BuildRequires: python-devel +BuildRequires: python-gtk-devel +BuildRequires: scrollkeeper +BuildRequires: sgml-skel +BuildRequires: swig +BuildRequires: translation-update-upstream +BuildRequires: update-desktop-files License: GPL v2 or later Group: Productivity/Graphics/Other -Requires: ghostscript-fonts-std python-gtk -# Ugh. I guess there should be a -devel subpackage split out -# Warning: Missing "Requires: libpng-devel" in dependency chain (/usr/lib/dia/libdia.la from dia requires /usr/lib/libpng.la). -# Warning: Missing "Requires: glibc-devel" in dependency chain (/usr/lib/dia/libdia.la from dia requires /usr/lib/libm.so). -# Warning: Missing "Requires: zlib-devel" in dependency chain (/usr/lib/dia/libdia.la from dia requires /usr/lib/libz.so). -# Requires: glibc-devel libpng-devel zlib-devel -AutoReqProv: on +Requires: ghostscript-fonts-std +Requires: python-gtk +# for xdg-open +Requires: xdg-utils Summary: A Diagram Creation Program -Version: 0.96.1 -Release: 167 +Version: 0.97 +Release: 1 Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{version}.tar.bz2 Source1: font-test-japanese.dia Source2: font-test-czech.dia Source3: font-test-german-euro.dia -# PATCH-FIX-OPENSUSE dia-0.92.2-callbrowser.patch -Patch: %name-0.92.2-callbrowser.patch +# PATCH-FIX-UPSTREAM bgo581529 dia-xdg-open.patch -- Use xdg-open instead of gnome-open +Patch: dia-xdg-open.patch # PATCH-FIX-OPENSUSE dia-0.92.2-no-strict-aliasing.patch Patch3: dia-0.92.2-no-strict-aliasing.patch -# PATCH-FIX-OPENSUSE dia-create-user-files.patch -Patch5: dia-create-user-files.patch -# PATCH-FIX-OPENSUSE dia-group-props-size.patch -Patch8: dia-group-props-size.patch -# PATCH-FIX-UPSTREAM dia-64bit-clean.patch bgo519529 -Patch13: dia-64bit-clean.patch -# PATCH-FIX-OPENSUSE dia-python-acinclude.patch +# PATCH-FIX-UPSTREAM bgo581531 dia-diagtkrc.patch vuntz@novell.com -- Use diagtkrc from config dir +Patch5: dia-diagtkrc.patch +# PATCH-FIX-UPSTREAM bgo581533 dia-python-acinclude.patch Patch14: dia-python-acinclude.patch -# PATCH-FIX-OPENSUSE dia-help.patch bnc157798 -Patch15: dia-help.patch -# PATCH-FIX-UPSTREAM dia-0.96-pre3-docs.patch bgo404535 -Patch16: dia-0.96-pre3-docs.patch +# PATCH-FIX-UPSTREAM bgo581542 dia-build-errors.patch vuntz@novell.com -- Fix compilation warnings +Patch15: dia-build-errors.patch # PATCH-FIX-OPENSUSE dia-remove-datetime.patch vuntz@novell.com -- Do not put date/time in the compiled binary (needed for build-compare) Patch17: dia-remove-datetime.patch Url: http://live.gnome.org/Dia BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if %suse_version > 1020 Requires: %{name}-lang = %{version} -%endif %description Dia is designed to be much like the commercial program 'Visio.' It can @@ -87,58 +92,111 @@ %patch -p1 %patch3 %patch5 -p1 -%patch8 -%patch13 %patch14 %patch15 -p1 -%patch16 -p1 %patch17 -p1 -# Work around gettext bug #186174 -LANG=en_US.UTF-8 msgconv po/ko.po -o po/ko.po.new -mv po/ko.po.new po/ko.po cp $RPM_SOURCE_DIR/font-test*dia . %build autoreconf -f -i intltoolize --force %configure\ + --disable-static\ --enable-db2html\ --enable-gnome\ --with-python\ --with-cairo\ - --with-gnomeprint + --with-swig make %{?jobs:-j%jobs} %install %makeinstall -%suse_update_desktop_file -r -N Dia -C "" -G "Diagram Editor" dia Office FlowChart GNOME +find %{buildroot} -type f -name "*.la" -exec %{__rm} -fv {} + +%suse_update_desktop_file -r -N Dia -C "" -G "Diagram Editor" dia Office FlowChart # Change sr@Latn to sr@latin mv %{buildroot}%{_datadir}/locale/sr@Latn %{buildroot}%{_datadir}/locale/sr@latin +# Workaround for bgo#581537: the C help is just a symlink to the en help. But +# find_lang doesn't like this +rm %{buildroot}%{_datadir}/gnome/help/dia/C +mv %{buildroot}%{_datadir}/gnome/help/dia/en %{buildroot}%{_datadir}/gnome/help/dia/C %find_lang %{name} # No need for mime-info-to-mime, application/x-dia-diagram is defined in freedesktop.org.xml rm -r $RPM_BUILD_ROOT%{_datadir}/mime-info -%if %suse_version > 1020 %fdupes -s $RPM_BUILD_ROOT -%endif %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) +%doc AUTHORS COPYING ChangeLog INSTALL KNOWN_BUGS NEWS README TODO samples/*.dia font-test*dia %{_bindir}/* %{_libdir}/dia %{_datadir}/applications/*.desktop %{_datadir}/dia -%{_datadir}/pixmaps/* +%{_datadir}/icons/hicolor/*/apps/dia.* +%doc %{_datadir}/doc/dia %doc %{_mandir}/man1/*.* -%doc AUTHORS COPYING ChangeLog INSTALL KNOWN_BUGS NEWS README TODO samples/*.dia font-test*dia +%doc %{_mandir}/fr/man1/*.* %files lang -f %{name}.lang -%defattr(-,root,root) -%{_datadir}/gnome/help/dia/* %changelog +* Wed May 06 2009 vuntz@novell.com +- Update to version 0.97: + + Many build fixes. + + Updated translations. + + Improved rendering with cairo (PS, PDF, SVG, PNG, EMF) and also + default print through Gtk+/cairo support. + + Simple Find & Replace for diagram objects names + + Dedicated text editing mode finally allows to use 'Del' while + editing text and/or for whole object removal + + Custom lines plug-in + + Shapes can now have sub-shapes that can be scaled or not when + the main shape is scaled. Also, it is now possible to specify + that shapes are created with their stated sizes. + + Much decreased start-up time and memory usage by delay loading + custom shapes. + + Rotated text by "Standard - Outline" object (based on cairo) + + Overhaul of the DXF plug-in (import and export) + + With the help of libEMF dia now can write EMF on Linux(x86), + too. + + New database table relation shapes + + A huge step forward regarding properties of grouped objects + bgo#60331 + + Antialiased rendering done with cairo if the plug-in is loaded + + Improvements on arrow bounding box calculations + + The "UML - Class" dialog fits again 800x600 screen again + + There is an optional 'integrated' UI for people otherwise + loosing their toolbox ;) + + Experimental stand-alone bindings with the help of SWIG/C++ +- Rename dia-0.92.2-callbrowser.patch to dia-xdg-open.patch, and + update the patch to use xdg-open. +- Respin dia-0.92.2-no-strict-aliasing.patch. +- Replace dia-create-user-files.patch with dia-diagtkrc.patch. This + last one is simpler and doesn't do things we don't want it to do. +- Drop dia-group-props-size.patch: doesn't seem to be needed + anymore. +- Drop dia-64bit-clean.patch: fixed upstream. +- Drop dia-help.patch: the use of --enable-gnome is enough for + this. +- Drop dia-0.96-pre3-docs.patch: fixed upstream. +- Add dia-build-errors.patch to fix compilation warnings. +- Remove unneeded BuildRequires: docbook-toys, libgnomeprint-devel +- Add BuildRequires: libEMF-devel (only for ix86), swig. +- Remove workaround for bnc#186174: I don't see how it could still + be needed. +- Remove --with-gnomeprint from configure: this doesn't exist + anymore. +- Pass --with-swig to configure. +- Pass --disable-static to configure and remove .la files. +- Do not add the GNOME category to the desktop file: it's already + there. +- Add a workaround for bgo#581537: rename the en help to C. +- Reorganize file list a bit. +* Fri May 01 2009 vuntz@novell.com +- Remove AutoReqProv: it's default now. +- Remove checks for old versions of openSUSE. * Fri Apr 03 2009 vuntz@novell.com - Remove python-numeric Requires: there's no reference to it anywhere in the code, so it wasn't needed. ++++++ dia-0.92.2-no-strict-aliasing.patch ++++++ --- /var/tmp/diff_new_pack.H13595/_old 2009-05-20 23:04:46.000000000 +0200 +++ /var/tmp/diff_new_pack.H13595/_new 2009-05-20 23:04:46.000000000 +0200 @@ -1,11 +1,13 @@ ---- configure.in +Index: configure.in +=================================================================== +--- configure.in.orig +++ configure.in -@@ -357,7 +357,7 @@ +@@ -409,7 +409,7 @@ if test "$GCC" = yes; then DIA_CHECK_CFLAG(-Wmissing-prototypes) DIA_CHECK_CFLAG(-Wmissing-declarations) DIA_CHECK_CFLAG(-finline-functions) - DIA_CHECK_CFLAG(-fstrict-aliasing) + DIA_CHECK_CFLAG(-fno-strict-aliasing) - fi - - AM_CONDITIONAL(HAVE_GCC, test "$GCC" = yes) + dnl DIA_CHECK_CFLAG(-Wshadow) + DIA_CHECK_CFLAG(-Wpointer-arith) + dnl DIA_CHECK_CFLAG(-Wswitch-enum) ++++++ dia-0.96.1.tar.bz2 -> dia-0.97.tar.bz2 ++++++ GNOME/dia/dia-0.96.1.tar.bz2 dia/dia-0.97.tar.bz2 differ: byte 11, line 1 ++++++ dia-build-errors.patch ++++++ Index: dia-0.97/bindings/dia-properties.cpp =================================================================== --- dia-0.97.orig/bindings/dia-properties.cpp +++ dia-0.97/bindings/dia-properties.cpp @@ -140,7 +140,7 @@ dia::Property< ::Property* >::get (const ::ArrayProperty *prop = (::ArrayProperty *)self; // now build with new values - int num_props = num_props = prop->ex_props->len; + int num_props = prop->ex_props->len; for (int i = 0; i < prop->records->len; ++i) { ::Property* p = 0; vec.push_back (new dia::Property <Property*> (0)); Index: dia-0.97/plug-ins/drs/dia-render-script-import.c =================================================================== --- dia-0.97.orig/plug-ins/drs/dia-render-script-import.c +++ dia-0.97/plug-ins/drs/dia-render-script-import.c @@ -164,10 +164,9 @@ gboolean import_drs (const gchar *filename, DiagramData *dia, void* user_data) { GList *item, *items; - xmlNodePtr root; xmlDocPtr doc = xmlParseFile(filename); - items = read_items (root->xmlChildrenNode); + items = read_items (doc->xmlChildrenNode); for (item = items; item != NULL; item = g_list_next (item)) { DiaObject *obj = (DiaObject *)item->data; layer_add_object(dia->active_layer, obj); ++++++ dia-diagtkrc.patch ++++++ Index: dia-0.97/lib/dialib.c =================================================================== --- dia-0.97.orig/lib/dialib.c +++ dia-0.97/lib/dialib.c @@ -27,6 +27,7 @@ #include <libxml/xmlerror.h> #include "dialib.h" +#include "dia_dirs.h" #include "message.h" #include "utils.h" #include "dia_image.h" @@ -104,12 +105,15 @@ libdia_init (guint flags) stdprops_init(); if (flags & DIA_INTERACTIVE) { + char *diagtkrc; dia_image_init(); gdk_rgb_init(); - gtk_rc_parse("diagtkrc"); + diagtkrc = dia_config_filename("diagtkrc"); + gtk_rc_parse(diagtkrc); + g_free(diagtkrc); color_init(); } ++++++ dia-xdg-open.patch ++++++ Index: dia-0.97/app/commands.c =================================================================== --- dia-0.97.orig/app/commands.c +++ dia-0.97/app/commands.c @@ -690,7 +690,7 @@ help_manual_callback (GtkAction *action) ShellExecuteA (0, "open", helpindex, NULL, helpdir, SW_SHOWNORMAL); #else command = getenv("BROWSER"); - command = g_strdup_printf("%s 'file://%s' &", command ? command : "gnome-open", helpindex); + command = g_strdup_printf("%s 'file://%s' &", command ? command : "xdg-open", helpindex); system(command); g_free(command); #endif @@ -708,7 +708,7 @@ activate_url (GtkAboutDialog *about, ShellExecuteA (0, "open", link, NULL, NULL, SW_SHOWNORMAL); #else gchar *command = getenv("BROWSER"); - command = g_strdup_printf("%s '%s' &", command ? command : "gnome-open", link); + command = g_strdup_printf("%s '%s' &", command ? command : "xdg-open", link); system(command); g_free(command); #endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org