cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to gtkhtml3-3.32.0.

Browse Source 
ok jasper@
This commit is contained in:
ajacoutot 2010-09-30 07:41:02 +00:00
parent 281b417ff6
commit f798995874
5 changed files with 59 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
www/gtkhtml3/Makefile
View File

@ -1,18 +1,17 @@
# $OpenBSD: Makefile,v 1.38 2010/09/14 07:01:16 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.39 2010/09/30 07:41:02 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= lightweight HTML rendering/printing/editing engine
GNOME_PROJECT= gtkhtml
GNOME_VERSION= 3.30.3
GNOME_VERSION= 3.32.0
API_VERSION= 3.14
PKGNAME= gtkhtml3-${VERSION}
REVISION= 0
SHARED_LIBS += gtkhtml-3.14 3.1 # .20.1
SHARED_LIBS += gtkhtml-editor 0.0 # .0.0
SHARED_LIBS += gtkhtml-3.14 3.1 # 20.1
SHARED_LIBS += gtkhtml-editor-3.14 0.0 # unknown
CATEGORIES= www

10
www/gtkhtml3/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gtkhtml-3.30.3.tar.bz2) = DRHOvQ8f4lQ1qwDXzSbfew==
RMD160 (gtkhtml-3.30.3.tar.bz2) = nVadr7tuyjdq/EfLrQrRHhGTAzs=
SHA1 (gtkhtml-3.30.3.tar.bz2) = XNV+L7HE+t2OTdWuFzTIE2DK3Y4=
SHA256 (gtkhtml-3.30.3.tar.bz2) = mXlcFU8cZFkGO7gBgGatRrrwhqJBlRDtlZFn1NnjX64=
SIZE (gtkhtml-3.30.3.tar.bz2) = 1354771
MD5 (gtkhtml-3.32.0.tar.bz2) = ybD/Y0RyIDKXNPjsKCocLw==
RMD160 (gtkhtml-3.32.0.tar.bz2) = 1eD4fXy4hwq1SbHs0ydqRHMb/CA=
SHA1 (gtkhtml-3.32.0.tar.bz2) = DwEaiyAfvvAcCVmpKbreJ6PtS8s=
SHA256 (gtkhtml-3.32.0.tar.bz2) = ZiaxsHzi2UTerMIXn79jXw8lNHc3PemGVjaayhE+iuU=
SIZE (gtkhtml-3.32.0.tar.bz2) = 1213263

27
www/gtkhtml3/patches/patch-components_editor_gtkhtml-editor-actions_c Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-components_editor_gtkhtml-editor-actions_c,v 1.1 2010/09/30 07:41:02 ajacoutot Exp $
From 027debf5ffb836841a68ab4d20e17d41bedc0be2 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Wed, 29 Sep 2010 09:06:41 +0000
Subject: Bug #630360 - Crash when inserting html file in composer
--- components/editor/gtkhtml-editor-actions.c.orig Mon Sep 13 14:16:10 2010
+++ components/editor/gtkhtml-editor-actions.c Wed Sep 29 14:43:46 2010
@@ -173,15 +173,14 @@ insert_html_file_ready_cb (GFile *file,
stream = gtk_html_begin (new_html);
gtk_html_write (html, stream, contents, length);
+ /* 'stream' is destroyed inside gtk_html_end */
gtk_html_end (html, stream, GTK_HTML_STREAM_OK);
- gtk_html_stream_destroy (stream);
g_free (contents);
html = gtkhtml_editor_get_html (editor);
+ /* 'new_html' destroys gtk_html_insert_gtk_html itself */
gtk_html_insert_gtk_html (html, new_html);
-
- g_object_unref (new_html);
goto exit;

18
www/gtkhtml3/patches/patch-configure Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-configure,v 1.1 2010/09/30 07:41:02 ajacoutot Exp $
XXX make it compile with gtk+2 2.22 (*_DISABLE_DEPRECATED)
error: implicit declaration of function 'gtk_dialog_set_has_separator'
error: implicit declaration of function 'gdk_gc_new'
--- configure.orig Wed Sep 29 14:54:00 2010
+++ configure Wed Sep 29 14:54:14 2010
@@ -5892,9 +5892,7 @@ if test "x${enable_deprecated_flags}" = "xyes"; then
list="-DG_DISABLE_DEPRECATED
-DPANGO_DISABLE_DEPRECATED
- -DGDK_DISABLE_DEPRECATED
-DGDK_PIXBUF_DISABLE_DEPRECATED
- -DGTK_DISABLE_DEPRECATED
-DGNOME_DISABLE_DEPRECATED"
flags_supported=""
flags_unsupported=""

10
www/gtkhtml3/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.7 2010/04/20 12:24:08 jasper Exp $
@comment $OpenBSD: PLIST,v 1.8 2010/09/30 07:41:02 ajacoutot Exp $
@bin bin/gtkhtml-editor-test
include/libgtkhtml-${API_VERSION}/
include/libgtkhtml-${API_VERSION}/editor/
@ -22,10 +22,10 @@ include/libgtkhtml-${API_VERSION}/gtkhtml/htmltypes.h
lib/libgtkhtml-${API_VERSION}.a
lib/libgtkhtml-${API_VERSION}.la
@lib lib/libgtkhtml-${API_VERSION}.so.${LIBgtkhtml-3.14_VERSION}
lib/libgtkhtml-editor.a
lib/libgtkhtml-editor.la
@lib lib/libgtkhtml-editor.so.${LIBgtkhtml-editor_VERSION}
lib/pkgconfig/gtkhtml-editor.pc
lib/libgtkhtml-editor-${API_VERSION}.a
lib/libgtkhtml-editor-${API_VERSION}.la
@lib lib/libgtkhtml-editor-${API_VERSION}.so.${LIBgtkhtml-editor-3.14_VERSION}
lib/pkgconfig/gtkhtml-editor-${API_VERSION}.pc
lib/pkgconfig/libgtkhtml-${API_VERSION}.pc
share/gtkhtml-${API_VERSION}/
share/gtkhtml-${API_VERSION}/gtkhtml-editor-builder.ui