diff options
| -rw-r--r-- | devel/glade/Makefile | 36 | ||||
| -rw-r--r-- | devel/glade/distinfo | 10 | ||||
| -rw-r--r-- | devel/glade/files/patch-configure | 24 | ||||
| -rw-r--r-- | devel/glade/pkg-plist | 73 |
4 files changed, 44 insertions, 99 deletions
diff --git a/devel/glade/Makefile b/devel/glade/Makefile index 3e23ff48f30e..d908bd1d6353 100644 --- a/devel/glade/Makefile +++ b/devel/glade/Makefile @@ -1,12 +1,15 @@ # Created by: Koop Mast <kwm@FreeBSD.org> PORTNAME= glade -PORTVERSION= 3.22.1 -PORTREVISION= 2 +PORTVERSION= 3.38.2 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 +PATCH_SITES= https://gitlab.gnome.org/GNOME/${PORTNAME}/-/commit/ +PATCHFILES+= 04ba6f96.patch:-p1 \ + 61304b2e.patch:-p1 + MAINTAINER= gnome@FreeBSD.org COMMENT= User interface builder for GTK+ 3 @@ -21,26 +24,25 @@ BUILD_DEPENDS= itstool:textproc/itstool \ CONFLICTS= glade3-3.* PORTSCOUT= limitw:1,even -USES= compiler:c11 desktop-file-utils gettext gmake gnome libtool \ - localbase:ldflags pathfix pkgconfig tar:xz -USE_GNOME= cairo gtk30 intlhack \ - introspection:build -USE_LDCONFIG= yes -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip +USES= compiler:c11 desktop-file-utils gettext gnome localbase:ldflags \ + meson pathfix pkgconfig tar:xz +USE_GNOME= cairo gtk30 intlhack introspection:build DOCSDIR= ${PREFIX}/share/doc/gladeui-2 -OPTIONS_SUB= yes -OPTIONS_DEFINE= PYTHON WEBKIT -OPTIONS_DEFAULT=PYTHON WEBKIT +OPTIONS_SUB= yes +OPTIONS_DEFINE= GJS PYTHON WEBKIT +OPTIONS_DEFAULT= GJS PYTHON WEBKIT + +GJS_MESON_ENABLED= gjs +GJS_LIB_DEPENDS= libgjs.so:lang/gjs -PYTHON_CONFIGURE_ENABLE= python -PYTHON_USES= python:3.4+ -PYTHON_USE= GNOME=pygobject3 +PYTHON_MESON_ENABLED= python +PYTHON_USES= python:3.4+ +PYTHON_USE= GNOME=pygobject3 -WEBKIT_DESC= Webkit glade support -WEBKIT_CONFIGURE_ENABLE= webkit2gtk +WEBKIT_DESC= Webkit glade support +WEBKIT_MESON_ENABLED= webkit2gtk WEBKIT_LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 diff --git a/devel/glade/distinfo b/devel/glade/distinfo index bb2debc08bdd..20857c5f4ded 100644 --- a/devel/glade/distinfo +++ b/devel/glade/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1523096445 -SHA256 (gnome3/glade-3.22.1.tar.xz) = dff89a2ef2eaf000ff2a46979978d03cb9202cb04668e01d0ea5c5bb5547e39a -SIZE (gnome3/glade-3.22.1.tar.xz) = 3592952 +TIMESTAMP = 1643310007 +SHA256 (gnome3/glade-3.38.2.tar.xz) = 98fc87647d88505c97dd2f30f2db2d3e9527515b3af11694787d62a8d28fbab7 +SIZE (gnome3/glade-3.38.2.tar.xz) = 2709224 +SHA256 (gnome3/04ba6f96.patch) = 42d3ba612bde5977a42ef29a9f33cb50b39715650c334c33f880d5259878f0b2 +SIZE (gnome3/04ba6f96.patch) = 478 +SHA256 (gnome3/61304b2e.patch) = a4501da2886d3aab0fde6e1ac522d2b1b8d004dcc3243237ef2ca5a71189ba6d +SIZE (gnome3/61304b2e.patch) = 846 diff --git a/devel/glade/files/patch-configure b/devel/glade/files/patch-configure deleted file mode 100644 index a8cd112ecdcf..000000000000 --- a/devel/glade/files/patch-configure +++ /dev/null @@ -1,24 +0,0 @@ ---- configure.orig 2016-04-07 13:52:21.629199000 +0200 -+++ configure 2016-04-07 13:53:25.241848000 +0200 -@@ -14929,7 +14929,7 @@ - - print(' '.join(incldirs)) - " --if test "x$PYTHON_INCLUDES" == x; then -+if test "x$PYTHON_INCLUDES" = x; then - PYTHON_INCLUDES=`$PYTHON -c "$am_python_print_includes"` - fi - -@@ -14962,10 +14962,10 @@ - am_python_print_lib_loc="\ - from distutils import sysconfig as sc - print(sc.get_config_var('LIBDIR'))" --if test "x$PYTHON_LIBS" == x; then -+if test "x$PYTHON_LIBS" = x; then - PYTHON_LIBS=`$PYTHON -c "$am_python_print_libs"` - fi --if test "x$PYTHON_LIB_LOC" == x; then -+if test "x$PYTHON_LIB_LOC" = x; then - PYTHON_LIB_LOC=`$PYTHON -c "$am_python_print_lib_loc"` - fi - diff --git a/devel/glade/pkg-plist b/devel/glade/pkg-plist index a8d9c1acaa07..7af428223096 100644 --- a/devel/glade/pkg-plist +++ b/devel/glade/pkg-plist @@ -22,11 +22,11 @@ include/libgladeui-2.0/gladeui/glade-name-context.h include/libgladeui-2.0/gladeui/glade-palette.h include/libgladeui-2.0/gladeui/glade-placeholder.h include/libgladeui-2.0/gladeui/glade-project.h -include/libgladeui-2.0/gladeui/glade-property-class.h +include/libgladeui-2.0/gladeui/glade-property-def.h include/libgladeui-2.0/gladeui/glade-property-label.h include/libgladeui-2.0/gladeui/glade-property-shell.h include/libgladeui-2.0/gladeui/glade-property.h -include/libgladeui-2.0/gladeui/glade-signal-class.h +include/libgladeui-2.0/gladeui/glade-signal-def.h include/libgladeui-2.0/gladeui/glade-signal-editor.h include/libgladeui-2.0/gladeui/glade-signal-model.h include/libgladeui-2.0/gladeui/glade-signal.h @@ -37,16 +37,19 @@ include/libgladeui-2.0/gladeui/glade-widget.h include/libgladeui-2.0/gladeui/glade-xml-utils.h include/libgladeui-2.0/gladeui/glade.h lib/girepository-1.0/Gladeui-2.0.typelib +%%GJS%%lib/glade/modules/libgladegjs.so lib/glade/modules/libgladegtk.so %%PYTHON%%lib/glade/modules/libgladepython.so %%WEBKIT%%lib/glade/modules/libgladewebkit2gtk.so lib/libgladeui-2.so -lib/libgladeui-2.so.6 -lib/libgladeui-2.so.6.5.1 +lib/libgladeui-2.so.13 +lib/libgladeui-2.so.13.0.2 libdata/pkgconfig/gladeui-2.0.pc man/man1/glade-previewer.1.gz man/man1/glade.1.gz -share/applications/glade.desktop +share/applications/org.gnome.Glade.desktop +share/gettext/its/glade-catalog.its +share/gettext/its/glade-catalog.loc share/gir-1.0/Gladeui-2.0.gir %%DATADIR%%/catalogs/glade-catalog.dtd %%DATADIR%%/catalogs/gtk+.xml @@ -364,47 +367,6 @@ share/gir-1.0/Gladeui-2.0.gir %%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-windowgroup.png %%DATADIR%%/pixmaps/placeholder.png %%DATADIR%%/pixmaps/plus.png -share/gtk-doc/html/gladeui-2/GladeApp.html -share/gtk-doc/html/gladeui-2/GladeBaseEditor.html -share/gtk-doc/html/gladeui-2/GladeClipboard.html -share/gtk-doc/html/gladeui-2/GladeDesignView.html -share/gtk-doc/html/gladeui-2/GladeEditorProperty.html -share/gtk-doc/html/gladeui-2/GladeInspector.html -share/gtk-doc/html/gladeui-2/GladePalette.html -share/gtk-doc/html/gladeui-2/GladePlaceholder.html -share/gtk-doc/html/gladeui-2/GladeProject.html -share/gtk-doc/html/gladeui-2/GladeProperty.html -share/gtk-doc/html/gladeui-2/GladeWidget.html -share/gtk-doc/html/gladeui-2/GladeWidgetAction.html -share/gtk-doc/html/gladeui-2/catalog.html -share/gtk-doc/html/gladeui-2/catalogintro.html -share/gtk-doc/html/gladeui-2/core.html -share/gtk-doc/html/gladeui-2/dockables.html -share/gtk-doc/html/gladeui-2/gladeui-2.devhelp2 -share/gtk-doc/html/gladeui-2/gladeui-Glade-Utils.html -share/gtk-doc/html/gladeui-2/gladeui-GladeClipboardView.html -share/gtk-doc/html/gladeui-2/gladeui-GladeFixed.html -share/gtk-doc/html/gladeui-2/gladeui-GladePropertyClass.html -share/gtk-doc/html/gladeui-2/gladeui-GladeSignalEditor.html -share/gtk-doc/html/gladeui-2/gladeui-Xml-Utils.html -share/gtk-doc/html/gladeui-2/gladeui-glade-command.html -share/gtk-doc/html/gladeui-2/gladeui-glade-editor.html -share/gtk-doc/html/gladeui-2/gladeui-glade-parameter.html -share/gtk-doc/html/gladeui-2/gladeui-glade-widget-adaptor.html -share/gtk-doc/html/gladeui-2/home.png -share/gtk-doc/html/gladeui-2/index.html -share/gtk-doc/html/gladeui-2/ix01.html -share/gtk-doc/html/gladeui-2/left-insensitive.png -share/gtk-doc/html/gladeui-2/left.png -share/gtk-doc/html/gladeui-2/misc.html -share/gtk-doc/html/gladeui-2/properties.html -share/gtk-doc/html/gladeui-2/pythonsupport.html -share/gtk-doc/html/gladeui-2/right-insensitive.png -share/gtk-doc/html/gladeui-2/right.png -share/gtk-doc/html/gladeui-2/style.css -share/gtk-doc/html/gladeui-2/up-insensitive.png -share/gtk-doc/html/gladeui-2/up.png -share/gtk-doc/html/gladeui-2/widgetclasses.html share/help/C/glade/figures/main-window.png share/help/C/glade/index.docbook share/help/C/glade/legal.xml @@ -417,6 +379,9 @@ share/help/ca/glade/legal.xml share/help/cs/glade/figures/main-window.png share/help/cs/glade/index.docbook share/help/cs/glade/legal.xml +share/help/da/glade/figures/main-window.png +share/help/da/glade/index.docbook +share/help/da/glade/legal.xml share/help/de/glade/figures/main-window.png share/help/de/glade/index.docbook share/help/de/glade/legal.xml @@ -444,6 +409,9 @@ share/help/hi/glade/legal.xml share/help/hu/glade/figures/main-window.png share/help/hu/glade/index.docbook share/help/hu/glade/legal.xml +share/help/id/glade/figures/main-window.png +share/help/id/glade/index.docbook +share/help/id/glade/legal.xml share/help/it/glade/figures/main-window.png share/help/it/glade/index.docbook share/help/it/glade/legal.xml @@ -477,14 +445,9 @@ share/help/uk/glade/legal.xml share/help/zh_CN/glade/figures/main-window.png share/help/zh_CN/glade/index.docbook share/help/zh_CN/glade/legal.xml -share/icons/hicolor/16x16/apps/glade.png -share/icons/hicolor/22x22/apps/glade.png -share/icons/hicolor/24x24/apps/glade.png -share/icons/hicolor/256x256/apps/glade.png -share/icons/hicolor/32x32/apps/glade.png -share/icons/hicolor/48x48/apps/glade.png -share/icons/hicolor/scalable/apps/glade-brand-symbolic.svg -share/icons/hicolor/scalable/apps/glade-symbolic.svg +share/icons/hicolor/scalable/apps/org.gnome.Glade.svg +share/icons/hicolor/symbolic/apps/glade-brand-symbolic.svg +share/icons/hicolor/symbolic/apps/org.gnome.Glade-symbolic.svg share/locale/ar/LC_MESSAGES/glade.mo share/locale/ast/LC_MESSAGES/glade.mo share/locale/az/LC_MESSAGES/glade.mo @@ -556,4 +519,4 @@ share/locale/vi/LC_MESSAGES/glade.mo share/locale/zh_CN/LC_MESSAGES/glade.mo share/locale/zh_HK/LC_MESSAGES/glade.mo share/locale/zh_TW/LC_MESSAGES/glade.mo -share/metainfo/glade.appdata.xml +share/metainfo/org.gnome.Glade.appdata.xml |