New revision with patches for bugs #67999, #81227 and #83726

(Portage version: 2.0.51.19)

3 files changed, 101 insertions, 0 deletions

diff --git a/app-office/dia/files/dia-0.94-help.patch b/app-office/dia/files/dia-0.94-help.patch
new file mode 100644
index 000000000000..9daf87f3080e
--- /dev/null
+++ b/app-office/dia/files/dia-0.94-help.patch
@@ -0,0 +1,82 @@
+diff -NurdB dia-0.94-orig/app/commands.c dia-0.94/app/commands.c
+--- dia-0.94-orig/app/commands.c	2005-03-16 20:02:59.000000000 -0500
++++ dia-0.94/app/commands.c	2005-03-16 21:13:01.000000000 -0500
+@@ -518,6 +518,9 @@
+ void
+ help_manual_callback(gpointer data, guint action, GtkWidget *widget)
+ {
++#ifdef GNOME
++  gnome_help_display("dia", NULL, NULL);
++#else  
+   char *helpdir, *helpindex = NULL, *command;
+   guint bestscore = G_MAXINT;
+   GDir *dp;
+@@ -579,6 +582,7 @@
+ #endif
+ 
+   g_free(helpindex);
++#endif  /* GNOME */
+ }
+ 
+ void
+diff -NurdB dia-0.94-orig/doc/en/Makefile.in dia-0.94/doc/en/Makefile.in
+--- dia-0.94-orig/doc/en/Makefile.in	2005-03-16 20:02:59.000000000 -0500
++++ dia-0.94/doc/en/Makefile.in	2005-03-17 01:41:43.000000000 -0500
+@@ -317,13 +317,13 @@
+ # **********  Begin of section some packagers may need to modify  **********
+ # This variable (docdir) specifies where the documents should be installed.
+ # This default value should work for most packages.
+-docdir = $(datadir)/gnome/help/$(docname)/$(lang)
++@HAVE_GNOME_FALSE@helpdir = $(pkgdatadir)/help
++@HAVE_GNOME_TRUE@helpdir = $(datadir)/gnome/help/dia
++docdir = $(helpdir)/$(lang)
+ 
+ # **********  You should not have to edit below this line  **********
+ xml_files = $(entities) $(docname).xml
+-EXTRA_DIST = $(xml_files) $(omffile) \
+-	dia.1 \
+-	dia.dbk \
++xml_files += \
+ 	authors.xml \
+ 	dia.xml \
+ 	entities.xml \
+@@ -338,10 +338,6 @@
+ 	usage-objects-special.xml \
+ 	usage-objects.xml \
+ 	usage-quickstart.xml \
+-	graphics/line_props.png \
+-	graphics/home_network.png \
+-	graphics/line_icon.png \
+-	graphics/greendots.png
+ 
+ CLEANFILES = omf_timestamp
+ omf_dest_dir = $(datadir)/omf/@PACKAGE@
+diff -NurdB dia-0.94-orig/doc/pl/Makefile.in dia-0.94/doc/pl/Makefile.in
+--- dia-0.94-orig/doc/pl/Makefile.in	2005-03-16 20:02:59.000000000 -0500
++++ dia-0.94/doc/pl/Makefile.in	2005-03-17 01:42:44.000000000 -0500
+@@ -313,11 +313,13 @@
+ # **********  Begin of section some packagers may need to modify  **********
+ # This variable (docdir) specifies where the documents should be installed.
+ # This default value should work for most packages.
+-docdir = $(datadir)/gnome/help/$(docname)/$(lang)
++@HAVE_GNOME_FALSE@helpdir = $(pkgdatadir)/help
++@HAVE_GNOME_TRUE@helpdir = $(datadir)/gnome/help/dia
++docdir = $(helpdir)/$(lang)
+ 
+ # **********  You should not have to edit below this line  **********
+ xml_files = $(entities) $(docname).xml
+-EXTRA_DIST = $(xml_files) $(omffile) \
++xml_files += \
+ 	authors.xml \
+ 	dia.xml \
+ 	intro.xml \
+@@ -330,9 +332,6 @@
+ 	usage-objects-special.xml \
+ 	usage-objects.xml \
+ 	usage-quickstart.xml \
+-	graphics/line_props.png \
+-	graphics/home_network.png \
+-	graphics/greendots.png
+ 
+ CLEANFILES = omf_timestamp
+ omf_dest_dir = $(datadir)/omf/@PACKAGE@
diff --git a/app-office/dia/files/dia-0.94-no_font_cache.patch b/app-office/dia/files/dia-0.94-no_font_cache.patch
new file mode 100644
index 000000000000..9e13979e2ab0
--- /dev/null
+++ b/app-office/dia/files/dia-0.94-no_font_cache.patch
@@ -0,0 +1,18 @@
+--- dia-0.94/lib/font.c	2004-12-17 21:51:41.000000000 +0000
++++ dia-0.94/lib/font.c.new	2004-12-17 22:58:38.379589320 +0000
+@@ -628,6 +628,7 @@
+     item->string = g_strdup(string);
+     item->font = font;
+     
++#if 0
+     /* If it's in the cache, use that instead. */
+     cached = g_hash_table_lookup(layoutcache, item);
+     if (cached != NULL) {
+@@ -637,6 +638,7 @@
+       cached->usecount ++;
+       return cached->layout;
+     }
++#endif
+ 
+     dia_font_ref(font);
+ 
diff --git a/app-office/dia/files/digest-dia-0.94-r1 b/app-office/dia/files/digest-dia-0.94-r1
new file mode 100644
index 000000000000..a4366b0c6a35
--- /dev/null
+++ b/app-office/dia/files/digest-dia-0.94-r1
@@ -0,0 +1 @@
+MD5 63584224912dab49fed8d2cf87ea2d85 dia-0.94.tar.bz2 3348869