OBS User unknown 2007-01-15 23:09:11 +00:00 committed by Git OBS Bridge
commit eddb82d9ad
18 changed files with 1205 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

View File

@ -0,0 +1,20 @@
--- 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

View File

@ -0,0 +1,11 @@
--- 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)

3
dia-0.95.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:be505ca1632ab1e573c034f2954dfc18fd4679b095e84900bcaaeaaefa0241c4
size 4202618

22
dia-64bit-clean.patch Normal file
View File

@ -0,0 +1,22 @@
--- 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 {

79
dia-cve-2006-2453.patch Normal file
View File

@ -0,0 +1,79 @@
--- app/app_procs.c
+++ app/app_procs.c
@@ -1298,22 +1298,22 @@
g_print(_("The original author of Dia was:\n\n"));
for (i = 0; i < NUMBER_OF_ORIG_AUTHORS; i++) {
- g_print(authors[i]); g_print("\n");
+ g_print("%s\n", authors[i]);
}
g_print(_("\nThe current maintainers of Dia are:\n\n"));
for (i = NUMBER_OF_ORIG_AUTHORS; i < NUMBER_OF_ORIG_AUTHORS + NUMBER_OF_MAINTAINERS; i++) {
- g_print(authors[i]); g_print("\n");
+ g_print("%s\n", authors[i]);
}
g_print(_("\nOther authors are:\n\n"));
for (i = NUMBER_OF_ORIG_AUTHORS + NUMBER_OF_MAINTAINERS; i < nauthors; i++) {
- g_print(authors[i]); g_print("\n");
+ g_print("%s\n", authors[i]);
}
g_print(_("\nDia is documented by:\n\n"));
for (i = 0; i < ndocumentors; i++) {
- g_print(documentors[i]); g_print("\n");
+ g_print("%s\n", documentors[i]);
}
exit(0);
--- app/load_save.c
+++ app/load_save.c
@@ -200,7 +200,7 @@
g_hash_table_foreach(unknown_hash,
GHFuncUnknownObjects,
unknown_str);
- message_error(unknown_str->str);
+ message_error("%s", unknown_str->str);
}
g_hash_table_destroy(unknown_hash);
g_string_free(unknown_str, TRUE);
--- plug-ins/python/diamodule.c
+++ plug-ins/python/diamodule.c
@@ -393,11 +393,11 @@
return NULL;
if (0 == type)
- message_notice (text);
+ message_notice ("%s", text);
else if (1 == type)
- message_warning (text);
+ message_warning ("%s", text);
else
- message_error (text);
+ message_error ("%s", text);
Py_INCREF(Py_None);
return Py_None;
--- plug-ins/wmf/wmf.cpp
+++ plug-ins/wmf/wmf.cpp
@@ -223,7 +223,7 @@
va_end (args);
//fprintf(renderer->file, string);
- g_print(string);
+ g_print("%s", string);
g_free(string);
}
--- plug-ins/xfig/xfig-export.c
+++ plug-ins/xfig/xfig-export.c
@@ -264,7 +264,7 @@
figWarn(XfigRenderer *renderer, int warning)
{
if (renderer->warnings[warning]) {
- message_warning(renderer->warnings[warning]);
+ message_warning("%s", renderer->warnings[warning]);
renderer->warnings[warning] = NULL;
}
}

11
dia-cve-2006-2480.patch Normal file
View File

