Fix a startup crash triggered by the new gtk+2 stuff.

Diff from jpilot CVS.

Problem reported by Konrad Foerstner, thanks!

Fix WANTLIB after gtk+2 update while I'm here.

ok Antoine Jacoutot (MAINTAINER)
This commit is contained in:
bernd 2006-06-13 07:38:01 +00:00
parent a74c45fb48
commit 66f5ccb801
2 changed files with 23 additions and 4 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.33 2006/01/16 12:45:37 steven Exp $
# $OpenBSD: Makefile,v 1.34 2006/06/13 07:38:01 bernd Exp $
COMMENT= "desktop organizer software for the palm pilot"
DISTNAME= jpilot-0.99.8
PKGNAME= ${DISTNAME}p2
PKGNAME= ${DISTNAME}p3
CATEGORIES= comms palm
MASTER_SITES= ${HOMEPAGE}
@ -18,11 +18,11 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c readline crypto m ncurses X11 Xext Xft \
WANTLIB= c readline crypto m ncurses X11 Xext \
Xrender fontconfig freetype atk-1.0.800.0 \
gdk_pixbuf-2.0.400.14 glib-2.0.400.8 gmodule-2.0.400.8 \
gobject-2.0.400.8 pango-1.0.600.0 pangoft2-1.0.600.0 \
pangox-1.0.0.0 pangoxft-1.0.0.0
pangocairo-1.0.0.0 cairo glitz png z
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig
LIB_DEPENDS= pisock.8::comms/pilot-link \

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-jpilot_c,v 1.1 2006/06/13 07:38:01 bernd Exp $
Fixes a startup crash. From jpilot CVS. Will be fixed in 0.99.9.
Log Message:
get_inline_pixbuf_data(): use g_object_unref() instead of g_free() since
gdk_pixbuf_new_from_xpm_data() returns an object.
--- jpilot.c.orig Tue Jun 13 08:51:31 2006
+++ jpilot.c Tue Jun 13 08:51:51 2006
@@ -1371,7 +1371,7 @@ guint8 *get_inline_pixbuf_data(const cha
gdk_pixdata_from_pixbuf(pixdata, pixbuf, FALSE);
data = gdk_pixdata_serialize(pixdata, &len);
- g_free(pixbuf);
+ g_object_unref(pixbuf);
g_free(pixdata);
return data;