diff options
Diffstat (limited to 'x11/gtk3')
| -rw-r--r-- | x11/gtk3/Makefile | 11 | ||||
| -rw-r--r-- | x11/gtk3/PLIST | 42 | ||||
| -rw-r--r-- | x11/gtk3/buildlink3.mk | 3 | ||||
| -rw-r--r-- | x11/gtk3/distinfo | 10 | ||||
| -rw-r--r-- | x11/gtk3/patches/patch-aj | 7 |
5 files changed, 54 insertions, 19 deletions
diff --git a/x11/gtk3/Makefile b/x11/gtk3/Makefile index 12883c4b9fa..576c826c053 100644 --- a/x11/gtk3/Makefile +++ b/x11/gtk3/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.60 2015/06/12 10:52:17 wiz Exp $ +# $NetBSD: Makefile,v 1.61 2015/06/14 22:02:08 prlw1 Exp $ -DISTNAME= gtk+-3.14.5 +DISTNAME= gtk+-3.16.3 PKGNAME= ${DISTNAME:S/gtk/gtk3/} -PKGREVISION= 4 CATEGORIES= x11 gnome MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/${PKGVERSION_NOREV:R}/ \ ${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/} @@ -26,11 +25,8 @@ CONFIG_SHELL= ${TOOLS_PATH.bash} CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/libdata # Work around build problems, disable unstable PAPI, PR #41608: CONFIGURE_ARGS+= --disable-papi -# XXX for now, to avoid conflict -CONFIGURE_ARGS+= --enable-gtk2-dependency # Avoid regeneration of Makefile.in after configure.ac patch CONFIGURE_ARGS+= --disable-maintainer-mode -DEPENDS+= gtk2+-[0-9]*:../../x11/gtk2 MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} TEST_TARGET= check @@ -98,8 +94,7 @@ BUILDLINK_API_DEPENDS.cairo+= cairo>=1.12.0 .include "../../graphics/cairo/buildlink3.mk" .include "../../graphics/cairo-gobject/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" -# gtk-update-icon-cache --source is called during build -NOOP_GTK_UPDATE_ICON_CACHE= +.include "../../graphics/libepoxy/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" diff --git a/x11/gtk3/PLIST b/x11/gtk3/PLIST index c562bd6d414..13fd7189429 100644 --- a/x11/gtk3/PLIST +++ b/x11/gtk3/PLIST @@ -1,7 +1,8 @@ -@comment $NetBSD: PLIST,v 1.14 2014/10/07 23:52:08 prlw1 Exp $ +@comment $NetBSD: PLIST,v 1.15 2015/06/14 22:02:08 prlw1 Exp $ bin/gtk-encode-symbolic-svg bin/gtk-launch bin/gtk-query-immodules-3.0 +bin/gtk-update-icon-cache bin/gtk3-demo bin/gtk3-demo-application bin/gtk3-icon-browser @@ -10,6 +11,7 @@ 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 include/gtk-3.0/gdk/deprecated/gdkcolor.h +include/gtk-3.0/gdk/gdk-autocleanup.h include/gtk-3.0/gdk/gdk.h include/gtk-3.0/gdk/gdkapplaunchcontext.h include/gtk-3.0/gdk/gdkcairo.h @@ -24,6 +26,7 @@ include/gtk-3.0/gdk/gdkenumtypes.h include/gtk-3.0/gdk/gdkevents.h include/gtk-3.0/gdk/gdkframeclock.h include/gtk-3.0/gdk/gdkframetimings.h +include/gtk-3.0/gdk/gdkglcontext.h include/gtk-3.0/gdk/gdkkeys.h include/gtk-3.0/gdk/gdkkeysyms-compat.h include/gtk-3.0/gdk/gdkkeysyms.h @@ -55,6 +58,7 @@ ${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartzscreen.h ${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartzutils.h ${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartzvisual.h ${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartzwindow.h +${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx-autocleanups.h ${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 @@ -66,6 +70,7 @@ ${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11devicemanager.h ${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11display.h ${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11displaymanager.h ${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11dnd.h +${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11glcontext.h ${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11keys.h ${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11property.h ${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11screen.h @@ -73,6 +78,7 @@ ${PLIST.x11}include/gtk-3.0/gdk/x11/gdkx11selection.h ${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/a11y/gtk-a11y-autocleanups.h include/gtk-3.0/gtk/a11y/gtkarrowaccessible.h include/gtk-3.0/gtk/a11y/gtkbooleancellaccessible.h include/gtk-3.0/gtk/a11y/gtkbuttonaccessible.h @@ -150,6 +156,7 @@ include/gtk-3.0/gtk/deprecated/gtkrecentaction.h include/gtk-3.0/gtk/deprecated/gtkstatusicon.h include/gtk-3.0/gtk/deprecated/gtkstock.h include/gtk-3.0/gtk/deprecated/gtkstyle.h +include/gtk-3.0/gtk/deprecated/gtkstyleproperties.h include/gtk-3.0/gtk/deprecated/gtksymboliccolor.h include/gtk-3.0/gtk/deprecated/gtktable.h include/gtk-3.0/gtk/deprecated/gtktearoffmenuitem.h @@ -163,6 +170,7 @@ 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-a11y.h +include/gtk-3.0/gtk/gtk-autocleanups.h include/gtk-3.0/gtk/gtk.h include/gtk-3.0/gtk/gtkaboutdialog.h include/gtk-3.0/gtk/gtkaccelgroup.h @@ -250,6 +258,7 @@ include/gtk-3.0/gtk/gtkgesturerotate.h include/gtk-3.0/gtk/gtkgesturesingle.h include/gtk-3.0/gtk/gtkgestureswipe.h include/gtk-3.0/gtk/gtkgesturezoom.h +include/gtk-3.0/gtk/gtkglarea.h include/gtk-3.0/gtk/gtkgrid.h include/gtk-3.0/gtk/gtkheaderbar.h include/gtk-3.0/gtk/gtkicontheme.h @@ -277,6 +286,7 @@ include/gtk-3.0/gtk/gtkmenuitem.h include/gtk-3.0/gtk/gtkmenushell.h include/gtk-3.0/gtk/gtkmenutoolbutton.h include/gtk-3.0/gtk/gtkmessagedialog.h +include/gtk-3.0/gtk/gtkmodelbutton.h include/gtk-3.0/gtk/gtkmodules.h include/gtk-3.0/gtk/gtkmountoperation.h include/gtk-3.0/gtk/gtknotebook.h @@ -289,6 +299,7 @@ include/gtk-3.0/gtk/gtkpapersize.h include/gtk-3.0/gtk/gtkplacessidebar.h include/gtk-3.0/gtk/gtkplug.h include/gtk-3.0/gtk/gtkpopover.h +include/gtk-3.0/gtk/gtkpopovermenu.h include/gtk-3.0/gtk/gtkprintcontext.h include/gtk-3.0/gtk/gtkprintoperation.h include/gtk-3.0/gtk/gtkprintoperationpreview.h @@ -304,6 +315,7 @@ include/gtk-3.0/gtk/gtkrecentchoosermenu.h include/gtk-3.0/gtk/gtkrecentchooserwidget.h include/gtk-3.0/gtk/gtkrecentfilter.h include/gtk-3.0/gtk/gtkrecentmanager.h +include/gtk-3.0/gtk/gtkrender.h include/gtk-3.0/gtk/gtkrevealer.h include/gtk-3.0/gtk/gtkscale.h include/gtk-3.0/gtk/gtkscalebutton.h @@ -324,10 +336,10 @@ include/gtk-3.0/gtk/gtksocket.h include/gtk-3.0/gtk/gtkspinbutton.h include/gtk-3.0/gtk/gtkspinner.h include/gtk-3.0/gtk/gtkstack.h +include/gtk-3.0/gtk/gtkstacksidebar.h include/gtk-3.0/gtk/gtkstackswitcher.h include/gtk-3.0/gtk/gtkstatusbar.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/gtktestutils.h @@ -369,11 +381,13 @@ include/gtk-3.0/gtk/gtkwidget.h include/gtk-3.0/gtk/gtkwidgetpath.h include/gtk-3.0/gtk/gtkwindow.h include/gtk-3.0/gtk/gtkwindowgroup.h +include/gtk-3.0/gtk/gtkx-autocleanups.h include/gtk-3.0/gtk/gtkx.h include/gtk-3.0/unix-print/gtk/gtkpagesetupunixdialog.h include/gtk-3.0/unix-print/gtk/gtkprinter.h include/gtk-3.0/unix-print/gtk/gtkprintjob.h include/gtk-3.0/unix-print/gtk/gtkprintunixdialog.h +include/gtk-3.0/unix-print/gtk/gtkunixprint-autocleanups.h include/gtk-3.0/unix-print/gtk/gtkunixprint.h lib/girepository-1.0/Gdk-3.0.typelib ${PLIST.x11}lib/girepository-1.0/GdkX11-3.0.typelib @@ -410,6 +424,7 @@ man/man1/gtk-encode-symbolic-svg.1 man/man1/gtk-launch.1 man/man1/gtk-query-immodules-3.0.1 man/man1/gtk-update-icon-cache.1 +man/man1/gtk3-demo-application.1 man/man1/gtk3-demo.1 man/man1/gtk3-icon-browser.1 man/man1/gtk3-widget-factory.1 @@ -444,6 +459,7 @@ share/gtk-doc/html/gdk3/GdkDeviceManager.html share/gtk-doc/html/gdk3/GdkDisplay.html share/gtk-doc/html/gdk3/GdkDisplayManager.html share/gtk-doc/html/gdk3/GdkFrameClock.html +share/gtk-doc/html/gdk3/GdkGLContext.html share/gtk-doc/html/gdk3/GdkScreen.html share/gtk-doc/html/gdk3/X_cursor.png share/gtk-doc/html/gdk3/annotation-glossary.html @@ -451,6 +467,7 @@ share/gtk-doc/html/gdk3/api-index-3-0.html share/gtk-doc/html/gdk3/api-index-3-10.html share/gtk-doc/html/gdk3/api-index-3-12.html share/gtk-doc/html/gdk3/api-index-3-14.html +share/gtk-doc/html/gtk3/api-index-3-16.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-3-6.html @@ -653,6 +670,7 @@ 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 +share/gtk-doc/html/gtk3/GtkGLArea.html share/gtk-doc/html/gtk3/GtkGesture.html share/gtk-doc/html/gtk3/GtkGestureDrag.html share/gtk-doc/html/gtk3/GtkGestureLongPress.html @@ -696,6 +714,7 @@ share/gtk-doc/html/gtk3/GtkMenuShell.html share/gtk-doc/html/gtk3/GtkMenuToolButton.html share/gtk-doc/html/gtk3/GtkMessageDialog.html share/gtk-doc/html/gtk3/GtkMisc.html +share/gtk-doc/html/gtk3/GtkModelButton.html share/gtk-doc/html/gtk3/GtkNotebook.html share/gtk-doc/html/gtk3/GtkNumerableIcon.html share/gtk-doc/html/gtk3/GtkOffscreenWindow.html @@ -707,6 +726,7 @@ share/gtk-doc/html/gtk3/GtkPaperSize.html share/gtk-doc/html/gtk3/GtkPlacesSidebar.html share/gtk-doc/html/gtk3/GtkPlug.html share/gtk-doc/html/gtk3/GtkPopover.html +share/gtk-doc/html/gtk3/GtkPopoverMenu.html share/gtk-doc/html/gtk3/GtkPrintContext.html share/gtk-doc/html/gtk3/GtkPrintJob.html share/gtk-doc/html/gtk3/GtkPrintSettings.html @@ -742,6 +762,7 @@ share/gtk-doc/html/gtk3/GtkSocket.html share/gtk-doc/html/gtk3/GtkSpinButton.html share/gtk-doc/html/gtk3/GtkSpinner.html share/gtk-doc/html/gtk3/GtkStack.html +share/gtk-doc/html/gtk3/GtkStackSidebar.html share/gtk-doc/html/gtk3/GtkStackSwitcher.html share/gtk-doc/html/gtk3/GtkStatusIcon.html share/gtk-doc/html/gtk3/GtkStatusbar.html @@ -811,6 +832,7 @@ share/gtk-doc/html/gtk3/api-index-3-0.html share/gtk-doc/html/gtk3/api-index-3-10.html share/gtk-doc/html/gtk3/api-index-3-12.html share/gtk-doc/html/gtk3/api-index-3-14.html +share/gtk-doc/html/gdk3/api-index-3-16.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-3-6.html @@ -886,6 +908,7 @@ share/gtk-doc/html/gtk3/getting-started-app6.png share/gtk-doc/html/gtk3/getting-started-app7.png share/gtk-doc/html/gtk3/getting-started-app8.png share/gtk-doc/html/gtk3/getting-started-app9.png +share/gtk-doc/html/gtk3/glarea.png share/gtk-doc/html/gtk3/glossary.html share/gtk-doc/html/gtk3/gradient1.png share/gtk-doc/html/gtk3/gradient2.png @@ -910,6 +933,7 @@ 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-mir.html share/gtk-doc/html/gtk3/gtk-osx.html share/gtk-doc/html/gtk3/gtk-query-immodules-3.0.html share/gtk-doc/html/gtk3/gtk-question-index.html @@ -941,6 +965,7 @@ share/gtk-doc/html/gtk3/gtk3-Standard-Enumerations.html share/gtk-doc/html/gtk3/gtk3-Stock-Items.html share/gtk-doc/html/gtk3/gtk3-Testing.html share/gtk-doc/html/gtk3/gtk3-Themeable-Stock-Images.html +share/gtk-doc/html/gtk3/gtk3-demo-application.html share/gtk-doc/html/gtk3/gtk3-demo.html share/gtk-doc/html/gtk3/gtk3-icon-browser.html share/gtk-doc/html/gtk3/gtk3-widget-factory.html @@ -1010,6 +1035,7 @@ share/gtk-doc/html/gtk3/scrolledwindow.png share/gtk-doc/html/gtk3/search-bar.png share/gtk-doc/html/gtk3/search-entry.png share/gtk-doc/html/gtk3/separator.png +share/gtk-doc/html/gtk3/sidebar.png share/gtk-doc/html/gtk3/slices.png share/gtk-doc/html/gtk3/sliders.png share/gtk-doc/html/gtk3/spinbutton.png @@ -1033,17 +1059,29 @@ share/gtk-doc/html/gtk3/volumebutton.png share/gtk-doc/html/gtk3/widget-hvalign.png share/gtk-doc/html/gtk3/window-default.png share/gtk-doc/html/gtk3/window.png +share/icons/hicolor/16x16/apps/gtk3-demo-symbolic.symbolic.png share/icons/hicolor/16x16/apps/gtk3-demo.png +share/icons/hicolor/16x16/apps/gtk3-widget-factory-symbolic.symbolic.png share/icons/hicolor/16x16/apps/gtk3-widget-factory.png +share/icons/hicolor/22x22/apps/gtk3-demo-symbolic.symbolic.png share/icons/hicolor/22x22/apps/gtk3-demo.png +share/icons/hicolor/22x22/apps/gtk3-widget-factory-symbolic.symbolic.png share/icons/hicolor/22x22/apps/gtk3-widget-factory.png +share/icons/hicolor/24x24/apps/gtk3-demo-symbolic.symbolic.png share/icons/hicolor/24x24/apps/gtk3-demo.png +share/icons/hicolor/24x24/apps/gtk3-widget-factory-symbolic.symbolic.png share/icons/hicolor/24x24/apps/gtk3-widget-factory.png +share/icons/hicolor/256x256/apps/gtk3-demo-symbolic.symbolic.png share/icons/hicolor/256x256/apps/gtk3-demo.png +share/icons/hicolor/256x256/apps/gtk3-widget-factory-symbolic.symbolic.png share/icons/hicolor/256x256/apps/gtk3-widget-factory.png +share/icons/hicolor/32x32/apps/gtk3-demo-symbolic.symbolic.png share/icons/hicolor/32x32/apps/gtk3-demo.png +share/icons/hicolor/32x32/apps/gtk3-widget-factory-symbolic.symbolic.png share/icons/hicolor/32x32/apps/gtk3-widget-factory.png +share/icons/hicolor/48x48/apps/gtk3-demo-symbolic.symbolic.png share/icons/hicolor/48x48/apps/gtk3-demo.png +share/icons/hicolor/48x48/apps/gtk3-widget-factory-symbolic.symbolic.png share/icons/hicolor/48x48/apps/gtk3-widget-factory.png share/locale/af/LC_MESSAGES/gtk30-properties.mo share/locale/af/LC_MESSAGES/gtk30.mo diff --git a/x11/gtk3/buildlink3.mk b/x11/gtk3/buildlink3.mk index 1b47e54736a..686cbc1fabc 100644 --- a/x11/gtk3/buildlink3.mk +++ b/x11/gtk3/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.26 2015/04/25 14:25:06 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.27 2015/06/14 22:02:08 prlw1 Exp $ BUILDLINK_TREE+= gtk3 @@ -23,6 +23,7 @@ pkgbase := gtk3 .include "../../graphics/cairo-gobject/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/gdk-pixbuf2/buildlink3.mk" +.include "../../graphics/libepoxy/buildlink3.mk" .if !empty(PKG_BUILD_OPTIONS.gtk3:Mx11) . if !empty(PKG_BUILD_OPTIONS.gtk3:Mgtk3-atk-bridge) . include "../../devel/at-spi2-atk/buildlink3.mk" diff --git a/x11/gtk3/distinfo b/x11/gtk3/distinfo index 89120681450..1d2892dc3e7 100644 --- a/x11/gtk3/distinfo +++ b/x11/gtk3/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.28 2014/11/11 00:58:05 prlw1 Exp $ +$NetBSD: distinfo,v 1.29 2015/06/14 22:02:08 prlw1 Exp $ -SHA1 (gtk+-3.14.5.tar.xz) = 0458df75d7218435c634c7cbd1d385bcf5497bfd -RMD160 (gtk+-3.14.5.tar.xz) = c1d46daf29de127e72e4a66b61603c2700af42b8 -Size (gtk+-3.14.5.tar.xz) = 15666824 bytes -SHA1 (patch-aj) = 00f7dcee15c73a594cbef31fddedc4d311499210 +SHA1 (gtk+-3.16.3.tar.xz) = 1ae1ffc565259e719c6fb8fc26e0e24abe518107 +RMD160 (gtk+-3.16.3.tar.xz) = 025e83565beca62713eb2f529eb35e3f0bfd540c +Size (gtk+-3.16.3.tar.xz) = 18228560 bytes +SHA1 (patch-aj) = cbfab43f27352f7c6bc57a7c562c2d84c69da07a SHA1 (patch-config.h.in) = 59bb990ca3f1d40648153eb092550ad925ca06a1 SHA1 (patch-configure) = 1dca87c6a85ee927b85d4edc14b0985c5130c0d9 SHA1 (patch-configure.ac) = 68793f40752f25ccaecc958c72c23a504670bea5 diff --git a/x11/gtk3/patches/patch-aj b/x11/gtk3/patches/patch-aj index 615a028b20e..ced42581494 100644 --- a/x11/gtk3/patches/patch-aj +++ b/x11/gtk3/patches/patch-aj @@ -1,6 +1,7 @@ -$NetBSD: patch-aj,v 1.5 2014/10/07 23:52:08 prlw1 Exp $ +$NetBSD: patch-aj,v 1.6 2015/06/14 22:02:08 prlw1 Exp $ Do not build files we won't install. +Oddly, the tool doc-shooter uses a source file from tests. --- Makefile.in.orig 2013-10-16 02:20:38.000000000 +0000 +++ Makefile.in @@ -8,8 +9,8 @@ Do not build files we won't install. || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY --SRC_SUBDIRS = util gdk gtk libgail-util modules demos tests testsuite examples -+SRC_SUBDIRS = util gdk gtk libgail-util modules demos +-SRC_SUBDIRS = gdk gtk libgail-util modules demos tests testsuite examples ++SRC_SUBDIRS = gdk gtk libgail-util modules demos tests SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} MAINTAINERCLEANFILES = \ |