Mon Apr 30 14:26:38 2012 UTC ()
update to 3.4.1
This is a new major release.


(drochner)
diff -r1.18 -r1.19 pkgsrc/x11/gtk3/Makefile
diff -r1.6 -r1.7 pkgsrc/x11/gtk3/PLIST
diff -r1.9 -r1.10 pkgsrc/x11/gtk3/distinfo
diff -r0 -r1.1 pkgsrc/x11/gtk3/patches/patch-ak

cvs diff -r1.18 -r1.19 pkgsrc/x11/gtk3/Makefile (expand / switch to context diff)
--- pkgsrc/x11/gtk3/Makefile 2012/03/21 19:58:47 1.18
+++ pkgsrc/x11/gtk3/Makefile 2012/04/30 14:26:38 1.19
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2012/03/21 19:58:47 hans Exp $
+# $NetBSD: Makefile,v 1.19 2012/04/30 14:26:38 drochner Exp $
 
-DISTNAME=	gtk+-3.2.4
+DISTNAME=	gtk+-3.4.1
 PKGNAME=	${DISTNAME:S/gtk/gtk3/}
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/3.2/ \
-		${MASTER_SITE_GNOME:=sources/gtk+/3.2/}
+MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/3.4/ \
+		${MASTER_SITE_GNOME:=sources/gtk+/3.4/}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org

cvs diff -r1.6 -r1.7 pkgsrc/x11/gtk3/PLIST (expand / switch to context diff)
--- pkgsrc/x11/gtk3/PLIST 2012/02/10 15:51:26 1.6
+++ pkgsrc/x11/gtk3/PLIST 2012/04/30 14:26:38 1.7
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.6 2012/02/10 15:51:26 drochner Exp $
+@comment $NetBSD: PLIST,v 1.7 2012/04/30 14:26:38 drochner Exp $
 bin/gtk-query-immodules-3.0
 bin/gtk3-demo
+bin/gtk3-demo-application
+bin/gtk3-widget-factory
 include/gail-3.0/libgail-util/gail-util.h
 include/gail-3.0/libgail-util/gailmisc.h
 include/gail-3.0/libgail-util/gailtextutil.h
@@ -33,6 +35,7 @@
 include/gtk-3.0/gdk/gdktestutils.h
 include/gtk-3.0/gdk/gdkthreads.h
 include/gtk-3.0/gdk/gdktypes.h
+include/gtk-3.0/gdk/gdkversionmacros.h
 include/gtk-3.0/gdk/gdkvisual.h
 include/gtk-3.0/gdk/gdkwindow.h
 ${PLIST.x11}include/gtk-3.0/gdk/gdkx.h
