From ec764bae59abf836d64d9fa7bf1066797864f254 Mon Sep 17 00:00:00 2001 From: drochner Date: Tue, 13 Apr 2010 17:44:30 +0000 Subject: update to 2.1.2 changes: -bugfixes -compatibility with GTK+2.18 -adds some documentation --- x11/gtk2+extra/Makefile | 7 ++- x11/gtk2+extra/PLIST | 60 +++++++++++++++++++++- x11/gtk2+extra/distinfo | 11 ++-- x11/gtk2+extra/patches/patch-aa | 8 +-- x11/gtk2+extra/patches/patch-ag | 110 ---------------------------------------- 5 files changed, 71 insertions(+), 125 deletions(-) delete mode 100644 x11/gtk2+extra/patches/patch-ag (limited to 'x11/gtk2+extra') diff --git a/x11/gtk2+extra/Makefile b/x11/gtk2+extra/Makefile index c7f9d5c7ea8..f9f6493bca7 100644 --- a/x11/gtk2+extra/Makefile +++ b/x11/gtk2+extra/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2009/08/26 19:56:57 sno Exp $ +# $NetBSD: Makefile,v 1.8 2010/04/13 17:44:30 drochner Exp $ # -DISTNAME= gtk+extra-2.1.1 +DISTNAME= gtk+extra-2.1.2 PKGNAME= ${DISTNAME:S/gtk/gtk2/} -PKGREVISION= 4 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scigraphica/} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkextra/} MAINTAINER= bouyer@NetBSD.org HOMEPAGE= http://gtkextra.sourceforge.net/ diff --git a/x11/gtk2+extra/PLIST b/x11/gtk2+extra/PLIST index 2690157991e..644daa1b060 100644 --- a/x11/gtk2+extra/PLIST +++ b/x11/gtk2+extra/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:24:50 joerg Exp $ +@comment $NetBSD: PLIST,v 1.3 2010/04/13 17:44:30 drochner Exp $ include/gtkextra-2.0/gtkextra/gtkbordercombo.h include/gtkextra-2.0/gtkextra/gtkcharsel.h include/gtkextra-2.0/gtkextra/gtkcheckitem.h @@ -47,3 +47,61 @@ include/gtkextra-2.0/gtkextra/gtksheet.h include/gtkextra-2.0/gtkextra/gtktogglecombo.h lib/libgtkextra-x11-2.0.la lib/pkgconfig/gtkextra-2.0.pc +share/gtk-doc/html/gtkextra/GtkPlotArray.html +share/gtk-doc/html/gtkextra/GtkPlotArrayList.html +share/gtk-doc/html/gtkextra/GtkSheet.html +share/gtk-doc/html/gtkextra/api-index.html +share/gtk-doc/html/gtkextra/ch01.html +share/gtk-doc/html/gtkextra/gtkextra-GtkBorderCombo.html +share/gtk-doc/html/gtkextra/gtkextra-GtkCharSelection.html +share/gtk-doc/html/gtkextra/gtkextra-GtkCheckItem.html +share/gtk-doc/html/gtkextra/gtkextra-GtkColorCombo.html +share/gtk-doc/html/gtkextra/gtkextra-GtkComboButton.html +share/gtk-doc/html/gtkextra/gtkextra-GtkDirTree.html +share/gtk-doc/html/gtkextra/gtkextra-GtkFileList.html +share/gtk-doc/html/gtkextra/gtkextra-GtkFontCombo.html +share/gtk-doc/html/gtkextra/gtkextra-GtkIconFileSel.html +share/gtk-doc/html/gtkextra/home.png +share/gtk-doc/html/gtkextra/gtkextra-GtkIconList.html +share/gtk-doc/html/gtkextra/gtkextra-GtkItemEntry.html +share/gtk-doc/html/gtkextra/gtkextra-GtkPlot.html +share/gtk-doc/html/gtkextra/gtkextra-GtkPlot3D.html +share/gtk-doc/html/gtkextra/gtkextra-GtkPlotBar.html +share/gtk-doc/html/gtkextra/gtkextra-GtkPlotBox.html +share/gtk-doc/html/gtkextra/gtkextra-GtkPlotBubble.html +share/gtk-doc/html/gtkextra/gtkextra-GtkPlotCSurface.html +share/gtk-doc/html/gtkextra/gtkextra-GtkPlotCandle.html +share/gtk-doc/html/gtkextra/gtkextra-GtkPlotCanvas.html +share/gtk-doc/html/gtkextra/gtkextra-GtkPlotCanvasEllipse.html +share/gtk-doc/html/gtkextra/gtkextra-GtkPlotCanvasLine.html +share/gtk-doc/html/gtkextra/gtkextra-GtkPlotCanvasPixmap.html +share/gtk-doc/html/gtkextra/gtkextra.devhelp +share/gtk-doc/html/gtkextra/gtkextra-GtkPlotCanvasPlot.html +share/gtk-doc/html/gtkextra/gtkextra-GtkPlotCanvasRectangle.html +share/gtk-doc/html/gtkextra/gtkextra-GtkPlotCanvasText.html +share/gtk-doc/html/gtkextra/gtkextra-GtkPlotDT.html +share/gtk-doc/html/gtkextra/gtkextra-GtkPlotData.html +share/gtk-doc/html/gtkextra/gtkextra-GtkPlotFlux.html +share/gtk-doc/html/gtkextra/gtkextra-GtkPlotGdk.html +share/gtk-doc/html/gtkextra/gtkextra-GtkPlotPC.html +share/gtk-doc/html/gtkextra/gtkextra-GtkPlotPS.html +share/gtk-doc/html/gtkextra/gtkextra-GtkPlotPixmap.html +share/gtk-doc/html/gtkextra/gtkextra-GtkPlotPolar.html +share/gtk-doc/html/gtkextra/gtkextra-GtkPlotSegment.html +share/gtk-doc/html/gtkextra/gtkextra-GtkPlotSurface.html +share/gtk-doc/html/gtkextra/gtkextra.devhelp2 +share/gtk-doc/html/gtkextra/gtkextra-GtkToggleCombo.html +share/gtk-doc/html/gtkextra/gtkextra-gdk-pixbuf-hacks.html +share/gtk-doc/html/gtkextra/gtkextra-gtkextra-marshal.html +share/gtk-doc/html/gtkextra/gtkextra-gtkextrafeatures.html +share/gtk-doc/html/gtkextra/gtkextra-gtkextratypebuiltins.html +share/gtk-doc/html/gtkextra/gtkextra-gtkplotdtriangle.html +share/gtk-doc/html/gtkextra/gtkextra-gtkplotprint.html +share/gtk-doc/html/gtkextra/gtkextra-gtkpsfont.html +share/gtk-doc/html/gtkextra/index.html +share/gtk-doc/html/gtkextra/index.sgml +share/gtk-doc/html/gtkextra/left.png +share/gtk-doc/html/gtkextra/objecttree.html +share/gtk-doc/html/gtkextra/right.png +share/gtk-doc/html/gtkextra/style.css +share/gtk-doc/html/gtkextra/up.png diff --git a/x11/gtk2+extra/distinfo b/x11/gtk2+extra/distinfo index 56c4d845880..760a27f1f81 100644 --- a/x11/gtk2+extra/distinfo +++ b/x11/gtk2+extra/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.4 2009/10/29 22:58:38 tnn Exp $ +$NetBSD: distinfo,v 1.5 2010/04/13 17:44:30 drochner Exp $ -SHA1 (gtk+extra-2.1.1.tar.gz) = 94d7ae9cb3aef05159cfff148265fc9ce0973980 -RMD160 (gtk+extra-2.1.1.tar.gz) = 7134fe4c5aaaa45ee3a7e651f3c477ba7c477214 -Size (gtk+extra-2.1.1.tar.gz) = 893481 bytes -SHA1 (patch-aa) = e6d1924b3c462b9c7d37dabf5a6cbb428caa2983 +SHA1 (gtk+extra-2.1.2.tar.gz) = 1b6cccbf89a79c8fe551d77c84dbf21a82c69f07 +RMD160 (gtk+extra-2.1.2.tar.gz) = e14bfc2a055fdef0d037b494018ca25047cc3c9e +Size (gtk+extra-2.1.2.tar.gz) = 1274946 bytes +SHA1 (patch-aa) = 901900170df0ca0e33ea9b8a8f8518dff70b242b SHA1 (patch-ad) = e2c45a044ef08c4e01df8f24ef174dc7d62a95f6 SHA1 (patch-ae) = a27172a43e2796dff796916773e3f57ed6be30ed SHA1 (patch-af) = 4d83e4859aa4377cae55cdccc4b3a2c774d32a9a -SHA1 (patch-ag) = 25cc3370da229fa1e0703fd2ebdf2afa73e2b6c4 diff --git a/x11/gtk2+extra/patches/patch-aa b/x11/gtk2+extra/patches/patch-aa index 392e4bb2857..deabb65c2f0 100644 --- a/x11/gtk2+extra/patches/patch-aa +++ b/x11/gtk2+extra/patches/patch-aa @@ -1,11 +1,11 @@ -$NetBSD: patch-aa,v 1.1 2009/09/11 14:09:54 joerg Exp $ +$NetBSD: patch-aa,v 1.2 2010/04/13 17:44:30 drochner Exp $ ---- gtkextra/Makefile.in.orig 2009-09-11 15:58:20.000000000 +0200 +--- gtkextra/Makefile.in.orig 2010-03-21 00:05:56.000000000 +0000 +++ gtkextra/Makefile.in -@@ -287,7 +287,7 @@ gtkextra_extra_sources = \ +@@ -469,7 +469,7 @@ gtkextra_extra_sources = \ + gtkextrafeatures.h.in \ gtkextra-marshal.list - -INCLUDES = -I$(top_buildir) -I$(top_srcdir) $(GTK_CFLAGS) +INCLUDES = -I$(top_builddir) -I$(top_srcdir) $(GTK_CFLAGS) diff --git a/x11/gtk2+extra/patches/patch-ag b/x11/gtk2+extra/patches/patch-ag deleted file mode 100644 index df683d56821..00000000000 --- a/x11/gtk2+extra/patches/patch-ag +++ /dev/null @@ -1,110 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2009/10/29 22:58:39 tnn Exp $ - ---- gtkextra/gtkitementry.c.orig 2002-06-27 18:57:19.000000000 +0200 -+++ gtkextra/gtkitementry.c -@@ -693,23 +693,23 @@ gtk_entry_real_insert_text (GtkEditable - new_text_length = g_utf8_offset_to_pointer (new_text, n_chars) - new_text; - } - -- if (new_text_length + entry->n_bytes + 1 > entry->text_size) -+ if (new_text_length + entry->x_n_bytes + 1 > entry->x_text_size) - { -- while (new_text_length + entry->n_bytes + 1 > entry->text_size) -+ while (new_text_length + entry->x_n_bytes + 1 > entry->x_text_size) - { -- if (entry->text_size == 0) -- entry->text_size = MIN_SIZE; -+ if (entry->x_text_size == 0) -+ entry->x_text_size = MIN_SIZE; - else - { -- if (2 * (guint)entry->text_size < MAX_SIZE && -- 2 * (guint)entry->text_size > entry->text_size) -- entry->text_size *= 2; -+ if (2 * (guint)entry->x_text_size < MAX_SIZE && -+ 2 * (guint)entry->x_text_size > entry->x_text_size) -+ entry->x_text_size *= 2; - else - { -- entry->text_size = MAX_SIZE; -- if (new_text_length > (gint)entry->text_size - (gint)entry->n_bytes - 1) -+ entry->x_text_size = MAX_SIZE; -+ if (new_text_length > (gint)entry->x_text_size - (gint)entry->x_n_bytes - 1) - { -- new_text_length = (gint)entry->text_size - (gint)entry->n_bytes - 1; -+ new_text_length = (gint)entry->x_text_size - (gint)entry->x_n_bytes - 1; - new_text_length = g_utf8_find_prev_char (new_text, new_text + new_text_length + 1) - new_text; - n_chars = g_utf8_strlen (new_text, new_text_length); - } -@@ -718,19 +718,19 @@ gtk_entry_real_insert_text (GtkEditable - } - } - -- entry->text = g_realloc (entry->text, entry->text_size); -+ entry->text = g_realloc (entry->text, entry->x_text_size); - } - - index = g_utf8_offset_to_pointer (entry->text, *position) - entry->text; - -- g_memmove (entry->text + index + new_text_length, entry->text + index, entry->n_bytes - index); -+ g_memmove (entry->text + index + new_text_length, entry->text + index, entry->x_n_bytes - index); - memcpy (entry->text + index, new_text, new_text_length); - -- entry->n_bytes += new_text_length; -+ entry->x_n_bytes += new_text_length; - entry->text_length += n_chars; - - /* NUL terminate for safety and convenience */ -- entry->text[entry->n_bytes] = '\0'; -+ entry->text[entry->x_n_bytes] = '\0'; - - if (entry->current_pos > *position) - entry->current_pos += n_chars; -@@ -763,9 +763,9 @@ gtk_entry_real_delete_text (GtkEditable - gint start_index = g_utf8_offset_to_pointer (entry->text, start_pos) - entry->text; - gint end_index = g_utf8_offset_to_pointer (entry->text, end_pos) - entry->text; - -- g_memmove (entry->text + start_index, entry->text + end_index, entry->n_bytes + 1 - end_index); -+ g_memmove (entry->text + start_index, entry->text + end_index, entry->x_n_bytes + 1 - end_index); - entry->text_length -= (end_pos - start_pos); -- entry->n_bytes -= (end_index - start_index); -+ entry->x_n_bytes -= (end_index - start_index); - - if (entry->current_pos > start_pos) - entry->current_pos -= MIN (entry->current_pos, end_pos) - start_pos; -@@ -1028,7 +1028,7 @@ gtk_entry_retrieve_surrounding_cb (GtkIM - { - gtk_im_context_set_surrounding (context, - entry->text, -- entry->n_bytes, -+ entry->x_n_bytes, - g_utf8_offset_to_pointer (entry->text, entry->current_pos) - entry->text); - - return TRUE; -@@ -1229,7 +1229,7 @@ gtk_entry_create_layout (GtkEntry *entry - - if (entry->visible) - { -- g_string_prepend_len (tmp_string, entry->text, entry->n_bytes); -+ g_string_prepend_len (tmp_string, entry->text, entry->x_n_bytes); - g_string_insert (tmp_string, cursor_index, preedit_string); - } - else -@@ -1238,7 +1238,7 @@ gtk_entry_create_layout (GtkEntry *entry - gint preedit_len_chars; - gunichar invisible_char; - -- ch_len = g_utf8_strlen (entry->text, entry->n_bytes); -+ ch_len = g_utf8_strlen (entry->text, entry->x_n_bytes); - preedit_len_chars = g_utf8_strlen (preedit_string, -1); - ch_len += preedit_len_chars; - -@@ -1272,7 +1272,7 @@ gtk_entry_create_layout (GtkEntry *entry - { - if (entry->visible) - { -- pango_layout_set_text (layout, entry->text, entry->n_bytes); -+ pango_layout_set_text (layout, entry->text, entry->x_n_bytes); - } - else - { -- cgit v1.2.3