[svn] r5634 - trunk/rpms/dia
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Mon Jul 23 19:40:51 CEST 2007
Author: dries
Date: 2007-07-23 19:40:50 +0200 (Mon, 23 Jul 2007)
New Revision: 5634
Added:
trunk/rpms/dia/dia-0.92.2-dtd.patch
trunk/rpms/dia/dia-0.94-fallbacktoxpmicons.patch
trunk/rpms/dia/dia-0.95-pre6-help.patch
trunk/rpms/dia/dia-0.96-python-detect.patch
trunk/rpms/dia/dia-0.96.1-64bit.patch
Log:
added the patches
Added: trunk/rpms/dia/dia-0.92.2-dtd.patch
===================================================================
--- trunk/rpms/dia/dia-0.92.2-dtd.patch (rev 0)
+++ trunk/rpms/dia/dia-0.92.2-dtd.patch 2007-07-23 17:40:50 UTC (rev 5634)
@@ -0,0 +1,11 @@
+--- dia-0.92.2/doc/en/dia.xml.dtdfix 2003-12-10 14:15:20.000000000 +0100
++++ dia-0.92.2/doc/en/dia.xml 2003-12-10 14:21:04.000000000 +0100
+@@ -4,7 +4,7 @@
+
+ <!DOCTYPE book
+
+- PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "../../dtd/docbookx.dtd"
++ PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+
+ [
+
Added: trunk/rpms/dia/dia-0.94-fallbacktoxpmicons.patch
===================================================================
--- trunk/rpms/dia/dia-0.94-fallbacktoxpmicons.patch (rev 0)
+++ trunk/rpms/dia/dia-0.94-fallbacktoxpmicons.patch 2007-07-23 17:40:50 UTC (rev 5634)
@@ -0,0 +1,28 @@
+--- dia-0.94/app/interface.c.orit 2005-03-10 08:29:36.000000000 +0000
++++ dia-0.94/app/interface.c 2005-03-10 08:30:44.000000000 +0000
+@@ -877,6 +877,17 @@
+ GError* gerror = NULL;
+
+ pixbuf = gdk_pixbuf_new_from_file(sheet_obj->pixmap_file, &gerror);
++ if (pixbuf == NULL) {
++ int len = strlen(sheet_obj->pixmap_file);
++ if ((len > 4) && !strcmp(sheet_obj->pixmap_file+len-4, ".png"))
++ {
++ GError* gerrortwo = NULL;
++ strcpy(sheet_obj->pixmap_file+len-4, ".xpm");
++ pixbuf = gdk_pixbuf_new_from_file(sheet_obj->pixmap_file, &gerrortwo);
++ if (gerrortwo) g_error_free (gerrortwo);
++ }
++ }
++
+ if (pixbuf != NULL) {
+ gdk_pixbuf_render_pixmap_and_mask(pixbuf, &pixmap, &mask, 1.0);
+ gdk_pixbuf_unref(pixbuf);
+@@ -885,6 +896,7 @@
+ g_warning("failed to load pixbuf for file %s; cause=%s",
+ sheet_obj->pixmap_file,gerror?gerror->message:"[NULL]");
+ }
++ if (gerror) g_error_free (gerror);
+ } else {
+ DiaObjectType *type;
+ type = object_get_type(sheet_obj->object_type);
Added: trunk/rpms/dia/dia-0.95-pre6-help.patch
===================================================================
--- trunk/rpms/dia/dia-0.95-pre6-help.patch (rev 0)
+++ trunk/rpms/dia/dia-0.95-pre6-help.patch 2007-07-23 17:40:50 UTC (rev 5634)
@@ -0,0 +1,45 @@
+--- dia-0.95-pre6/app/commands.c.help 2006-01-27 18:48:45.000000000 +0100
++++ dia-0.95-pre6/app/commands.c 2006-03-22 16:37:25.000000000 +0100
+@@ -526,7 +526,7 @@
+ const char *dentry;
+ GError *error = NULL;
+
+- helpdir = dia_get_data_directory("help");
++ helpdir = g_strdup ("/usr/share/gnome/help/dia");
+ if (!helpdir) {
+ message_warning(_("Could not find help directory"));
+ return;
+@@ -554,11 +554,11 @@
+ G_DIR_SEPARATOR_S "dia-manual.chm", NULL);
+ if (!g_file_test(helpindex, G_FILE_TEST_EXISTS)) {
+ helpindex = g_strconcat(helpdir, G_DIR_SEPARATOR_S, dentry,
+- G_DIR_SEPARATOR_S "index.html", NULL);
++ G_DIR_SEPARATOR_S "dia.xml", NULL);
+ }
+ #else
+ helpindex = g_strconcat(helpdir, G_DIR_SEPARATOR_S, dentry,
+- G_DIR_SEPARATOR_S "index.html", NULL);
++ G_DIR_SEPARATOR_S "dia.xml", NULL);
+ #endif
+ bestscore = score;
+ }
+@@ -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 '%s' &", command ? command : "yelp", helpindex);
+ system(command);
+ g_free(command);
+ #endif
+--- dia-0.95-pre6/doc/en/dia.xml.help 2006-03-22 16:33:12.000000000 +0100
++++ dia-0.95-pre6/doc/en/dia.xml 2006-03-22 16:33:13.000000000 +0100
+@@ -5,7 +5,7 @@
+ <!DOCTYPE book
+
+ PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+-
++"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
+ [
+
+ <!ENTITY VERSION "0.95-pre6">
Added: trunk/rpms/dia/dia-0.96-python-detect.patch
===================================================================
--- trunk/rpms/dia/dia-0.96-python-detect.patch (rev 0)
+++ trunk/rpms/dia/dia-0.96-python-detect.patch 2007-07-23 17:40:50 UTC (rev 5634)
@@ -0,0 +1,22 @@
+--- dia-0.96/acinclude.m4~ 2007-04-01 11:43:19.000000000 +0200
++++ dia-0.96/acinclude.m4 2007-04-01 11:43:19.000000000 +0200
+@@ -225,7 +225,7 @@
+
+ AC_MSG_CHECKING(for libpython${PYTHON_VERSION}.a)
+
+-py_config_dir="$py_prefix/lib/python${PYTHON_VERSION}/config"
++py_config_dir="$pyexecdir/../config"
+
+ py_makefile="${py_config_dir}/Makefile"
+ if test -f "$py_makefile"; then
+--- dia-0.96/configure~ 2007-04-01 11:43:18.000000000 +0200
++++ dia-0.96/configure 2007-04-01 11:43:18.000000000 +0200
+@@ -25152,7 +25152,7 @@
+ echo "$as_me:$LINENO: checking for libpython${PYTHON_VERSION}.a" >&5
+ echo $ECHO_N "checking for libpython${PYTHON_VERSION}.a... $ECHO_C" >&6
+
+-py_config_dir="$py_prefix/lib/python${PYTHON_VERSION}/config"
++py_config_dir="$pyexecdir/../config"
+
+ py_makefile="${py_config_dir}/Makefile"
+ if test -f "$py_makefile"; then
Added: trunk/rpms/dia/dia-0.96.1-64bit.patch
===================================================================
--- trunk/rpms/dia/dia-0.96.1-64bit.patch (rev 0)
+++ trunk/rpms/dia/dia-0.96.1-64bit.patch 2007-07-23 17:40:50 UTC (rev 5634)
@@ -0,0 +1,11 @@
+--- dia-0.96.1/app/load_save.c~ 2007-06-09 09:55:13.000000000 +0200
++++ dia-0.96.1/app/load_save.c 2007-06-09 10:02:30.000000000 +0200
+@@ -17,6 +17,8 @@
+ */
+ #include <config.h>
+
++/* so we get fdopen declared even when compiling with -ansi */
++#define _POSIX_C_SOURCE 2
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
More information about the svn-commits
mailing list