@@ -50,11 +53,9 @@
 ${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11applaunchcontext.h
 ${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11cursor.h
 ${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11device-core.h
-${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11device-xi.h
 ${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11device-xi2.h
 ${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11device.h
 ${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11devicemanager-core.h
-${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11devicemanager-xi.h
 ${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11devicemanager-xi2.h
 ${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11devicemanager.h
 ${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11display.h
@@ -67,6 +68,27 @@
 ${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11utils.h
 ${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11visual.h
 ${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11window.h
+include/gtk-3.0/gtk/deprecated/gtkcolorsel.h
+include/gtk-3.0/gtk/deprecated/gtkcolorseldialog.h
+include/gtk-3.0/gtk/deprecated/gtkfontsel.h
+include/gtk-3.0/gtk/deprecated/gtkhandlebox.h
+include/gtk-3.0/gtk/deprecated/gtkhbbox.h
+include/gtk-3.0/gtk/deprecated/gtkhbox.h
+include/gtk-3.0/gtk/deprecated/gtkhpaned.h
+include/gtk-3.0/gtk/deprecated/gtkhscale.h
+include/gtk-3.0/gtk/deprecated/gtkhscrollbar.h
+include/gtk-3.0/gtk/deprecated/gtkhseparator.h
+include/gtk-3.0/gtk/deprecated/gtkhsv.h
+include/gtk-3.0/gtk/deprecated/gtkrc.h
+include/gtk-3.0/gtk/deprecated/gtkstyle.h
+include/gtk-3.0/gtk/deprecated/gtktable.h
+include/gtk-3.0/gtk/deprecated/gtktearoffmenuitem.h
+include/gtk-3.0/gtk/deprecated/gtkvbbox.h
+include/gtk-3.0/gtk/deprecated/gtkvbox.h
+include/gtk-3.0/gtk/deprecated/gtkvpaned.h
+include/gtk-3.0/gtk/deprecated/gtkvscale.h
+include/gtk-3.0/gtk/deprecated/gtkvscrollbar.h
+include/gtk-3.0/gtk/deprecated/gtkvseparator.h
 include/gtk-3.0/gtk/gtk.h
 include/gtk-3.0/gtk/gtkaboutdialog.h
 include/gtk-3.0/gtk/gtkaccelgroup.h
@@ -74,6 +96,7 @@
 include/gtk-3.0/gtk/gtkaccelmap.h
 include/gtk-3.0/gtk/gtkaccessible.h
 include/gtk-3.0/gtk/gtkaction.h
+include/gtk-3.0/gtk/gtkactionable.h
 include/gtk-3.0/gtk/gtkactiongroup.h
 include/gtk-3.0/gtk/gtkactivatable.h
 include/gtk-3.0/gtk/gtkadjustment.h
@@ -83,6 +106,7 @@
 include/gtk-3.0/gtk/gtkappchooserdialog.h
 include/gtk-3.0/gtk/gtkappchooserwidget.h
 include/gtk-3.0/gtk/gtkapplication.h
+include/gtk-3.0/gtk/gtkapplicationwindow.h
 include/gtk-3.0/gtk/gtkarrow.h
 include/gtk-3.0/gtk/gtkaspectframe.h
 include/gtk-3.0/gtk/gtkassistant.h
@@ -114,8 +138,10 @@
 include/gtk-3.0/gtk/gtkcheckmenuitem.h
 include/gtk-3.0/gtk/gtkclipboard.h
 include/gtk-3.0/gtk/gtkcolorbutton.h
-include/gtk-3.0/gtk/gtkcolorsel.h
-include/gtk-3.0/gtk/gtkcolorseldialog.h
+include/gtk-3.0/gtk/gtkcolorchooser.h
+include/gtk-3.0/gtk/gtkcolorchooserdialog.h
+include/gtk-3.0/gtk/gtkcolorchooserwidget.h
+include/gtk-3.0/gtk/gtkcolorutils.h
 include/gtk-3.0/gtk/gtkcombobox.h
 include/gtk-3.0/gtk/gtkcomboboxtext.h
 include/gtk-3.0/gtk/gtkcontainer.h
@@ -142,24 +168,16 @@
 include/gtk-3.0/gtk/gtkfontchooser.h
 include/gtk-3.0/gtk/gtkfontchooserdialog.h
 include/gtk-3.0/gtk/gtkfontchooserwidget.h
-include/gtk-3.0/gtk/gtkfontsel.h
 include/gtk-3.0/gtk/gtkframe.h
 include/gtk-3.0/gtk/gtkgradient.h
 include/gtk-3.0/gtk/gtkgrid.h
-include/gtk-3.0/gtk/gtkhandlebox.h
-include/gtk-3.0/gtk/gtkhbbox.h
-include/gtk-3.0/gtk/gtkhbox.h
-include/gtk-3.0/gtk/gtkhpaned.h
-include/gtk-3.0/gtk/gtkhscale.h
-include/gtk-3.0/gtk/gtkhscrollbar.h
-include/gtk-3.0/gtk/gtkhseparator.h
-include/gtk-3.0/gtk/gtkhsv.h
 include/gtk-3.0/gtk/gtkiconfactory.h
 include/gtk-3.0/gtk/gtkicontheme.h
 include/gtk-3.0/gtk/gtkiconview.h
 include/gtk-3.0/gtk/gtkimage.h
 include/gtk-3.0/gtk/gtkimagemenuitem.h
 include/gtk-3.0/gtk/gtkimcontext.h
+include/gtk-3.0/gtk/gtkimcontextinfo.h
 include/gtk-3.0/gtk/gtkimcontextsimple.h
 include/gtk-3.0/gtk/gtkimmodule.h
 include/gtk-3.0/gtk/gtkimmulticontext.h
@@ -199,7 +217,6 @@
 include/gtk-3.0/gtk/gtkradiomenuitem.h
 include/gtk-3.0/gtk/gtkradiotoolbutton.h
 include/gtk-3.0/gtk/gtkrange.h
-include/gtk-3.0/gtk/gtkrc.h
 include/gtk-3.0/gtk/gtkrecentaction.h
 include/gtk-3.0/gtk/gtkrecentchooser.h
 include/gtk-3.0/gtk/gtkrecentchooserdialog.h
@@ -226,14 +243,11 @@
 include/gtk-3.0/gtk/gtkstatusbar.h
 include/gtk-3.0/gtk/gtkstatusicon.h
 include/gtk-3.0/gtk/gtkstock.h
-include/gtk-3.0/gtk/gtkstyle.h
 include/gtk-3.0/gtk/gtkstylecontext.h
 include/gtk-3.0/gtk/gtkstyleproperties.h
 include/gtk-3.0/gtk/gtkstyleprovider.h
 include/gtk-3.0/gtk/gtkswitch.h
 include/gtk-3.0/gtk/gtksymboliccolor.h
-include/gtk-3.0/gtk/gtktable.h
-include/gtk-3.0/gtk/gtktearoffmenuitem.h
 include/gtk-3.0/gtk/gtktestutils.h
 include/gtk-3.0/gtk/gtktextattributes.h
 include/gtk-3.0/gtk/gtktextbuffer.h
@@ -267,16 +281,11 @@
 include/gtk-3.0/gtk/gtktreeview.h
 include/gtk-3.0/gtk/gtktreeviewcolumn.h
 include/gtk-3.0/gtk/gtktypebuiltins.h
+include/gtk-3.0/gtk/gtktypes.h
 include/gtk-3.0/gtk/gtkuimanager.h
-include/gtk-3.0/gtk/gtkvbbox.h
-include/gtk-3.0/gtk/gtkvbox.h
 include/gtk-3.0/gtk/gtkversion.h
 include/gtk-3.0/gtk/gtkviewport.h
 include/gtk-3.0/gtk/gtkvolumebutton.h
-include/gtk-3.0/gtk/gtkvpaned.h
-include/gtk-3.0/gtk/gtkvscale.h
-include/gtk-3.0/gtk/gtkvscrollbar.h
-include/gtk-3.0/gtk/gtkvseparator.h
 include/gtk-3.0/gtk/gtkwidget.h
 include/gtk-3.0/gtk/gtkwidgetpath.h
 include/gtk-3.0/gtk/gtkwindow.h
@@ -321,9 +330,12 @@
 share/gir-1.0/Gdk-3.0.gir
 ${PLIST.x11}share/gir-1.0/GdkX11-3.0.gir
 share/gir-1.0/Gtk-3.0.gir
+share/glib-2.0/schemas/org.gtk.Demo.gschema.xml
+share/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml
 share/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
 share/gtk-3.0/demo/alphatest.png
 share/gtk-3.0/demo/apple-red.png
+share/gtk-3.0/demo/application.c
 share/gtk-3.0/demo/appwindow.c
 share/gtk-3.0/demo/assistant.c
 share/gtk-3.0/demo/background.jpg
@@ -374,8 +386,10 @@
 share/gtk-3.0/demo/textscroll.c
 share/gtk-3.0/demo/textview.c
 share/gtk-3.0/demo/toolpalette.c
+share/gtk-3.0/demo/transparent.c
 share/gtk-3.0/demo/tree_store.c
 share/gtk-3.0/demo/ui_manager.c
+share/gtk-3.0/gtkbuilder.rng
 share/gtk-doc/html/gail-libgail-util3/gail-libgail-util3-GailMisc.html
 share/gtk-doc/html/gail-libgail-util3/gail-libgail-util3-GailTextUtil.html
 share/gtk-doc/html/gail-libgail-util3/gail-libgail-util3.devhelp2
@@ -396,6 +410,7 @@
 share/gtk-doc/html/gdk3/annotation-glossary.html
 share/gtk-doc/html/gdk3/api-index-3-0.html
 share/gtk-doc/html/gdk3/api-index-3-2.html
+share/gtk-doc/html/gdk3/api-index-3-4.html
 share/gtk-doc/html/gdk3/api-index-deprecated.html
 share/gtk-doc/html/gdk3/api-index-full.html
 share/gtk-doc/html/gdk3/arrow.png
@@ -439,7 +454,6 @@
 share/gtk-doc/html/gdk3/gdk3-Properties-and-Atoms.html
 share/gtk-doc/html/gdk3/gdk3-RGBA-Colors.html
 share/gtk-doc/html/gdk3/gdk3-Selections.html
-share/gtk-doc/html/gdk3/gdk3-Testing.html
 share/gtk-doc/html/gdk3/gdk3-Threads.html
 share/gtk-doc/html/gdk3/gdk3-Visuals.html
 share/gtk-doc/html/gdk3/gdk3-Windows.html
@@ -516,6 +530,7 @@
 share/gtk-doc/html/gtk3/GtkAccessible.html
 share/gtk-doc/html/gtk3/GtkAction.html
 share/gtk-doc/html/gtk3/GtkActionGroup.html
+share/gtk-doc/html/gtk3/GtkActionable.html
 share/gtk-doc/html/gtk3/GtkActivatable.html
 share/gtk-doc/html/gtk3/GtkAdjustment.html
 share/gtk-doc/html/gtk3/GtkAlignment.html
@@ -524,6 +539,7 @@
 share/gtk-doc/html/gtk3/GtkAppChooserDialog.html
 share/gtk-doc/html/gtk3/GtkAppChooserWidget.html
 share/gtk-doc/html/gtk3/GtkApplication.html
+share/gtk-doc/html/gtk3/GtkApplicationWindow.html
 share/gtk-doc/html/gtk3/GtkArrow.html
 share/gtk-doc/html/gtk3/GtkAspectFrame.html
 share/gtk-doc/html/gtk3/GtkAssistant.html
@@ -552,6 +568,9 @@
 share/gtk-doc/html/gtk3/GtkCheckButton.html
 share/gtk-doc/html/gtk3/GtkCheckMenuItem.html
 share/gtk-doc/html/gtk3/GtkColorButton.html
+share/gtk-doc/html/gtk3/GtkColorChooser.html
+share/gtk-doc/html/gtk3/GtkColorChooserDialog.html
+share/gtk-doc/html/gtk3/GtkColorChooserWidget.html
 share/gtk-doc/html/gtk3/GtkColorSelection.html
 share/gtk-doc/html/gtk3/GtkColorSelectionDialog.html
 share/gtk-doc/html/gtk3/GtkComboBox.html
@@ -575,6 +594,7 @@
 share/gtk-doc/html/gtk3/GtkFontButton.html
 share/gtk-doc/html/gtk3/GtkFontChooser.html
 share/gtk-doc/html/gtk3/GtkFontChooserDialog.html
+share/gtk-doc/html/gtk3/GtkFontChooserWidget.html
 share/gtk-doc/html/gtk3/GtkFontSelection.html
 share/gtk-doc/html/gtk3/GtkFontSelectionDialog.html
 share/gtk-doc/html/gtk3/GtkFrame.html
@@ -713,6 +733,7 @@
 share/gtk-doc/html/gtk3/annotation-glossary.html
 share/gtk-doc/html/gtk3/api-index-3-0.html
 share/gtk-doc/html/gtk3/api-index-3-2.html
+share/gtk-doc/html/gtk3/api-index-3-4.html
 share/gtk-doc/html/gtk3/api-index-deprecated.html
 share/gtk-doc/html/gtk3/api-index-full.html
 share/gtk-doc/html/gtk3/appchooserbutton.png
@@ -721,6 +742,9 @@
 share/gtk-doc/html/gtk3/arrows.png
 share/gtk-doc/html/gtk3/assistant.png
 share/gtk-doc/html/gtk3/background.png
+share/gtk-doc/html/gtk3/bloatpad-gnome.png
+share/gtk-doc/html/gtk3/bloatpad-osx.png
+share/gtk-doc/html/gtk3/bloatpad-xfce.png
 share/gtk-doc/html/gtk3/border1.png
 share/gtk-doc/html/gtk3/border2.png
 share/gtk-doc/html/gtk3/border3.png
@@ -729,10 +753,10 @@
 share/gtk-doc/html/gtk3/button.png
 share/gtk-doc/html/gtk3/ch02.html
 share/gtk-doc/html/gtk3/ch03.html
-share/gtk-doc/html/gtk3/ch25s02.html
+share/gtk-doc/html/gtk3/ch24s02.html
+share/gtk-doc/html/gtk3/ch26s02.html
 share/gtk-doc/html/gtk3/ch28s02.html
-share/gtk-doc/html/gtk3/ch29s02.html
-share/gtk-doc/html/gtk3/ch29s03.html
+share/gtk-doc/html/gtk3/ch28s03.html
 share/gtk-doc/html/gtk3/chap-drawing-model.html
 share/gtk-doc/html/gtk3/check-button.png
 share/gtk-doc/html/gtk3/checklist-gdkeventexpose-region.html
@@ -740,6 +764,7 @@
 share/gtk-doc/html/gtk3/checklist-named-icons.html
 share/gtk-doc/html/gtk3/checks.png
 share/gtk-doc/html/gtk3/color-button.png
+share/gtk-doc/html/gtk3/colorchooser.png
 share/gtk-doc/html/gtk3/colorsel.png
 share/gtk-doc/html/gtk3/combo-box-entry.png
 share/gtk-doc/html/gtk3/combo-box.png
@@ -785,6 +810,7 @@
 share/gtk-doc/html/gtk3/focus.png
 share/gtk-doc/html/gtk3/folder.png
 share/gtk-doc/html/gtk3/font-button.png
+share/gtk-doc/html/gtk3/fontchooser.png
 share/gtk-doc/html/gtk3/fontsel.png
 share/gtk-doc/html/gtk3/format-indent-less-ltr.png
 share/gtk-doc/html/gtk3/format-indent-less-rtl.png
@@ -823,6 +849,7 @@
 share/gtk-doc/html/gtk3/gradient4.png
 share/gtk-doc/html/gtk3/grid-packing.png
 share/gtk-doc/html/gtk3/gtk-apply.png
+share/gtk-doc/html/gtk3/gtk-broadway.html
 share/gtk-doc/html/gtk3/gtk-building.html
 share/gtk-doc/html/gtk3/gtk-cancel.png
 share/gtk-doc/html/gtk3/gtk-caps-lock-warning.png
@@ -838,7 +865,6 @@
 share/gtk-doc/html/gtk3/gtk-getting-started.html
 share/gtk-doc/html/gtk3/gtk-index.png
 share/gtk-doc/html/gtk3/gtk-migrating-2-to-3.html
-share/gtk-doc/html/gtk3/gtk-migrating-GtkApplication.html
 share/gtk-doc/html/gtk3/gtk-migrating-GtkGrid.html
 share/gtk-doc/html/gtk3/gtk-migrating-GtkStyleContext-bonus-points.html
 share/gtk-doc/html/gtk3/gtk-migrating-GtkStyleContext-checklist.html
@@ -847,7 +873,9 @@
 share/gtk-doc/html/gtk3/gtk-migrating-GtkStyleContext-parsing.html
 share/gtk-doc/html/gtk3/gtk-migrating-GtkStyleContext.html
 share/gtk-doc/html/gtk3/gtk-migrating-checklist.html
+share/gtk-doc/html/gtk3/gtk-migrating-smclient-GtkApplication.html
 share/gtk-doc/html/gtk3/gtk-migrating-theme-GtkStyleContext-engines.html
+share/gtk-doc/html/gtk3/gtk-migrating-unique-GtkApplication.html
 share/gtk-doc/html/gtk3/gtk-no.png
 share/gtk-doc/html/gtk3/gtk-ok.png
 share/gtk-doc/html/gtk3/gtk-orientation-landscape.png
@@ -918,6 +946,7 @@
 share/gtk-doc/html/gtk3/list-add.png
 share/gtk-doc/html/gtk3/list-and-tree.png
 share/gtk-doc/html/gtk3/list-remove.png
+share/gtk-doc/html/gtk3/lock-button.png
 share/gtk-doc/html/gtk3/lockbutton-locked.png
 share/gtk-doc/html/gtk3/lockbutton-sorry.png
 share/gtk-doc/html/gtk3/lockbutton-unlocked.png
@@ -1213,7 +1242,6 @@
 share/themes/Default/gtk-3.0/gtk-keys.css
 share/themes/Emacs/gtk-3.0/gtk-keys.css
 ${PLIST.quartz}share/themes/Mac/gtk-3.0/gtk-keys.css
-share/themes/Raleigh/gtk-3.0/gtk.css
 @pkgdir lib/gtk-3.0/modules
 @pkgdir lib/gtk-3.0/immodules
 @pkgdir lib/gtk-3.0/3.0.0/filesystems

cvs diff -r1.9 -r1.10 pkgsrc/x11/gtk3/distinfo (expand / switch to context diff)
--- pkgsrc/x11/gtk3/distinfo 2012/03/21 19:58:47 1.9
+++ pkgsrc/x11/gtk3/distinfo 2012/04/30 14:26:38 1.10
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.9 2012/03/21 19:58:47 hans Exp $
+$NetBSD: distinfo,v 1.10 2012/04/30 14:26:38 drochner Exp $
 
-SHA1 (gtk+-3.2.4.tar.xz) = 3d0b6413750bc0cb51e98a387abbd606a1aa021e
-RMD160 (gtk+-3.2.4.tar.xz) = bbf0922f53a2acc2cb0337c08583208b39255768
-Size (gtk+-3.2.4.tar.xz) = 12261004 bytes
+SHA1 (gtk+-3.4.1.tar.xz) = 91b68f0dd5f6558eae98811f4031f32ff46ad172
+RMD160 (gtk+-3.4.1.tar.xz) = e8c0c8c71167e037eb88689713b8ae05aed29b03
+Size (gtk+-3.4.1.tar.xz) = 12809412 bytes
 SHA1 (patch-ab) = 9c82cc60f3825d377a197c876fcc6faa379cbde3
 SHA1 (patch-af) = f1c8d7929ea84a3b92f0bfc76f32f8e79e1d4352
 SHA1 (patch-aj) = 88d5a5c25bcc005bce8597d1262e68a9e67b5f93
+SHA1 (patch-ak) = bcafa213ce14ebf37e0e2e8530f8f94271679c9f
 SHA1 (patch-gtk_gtksearchenginesimple.c) = c41e529c1cafcd8152684d74971601eac4845a5a

File Added: pkgsrc/x11/gtk3/patches/Attic/patch-ak
$NetBSD: patch-ak,v 1.1 2012/04/30 14:26:38 drochner Exp $

--- gtk/gtkthemingengine.c.orig	2012-04-15 17:32:48.000000000 +0000
+++ gtk/gtkthemingengine.c
@@ -1481,7 +1481,7 @@ set_stroke_style (cairo_t        *cr,
       /* Optimize the common case of an integer-sized rectangle
        * Again, we care about focus rectangles.
        */
-      if (n == nearbyint (n))
+      if (n == floor (n + 0.5))
         {
           segments[0] = 1;
           segments[1] = 2;