コミット: aec96afabbc379b556e318ed44a9dba3e16cc1f2 - dia (git)

作図ソフト dia の改良版

コミットメタ情報

• リビジョン: aec96afabbc379b556e318ed44a9dba3e16cc1f2 (tree)
• 日時: 2004-04-14 03:57:53
• 作者: Lars Clausen <lclausen@src....>
• コミッター: Lars Clausen

ログメッセージ

Dia manual renamed. Ellipse fix. 0.92-pre2

変更サマリ

• modified: ChangeLog
• modified: NEWS
• modified: config.h.win32
• modified: configure.in
• modified: dia.spec
• modified: doc/en/Makefile.am
• delete: doc/en/{dia-manual.xml => dia.xml}
• modified: doc/pl/Makefile.am
• delete: doc/pl/{dia-manual.xml => dia.xml}
• modified: objects/standard/ellipse.c

差分

--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,22 @@
 
 	* is.po: Added "is" to ALL_LINGUAS.
 
[phone]  Lars Clausen  <[e-mail]>
+
+	* configure.in: 
+	* dia.spec (Release): 
+	* NEWS: 
+	* config.h.win32: 
+	* doc/{en,pl}/dia.xml: 
+	Update to pre2.
+
+	* dia.spec: Updated as per mail from Zhang Lin-bo <[e-mail]>
+
[phone]  Lars Clausen  <[e-mail]>
+
+	* objects/standard/ellipse.c (ellipse_copy): Properly copy the
+	handle in the middle of the ellipse.
+
 2004-03-21  Hans Breuer  <[e-mail]>
 
 	* lib/makefile.msc : removed -DGTK_DISABLE_DEPRECATED; the 

--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+dia-0.93-pre2: 04-Apr-2004
+
+Fixed crash bug in ellipse, plus various compilation problems.  Also
+renamed the dia manual to make dia.spec work better and did a few updates
+to dia.spec.
+
 dia-0.93-pre1: 11-Mar-2004
 
 Major improvements in this release include:

--- a/config.h.win32
+++ b/config.h.win32
@@ -15,7 +15,7 @@
 #define GETTEXT_PACKAGE "dia"
 #define LOCALEDIR "../lib/locale"
 
