pool/dia
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dia?expand=0&rev=5

Browse Source
This commit is contained in:
OBS User unknown 2007-08-17 16:46:49 +00:00 committed by Git OBS Bridge
parent 13abcd6b3e
commit 63767b8a2c
10 changed files with 124 additions and 313 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dia-0.95.tar.bz2
View File

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

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

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

22
dia-64bit-clean.patch
View File

@ -1,22 +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);
@@ -940,7 +940,7 @@
#else
ret = 0; /* less paranoia on windoze */
#endif
- file = fdopen(fildes,"wb");
+ file = (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 @@
@@ -391,7 +391,7 @@
#ifdef G_OS_WIN32
file = win32_printer_open (printcmd);
file = win32_printer_open (printcmd);
#else
- file = popen(printcmd, "w");
+ file = (FILE *)popen(printcmd, "w");
- file = popen(printcmd, "w");
+ file = (FILE *) popen(printcmd, "w");
#endif
is_pipe = TRUE;
} else {
is_pipe = TRUE;
} else {

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

@ -1,79 +0,0 @@
--- 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
View File

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

46
dia-python-acinclude.patch Normal file
View File

@ -0,0 +1,46 @@
--- acinclude.m4.orig 2007-01-06 22:39:36.000000000 +0000
+++ acinclude.m4 2007-06-13 11:52:39.000000000 +0000
@@ -128,7 +128,7 @@
AC_CACHE_CHECK([for $am_display_PYTHON script directory],
[am_cv_python_pythondir],
[am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`])
+ echo "$PYTHON_PREFIX/${py_lib}/python$PYTHON_VERSION/site-packages"`])
AC_SUBST([pythondir], [$am_cv_python_pythondir])
dnl pkgpythondir -- $PACKAGE directory under pythondir. Was
@@ -145,7 +145,7 @@
AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
[am_cv_python_pyexecdir],
[am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
- echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`])
+ echo "${PYTHON_EXEC_PREFIX}/${py_lib}/python${PYTHON_VERSION}/site-packages"`])
AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
@@ -202,6 +202,7 @@
AC_MSG_CHECKING(for headers required to compile python extensions)
dnl deduce PYTHON_INCLUDES
py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+py_lib=`$PYTHON -c "import sys; print sys.lib"`
py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
if test "$py_prefix" != "$py_exec_prefix"; then
@@ -225,7 +226,7 @@
AC_MSG_CHECKING(for libpython${PYTHON_VERSION}.a)
-py_config_dir="$py_prefix/lib/python${PYTHON_VERSION}/config"
+py_config_dir="$py_prefix/$py_lib/python${PYTHON_VERSION}/config"
py_makefile="${py_config_dir}/Makefile"
if test -f "$py_makefile"; then
@@ -235,7 +236,7 @@
py_other_libs=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $py_makefile`
dnl now the actual libpython
- if test -e "${py_config_dir}/libpython${PYTHON_VERSION}.a"; then
+ if test -e "$PYTHON_PREFIX/${py_lib}/libpython${PYTHON_VERSION}.so"; then
PYTHON_LIBS="-L${py_config_dir} -lpython${PYTHON_VERSION} $py_localmodlibs $py_basemodlibs $py_other_libs"
AC_MSG_RESULT(found)
else

185
dia-python2.5.patch
View File

@ -1,185 +0,0 @@
--- 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);
}
/*

30
dia.changes
View File

@ -1,4 +1,34 @@
-------------------------------------------------------------------
Thu Aug 16 22:42:30 CEST 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.
* Text-line rendering in SVG export.
* Keyboard shortcuts for tools now use shift-alt.
* Improvement in autogaps for some objects.
* .desktop file now has current version.
* Change in zoom levels in menus.
* Check that windows are within bounds before opening.
* Various compilation-time improvements.
* UML class improvements on comment and wrapped underlined names.
* Text rendering is now based on the TextLine objects
* Visio VXD files can now be imported and exported
* Renderer API change: Added function draw_text_line.
* Object API change: can_parent replaced by flags field.
* Dia menus now based on GtkAction framework.
* A number of new keyboard shortcuts.
* Layer visibility is now undoable.
* New sheets for Business Process Modelling
* The initial diagram will now be filled with opened diagram if
unchanged, like Gnumeric.
* Pasted objects now no longer land on top of each other.
* Fix of bug BGO #339562 (page margins restriction), BGO #338336
("query" in umloperation_offsets), and BGO #334771 (ungroup
crashes)
- Improved SVG export (#283773)
- Remove upstreamed patches
-------------------------------------------------------------------
Thu Aug 9 19:21:24 CEST 2007 - maw@suse.de
- Fix the -lang subpackage.

48
dia.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package dia (Version 0.95)
# spec file for package dia (Version 0.96.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -11,7 +11,7 @@
# norootforbuild
Name: dia
BuildRequires: docbook-toys docbook-xsl-stylesheets fdupes gcc-c++ gnome-patch-translation intltool libgnomeprint-devel libgnomeui-devel libxslt-devel python-devel python-gtk-devel scrollkeeper sgml-skel update-desktop-files
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
Group: Productivity/Graphics/Other
Requires: ghostscript-fonts-std python-gtk python-numeric
@ -22,8 +22,8 @@ Requires: ghostscript-fonts-std python-gtk python-numeric
# Requires: glibc-devel libpng-devel zlib-devel
Autoreqprov: on
Summary: A Diagram Creation Program
Version: 0.95
Release: 90
Version: 0.96.1
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
@ -32,11 +32,8 @@ 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
Patch14: dia-python-acinclude.patch
URL: http://live.gnome.org/Dia
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version > 1020
@ -66,20 +63,15 @@ Authors:
%lang_package
%prep
%setup -q
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
@ -94,7 +86,7 @@ make docdir=%{_docdir}/%{name} %{?jobs:-j%jobs}
%install
%makeinstall docdir=%{_docdir}/%{name}
%suse_update_desktop_file -r -C "" -G "Diagram Editor" dia Office FlowChart GNOME
%suse_update_desktop_file -r -N Dia -C "" -G "Diagram Editor" dia Office FlowChart GNOME
%find_lang %{name}
cp -a AUTHORS COPYING ChangeLog INSTALL KNOWN_BUGS NEWS README TODO samples/*.dia font-test*dia $RPM_BUILD_ROOT%{_docdir}/%{name}/
# No need for mime-info-to-mime, application/x-dia-diagram is defined in freedesktop.org.xml
@ -120,6 +112,34 @@ rm -rf $RPM_BUILD_ROOT
%files lang -f %{name}.lang
%changelog
* 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.
* Text-line rendering in SVG export.
* Keyboard shortcuts for tools now use shift-alt.
* Improvement in autogaps for some objects.
* .desktop file now has current version.
* Change in zoom levels in menus.
* Check that windows are within bounds before opening.
* Various compilation-time improvements.
* UML class improvements on comment and wrapped underlined names.
* Text rendering is now based on the TextLine objects
* Visio VXD files can now be imported and exported
* Renderer API change: Added function draw_text_line.
* Object API change: can_parent replaced by flags field.
* Dia menus now based on GtkAction framework.
* A number of new keyboard shortcuts.
* Layer visibility is now undoable.
* New sheets for Business Process Modelling
* The initial diagram will now be filled with opened diagram if
unchanged, like Gnumeric.
* Pasted objects now no longer land on top of each other.
* Fix of bug BGO #339562 (page margins restriction), BGO #338336
("query" in umloperation_offsets), and BGO #334771 (ungroup
crashes)
- Improved SVG export (#283773)
- Remove upstreamed patches
* Thu Aug 09 2007 - maw@suse.de
- Fix the -lang subpackage.
* Tue Aug 07 2007 - mauro@suse.de

10
fix-desktop-file.diff
View File

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