Update to dia-0.97.2.

* lots of bugfixes, see here for details:
http://bugzilla.gnome.org/buglist.cgi?product=dia&target_milestone=0.97.2
This commit is contained in:
ajacoutot 2011-12-18 19:18:39 +00:00
parent 021115b214
commit 6f195d47cd
5 changed files with 22 additions and 56 deletions

View File

@ -1,14 +1,11 @@
# $OpenBSD: Makefile,v 1.85 2011/12/03 20:30:09 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.86 2011/12/18 19:18:39 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= technical diagrams drawing tool
GNOME_PROJECT= dia
GNOME_VERSION= 0.97.1
REVISION= 11
EXTRACT_SUFX= .tar.bz2
GNOME_VERSION= 0.97.2
CATEGORIES= graphics
@ -28,35 +25,32 @@ WANTLIB += c cairo drm expat ffi fontconfig freetype gdk-x11-2.0
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += gthread-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
WANTLIB += util xcb xcb-render xcb-shm xml2 xslt z ${MODPY_WANTLIB}
WANTLIB += stdc++
WANTLIB += stdc++ xcb xcb-render xcb-shm xml2 xslt z
RUN_DEPENDS= devel/xdg-utils
BUILD_DEPENDS= textproc/docbook-xsl
LIB_DEPENDS= x11/gtk+2 \
graphics/libart \
textproc/libxslt \
${MODPY_LIB_DEPENDS}
textproc/libxslt
MODULES= devel/gettext \
x11/gnome \
lang/python
x11/gnome
MODGNOME_DESKTOP_FILE= Yes
MODGNOME_ICON_CACHE= Yes
MODGNOME_CPPFLAGS=-I${LOCALBASE}/include/libpng
MODPY_ADJ_FILES=po-checktrans.py
LIBTOOL_FLAGS= --tag=disable-static
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --disable-static \
--with-cairo \
--with-python \
--disable-db2html \
--disable-gnome \
--without-hardbooks \
--without-python \
--without-swig \
--disable-db2html \
--disable-libemf \
--disable-gnome
pre-configure:
${SUBST_CMD} ${WRKSRC}/app/commands.c

View File

@ -1,5 +1,5 @@
MD5 (dia-0.97.1.tar.bz2) = V+RLufOHVZoFBrUqE03q8A==
RMD160 (dia-0.97.1.tar.bz2) = 5sPNKHKqfQvY/6UCV3An1/RciYI=
SHA1 (dia-0.97.1.tar.bz2) = 6jXg4PL3W2niL6o4lo4IA6irT0c=
SHA256 (dia-0.97.1.tar.bz2) = jf6LLJ2HuvKYNMjeXj7JFJfCsX8rd/sbhnr931xCkUI=
SIZE (dia-0.97.1.tar.bz2) = 6836081
MD5 (dia-0.97.2.tar.xz) = HhGApRP7VncJsJvBnxIQXg==
RMD160 (dia-0.97.2.tar.xz) = +ScPHyy2rVBSGUY4J9AuN1lpN5Y=
SHA1 (dia-0.97.2.tar.xz) = 3H7W+M2DrMj0IdKPMOQEL+Nw6bo=
SHA256 (dia-0.97.2.tar.xz) = p2FHj7mGl/cbANMEHXwmfz20uU/jOsB8aJy4nE/l6uE=
SIZE (dia-0.97.2.tar.xz) = 5507004

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-app_commands_c,v 1.6 2010/03/20 16:53:22 ajacoutot Exp $
--- app/commands.c.orig Sat Nov 7 18:13:53 2009
+++ app/commands.c Sun Jan 24 20:14:59 2010
@@ -641,7 +641,7 @@ help_manual_callback (GtkAction *action)
$OpenBSD: patch-app_commands_c,v 1.7 2011/12/18 19:18:39 ajacoutot Exp $
--- app/commands.c.orig Sat Dec 17 17:30:38 2011
+++ app/commands.c Sun Dec 18 19:57:02 2011
@@ -648,7 +648,7 @@ help_manual_callback (GtkAction *action)
const char *dentry;
GError *error = NULL;

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-plug-ins_libart_export_png_c,v 1.1 2011/07/08 20:38:02 naddy Exp $
--- plug-ins/libart/export_png.c.orig Mon Jul 4 22:35:43 2011
+++ plug-ins/libart/export_png.c Mon Jul 4 22:36:02 2011
@@ -178,7 +178,7 @@ export_png_ok(GtkButton *button, gpointer userdata)
}
/* set error handling ... */
- if (setjmp(png->jmpbuf)) {
+ if (setjmp(png_jmpbuf(png))) {
fclose(fp);
png_destroy_write_struct(&png, &info);
message_error(_("Error occurred while writing PNG"));

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.24 2011/12/03 20:30:09 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.25 2011/12/18 19:18:39 ajacoutot Exp $
@pkgpath graphics/dia,gnome
@bin bin/dia
lib/dia/
@ -52,8 +52,6 @@ lib/dia/libpixbuf_filter.so
lib/dia/libpostscript_filter.so
@comment lib/dia/libpstricks_filter.la
lib/dia/libpstricks_filter.so
@comment lib/dia/libpython_plugin.la
lib/dia/libpython_plugin.so
@comment lib/dia/libsadt_objects.la
lib/dia/libsadt_objects.so
@comment lib/dia/libshape_filter.la
@ -76,22 +74,6 @@ lib/dia/libxslt_filter.so
share/applications/dia.desktop
share/dia/
share/dia/dia-splash.png
share/dia/python/
share/dia/python-startup.py
share/dia/python/allprops.py
share/dia/python/aobjects.py
share/dia/python/codegen.py
share/dia/python/diasvg.py
share/dia/python/diasvg_import.py
share/dia/python/dot.py
share/dia/python/doxrev.py
share/dia/python/gtkcons.py
share/dia/python/imgmap.py
share/dia/python/otypes.py
share/dia/python/pydiadoc.py
share/dia/python/scascale.py
share/dia/python/select_by.py
share/dia/python/select_empty.py
share/dia/shapes/
share/dia/shapes/Assorted/
share/dia/shapes/Assorted/arrow-chevron.png
@ -1785,6 +1767,7 @@ share/icons/hicolor/48x48/apps/dia.png
share/icons/hicolor/scalable/apps/dia.svg
share/locale/am/LC_MESSAGES/dia.mo
share/locale/ar/LC_MESSAGES/dia.mo
share/locale/ast/LC_MESSAGES/dia.mo
share/locale/az/LC_MESSAGES/dia.mo
share/locale/be/LC_MESSAGES/dia.mo
share/locale/bg/LC_MESSAGES/dia.mo
@ -1798,6 +1781,7 @@ share/locale/dz/LC_MESSAGES/dia.mo
share/locale/el/LC_MESSAGES/dia.mo
share/locale/en_CA/LC_MESSAGES/dia.mo
share/locale/en_GB/LC_MESSAGES/dia.mo
share/locale/eo/LC_MESSAGES/dia.mo
share/locale/es/LC_MESSAGES/dia.mo
share/locale/eu/LC_MESSAGES/dia.mo
share/locale/fi/LC_MESSAGES/dia.mo