diff options
Diffstat (limited to 'x11')
-rw-r--r-- | x11/gtk3/Makefile | 22 | ||||
-rw-r--r-- | x11/gtk3/buildlink3.mk | 8 | ||||
-rw-r--r-- | x11/gtk3/distinfo | 12 | ||||
-rw-r--r-- | x11/gtk3/patches/patch-Makefile.in (renamed from x11/gtk3/patches/patch-aj) | 8 |
4 files changed, 25 insertions, 25 deletions
diff --git a/x11/gtk3/Makefile b/x11/gtk3/Makefile index 9d0eab3c23b..23b8819a229 100644 --- a/x11/gtk3/Makefile +++ b/x11/gtk3/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.152 2020/07/20 14:39:34 maya Exp $ +# $NetBSD: Makefile,v 1.153 2020/08/14 11:14:09 adam Exp $ -DISTNAME= gtk+-3.24.21 +DISTNAME= gtk+-3.24.22 PKGNAME= ${DISTNAME:S/gtk/gtk3/} -PKGREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/} EXTRACT_SUFX= .tar.xz @@ -12,18 +11,19 @@ HOMEPAGE= https://www.gtk.org/ COMMENT= GIMP Toolkit v3 - libraries for building X11 user interfaces LICENSE= gnu-lgpl-v2.1 -USE_PKGLOCALEDIR= yes -USE_TOOLS+= ggrep gmake perl pkg-config bash xgettext msgmerge -USE_LANGUAGES= c c++ -USE_LIBTOOL= yes -PTHREAD_AUTO_VARS= yes -TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen -TOOL_DEPENDS+= gettext-tools>=0.19.4nb1:../../devel/gettext-tools +USE_LANGUAGES= c c++ +USE_LIBTOOL= yes +USE_PKGLOCALEDIR= yes +USE_TOOLS+= ggrep gmake perl pkg-config bash xgettext msgmerge +GNU_CONFIGURE= yes +PTHREAD_AUTO_VARS= yes +TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen +TOOL_DEPENDS+= gettext-tools>=0.19.4nb1:../../devel/gettext-tools + # There is no logic in gettext.mk to detect the native version of xgettext, # and we do need it to be compiled with Glade support. _TOOLS_USE_PKGSRC.xgettext= yes -GNU_CONFIGURE= yes # XXX there is a subtle bashism in "configure" or a bug in NetBSD's sh CONFIG_SHELL= ${TOOLS_PATH.bash} CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/libdata diff --git a/x11/gtk3/buildlink3.mk b/x11/gtk3/buildlink3.mk index 62e0f86a08f..d90f9e04995 100644 --- a/x11/gtk3/buildlink3.mk +++ b/x11/gtk3/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.41 2020/03/10 22:09:06 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.42 2020/08/14 11:14:09 adam Exp $ BUILDLINK_TREE+= gtk3 @@ -25,8 +25,8 @@ pkgbase := gtk3 .include "../../graphics/gdk-pixbuf2/buildlink3.mk" BUILDLINK_API_DEPENDS.libepoxy+= libepoxy>=1.4 .include "../../graphics/libepoxy/buildlink3.mk" -.if !empty(PKG_BUILD_OPTIONS.gtk3:Mx11) -. if !empty(PKG_BUILD_OPTIONS.gtk3:Mgtk3-atk-bridge) +.if ${PKG_BUILD_OPTIONS.gtk3:Mx11} +. if ${PKG_BUILD_OPTIONS.gtk3:Mgtk3-atk-bridge} . include "../../devel/at-spi2-atk/buildlink3.mk" . endif # PKG_BUILD_OPTIONS.gtk3:Mgtk3-atk-bridge .include "../../x11/libXcursor/buildlink3.mk" @@ -37,7 +37,7 @@ BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.2nb2 .include "../../x11/libXi/buildlink3.mk" .include "../../x11/libXcomposite/buildlink3.mk" .endif # PKG_BUILD_OPTIONS.gtk3:Mx11 -.if !empty(PKG_BUILD_OPTIONS.gtk3:Mwayland) +.if ${PKG_BUILD_OPTIONS.gtk3:Mwayland} .include "../../devel/wayland/buildlink3.mk" .include "../../devel/wayland-protocols/buildlink3.mk" .include "../../x11/libxkbcommon/buildlink3.mk" diff --git a/x11/gtk3/distinfo b/x11/gtk3/distinfo index 783b36839a9..85d9ae92450 100644 --- a/x11/gtk3/distinfo +++ b/x11/gtk3/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.81 2020/07/23 09:09:48 maya Exp $ +$NetBSD: distinfo,v 1.82 2020/08/14 11:14:09 adam Exp $ -SHA1 (gtk+-3.24.21.tar.xz) = c34360a46556732d0143b2fd010f4065e9c3987b -RMD160 (gtk+-3.24.21.tar.xz) = a5d96f7ea194c24adc3468328aed19c631d5421e -SHA512 (gtk+-3.24.21.tar.xz) = 97ed88e69d9002279869044772e5aebc1ac4ed6f4a8afc1586a349710a1d414fc735e1257d5f34f6300914a0ca7c7ede073bd9429ee16077aa83f3594784c60e -Size (gtk+-3.24.21.tar.xz) = 21353740 bytes -SHA1 (patch-aj) = cbfab43f27352f7c6bc57a7c562c2d84c69da07a +SHA1 (gtk+-3.24.22.tar.xz) = c55edc6f6233aa5fd94e77af3ae5a9362a483529 +RMD160 (gtk+-3.24.22.tar.xz) = af613b25fb40eccd91121de45067c34b9cad4442 +SHA512 (gtk+-3.24.22.tar.xz) = ac653438a0a818885f2aa46a131b1ab0038a57b438406724a674313d8bf4325b1d2e87e4e8c77a92d0cfa8f8d6eaac46ba6890830290e9a9e598c978144861a2 +Size (gtk+-3.24.22.tar.xz) = 21349784 bytes +SHA1 (patch-Makefile.in) = 8edcfe2ff492d90138a24b680fe39814c3848d80 SHA1 (patch-config.h.in) = dc5f8741eed554f88c0b6834cadad95083e4dc8f SHA1 (patch-configure) = d531b33e52facf960058f1223b70db680da35300 SHA1 (patch-configure.ac) = 68793f40752f25ccaecc958c72c23a504670bea5 diff --git a/x11/gtk3/patches/patch-aj b/x11/gtk3/patches/patch-Makefile.in index ced42581494..2980f113767 100644 --- a/x11/gtk3/patches/patch-aj +++ b/x11/gtk3/patches/patch-Makefile.in @@ -1,16 +1,16 @@ -$NetBSD: patch-aj,v 1.6 2015/06/14 22:02:08 prlw1 Exp $ +$NetBSD: patch-Makefile.in,v 1.1 2020/08/14 11:14:09 adam 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.orig 2020-08-10 15:35:54.000000000 +0000 +++ Makefile.in -@@ -534,7 +534,7 @@ XVFB_START = \ +@@ -573,7 +573,7 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY -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 + SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros win32 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} MAINTAINERCLEANFILES = \ |