pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/gtk2 update to 2.20.1
details: https://anonhg.NetBSD.org/pkgsrc/rev/8967b0867e09
branches: trunk
changeset: 576053:8967b0867e09
user: drochner <drochner%pkgsrc.org@localhost>
date: Mon May 31 17:34:33 2010 +0000
description:
update to 2.20.1
this switches to the gnome-2.30 branch
diffstat:
x11/gtk2/Makefile | 10 +++++-----
x11/gtk2/PLIST | 24 ++++++++++++++++++++++--
x11/gtk2/distinfo | 12 +++++-------
x11/gtk2/patches/patch-ab | 10 ++++------
x11/gtk2/patches/patch-gb | 15 ---------------
x11/gtk2/patches/patch-ob | 34 ----------------------------------
6 files changed, 36 insertions(+), 69 deletions(-)
diffs (286 lines):
diff -r bf69dc4aa793 -r 8967b0867e09 x11/gtk2/Makefile
--- a/x11/gtk2/Makefile Mon May 31 17:31:30 2010 +0000
+++ b/x11/gtk2/Makefile Mon May 31 17:34:33 2010 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.200 2010/04/15 01:09:55 wiz Exp $
+# $NetBSD: Makefile,v 1.201 2010/05/31 17:34:33 drochner Exp $
-DISTNAME= gtk+-2.18.9
+DISTNAME= gtk+-2.20.1
PKGNAME= ${DISTNAME:S/gtk/gtk2/}
-PKGREVISION= 1
CATEGORIES= x11
-MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/2.18/ \
- ${MASTER_SITE_GNOME:=sources/gtk+/2.18/}
+MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/2.20/ \
+ ${MASTER_SITE_GNOME:=sources/gtk+/2.20/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -30,6 +29,7 @@
PTHREAD_AUTO_VARS= yes
GNU_CONFIGURE= yes
+CONFIG_SHELL= bash
CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/libdata
# Work around build problems, disable unstable PAPI, PR #41608:
CONFIGURE_ARGS+= --disable-papi
diff -r bf69dc4aa793 -r 8967b0867e09 x11/gtk2/PLIST
--- a/x11/gtk2/PLIST Mon May 31 17:31:30 2010 +0000
+++ b/x11/gtk2/PLIST Mon May 31 17:34:33 2010 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.70 2010/02/14 09:58:14 wiz Exp $
+@comment $NetBSD: PLIST,v 1.71 2010/05/31 17:34:33 drochner Exp $
bin/gdk-pixbuf-csource
bin/gdk-pixbuf-query-loaders
bin/gtk-builder-convert
@@ -86,6 +86,7 @@
include/gtk-2.0/gtk/gtkcellrendererpixbuf.h
include/gtk-2.0/gtk/gtkcellrendererprogress.h
include/gtk-2.0/gtk/gtkcellrendererspin.h
+include/gtk-2.0/gtk/gtkcellrendererspinner.h
include/gtk-2.0/gtk/gtkcellrenderertext.h
include/gtk-2.0/gtk/gtkcellrenderertoggle.h
include/gtk-2.0/gtk/gtkcellview.h
@@ -167,6 +168,7 @@
include/gtk-2.0/gtk/gtkmountoperation.h
include/gtk-2.0/gtk/gtknotebook.h
include/gtk-2.0/gtk/gtkobject.h
+include/gtk-2.0/gtk/gtkoffscreenwindow.h
include/gtk-2.0/gtk/gtkoldeditable.h
include/gtk-2.0/gtk/gtkoptionmenu.h
include/gtk-2.0/gtk/gtkorientable.h
@@ -211,6 +213,7 @@
include/gtk-2.0/gtk/gtksizegroup.h
include/gtk-2.0/gtk/gtksocket.h
include/gtk-2.0/gtk/gtkspinbutton.h
+include/gtk-2.0/gtk/gtkspinner.h
include/gtk-2.0/gtk/gtkstatusbar.h
include/gtk-2.0/gtk/gtkstatusicon.h
include/gtk-2.0/gtk/gtkstock.h
@@ -236,6 +239,8 @@
include/gtk-2.0/gtk/gtktoolbar.h
include/gtk-2.0/gtk/gtktoolbutton.h
include/gtk-2.0/gtk/gtktoolitem.h
+include/gtk-2.0/gtk/gtktoolitemgroup.h
+include/gtk-2.0/gtk/gtktoolpalette.h
include/gtk-2.0/gtk/gtktoolshell.h
include/gtk-2.0/gtk/gtktooltip.h
include/gtk-2.0/gtk/gtktooltips.h
@@ -292,6 +297,7 @@
lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.la
lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.la
lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.la
+lib/gtk-2.0/2.10.0/loaders/libpixbufloader-qtif.la
lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.la
lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.la
lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.la
@@ -369,9 +375,11 @@
share/gtk-2.0/demo/rotated_text.c
share/gtk-2.0/demo/search_entry.c
share/gtk-2.0/demo/sizegroup.c
+share/gtk-2.0/demo/spinner.c
share/gtk-2.0/demo/stock_browser.c
share/gtk-2.0/demo/textscroll.c
share/gtk-2.0/demo/textview.c
+share/gtk-2.0/demo/toolpalette.c
share/gtk-2.0/demo/tree_store.c
share/gtk-2.0/demo/ui_manager.c
share/gtk-doc/html/gail-libgail-util/gail-libgail-util-GailMisc.html
@@ -387,6 +395,7 @@
share/gtk-doc/html/gail-libgail-util/style.css
share/gtk-doc/html/gail-libgail-util/up.png
share/gtk-doc/html/gdk-pixbuf/GdkPixbufLoader.html
+share/gtk-doc/html/gdk-pixbuf/annotation-glossary.html
share/gtk-doc/html/gdk-pixbuf/apa.html
share/gtk-doc/html/gdk-pixbuf/apas02.html
share/gtk-doc/html/gdk-pixbuf/apas03.html
@@ -435,12 +444,14 @@
share/gtk-doc/html/gdk/GdkDisplayManager.html
share/gtk-doc/html/gdk/GdkScreen.html
share/gtk-doc/html/gdk/X_cursor.png
+share/gtk-doc/html/gdk/annotation-glossary.html
share/gtk-doc/html/gdk/api-index-2-10.html
share/gtk-doc/html/gdk/api-index-2-12.html
share/gtk-doc/html/gdk/api-index-2-14.html
share/gtk-doc/html/gdk/api-index-2-16.html
share/gtk-doc/html/gdk/api-index-2-18.html
share/gtk-doc/html/gdk/api-index-2-2.html
+share/gtk-doc/html/gdk/api-index-2-20.html
share/gtk-doc/html/gdk/api-index-2-4.html
share/gtk-doc/html/gdk/api-index-2-6.html
share/gtk-doc/html/gdk/api-index-2-8.html
@@ -594,11 +605,11 @@
share/gtk-doc/html/gtk/GtkCellRendererPixbuf.html
share/gtk-doc/html/gtk/GtkCellRendererProgress.html
share/gtk-doc/html/gtk/GtkCellRendererSpin.html
+share/gtk-doc/html/gtk/GtkCellRendererSpinner.html
share/gtk-doc/html/gtk/GtkCellRendererText.html
share/gtk-doc/html/gtk/GtkCellRendererToggle.html
share/gtk-doc/html/gtk/GtkCellView.html
share/gtk-doc/html/gtk/GtkCheckButton.html
-share/gtk-doc/html/gtk/GtkCheckMenuItem.html
share/gtk-doc/html/gtk/GtkColorButton.html
share/gtk-doc/html/gtk/GtkColorSelection.html
share/gtk-doc/html/gtk/GtkColorSelectionDialog.html
@@ -662,6 +673,7 @@
share/gtk-doc/html/gtk/GtkMisc.html
share/gtk-doc/html/gtk/GtkNotebook.html
share/gtk-doc/html/gtk/GtkObject.html
+share/gtk-doc/html/gtk/GtkOffscreenWindow.html
share/gtk-doc/html/gtk/GtkOldEditable.html
share/gtk-doc/html/gtk/GtkOptionMenu.html
share/gtk-doc/html/gtk/GtkPageSetup.html
@@ -701,6 +713,7 @@
share/gtk-doc/html/gtk/GtkSizeGroup.html
share/gtk-doc/html/gtk/GtkSocket.html
share/gtk-doc/html/gtk/GtkSpinButton.html
+share/gtk-doc/html/gtk/GtkSpinner.html
share/gtk-doc/html/gtk/GtkStatusIcon.html
share/gtk-doc/html/gtk/GtkStatusbar.html
share/gtk-doc/html/gtk/GtkStyle.html
@@ -718,6 +731,8 @@
share/gtk-doc/html/gtk/GtkToggleToolButton.html
share/gtk-doc/html/gtk/GtkToolButton.html
share/gtk-doc/html/gtk/GtkToolItem.html
+share/gtk-doc/html/gtk/GtkToolItemGroup.html
+share/gtk-doc/html/gtk/GtkToolPalette.html
share/gtk-doc/html/gtk/GtkToolShell.html
share/gtk-doc/html/gtk/GtkToolbar.html
share/gtk-doc/html/gtk/GtkTooltip.html
@@ -763,12 +778,14 @@
share/gtk-doc/html/gtk/WindowWidgets.html
share/gtk-doc/html/gtk/aboutdialog.png
share/gtk-doc/html/gtk/accel-label.png
+share/gtk-doc/html/gtk/annotation-glossary.html
share/gtk-doc/html/gtk/api-index-2-10.html
share/gtk-doc/html/gtk/api-index-2-12.html
share/gtk-doc/html/gtk/api-index-2-14.html
share/gtk-doc/html/gtk/api-index-2-16.html
share/gtk-doc/html/gtk/api-index-2-18.html
share/gtk-doc/html/gtk/api-index-2-2.html
+share/gtk-doc/html/gtk/api-index-2-20.html
share/gtk-doc/html/gtk/api-index-2-4.html
share/gtk-doc/html/gtk/api-index-2-6.html
share/gtk-doc/html/gtk/api-index-2-8.html
@@ -870,6 +887,7 @@
share/gtk-doc/html/gtk/gtk-goto-last-rtl.png
share/gtk-doc/html/gtk/gtk-goto-top.png
share/gtk-doc/html/gtk/gtk-gtkbuildable.html
+share/gtk-doc/html/gtk/gtk-gtkcheckmenuitem.html
share/gtk-doc/html/gtk/gtk-gtkfilefilter.html
share/gtk-doc/html/gtk/gtk-harddisk.png
share/gtk-doc/html/gtk/gtk-help.png
@@ -1018,10 +1036,12 @@
share/gtk-doc/html/gtk/separator.png
share/gtk-doc/html/gtk/setting-the-page-flow.html
share/gtk-doc/html/gtk/spinbutton.png
+share/gtk-doc/html/gtk/spinner.png
share/gtk-doc/html/gtk/statusbar.png
share/gtk-doc/html/gtk/style.css
share/gtk-doc/html/gtk/toggle-button.png
share/gtk-doc/html/gtk/toolbar.png
+share/gtk-doc/html/gtk/toolpalette.png
share/gtk-doc/html/gtk/tree-view-coordinates.png
share/gtk-doc/html/gtk/ui-manager.html
share/gtk-doc/html/gtk/up.png
diff -r bf69dc4aa793 -r 8967b0867e09 x11/gtk2/distinfo
--- a/x11/gtk2/distinfo Mon May 31 17:31:30 2010 +0000
+++ b/x11/gtk2/distinfo Mon May 31 17:34:33 2010 +0000
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.126 2010/04/15 01:09:55 wiz Exp $
+$NetBSD: distinfo,v 1.127 2010/05/31 17:34:33 drochner Exp $
-SHA1 (gtk+-2.18.9.tar.bz2) = 1f50dbc0de230e1b3df7d461bdfaeceedcc5f65b
-RMD160 (gtk+-2.18.9.tar.bz2) = 4499af3cef1c53cddda989f35aaf2e030aab5bcf
-Size (gtk+-2.18.9.tar.bz2) = 18194639 bytes
+SHA1 (gtk+-2.20.1.tar.bz2) = a80953b4e81c6a5bc2a986852f7fe60c8704cc02
+RMD160 (gtk+-2.20.1.tar.bz2) = bcd5f20f9e3f8d4e6f9bd91388de2fe9851ef361
+Size (gtk+-2.20.1.tar.bz2) = 19089076 bytes
SHA1 (patch-aa) = 105a5b9d0bad708bcceb6f9a801207f0eff96eb3
-SHA1 (patch-ab) = 60b23f3b5691e9ffa689b9c32d49d5944a056bf0
+SHA1 (patch-ab) = 0a8d5c2b2e6ad0f3be26fd7e63dc4f1e7aea0511
SHA1 (patch-af) = 54408034519f752de662567ea9d65056f2d27d95
SHA1 (patch-aj) = 40d91c8698981662e6926a27e39006b5ec413133
-SHA1 (patch-gb) = 6c0728eda2d4a59add4f8962bdab4f05022eda79
-SHA1 (patch-ob) = 51cbaa82d534ca4ea5253e3a938daa3a5d1e05fb
diff -r bf69dc4aa793 -r 8967b0867e09 x11/gtk2/patches/patch-ab
--- a/x11/gtk2/patches/patch-ab Mon May 31 17:31:30 2010 +0000
+++ b/x11/gtk2/patches/patch-ab Mon May 31 17:34:33 2010 +0000
@@ -1,10 +1,8 @@
-$NetBSD: patch-ab,v 1.22 2010/04/15 01:09:55 wiz Exp $
-
-http://mail.gnome.org/archives/gtk-devel-list/2010-March/msg00113.html
+$NetBSD: patch-ab,v 1.23 2010/05/31 17:34:33 drochner Exp $
---- gtk/gtkentry.c.orig 2010-03-17 13:45:47.000000000 +0000
+--- gtk/gtkentry.c.orig 2010-05-02 03:14:28.000000000 +0000
+++ gtk/gtkentry.c
-@@ -6661,8 +6661,11 @@ gtk_entry_set_buffer (GtkEntry *en
+@@ -6712,8 +6712,11 @@ gtk_entry_set_buffer (GtkEntry *en
g_object_notify (obj, "invisible-char-set");
g_object_thaw_notify (obj);
@@ -17,4 +15,4 @@
+ }
}
-
+ /**
diff -r bf69dc4aa793 -r 8967b0867e09 x11/gtk2/patches/patch-gb
--- a/x11/gtk2/patches/patch-gb Mon May 31 17:31:30 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-gb,v 1.1 2008/12/15 11:17:47 rillig Exp $
-
-Prevent an int-to-pointer-cast warning from gcc.
-
---- modules/other/gail/gailbutton.c.orig 2008-10-17 06:06:24.000000000 +0200
-+++ modules/other/gail/gailbutton.c 2008-12-15 11:34:12.000000000 +0100
-@@ -475,7 +475,7 @@ gail_button_do_action (AtkAction *action
- {
- button->action_queue = g_queue_new ();
- }
-- g_queue_push_head (button->action_queue, (gpointer) i);
-+ g_queue_push_head (button->action_queue, (gpointer) (gssize) i);
- if (!button->action_idle_handler)
- button->action_idle_handler = gdk_threads_add_idle (idle_do_action, button);
- break;
diff -r bf69dc4aa793 -r 8967b0867e09 x11/gtk2/patches/patch-ob
--- a/x11/gtk2/patches/patch-ob Mon May 31 17:31:30 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-$NetBSD: patch-ob,v 1.1 2008/12/15 11:17:47 rillig Exp $
-
-Prevent an int-to-pointer-cast warning from gcc. The specification says
-about gsize that "This type is wide enough to hold the numeric value of
-a pointer", so there's no additional loss in converting a glong first to
-gssize and later to (void *).
-
---- gtk/tests/object.c.orig 2008-10-17 06:06:13.000000000 +0200
-+++ gtk/tests/object.c 2008-12-15 11:27:59.000000000 +0100
-@@ -199,19 +199,19 @@ value_as_pointer (GValue *value)
- if (g_value_fits_pointer (value))
- return g_value_peek_pointer (value);
- if (G_VALUE_HOLDS_BOOLEAN (value))
-- return (void*) g_value_get_boolean (value);
-+ return (void*) (gsize) g_value_get_boolean (value);
- if (G_VALUE_HOLDS_CHAR (value))
- return (void*) (gssize) g_value_get_char (value);
- if (G_VALUE_HOLDS_UCHAR (value))
- return (void*) (gsize) g_value_get_uchar (value);
- if (G_VALUE_HOLDS_INT (value))
-- return (void*) g_value_get_int (value);
-+ return (void*) (gssize) g_value_get_int (value);
- if (G_VALUE_HOLDS_UINT (value))
-- return (void*) g_value_get_uint (value);
-+ return (void*) (gsize) g_value_get_uint (value);
- if (G_VALUE_HOLDS_LONG (value))
-- return (void*) g_value_get_long (value);
-+ return (void*) (gssize) g_value_get_long (value);
- if (G_VALUE_HOLDS_ULONG (value))
-- return (void*) g_value_get_ulong (value);
-+ return (void*) (gsize) g_value_get_ulong (value);
- if (G_VALUE_HOLDS_FLOAT (value))
- return (void*) (gssize) g_value_get_float (value);
- if (G_VALUE_HOLDS_DOUBLE (value))
Home |
Main Index |
Thread Index |
Old Index