-#define VERSION "0.93-pre1"
+#define VERSION "0.93-pre2"
 
 /*
  * We are linking libxml as DLL with either msvc or mingw, but this

--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this -*- autoconf -*- file with autoconf to produce a 
 dnl configure script.
-AC_INIT(dia, 0.93-pre1, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
+AC_INIT(dia, 0.93-pre2, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
 AC_CONFIG_SRCDIR(app/diagram.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
 

--- a/dia.spec
+++ b/dia.spec
@@ -6,16 +6,18 @@ Summary: A gtk+ based diagram creation program.
 Name: %name
 Version: %ver
 # This indicates changes to the spec file after last time %ver has changed.
-Release: pre1
+Release: pre2
 Copyright: GPL
 Group: Applications/
 Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{ver}.tar.gz
 URL: http://www.lysator.liu.se/~alla/dia/dia.html
 BuildRoot: /var/tmp/%{name}-%{ver}-root
 
-Requires: libxml2 >= 2.3.9 gtk2 pango >= 1.1.5 freetype >= 2.0.9
+Requires: libxml2 >= 2.3.9 gtk2 pango >= 1.1.5 freetype2 >= 2.0.9
+Requires: libgnome libgnomeui popt
 BuildRequires: libxml2-devel >= 2.3.9 gtk2-devel pango-devel >= 1.1.5 
-BuildRequires: freetype-devel >= 2.0.9 intltool > 0.21
+BuildRequires: freetype2-devel >= 2.0.9 intltool > 0.21
+BuildRequires: libgnome-devel libgnomeui-devel
 
 %description
 Dia is a GNU program designed to be much like the Windows
@@ -26,6 +28,8 @@ flowchart and others.  The native file format for Dia is XML (optionally
 gzip compressed).  It has print support, and can export to a number of formats such as EPS, SVG, CGM and PNG.
 
 %changelog
+* Sat Mar 27 2004 Lars Clausen <[e-mail]>
+- Update requirements to add the optional but always compiled in parts.
 * Thu Feb 4 2003 Lars Clausen <[e-mail]>
 - update requirements.
 - update prerelease number, move to release field.
@@ -49,7 +53,7 @@ gzip compressed).  It has print support, and can export to a number of formats s
 - First RPM release.
 
 %prep
-%setup -q
+%setup -q -n %name-%ver-%release
 
 %build
 
@@ -67,6 +71,8 @@ make
 rm -fr $RPM_BUILD_ROOT
 make prefix=$RPM_BUILD_ROOT%{_prefix} install
 
+rm -rf $RPM_BUILD_ROOT/%{_prefix}/var
+
 gzip --best $RPM_BUILD_ROOT%{_prefix}/man/man1/dia.1
 
 %clean

--- a/doc/en/Makefile.am
+++ b/doc/en/Makefile.am
@@ -1,5 +1,5 @@
 figdir=graphics
-docname=dia-manual
+docname=dia
 lang=en
 omffile=
 entities=
@@ -9,7 +9,7 @@ dist-hook: app-dist-hook
 
 EXTRA_DIST += \
 	dia.1 \
-	dia-manual.xml \
+	dia.xml \
 	graphics/line_props.png \
 	graphics/home_network.png \
 	graphics/line_icon.png \

--- a/doc/en/dia-manual.xml
+++ b/doc/en/dia.xml
@@ -8,7 +8,7 @@
 
   [
 
-    <!ENTITY VERSION "0.93-pre1">
+    <!ENTITY VERSION "0.93-pre2">
 
     <!ENTITY INTRODUCTION SYSTEM "intro.xml">
 

--- a/doc/pl/Makefile.am
+++ b/doc/pl/Makefile.am
@@ -1,5 +1,5 @@
 figdir=graphics
-docname=dia-manual
+docname=dia
 lang=pl
 omffile=
 entities=
@@ -8,7 +8,7 @@ include $(top_srcdir)/xmldocs.make
 dist-hook: app-dist-hook
 
 EXTRA_DIST += \
-	dia-manual.xml \
+	dia.xml \
 	graphics/line_props.png \
 	graphics/home_network.png \
 	graphics/greendots.png

--- a/doc/pl/dia-manual.xml
+++ b/doc/pl/dia.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
 <!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "../../dtd/docbookx.dtd"[
-<!ENTITY VERSION "0.93-pre1">
+<!ENTITY VERSION "0.93-pre2">
 <!ENTITY INTRODUCTION SYSTEM "intro.sgml">
 <!ENTITY QUICKSTART SYSTEM "usage-quickstart.sgml">
 <!ENTITY CANVAS SYSTEM "usage-canvas.sgml">

--- a/objects/standard/ellipse.c
+++ b/objects/standard/ellipse.c
@@ -208,6 +208,7 @@ ellipse_move_handle(Ellipse *ellipse, Handle *handle,
 		    HandleMoveReason reason, ModifierKeys modifiers)
 {
   Element *elem = &ellipse->element;
+  Point nw_to, se_to;
 
   assert(ellipse!=NULL);
   assert(handle!=NULL);
@@ -472,6 +473,10 @@ ellipse_copy(Ellipse *ellipse)
   newellipse->aspect = ellipse->aspect;
   newellipse->line_style = ellipse->line_style;
 
+  newobj->handles[8] = &newellipse->center_handle;
+  newellipse->center_handle = ellipse->center_handle;
+  newellipse->center_handle.connected_to = NULL;
+
   for (i=0;i<9;i++) {
     newobj->connections[i] = &newellipse->connections[i];
     newellipse->connections[i].object = newobj;