@ -0,0 +1,11 @@
--- lib/message.c
+++ lib/message.c
@@ -86,7 +86,7 @@
0, /* GtkDialogFlags */
type,
GTK_BUTTONS_CLOSE,
- buf);
+ "%s", buf);
if (title) {
gchar *real_title;

View File

@ -0,0 +1,24 @@
Index: plug-ins/python/group_props.py
===================================================================
RCS file: /cvs/gnome/dia/plug-ins/python/group_props.py,v
retrieving revision 1.3
diff -u -p -r1.3 group_props.py
--- plug-ins/python/group_props.py 18 Jul 2004 17:45:58 -0000 1.3
+++ plug-ins/python/group_props.py 17 Aug 2005 22:29:14 -0000
@@ -86,14 +86,14 @@ class CPropsDialog :
box1.pack_start(separator, expand=0)
separator.show()
- box2 = gtk.VBox(spacing=10)
+ box2 = gtk.HBox(spacing=10)
box2.set_border_width(10)
box1.pack_start(box2, expand=0)
box2.show()
button = gtk.Button("Ok")
button.connect("clicked", self.on_ok)
- box2.pack_start(button)
+ box2.pack_start(button, padding=80, expand=1, fill=0)
button.set_flags(gtk.CAN_DEFAULT)
button.grab_default()
button.show()

185
dia-python2.5.patch Normal file
View File

@ -0,0 +1,185 @@
--- plug-ins/python/pydia-color.c
+++ plug-ins/python/pydia-color.c
@@ -43,7 +43,7 @@
static void
PyDiaColor_Dealloc(PyObject *self)
{
- PyMem_DEL(self);
+ PyObject_DEL(self);
}
/*
--- plug-ins/python/pydia-cpoint.c
+++ plug-ins/python/pydia-cpoint.c
@@ -38,7 +38,7 @@
static void
PyDiaConnectionPoint_Dealloc(PyDiaConnectionPoint *self)
{
- PyMem_DEL(self);
+ PyObject_DEL(self);
}
static int
--- plug-ins/python/pydia-diagram.c
+++ plug-ins/python/pydia-diagram.c
@@ -50,7 +50,7 @@
PyDiaDiagram_Dealloc(PyDiaDiagram *self)
{
g_object_unref(self->dia);
- PyMem_DEL(self);
+ PyObject_DEL(self);
}
static int
--- plug-ins/python/pydia-diagramdata.c
+++ plug-ins/python/pydia-diagramdata.c
@@ -46,7 +46,7 @@
PyDiaDiagramData_Dealloc(PyDiaDiagramData *self)
{
g_object_unref (self->data);
- PyMem_DEL(self);
+ PyObject_DEL(self);
}
static int
--- plug-ins/python/pydia-display.c
+++ plug-ins/python/pydia-display.c
@@ -38,7 +38,7 @@
static void
PyDiaDisplay_Dealloc(PyDiaDisplay *self)
{
- PyMem_DEL(self);
+ PyObject_DEL(self);
}
static int
--- plug-ins/python/pydia-error.c
+++ plug-ins/python/pydia-error.c
@@ -84,7 +84,7 @@
{
if (self->str)
g_string_free (self->str, TRUE);
- PyMem_DEL(self);
+ PyObject_DEL(self);
}
/*
--- plug-ins/python/pydia-export.c
+++ plug-ins/python/pydia-export.c
@@ -37,7 +37,7 @@
static void
PyDiaExportFilter_Dealloc(PyDiaExportFilter *self)
{
- PyMem_DEL(self);
+ PyObject_DEL(self);
}
static int
--- plug-ins/python/pydia-font.c
+++ plug-ins/python/pydia-font.c
@@ -48,7 +48,7 @@
{
if (self->font)
dia_font_unref (self->font);
- PyMem_DEL(self);
+ PyObject_DEL(self);
}
/*
--- plug-ins/python/pydia-geometry.c
+++ plug-ins/python/pydia-geometry.c
@@ -135,7 +135,7 @@
static void
PyDiaGeometry_Dealloc(void *self)
{
- PyMem_DEL(self);
+ PyObject_DEL(self);
}
/*
--- plug-ins/python/pydia-handle.c
+++ plug-ins/python/pydia-handle.c
@@ -40,7 +40,7 @@
static void
PyDiaHandle_Dealloc(PyDiaHandle *self)
{
- PyMem_DEL(self);
+ PyObject_DEL(self);
}
static int
--- plug-ins/python/pydia-image.c
+++ plug-ins/python/pydia-image.c
@@ -45,7 +45,7 @@
PyDiaImage_Dealloc(PyDiaImage *self)
{
dia_image_release (self->image);
- PyMem_DEL(self);
+ PyObject_DEL(self);
}
/*
--- plug-ins/python/pydia-layer.c
+++ plug-ins/python/pydia-layer.c
@@ -38,7 +38,7 @@
static void
PyDiaLayer_Dealloc(PyDiaLayer *self)
{
- PyMem_DEL(self);
+ PyObject_DEL(self);
}
static int
--- plug-ins/python/pydia-object.c
+++ plug-ins/python/pydia-object.c
@@ -40,7 +40,7 @@
static void
PyDiaObject_Dealloc(PyDiaObject *self)
{
- PyMem_DEL(self);
+ PyObject_DEL(self);
}
static int
@@ -250,7 +250,7 @@
static void
PyDiaObjectType_Dealloc(PyDiaObjectType *self)
{
- PyMem_DEL(self);
+ PyObject_DEL(self);
}
static int
--- plug-ins/python/pydia-properties.c
+++ plug-ins/python/pydia-properties.c
@@ -46,7 +46,7 @@
PyDiaProperties_Dealloc(PyDiaObject *self)
{
self->object = NULL; /* XXX: should dec ref */
- PyMem_DEL(self);
+ PyObject_DEL(self);
}
/*
--- plug-ins/python/pydia-property.c
+++ plug-ins/python/pydia-property.c
@@ -60,7 +60,7 @@
PyDiaProperty_Dealloc(PyDiaProperty *self)
{
self->property->ops->free(self->property);
- PyMem_DEL(self);
+ PyObject_DEL(self);
}
/*
--- plug-ins/python/pydia-text.c
+++ plug-ins/python/pydia-text.c
@@ -49,7 +49,7 @@
PyDiaText_Dealloc(PyDiaText *self)
{
g_free (self->text_data);
- PyMem_DEL(self);
+ PyObject_DEL(self);
}
/*

419
dia.changes Normal file
View File

@ -0,0 +1,419 @@
-------------------------------------------------------------------
Tue Nov 14 15:36:28 CET 2006 - sbrabec@suse.cz
- Re-enabled use of gnome-patch-translation.
-------------------------------------------------------------------
Sun Nov 12 17:52:56 CET 2006 - stbinner@suse.de
- don't duplicate GenericName content within Name in .desktop file
-------------------------------------------------------------------
Fri Nov 3 15:57:11 CET 2006 - sbrabec@suse.cz
- Fixed python 2.5 related crash (#217495, backport Andreas Hanke).
-------------------------------------------------------------------
Fri Oct 13 04:21:24 CEST 2006 - danw@suse.de
- Remove dead patches
-------------------------------------------------------------------
Sat Sep 30 12:47:40 CEST 2006 - aj@suse.de
- Cleanup BuildRequires.
- Build C++ with RPM_OPT_FLAGS.
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Wed Aug 16 11:59:26 CEST 2006 - cthiel@suse.de
- buildrequire python-gtk-devel instead of python-gtk
-------------------------------------------------------------------
Fri Aug 11 21:01:22 CEST 2006 - cthiel@suse.de
- remove dia-0.94-pygtk-hack.patch, since python-gtk has been fixed in the
meanwhile
-------------------------------------------------------------------
Sun Aug 6 14:28:05 CEST 2006 - cthiel@suse.de
- fixed build by adding dia-0.94-pygtk-hack.patch to hack around an
unfavorable configure check
-------------------------------------------------------------------
Mon Jun 19 14:18:05 CEST 2006 - sbrabec@suse.cz
- Worked around failing msgmerge (#186174).
-------------------------------------------------------------------
Tue May 23 18:15:45 CEST 2006 - sbrabec@suse.cz
- Fixed more format string vulnerabilities (CVE-2006-2453,
#173867).
-------------------------------------------------------------------
Wed May 17 13:05:29 CEST 2006 - sbrabec@suse.cz
- Fixed message format string vulnerability (CVE-2006-2480,
#173867).
-------------------------------------------------------------------
Thu Mar 30 17:26:12 CEST 2006 - sbrabec@suse.cz
- Fixed XFig import buffer overflows (#162074).
http://mail.gnome.org/archives/dia-list/2006-March/msg00149.html
-------------------------------------------------------------------
Fri Feb 24 13:55:29 CET 2006 - sbrabec@suse.cz
- Improved Categories.
-------------------------------------------------------------------
Wed Feb 15 09:05:41 CET 2006 - stbinner@suse.de
- fix %suse_update_desktop and add .desktop file GenericName entry
-------------------------------------------------------------------
Wed Feb 1 17:19:38 CET 2006 - sbrabec@suse.cz
- Use translation compendium gnome-patch-translation.
-------------------------------------------------------------------
Wed Jan 25 21:31:22 CET 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
-------------------------------------------------------------------
Wed Jan 11 14:02:57 CET 2006 - sbrabec@suse.cz
- Removed libpixman from neededforbuild.
-------------------------------------------------------------------
Tue Dec 20 15:02:49 CET 2005 - ro@suse.de
- add /opt/gnome/share/gnome/help/dia/C to filelist
-------------------------------------------------------------------
Tue Oct 4 17:46:27 CEST 2005 - sbrabec@suse.cz
- Fixed SVG import arbitary python code execution
(#120091, CAN-2005-2966).
-------------------------------------------------------------------
Thu Aug 18 01:25:44 CEST 2005 - sreeves@suse.de
- Patch to fix bugzilla.novell.com defect#6341 - "popup of group
properties is too small"
-------------------------------------------------------------------
Fri Jun 10 18:20:48 CEST 2005 - sbrabec@suse.cz
- Updated cairo patch from Hans Breuer.
http://bugzilla.gnome.org/show_bug.cgi?id=307144
-------------------------------------------------------------------
Fri Jun 3 14:09:29 CEST 2005 - ro@suse.de
- fix build with new cairo using cairo-api-update script
-------------------------------------------------------------------
Wed May 11 14:11:53 CEST 2005 - uli@suse.de
- fixed to build (glitz* missing in neededforbuild)
-------------------------------------------------------------------
Fri Apr 8 15:15:50 CEST 2005 - sbrabec@suse.cz
- Fixed GCC 4 related problems.
-------------------------------------------------------------------
Mon Feb 21 14:50:31 CET 2005 - sbrabec@suse.cz
- Updated to version 0.94.
-------------------------------------------------------------------
Wed Oct 27 11:12:01 CEST 2004 - mmj@suse.de
- locale rename no to nb
-------------------------------------------------------------------
Mon Aug 23 00:31:47 CEST 2004 - ro@suse.de
- adapt filelist (help is installed below pkgdatadir)
-------------------------------------------------------------------
Fri Aug 20 16:25:51 CEST 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 08:28:46 CEST 2004 - kimmidi@suse.de
- Fixes bugs #60003 and #61815 on ximian bugzilla.
-------------------------------------------------------------------
Fri Jul 16 11:51:28 CEST 2004 - kimmidi@suse.de
- Correct the -p option for patch6 and patch7 in dia.spec
-------------------------------------------------------------------
Thu Jul 15 07:31:02 CEST 2004 - kimmidi@suse.de
- Fixes bugs #60814 and #60816 on ximian bugzilla.
-------------------------------------------------------------------
Mon Jun 28 06:44:12 CEST 2004 - kimmidi@suse.de
- Fixes bugs #59101, #59230, #59097 and #59548 on ximian bugzilla.
-------------------------------------------------------------------
Mon May 31 16:58:35 CEST 2004 - sbrabec@suse.cz
- Fixed crash on IA64 (#41339).
http://bugzilla.gnome.org/show_bug.cgi?id=143448
-------------------------------------------------------------------
Fri May 14 01:38:26 CEST 2004 - ro@suse.de
- use -fno-strict-aliasing
-------------------------------------------------------------------
Mon Feb 23 10:51:00 CET 2004 - adrian@suse.de
- fix multiple menu entries
-------------------------------------------------------------------
Thu Jan 8 14:25:07 CET 2004 - ro@suse.de
- fix build with current freetype
- fix build with lib64
-------------------------------------------------------------------
Sun Nov 9 15:49:39 CET 2003 - mmj@suse.de
- Update to dia-0.92.2
-------------------------------------------------------------------
Mon Oct 27 18:21:45 CET 2003 - sbrabec@suse.cz
- Updated to version 0.92.
- Enabled python, xslt and GNOME support.
-------------------------------------------------------------------
Thu Oct 16 11:29:40 CEST 2003 - mmj@suse.de
- Don't build as root
-------------------------------------------------------------------
Wed Sep 10 13:31:26 CEST 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 1 11:48:41 CEST 2003 - mmj@suse.de
- Disable buggy xslt plugin [#29690]
-------------------------------------------------------------------
Sat Aug 16 16:00:52 CEST 2003 - adrian@suse.de
- add Categories
-------------------------------------------------------------------
Thu Jul 24 04:01:57 CEST 2003 - hhetter@suse.de
- %_lib fixes
-------------------------------------------------------------------
Tue Jul 22 02:32:21 CEST 2003 - hhetter@suse.de
- prefix to /opt/gnome
- remove former prefix clash fixes
- use gnome-filesystem
-------------------------------------------------------------------
Wed Jun 18 15:31:27 CEST 2003 - sbrabec@suse.cz
- Desktop file prefix clash fix.
-------------------------------------------------------------------
Wed Mar 26 16:50:01 CET 2003 - mmj@suse.de
- Update to 0.91, which switches to GNOME2
-------------------------------------------------------------------
Fri Mar 7 22:47:51 CET 2003 - mmj@suse.de
- Add patch to avoid strlen(0); [#24620]
-------------------------------------------------------------------
Wed Jan 8 16:10:39 CET 2003 - ro@suse.de
- fixed configure
-------------------------------------------------------------------
Wed Nov 6 16:00:28 CET 2002 - uli@suse.de
- fixed segfault on x86-64 and other 64 bit systems
-------------------------------------------------------------------
Thu Oct 24 15:39:14 CEST 2002 - hhetter@suse.de
- applied patch from CVS (no longer translate font
strings) (Bug Id #20676)
-------------------------------------------------------------------
Fri Sep 27 14:34:19 CEST 2002 - ro@suse.de
- Added alsa alsa-devel to neededforbuild (esound)
-------------------------------------------------------------------
Thu Aug 8 18:16:00 CEST 2002 - mfabian@suse.de
- update to 0.90
- add configure option --enable-freetype
using this option, fonts will be embedded in the PostScript
ouput and all scalable fonts installed can be used.
This works nicely for most European languages.
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 2 10:28:07 CEST 2002 - meissner@suse.de
- auto* rerun, some automake related fixes.
-------------------------------------------------------------------
Thu Mar 21 16:22:51 CET 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.
(I made iso8859-15 fonts usable with 'dia' available in the
ghostscript-fonts-std package, i.e. 'dia' will not crash anymore
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 2 02:34:42 CET 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
as these are very similar to the fonts used for printing
(identical when our Ghostscript is used). Leaving in the bitmap
fonts as fallbacks doesn't hurt.
- add Requires: ghostscript-fonts-std
- use gdk_fontset_load instead of gdk_font_load always *exept*
for the "fontspecific" fonts (i.e. "Symbol" and "Dingbats").
- Add support for the Japanese fonts
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 10:59:03 CET 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 1 00:26:05 CET 2002 - ro@suse.de
- changed neededforbuild <libpng> to <libpng-devel-packages>
-------------------------------------------------------------------
Thu Jun 14 23:23:44 MEST 2001 - egger@suse.de
- Updated to version 0.88.1.
- General specfile cleanup.
-------------------------------------------------------------------
Tue May 8 23:14:47 CEST 2001 - mfabian@suse.de
- bzip2 sources
-------------------------------------------------------------------
Wed Mar 21 01:56:27 CET 2001 - ro@suse.de
- added esound-devel
-------------------------------------------------------------------
Sun Feb 25 18:28:47 MET 2001 - egger@suse.de
- Remove unnecessary dependencies from #neededforbuild,
especially imlib-config.
-------------------------------------------------------------------
Tue Jan 30 23:35:00 CET 2001 - ro@suse.de
- changed neededforbuild <imlibcfe> to <imlib-config>
-------------------------------------------------------------------
Wed Nov 1 01:21:05 MET 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 8 11:58:33 CEST 2000 - grimmer@suse.de
- update to 0.86
- moved man page to %{_mandir}/man1
- added some more docu (doc/*)
-------------------------------------------------------------------
Wed May 24 14:05:34 CEST 2000 - egger@suse.de
- update to 0.85
-------------------------------------------------------------------
Tue Feb 29 12:41:46 MET 2000 - grimmer@suse.de
- update to 0.84
- use BUILD_ROOT and strip binary during installation
-------------------------------------------------------------------
Wed Jan 26 17:52:05 MET 2000 - grimmer@suse.de
- update to 0.83
- use version macro in spec file
-------------------------------------------------------------------
Tue Jan 4 10:06:44 MET 2000 - grimmer@suse.de
- update to 0.82
- reworked package descriptions
- added NLS support
- added missing files to file list
-------------------------------------------------------------------
Thu Nov 11 15:59:30 MET 1999 - ray@suse.de
- new package dia version 0.81

324
dia.spec Normal file
View File

@ -0,0 +1,324 @@
#
# 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
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: dia
BuildRequires: docbook-toys docbook-xsl-stylesheets gcc-c++ gnome-patch-translation intltool libgnomeui-devel libxslt-devel mDNSResponder-devel perl-XML-Parser python-devel python-gtk-devel sgml-skel update-desktop-files
%define prefix /opt/gnome
License: GNU General Public License (GPL)
Group: Productivity/Graphics/Other
Requires: ghostscript-fonts-std python-gtk python-numeric
Autoreqprov: on
Summary: A Diagram Creation Program
Version: 0.95
Release: 23
Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/dia-%{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
Patch8: dia-group-props-size.patch
Patch11: dia-cve-2006-2480.patch
Patch12: dia-cve-2006-2453.patch
Patch13: dia-64bit-clean.patch
Patch14: dia-python2.5.patch
Patch15: fix-desktop-file.diff
URL: http://www.gnome.org/projects/dia/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Dia is designed to be much like the commercial program 'Visio.' It can
be used to draw many different kinds of diagrams. It has special
objects to help draw entity relationship diagrams, UML diagrams, SADT,
flowcharts, network diagrams, and simple circuits. It is possible to
add support for new shapes by writing simple XML files, and using a
subset of SVG to draw the shape.
Dia can load and save diagrams to a custom XML format (gzipped by
default to save space), can export diagrams to EPS, PNG, CGM, or SVG
formats, and can print diagrams (including ones that span multiple
pages).
Authors:
--------
James Henstridge <james@daa.com.au>
Alexander Larsson <alla@lysator.liu.se>
%prep
%setup
gnome-patch-translation-prepare
%patch -p1
%patch3
%patch5 -p1
%patch8
%patch11
%patch12
%patch13
%patch14
%patch15
# 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
cp $RPM_SOURCE_DIR/font-test*dia .
%build
autoconf
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS"
export CPPFLAGS="$(pkg-config --cflags cairo)"
./configure --prefix=%prefix \
--mandir=%_mandir \
--sysconfdir=/etc%_prefix \
--libdir=%prefix/%_lib \
--enable-db2html \
--enable-gnome \
--with-python \
--with-cairo
make
%install
make DESTDIR=$RPM_BUILD_ROOT install
%suse_update_desktop_file -r -C "" -G "Diagram Editor" dia Office FlowChart GNOME
%find_lang dia
%clean
rm -rf $RPM_BUILD_ROOT
%files -f dia.lang
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog INSTALL
%doc KNOWN_BUGS NEWS README TODO samples/*.dia
%doc font-test*dia
%_mandir/man1/*
%prefix/bin/*
%prefix/%_lib/dia
%prefix/share/dia
%prefix/share/applications/*.desktop
#%prefix/share/gnome/help/*
%dir %prefix/share/gnome/help/dia/C
%prefix/share/mime-info/*
%prefix/share/pixmaps/*
%changelog -n dia
* Tue Nov 14 2006 - sbrabec@suse.cz
- Re-enabled use of gnome-patch-translation.
* Sun Nov 12 2006 - stbinner@suse.de
- don't duplicate GenericName content within Name in .desktop file
* Fri Nov 03 2006 - sbrabec@suse.cz
- Fixed python 2.5 related crash (#217495, backport Andreas Hanke).
* Fri Oct 13 2006 - danw@suse.de
- Remove dead patches
* Sat Sep 30 2006 - aj@suse.de
- Cleanup BuildRequires.
- Build C++ with RPM_OPT_FLAGS.
* 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
- remove dia-0.94-pygtk-hack.patch, since python-gtk has been fixed in the
meanwhile
* 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
- Worked around failing msgmerge (#186174).
* Tue May 23 2006 - sbrabec@suse.cz
- Fixed more format string vulnerabilities (CVE-2006-2453,
[#173867]).
* Wed May 17 2006 - sbrabec@suse.cz
- Fixed message format string vulnerability (CVE-2006-2480,
[#173867]).
* 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
- Improved Categories.
* Wed Feb 15 2006 - stbinner@suse.de
- fix %%suse_update_desktop and add .desktop file GenericName entry
* Wed Feb 01 2006 - sbrabec@suse.cz
- Use translation compendium gnome-patch-translation.
* Wed Jan 25 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
* Wed Jan 11 2006 - sbrabec@suse.cz
- Removed libpixman from neededforbuild.
* Tue Dec 20 2005 - ro@suse.de
- add /opt/gnome/share/gnome/help/dia/C to filelist
* 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
- Patch to fix bugzilla.novell.com defect#6341 - "popup of group
properties is too small"
* 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
- fix build with new cairo using cairo-api-update script
* Wed May 11 2005 - uli@suse.de
- fixed to build (glitz* missing in neededforbuild)
* Fri Apr 08 2005 - sbrabec@suse.cz
- Fixed GCC 4 related problems.
* Mon Feb 21 2005 - sbrabec@suse.cz
- Updated to version 0.94.
* Wed Oct 27 2004 - mmj@suse.de
- locale rename no to nb
* Mon Aug 23 2004 - ro@suse.de
- adapt filelist (help is installed below pkgdatadir)
* 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
- Fixes bugs #60003 and #61815 on ximian bugzilla.
* 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
- Fixes bugs #60814 and #60816 on ximian bugzilla.
* Mon Jun 28 2004 - kimmidi@suse.de
- Fixes bugs #59101, #59230, #59097 and #59548 on ximian bugzilla.
* 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
- use -fno-strict-aliasing
* Mon Feb 23 2004 - adrian@suse.de
- fix multiple menu entries
* Thu Jan 08 2004 - ro@suse.de
- fix build with current freetype
- fix build with lib64
* Sun Nov 09 2003 - mmj@suse.de
- Update to dia-0.92.2
* 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
- Don't build as root
* 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
- Disable buggy xslt plugin [#29690]
* Sat Aug 16 2003 - adrian@suse.de
- add Categories
* Thu Jul 24 2003 - hhetter@suse.de
- %%_lib fixes
* 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
- Desktop file prefix clash fix.
* Wed Mar 26 2003 - mmj@suse.de
- Update to 0.91, which switches to GNOME2
* Fri Mar 07 2003 - mmj@suse.de
- Add patch to avoid strlen(0); [#24620]
* Wed Jan 08 2003 - ro@suse.de
- fixed configure
* Wed Nov 06 2002 - uli@suse.de
- fixed segfault on x86-64 and other 64 bit systems
* 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
- Added alsa alsa-devel to neededforbuild (esound)
* 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
ouput and all scalable fonts installed can be used.
This works nicely for most European languages.
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
- auto* rerun, some automake related fixes.
* 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.
(I made iso8859-15 fonts usable with 'dia' available in the
ghostscript-fonts-std package, i.e. 'dia' will not crash anymore
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
- 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
as these are very similar to the fonts used for printing
(identical when our Ghostscript is used). Leaving in the bitmap
fonts as fallbacks doesn't hurt.
- add Requires: ghostscript-fonts-std
- use gdk_fontset_load instead of gdk_font_load always *exept*
for the "fontspecific" fonts (i.e. "Symbol" and "Dingbats").
- Add support for the Japanese fonts
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
- 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
- changed neededforbuild <libpng> to <libpng-devel-packages>
* Thu Jun 14 2001 - egger@suse.de
- Updated to version 0.88.1.
- General specfile cleanup.
* Tue May 08 2001 - mfabian@suse.de
- bzip2 sources
* Wed Mar 21 2001 - ro@suse.de
- added esound-devel
* Sun Feb 25 2001 - egger@suse.de
- Remove unnecessary dependencies from #neededforbuild,
especially imlib-config.
* Tue Jan 30 2001 - ro@suse.de
- changed neededforbuild <imlibcfe> to <imlib-config>
* 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
- update to 0.86
- moved man page to %%{_mandir}/man1
- added some more docu (doc/*)
* Wed May 24 2000 - egger@suse.de
- update to 0.85
* 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
- update to 0.83
- use version macro in spec file
* 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
- new package dia version 0.81

73
dia_bugfixes.diff Normal file
View File

@ -0,0 +1,73 @@
--- 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;

10
fix-desktop-file.diff Normal file
View File

@ -0,0 +1,10 @@
--- dia.desktop.in 2006/11/12 16:52:10 1.1
+++ dia.desktop.in 2006/11/12 16:52:18
@@ -1,6 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
-_Name=Dia Diagram Editor
+_Name=Dia
_Comment=Edit your Diagrams
Type=Application
Exec=dia

BIN
font-test-czech.dia Normal file

Binary file not shown.

BIN
font-test-german-euro.dia Normal file

Binary file not shown.

BIN
font-test-japanese.dia Normal file

Binary file not shown.

0
ready Normal file
View File