Page MenuHomeFreeBSD
Files F140138262

D33940.id147539.diff
No OneTemporary
Actions

D33940.id147539.diff
View Options

diff --git a/x11-toolkits/pangomm/Makefile b/x11-toolkits/pangomm/Makefile
--- a/x11-toolkits/pangomm/Makefile
+++ b/x11-toolkits/pangomm/Makefile
@@ -1,42 +1,25 @@
PORTNAME= pangomm
-PORTVERSION= 2.40.1
-PORTREVISION?= 6
+PORTVERSION= 2.46.4
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome2
+DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= C++ wrapper for Pango
-WWW= http://gtkmm.sourceforge.net/
+WWW= https://www.gtkmm.org/
LICENSE= LGPL21
-USES= tar:xz
-
-.if !defined(REFERENCE_PORT)
-PORTSCOUT= limitw:1,even
-
-USES+= compiler:c++11-lang gmake gnome libtool localbase pathfix \
- pkgconfig
-USE_CXXSTD= c++11
+USES= compiler:c++11-lang gnome localbase meson pkgconfig \
+ python:build tar:xz
USE_GNOME= cairomm glibmm pango
-GNU_CONFIGURE= yes
-USE_LDCONFIG= yes
-CONFIGURE_ARGS= --disable-documentation \
- --enable-static=yes
-INSTALL_TARGET= install-strip
-BINARY_WRAPPERS= gm4
-PLIST_SUB= VERSION="2.4" API_VERSION="1.4"
+USE_LDCONFIG= yes
+MESON_ARGS= -Ddefault_library=both
+BINARY_ALIAS= python3=${PYTHON_CMD}
-post-patch:
-.for d in tests
- @${REINPLACE_CMD} -e '/^SUBDIRS =/s/${d}//' \
- ${WRKSRC}/Makefile.in
-.endfor
+# 2.48 and later are incompatible
+PORTSCOUT= limit:^2\.46
+PLIST_SUB= API_VERSION=1.4
.include <bsd.port.mk>
-
-.else
-PORTSCOUT= ignore:1
-.endif
diff --git a/x11-toolkits/pangomm/distinfo b/x11-toolkits/pangomm/distinfo
--- a/x11-toolkits/pangomm/distinfo
+++ b/x11-toolkits/pangomm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491167697
-SHA256 (gnome2/pangomm-2.40.1.tar.xz) = 9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af
-SIZE (gnome2/pangomm-2.40.1.tar.xz) = 810384
+TIMESTAMP = 1733426036
+SHA256 (gnome/pangomm-2.46.4.tar.xz) = b92016661526424de4b9377f1512f59781f41fb16c9c0267d6133ba1cd68db22
+SIZE (gnome/pangomm-2.46.4.tar.xz) = 695088
diff --git a/x11-toolkits/pangomm/files/patch-pango_pangomm_attributes.h b/x11-toolkits/pangomm/files/patch-pango_pangomm_attributes.h
deleted file mode 100644
--- a/x11-toolkits/pangomm/files/patch-pango_pangomm_attributes.h
+++ /dev/null
@@ -1,22 +0,0 @@
-https://gitlab.gnome.org/GNOME/pangomm/-/commit/a8ab02ac9b96
-https://gitlab.gnome.org/GNOME/pangomm/-/commit/c098f35144ff
-
-attrlist.cc:38:20: error: use of undeclared identifier 'pango_parse_markup'
- gboolean bTest = pango_parse_markup(markup_text.c_str(), -1 /* means null-terminated */, accel_marker,
- ^
-attrlist.cc:65:20: error: use of undeclared identifier 'pango_parse_markup'
- gboolean bTest = pango_parse_markup(markup_text.c_str(), -1 /* means null-terminated */, accel_marker,
- ^
-
---- pango/pangomm/attributes.h.orig 2016-08-19 13:58:37 UTC
-+++ pango/pangomm/attributes.h
-@@ -30,6 +30,9 @@
- #include <pangomm/color.h>
- #include <pangomm/fontdescription.h>
- #include <pango/pango-attributes.h>
-+#if __has_include(<pango/pango-markup.h>)
-+#include <pango/pango-markup.h>
-+#endif
- #include <glibmm/slisthandle.h>
-
-
diff --git a/x11-toolkits/pangomm/files/patch-tools_extra__defs__gen_meson.build b/x11-toolkits/pangomm/files/patch-tools_extra__defs__gen_meson.build
new file mode 100644
--- /dev/null
+++ b/x11-toolkits/pangomm/files/patch-tools_extra__defs__gen_meson.build
@@ -0,0 +1,10 @@
+--- tools/extra_defs_gen/meson.build.orig 2021-12-06 18:18:10 UTC
++++ tools/extra_defs_gen/meson.build
+@@ -7,6 +7,7 @@
+ glibmm_generate_extra_defs_dep = cpp_compiler.find_library(
+ 'glibmm_generate_extra_defs@0@-2.68'.format(msvc14x_toolset_ver),
+ required: glibmm_dep.type_name() != 'internal',
++ dirs: join_paths(get_option('prefix'), get_option('libdir')),
+ )
+ if not glibmm_generate_extra_defs_dep.found()
+ glibmm_generate_extra_defs_dep = dependency(

File Metadata

Mime Type
text/plain
Expires
Sun, Dec 21, 6:02 PM (1 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27118274
Default Alt Text
D33940.id147539.diff (3 KB)

Event Timeline