From fa68ca979c2783fbb8c7cf83ba09db0fa74fe2b9 Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Tue, 6 Aug 2024 21:54:35 +0200 Subject: [PATCH] x11-toolkits/gtkmm30: Update to 3.24.9 Changelog: https://gitlab.gnome.org/GNOME/gtkmm/-/blob/2ae5c7ec2daf58f8320c411465c61c228ec8bd27/NEWS PR: 280179 Approved by: gnome (fluffy) via Matrix Sponsored by: Blinkinblox --- x11-toolkits/gtkmm30/Makefile | 22 +++++++------------- x11-toolkits/gtkmm30/distinfo | 6 +++--- x11-toolkits/gtkmm30/files/patch-meson.build | 11 ++++++++++ x11-toolkits/gtkmm30/pkg-plist | 1 + 4 files changed, 22 insertions(+), 18 deletions(-) create mode 100644 x11-toolkits/gtkmm30/files/patch-meson.build diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile index 659bc42a143e..9769316b5ecb 100644 --- a/x11-toolkits/gtkmm30/Makefile +++ b/x11-toolkits/gtkmm30/Makefile @@ -1,6 +1,5 @@ PORTNAME= gtkmm -PORTVERSION= 3.24.2 -PORTREVISION?= 4 +DISTVERSION= 3.24.9 CATEGORIES= x11-toolkits MASTER_SITES= GNOME PKGNAMESUFFIX= 30 @@ -12,24 +11,17 @@ WWW= http://gtkmm.sourceforge.net/ LICENSE= LGPL21 -USES+= tar:xz - PORTSCOUT= limitw:1,even -USES+= gettext gmake gnome libtool pathfix pkgconfig \ - compiler:c++11-lang -USE_CXXSTD= c++11 +USES= compiler:c++11-lang gnome localbase:ldflags meson \ + pkgconfig python:build tar:xz USE_GNOME= gdkpixbuf2 gtk30 glibmm cairomm atkmm pangomm -GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ARGS= --disable-documentation -INSTALL_TARGET= install-strip -BINARY_WRAPPERS= gm4 + +MESON_ARGS= -Dbuild-documentation=false \ + -Dbuild-demos=false \ + -Dcpp_std=c++11 PLIST_SUB= API_VERSION="3.0" -post-patch: - @${REINPLACE_CMD} -e '/^SUBDIRS =/s/tests//' \ - ${WRKSRC}/Makefile.in - .include diff --git a/x11-toolkits/gtkmm30/distinfo b/x11-toolkits/gtkmm30/distinfo index 5d3a695a0aca..3e3cd6816e00 100644 --- a/x11-toolkits/gtkmm30/distinfo +++ b/x11-toolkits/gtkmm30/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1592235232 -SHA256 (gnome/gtkmm-3.24.2.tar.xz) = 6d71091bcd1863133460d4188d04102810e9123de19706fb656b7bb915b4adc3 -SIZE (gnome/gtkmm-3.24.2.tar.xz) = 13336236 +TIMESTAMP = 1720351007 +SHA256 (gnome/gtkmm-3.24.9.tar.xz) = 30d5bfe404571ce566a8e938c8bac17576420eb508f1e257837da63f14ad44ce +SIZE (gnome/gtkmm-3.24.9.tar.xz) = 15122612 diff --git a/x11-toolkits/gtkmm30/files/patch-meson.build b/x11-toolkits/gtkmm30/files/patch-meson.build new file mode 100644 index 000000000000..7354d93dafe7 --- /dev/null +++ b/x11-toolkits/gtkmm30/files/patch-meson.build @@ -0,0 +1,11 @@ +--- meson.build.orig 2024-08-06 19:46:50 UTC ++++ meson.build +@@ -102,7 +102,7 @@ install_datadir = get_option('datadir') + install_includedir = get_option('includedir') + install_libdir = get_option('libdir') + install_datadir = get_option('datadir') +-install_pkgconfigdir = install_libdir / 'pkgconfig' ++install_pkgconfigdir = install_prefix / 'libdata' / 'pkgconfig' + + # Dependencies. = gdk and gtk + # mm_build_dep: Dependencies when building the mm library. diff --git a/x11-toolkits/gtkmm30/pkg-plist b/x11-toolkits/gtkmm30/pkg-plist index ac81683a2f2e..828ae04b9403 100644 --- a/x11-toolkits/gtkmm30/pkg-plist +++ b/x11-toolkits/gtkmm30/pkg-plist @@ -546,6 +546,7 @@ lib/gdkmm-%%API_VERSION%%/include/gdkmmconfig.h lib/gtkmm-%%API_VERSION%%/include/gtkmmconfig.h lib/gtkmm-%%API_VERSION%%/proc/m4/child_property.m4 lib/gtkmm-%%API_VERSION%%/proc/m4/class_gtkobject.m4 +lib/gtkmm-%%API_VERSION%%/proc/m4/class_shared.m4 lib/gtkmm-%%API_VERSION%%/proc/m4/convert.m4 lib/gtkmm-%%API_VERSION%%/proc/m4/convert_gdk.m4 lib/gtkmm-%%API_VERSION%%/proc/m4/convert_gtk.m4