Hello community, here is the log from the commit of package dia checked in at Fri Feb 29 22:39:24 CET 2008. -------- --- GNOME/dia/dia.changes 2007-10-31 23:41:51.000000000 +0100 +++ dia/dia.changes 2008-02-29 16:03:09.370258000 +0100 @@ -1,0 +2,5 @@ +Fri Feb 29 16:05:16 CET 2008 - rodrigo@suse.de + +- Upstream, tag and rename (where appropriate) patches + +------------------------------------------------------------------- Old: ---- dia-0.92.2-callbrowser.diff dia-0.92.2-no-strict-aliasing.diff dia_bugfixes.diff New: ---- dia-0.92.2-callbrowser.patch dia-0.92.2-no-strict-aliasing.patch dia-create-user-files.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dia.spec ++++++ --- /var/tmp/diff_new_pack.r24954/_old 2008-02-29 22:37:21.000000000 +0100 +++ /var/tmp/diff_new_pack.r24954/_new 2008-02-29 22:37:21.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package dia (Version 0.96.1) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,6 +10,7 @@ # norootforbuild + 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 update-desktop-files License: GPL v2 or later @@ -23,16 +24,22 @@ AutoReqProv: on Summary: A Diagram Creation Program Version: 0.96.1 -Release: 41 +Release: 84 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: %name-0.92.2-callbrowser.diff -Patch3: dia-0.92.2-no-strict-aliasing.diff -Patch5: dia_bugfixes.diff +# PATCH-FIX-OPENSUSE dia-0.92.2-callbrowser.patch +Patch: %name-0.92.2-callbrowser.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 Patch14: dia-python-acinclude.patch # PATCH-FIX-OPENSUSE dia-help.patch bnc157798 Patch15: dia-help.patch @@ -116,12 +123,15 @@ %files lang -f %{name}.lang %defattr(-,root,root) %{_datadir}/gnome/help/dia/* + %changelog -* Wed Oct 31 2007 - btimothy@suse.de +* Fri Feb 29 2008 rodrigo@suse.de +- Upstream, tag and rename (where appropriate) patches +* Thu Nov 01 2007 btimothy@suse.de - Force xmldocs.make and doc/Makefile.am to use GNOME configuration for help files (BNC #157798). - Fix en language help file XML parsing (BGO #404535). -* Thu Aug 16 2007 - jpr@suse.de +* Thu Aug 16 2007 jpr@suse.de - Update to 0.96.1 * Empty initial lines in shapes crashes Dia (BGO #421250). * several Python fixes, including a Doxygen import filter. @@ -149,28 +159,28 @@ crashes) - Improved SVG export (#283773) - Remove upstreamed patches -* Thu Aug 09 2007 - maw@suse.de +* Thu Aug 09 2007 maw@suse.de - Fix the -lang subpackage. -* Tue Aug 07 2007 - mauro@suse.de +* Tue Aug 07 2007 mauro@suse.de - Split out a -lang subpackage -* Fri Jul 27 2007 - maw@suse.de +* Fri Jul 27 2007 maw@suse.de - Add %%fdupes stuff -* Mon Jan 22 2007 - sbrabec@suse.cz +* Mon Jan 22 2007 sbrabec@suse.cz - Prefix changed to /usr. - Spec file cleanup. - Enabled GNOME print support. -* Tue Nov 14 2006 - sbrabec@suse.cz +* Tue Nov 14 2006 sbrabec@suse.cz - Re-enabled use of gnome-patch-translation. -* Sun Nov 12 2006 - stbinner@suse.de +* Sun Nov 12 2006 stbinner@suse.de - don't duplicate GenericName content within Name in .desktop file -* Fri Nov 03 2006 - sbrabec@suse.cz +* Fri Nov 03 2006 sbrabec@suse.cz - Fixed python 2.5 related crash (#217495, backport Andreas Hanke). -* Fri Oct 13 2006 - danw@suse.de +* Fri Oct 13 2006 danw@suse.de - Remove dead patches -* Sat Sep 30 2006 - aj@suse.de +* Sat Sep 30 2006 aj@suse.de - Cleanup BuildRequires. - Build C++ with RPM_OPT_FLAGS. -* Fri Sep 29 2006 - jhargadon@suse.de +* Fri Sep 29 2006 jhargadon@suse.de - update to version 0.95 - Update of Gane/Sarson sheets - Fix of configure check for xgettext @@ -179,118 +189,118 @@ - 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 +* Wed Aug 16 2006 cthiel@suse.de - buildrequire python-gtk-devel instead of python-gtk -* Fri Aug 11 2006 - cthiel@suse.de +* Fri Aug 11 2006 cthiel@suse.de - remove dia-0.94-pygtk-hack.patch, since python-gtk has been fixed in the meanwhile -* Sun Aug 06 2006 - cthiel@suse.de +* Sun Aug 06 2006 cthiel@suse.de - fixed build by adding dia-0.94-pygtk-hack.patch to hack around an unfavorable configure check -* Mon Jun 19 2006 - sbrabec@suse.cz +* Mon Jun 19 2006 sbrabec@suse.cz - Worked around failing msgmerge (#186174). -* Tue May 23 2006 - sbrabec@suse.cz +* Tue May 23 2006 sbrabec@suse.cz - Fixed more format string vulnerabilities (CVE-2006-2453, [#173867]). -* Wed May 17 2006 - sbrabec@suse.cz +* Wed May 17 2006 sbrabec@suse.cz - Fixed message format string vulnerability (CVE-2006-2480, [#173867]). -* Thu Mar 30 2006 - sbrabec@suse.cz +* Thu Mar 30 2006 sbrabec@suse.cz - Fixed XFig import buffer overflows (#162074). http://mail.gnome.org/archives/dia-list/2006-March/msg00149.html -* Fri Feb 24 2006 - sbrabec@suse.cz +* Fri Feb 24 2006 sbrabec@suse.cz - Improved Categories. -* Wed Feb 15 2006 - stbinner@suse.de +* Wed Feb 15 2006 stbinner@suse.de - fix %%suse_update_desktop and add .desktop file GenericName entry -* Wed Feb 01 2006 - sbrabec@suse.cz +* Wed Feb 01 2006 sbrabec@suse.cz - Use translation compendium gnome-patch-translation. -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Wed Jan 11 2006 - sbrabec@suse.cz +* Wed Jan 11 2006 sbrabec@suse.cz - Removed libpixman from neededforbuild. -* Tue Dec 20 2005 - ro@suse.de +* Tue Dec 20 2005 ro@suse.de - add /opt/gnome/share/gnome/help/dia/C to filelist -* Tue Oct 04 2005 - sbrabec@suse.cz +* Tue Oct 04 2005 sbrabec@suse.cz - Fixed SVG import arbitary python code execution (#120091, CAN-2005-2966). -* Thu Aug 18 2005 - sreeves@suse.de +* Thu Aug 18 2005 sreeves@suse.de - Patch to fix bugzilla.novell.com defect#6341 - "popup of group properties is too small" -* Fri Jun 10 2005 - sbrabec@suse.cz +* Fri Jun 10 2005 sbrabec@suse.cz - Updated cairo patch from Hans Breuer. http://bugzilla.gnome.org/show_bug.cgi?id=307144 -* Fri Jun 03 2005 - ro@suse.de +* Fri Jun 03 2005 ro@suse.de - fix build with new cairo using cairo-api-update script -* Wed May 11 2005 - uli@suse.de +* Wed May 11 2005 uli@suse.de - fixed to build (glitz* missing in neededforbuild) -* Fri Apr 08 2005 - sbrabec@suse.cz +* Fri Apr 08 2005 sbrabec@suse.cz - Fixed GCC 4 related problems. -* Mon Feb 21 2005 - sbrabec@suse.cz +* Mon Feb 21 2005 sbrabec@suse.cz - Updated to version 0.94. -* Wed Oct 27 2004 - mmj@suse.de +* Wed Oct 27 2004 mmj@suse.de - locale rename no to nb -* Mon Aug 23 2004 - ro@suse.de +* Mon Aug 23 2004 ro@suse.de - adapt filelist (help is installed below pkgdatadir) -* Fri Aug 20 2004 - shprasad@suse.de +* Fri Aug 20 2004 shprasad@suse.de - Fixes bug #60814 Remove the default gnome-menu style. It will display 'Help -> Manual' and clicking on it will bring the help window. -* Thu Jul 22 2004 - kimmidi@suse.de +* Thu Jul 22 2004 kimmidi@suse.de - Fixes bugs #60003 and #61815 on ximian bugzilla. -* Fri Jul 16 2004 - kimmidi@suse.de +* Fri Jul 16 2004 kimmidi@suse.de - Correct the -p option for patch6 and patch7 in dia.spec -* Thu Jul 15 2004 - kimmidi@suse.de +* Thu Jul 15 2004 kimmidi@suse.de - Fixes bugs #60814 and #60816 on ximian bugzilla. -* Mon Jun 28 2004 - kimmidi@suse.de +* Mon Jun 28 2004 kimmidi@suse.de - Fixes bugs #59101, #59230, #59097 and #59548 on ximian bugzilla. -* Mon May 31 2004 - sbrabec@suse.cz +* Mon May 31 2004 sbrabec@suse.cz - Fixed crash on IA64 (#41339). http://bugzilla.gnome.org/show_bug.cgi?id=143448 -* Fri May 14 2004 - ro@suse.de +* Fri May 14 2004 ro@suse.de - use -fno-strict-aliasing -* Mon Feb 23 2004 - adrian@suse.de +* Mon Feb 23 2004 adrian@suse.de - fix multiple menu entries -* Thu Jan 08 2004 - ro@suse.de +* Thu Jan 08 2004 ro@suse.de - fix build with current freetype - fix build with lib64 -* Sun Nov 09 2003 - mmj@suse.de +* Sun Nov 09 2003 mmj@suse.de - Update to dia-0.92.2 -* Mon Oct 27 2003 - sbrabec@suse.cz +* Mon Oct 27 2003 sbrabec@suse.cz - Updated to version 0.92. - Enabled python, xslt and GNOME support. -* Thu Oct 16 2003 - mmj@suse.de +* Thu Oct 16 2003 mmj@suse.de - Don't build as root -* Wed Sep 10 2003 - mmj@suse.de +* Wed Sep 10 2003 mmj@suse.de - Bug [#30080] brought to my attention we don't package the docu- mentation. - Use call-browser instead of netscape [#30080] -* Mon Sep 01 2003 - mmj@suse.de +* Mon Sep 01 2003 mmj@suse.de - Disable buggy xslt plugin [#29690] -* Sat Aug 16 2003 - adrian@suse.de +* Sat Aug 16 2003 adrian@suse.de - add Categories -* Thu Jul 24 2003 - hhetter@suse.de +* Thu Jul 24 2003 hhetter@suse.de - %%_lib fixes -* Tue Jul 22 2003 - hhetter@suse.de +* Tue Jul 22 2003 hhetter@suse.de - prefix to /opt/gnome - remove former prefix clash fixes - use gnome-filesystem -* Wed Jun 18 2003 - sbrabec@suse.cz +* Wed Jun 18 2003 sbrabec@suse.cz - Desktop file prefix clash fix. -* Wed Mar 26 2003 - mmj@suse.de +* Wed Mar 26 2003 mmj@suse.de - Update to 0.91, which switches to GNOME2 -* Fri Mar 07 2003 - mmj@suse.de +* Fri Mar 07 2003 mmj@suse.de - Add patch to avoid strlen(0); [#24620] -* Wed Jan 08 2003 - ro@suse.de +* Wed Jan 08 2003 ro@suse.de - fixed configure -* Wed Nov 06 2002 - uli@suse.de +* Wed Nov 06 2002 uli@suse.de - fixed segfault on x86-64 and other 64 bit systems -* Thu Oct 24 2002 - hhetter@suse.de +* Thu Oct 24 2002 hhetter@suse.de - applied patch from CVS (no longer translate font strings) (Bug Id #20676) -* Fri Sep 27 2002 - ro@suse.de +* Fri Sep 27 2002 ro@suse.de - Added alsa alsa-devel to neededforbuild (esound) -* Thu Aug 08 2002 - mfabian@suse.de +* Thu Aug 08 2002 mfabian@suse.de - update to 0.90 - add configure option --enable-freetype using this option, fonts will be embedded in the PostScript @@ -299,9 +309,9 @@ Unfortunately it doesn't work for CJK. Japanese can be displayed on screen but printing doesn't work (but Japanese printing stopped working without "--enable-freetype" as well). -* Tue Jul 02 2002 - meissner@suse.de +* Tue Jul 02 2002 meissner@suse.de - auto* rerun, some automake related fixes. -* Thu Mar 21 2002 - mfabian@suse.de +* Thu Mar 21 2002 mfabian@suse.de - fix for bugzilla #15026 (dia crashes for LANG=de_DE@euro) use fallback fonts which certainly work with gdk_fontset_load if some fonts cannot be found to avoid crashing. @@ -310,7 +320,7 @@ for de_DE@euro even without this fallback font fix. Nevertheless it is a safer to have valid fallback fonts as well). - include test file for de_DE@euro font-test-german-euro.dia -* Sat Mar 02 2002 - mfabian@suse.de +* Sat Mar 02 2002 mfabian@suse.de - fix for bugzilla #13267 and #14015 (International fonts are broken (can't write in czech)): - use the URW Type1 fonts as the preferred fonts for display on X11 @@ -324,47 +334,47 @@ Ryumin-Light-EUC-H and GothicBBB-Medium-EUC-H - don't reencode the "Dingbats" font and the Japanese fonts either when generating .eps -* Thu Feb 21 2002 - hhetter@suse.de +* Thu Feb 21 2002 hhetter@suse.de - dia-fonts.dif: Dia maintains a static font list with nearly only Bitmap-Fonts. It does internal AA via libart and requests the fonts in sizes that our X-Server doesn't provide because the :unscaled flag is set on bitmap fonts. The patch reorganizes Dia's font list to actually scaleable ones and fonts where scaling makes sense. -* Fri Feb 01 2002 - ro@suse.de +* Fri Feb 01 2002 ro@suse.de - changed neededforbuild <libpng> to <libpng-devel-packages> -* Thu Jun 14 2001 - egger@suse.de +* Fri Jun 15 2001 egger@suse.de - Updated to version 0.88.1. - General specfile cleanup. -* Tue May 08 2001 - mfabian@suse.de +* Wed May 09 2001 mfabian@suse.de - bzip2 sources -* Wed Mar 21 2001 - ro@suse.de +* Wed Mar 21 2001 ro@suse.de - added esound-devel -* Sun Feb 25 2001 - egger@suse.de +* Sun Feb 25 2001 egger@suse.de - Remove unnecessary dependencies from #neededforbuild, especially imlib-config. -* Tue Jan 30 2001 - ro@suse.de +* Wed Jan 31 2001 ro@suse.de - changed neededforbuild <imlibcfe> to <imlib-config> -* Wed Nov 01 2000 - egger@suse.de +* Wed Nov 01 2000 egger@suse.de - Updated specfile to new long packagenames. - Reworked specfile. - Probably needs some more work; I'm taking care of that. -* Tue Aug 08 2000 - grimmer@suse.de +* Tue Aug 08 2000 grimmer@suse.de - update to 0.86 - moved man page to %%{_mandir}/man1 - added some more docu (doc/*) -* Wed May 24 2000 - egger@suse.de +* Wed May 24 2000 egger@suse.de - update to 0.85 -* Tue Feb 29 2000 - grimmer@suse.de +* Tue Feb 29 2000 grimmer@suse.de - update to 0.84 - use BUILD_ROOT and strip binary during installation -* Wed Jan 26 2000 - grimmer@suse.de +* Wed Jan 26 2000 grimmer@suse.de - update to 0.83 - use version macro in spec file -* Tue Jan 04 2000 - grimmer@suse.de +* Tue Jan 04 2000 grimmer@suse.de - update to 0.82 - reworked package descriptions - added NLS support - added missing files to file list -* Thu Nov 11 1999 - ray@suse.de +* Thu Nov 11 1999 ray@suse.de - new package dia version 0.81 ++++++ dia-0.92.2-callbrowser.patch ++++++ --- 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 : "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.92.2-no-strict-aliasing.patch ++++++ --- configure.in +++ configure.in @@ -357,7 +357,7 @@ 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) ++++++ dia-create-user-files.patch ++++++ --- 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, #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; gchar *export_format_string = /* Translators: The argument is a list of options, not to be translated */ @@ -862,8 +865,6 @@ gdk_rgb_init(); - gtk_rc_parse("diagtkrc"); - if (!nosplash) { app_splash_init(""); } @@ -871,6 +872,11 @@ if (dia_is_interactive) create_user_dirs(); + create_user_files(); + + rcf = dia_config_filename("diagtkrc"); + gtk_rc_parse(rcf); + g_free(rcf); /* Init cursors: */ if (dia_is_interactive) { @@ -1055,6 +1061,25 @@ return TRUE; } +static void create_user_files(void) +{ + gchar *rc = NULL; + + rc = dia_config_filename("diagtkrc"); + + /* If the file does not exist, we put in our defaults */ + if (!g_file_test(rc, G_FILE_TEST_EXISTS)) { + FILE *f; + + /* Never mind if it fails */ + if ((f = fopen(rc, "w"))!= NULL) { + fprintf(f, "gtk-can-change-accels = 1"); + fclose(f); + } + } + g_free(rc); +} + static void create_user_dirs(void) { gchar *dir, *subdir; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org