Hello community, here is the log from the commit of package dia checked in at Fri Sep 29 00:56:48 CEST 2006. -------- --- GNOME/dia/dia.changes 2006-08-16 11:59:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/dia/dia.changes 2006-09-29 00:40:18.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Sep 29 00:37:39 CEST 2006 - jhargadon@suse.de + +- update to version 0.95 +- Update of Gane/Sarson sheets +- Fix of configure check for xgettext +- Fix of font placement in xfig import +- Three security holes in the XFig importer fixed after review +- Made children of objects not be magnetic to their parents. +- new or improved plugins written in Python +- many bug fixes + +------------------------------------------------------------------- Old: ---- dia-0.94.tar.bz2 New: ---- dia-0.95.tar.bz2 dia-64bit-clean.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dia.spec ++++++ --- /var/tmp/diff_new_pack.oK4Wwa/_old 2006-09-29 00:53:00.000000000 +0200 +++ /var/tmp/diff_new_pack.oK4Wwa/_new 2006-09-29 00:53:00.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package dia (Version 0.94) +# spec file for package dia (Version 0.95) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,15 +11,15 @@ # norootforbuild Name: dia -BuildRequires: docbook-toys gcc-c++ gnome-patch-translation gnutls-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel libxslt-devel mDNSResponder-devel perl-XML-Parser python-devel python-gtk-devel sgml-skel update-desktop-files +BuildRequires: docbook-toys docbook-xsl-stylesheets gcc-c++ gnome-patch-translation gnutls-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel libxslt-devel mDNSResponder-devel perl-XML-Parser python-devel python-gtk-devel sgml-skel update-desktop-files %define prefix /opt/gnome License: GPL Group: Productivity/Graphics/Other Requires: ghostscript-fonts-std python-gtk python-numeric Autoreqprov: on Summary: A Diagram Creation Program -Version: 0.94 -Release: 49 +Version: 0.95 +Release: 1 Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/dia-%{version}.tar.bz2 Source1: font-test-japanese.dia Source2: font-test-czech.dia @@ -35,6 +35,7 @@ Patch10: dia-xfig.patch Patch11: dia-cve-2006-2480.patch Patch12: dia-cve-2006-2453.patch +Patch13: dia-64bit-clean.patch URL: http://www.gnome.org/projects/dia/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -60,30 +61,28 @@ %prep %setup -gnome-patch-translation-prepare +#gnome-patch-translation-prepare %patch -p1 %patch3 -%patch4 +#%patch4 %patch5 -p1 -%patch6 -%patch7 +#%patch6 +#%patch7 %patch8 -%patch9 +#%patch9 cd plug-ins/xfig -%patch10 +#%patch10 cd ../.. %patch11 %patch12 +%patch13 # 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 -gnome-patch-translation-update +#gnome-patch-translation-update cp $RPM_SOURCE_DIR/font-test*dia . %build -rename no nb po/no.* -sed "s/\(ALL_LINGUAS.*\) no /\1 nb /" configure.in > configure.in.tmp && \ - mv configure.in.tmp configure.in autoconf export CFLAGS="$RPM_OPT_FLAGS" export CPPFLAGS="$(pkg-config --cflags cairo)" @@ -121,6 +120,15 @@ %prefix/share/pixmaps/* %changelog -n dia +* Fri Sep 29 2006 - jhargadon@suse.de +- update to version 0.95 +- Update of Gane/Sarson sheets +- Fix of configure check for xgettext +- Fix of font placement in xfig import +- Three security holes in the XFig importer fixed after review +- Made children of objects not be magnetic to their parents. +- new or improved plugins written in Python +- many bug fixes * Wed Aug 16 2006 - cthiel@suse.de - buildrequire python-gtk-devel instead of python-gtk * Fri Aug 11 2006 - cthiel@suse.de ++++++ dia-0.92.2-callbrowser.diff ++++++ --- /var/tmp/diff_new_pack.oK4Wwa/_old 2006-09-29 00:53:00.000000000 +0200 +++ /var/tmp/diff_new_pack.oK4Wwa/_new 2006-09-29 00:53:00.000000000 +0200 @@ -1,12 +1,20 @@ -diff -ur dia-0.92.orig/app/commands.c dia-0.92/app/commands.c ---- dia-0.92.orig/app/commands.c 2003-09-03 00:06:29.000000000 +0200 -+++ dia-0.92/app/commands.c 2003-10-27 16:17:56.000000000 +0100 -@@ -514,7 +514,7 @@ +--- dia-0.95/app/commands.c ++++ dia-0.95/app/commands.c +@@ -575,7 +575,7 @@ ShellExecuteA (0, "open", helpindex, NULL, helpdir, SW_SHOWNORMAL); #else command = getenv("BROWSER"); -- command = g_strdup_printf("%s 'file://%s' &", command ? command : "netscape", helpindex); +- command = g_strdup_printf("%s 'file://%s' &", command ? command : "gnome-open", helpindex); + command = g_strdup_printf("%s 'file://%s' &", command ? command : "call-browser", helpindex); system(command); g_free(command); #endif +@@ -593,7 +593,7 @@ + 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 : "call-browser", link); + system(command); + g_free(command); + #endif ++++++ dia-0.94.tar.bz2 -> dia-0.95.tar.bz2 ++++++ ++++ 649259 lines of diff (skipped) ++++++ dia-64bit-clean.patch ++++++ --- app/load_save.c +++ app/load_save.c @@ -910,7 +910,7 @@ _umask = umask(0); umask(_umask); mode = 0666 & ~_umask; ret = fchmod(fildes,mode); - file = fdopen(fildes,"wb"); + file = (FILE *)fdopen(fildes,"wb"); /* Now write the data in the temporary file name. */ --- app/paginate_psprint.c +++ app/paginate_psprint.c @@ -371,7 +371,7 @@ #ifdef G_OS_WIN32 file = win32_printer_open (printcmd); #else - file = popen(printcmd, "w"); + file = (FILE *)popen(printcmd, "w"); #endif is_pipe = TRUE; } else { ++++++ dia-cve-2006-2453.patch ++++++ --- /var/tmp/diff_new_pack.oK4Wwa/_old 2006-09-29 00:53:12.000000000 +0200 +++ /var/tmp/diff_new_pack.oK4Wwa/_new 2006-09-29 00:53:12.000000000 +0200 @@ -1,6 +1,6 @@ --- app/app_procs.c +++ app/app_procs.c -@@ -897,22 +897,22 @@ +@@ -1298,22 +1298,22 @@ g_print(_("The original author of Dia was:\n\n")); for (i = 0; i < NUMBER_OF_ORIG_AUTHORS; i++) { @@ -27,89 +27,9 @@ } exit(0); ---- app/display.c -+++ app/display.c -@@ -968,7 +968,6 @@ - Diagram *dia; - GtkWidget *dialog, *button; - gchar *fname; -- gchar *msg; - - dia = ddisp->diagram; - -@@ -981,18 +980,14 @@ - fname = dia->filename; - if (!fname) - fname = _("<unnamed>"); -- msg = g_strdup_printf ( -- _("The diagram '%s'\n" -- "has not been saved. Save changes now?"), -- fname); - - dialog = gtk_message_dialog_new(GTK_WINDOW (ddisp->shell), - GTK_DIALOG_MODAL, - GTK_MESSAGE_QUESTION, - GTK_BUTTONS_NONE, /* no standard buttons */ -- msg, -- NULL); -- g_free (msg); -+ _("The diagram '%s'\n" -+ "has not been saved. Save changes now?"), -+ fname); - gtk_window_set_title (GTK_WINDOW(dialog), _("Close Diagram")); - - button = gtk_button_new_from_stock (GTK_STOCK_CANCEL); ---- app/filedlg.c -+++ app/filedlg.c -@@ -251,7 +251,6 @@ - - if (stat(filename, &stat_struct) == 0) { - GtkWidget *dialog = NULL; -- char buffer[300]; - char *utf8filename = NULL; - if (!g_utf8_validate(filename, -1, NULL)) { - utf8filename = g_filename_to_utf8(filename, -1, NULL, NULL, NULL); -@@ -261,15 +260,12 @@ - } - if (utf8filename == NULL) utf8filename = g_strdup(filename); - -- g_snprintf(buffer, 300, -- _("The file '%s' already exists.\n" -- "Do you want to overwrite it?"), utf8filename); -- g_free(utf8filename); -- - dialog = gtk_message_dialog_new (GTK_WINDOW(fs), - GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, - GTK_BUTTONS_YES_NO, -- buffer); -+ _("The file '%s' already exists.\n" -+ "Do you want to overwrite it?"), utf8filename); -+ g_free(utf8filename); - gtk_window_set_title (GTK_WINDOW (dialog), _("File already exists")); - gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES); - -@@ -442,16 +438,13 @@ - - if (stat(filename, &statbuf) == 0) { - GtkWidget *dialog = NULL; -- char buffer[300]; - -- g_snprintf(buffer, 300, -- _("The file '%s' already exists.\n" -- "Do you want to overwrite it?"), filename); - dialog = gtk_message_dialog_new (GTK_WINDOW(fs), - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_QUESTION, - GTK_BUTTONS_YES_NO, -- buffer); -+ _("The file '%s' already exists.\n" -+ "Do you want to overwrite it?"), filename); - gtk_window_set_title (GTK_WINDOW (dialog), _("File already exists")); - gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES); - --- app/load_save.c +++ app/load_save.c -@@ -199,7 +199,7 @@ +@@ -200,7 +200,7 @@ g_hash_table_foreach(unknown_hash, GHFuncUnknownObjects, unknown_str); @@ -118,20 +38,9 @@ } g_hash_table_destroy(unknown_hash); g_string_free(unknown_str, TRUE); ---- app/sheets.c -+++ app/sheets.c -@@ -338,7 +338,7 @@ - gdk_pixbuf_render_pixmap_and_mask(pixbuf, pixmap, mask, 1.0); - gdk_pixbuf_unref(pixbuf); - } else { -- g_warning (error->message); -+ g_warning ("%s", error->message); - g_error_free (error); - } - } --- plug-ins/python/diamodule.c +++ plug-ins/python/diamodule.c -@@ -377,11 +377,11 @@ +@@ -393,11 +393,11 @@ return NULL; if (0 == type) @@ -146,17 +55,6 @@ Py_INCREF(Py_None); return Py_None; ---- plug-ins/python/pydia-error.c -+++ plug-ins/python/pydia-error.c -@@ -98,7 +98,7 @@ - if (self->str) - g_string_append (self->str, s); - -- g_print (s); -+ g_print ("%s", s); - - Py_INCREF(Py_None); - return Py_None; --- plug-ins/wmf/wmf.cpp +++ plug-ins/wmf/wmf.cpp @@ -223,7 +223,7 @@ @@ -170,7 +68,7 @@ } --- plug-ins/xfig/xfig-export.c +++ plug-ins/xfig/xfig-export.c -@@ -263,7 +263,7 @@ +@@ -264,7 +264,7 @@ figWarn(XfigRenderer *renderer, int warning) { if (renderer->warnings[warning]) { ++++++ dia_bugfixes.diff ++++++ --- /var/tmp/diff_new_pack.oK4Wwa/_old 2006-09-29 00:53:12.000000000 +0200 +++ /var/tmp/diff_new_pack.oK4Wwa/_new 2006-09-29 00:53:12.000000000 +0200 @@ -1,22 +1,30 @@ ---- dia-0.94/app/app_procs.c -+++ dia-0.94/app/app_procs.c -@@ -99,6 +99,7 @@ - const char *size); +--- dia-0.95/app/app_procs.c ++++ dia-0.95/app/app_procs.c +@@ -111,6 +111,7 @@ + char *show_layers); static void create_user_dirs(void); +static void create_user_files(void); static PluginInitResult internal_plugin_init(PluginInfo *info); static void process_opts(int argc, char **argv, - #ifdef HAVE_POPT -@@ -393,6 +394,7 @@ - char *size = NULL; + #if USE_GOPTION +@@ -557,6 +558,7 @@ + DDisplay *ddisp = NULL; + Diagram *diagram = NULL; + gboolean made_conversions = FALSE; ++ gchar *rcf; + + if (export_file_format) { + char *export_file_name = NULL; +@@ -662,6 +664,7 @@ + static char *show_layers = NULL; gboolean made_conversions = FALSE; GSList *files = NULL; + gchar *rcf; - #ifdef HAVE_POPT - poptContext poptCtx = NULL; -@@ -517,14 +519,17 @@ + gchar *export_format_string = + /* Translators: The argument is a list of options, not to be translated */ +@@ -862,8 +865,6 @@ gdk_rgb_init(); @@ -25,18 +33,19 @@ if (!nosplash) { app_splash_init(""); } - } +@@ -871,6 +872,11 @@ - create_user_dirs(); -+ create_user_files(); + if (dia_is_interactive) + create_user_dirs(); ++ create_user_files(); + -+ rcf = dia_config_filename("diagtkrc"); -+ gtk_rc_parse(rcf); -+ g_free(rcf); ++ rcf = dia_config_filename("diagtkrc"); ++ gtk_rc_parse(rcf); ++ g_free(rcf); /* Init cursors: */ if (dia_is_interactive) { -@@ -703,6 +708,25 @@ +@@ -1055,6 +1061,25 @@ return TRUE; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org