diff options
Diffstat (limited to 'devel')
103 files changed, 2803 insertions, 3282 deletions
diff --git a/devel/Makefile b/devel/Makefile index bde7a34d1707..54a9e3d5921e 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1270,6 +1270,7 @@ SUBDIR += json-glib SUBDIR += jsoncpp SUBDIR += jsonnet + SUBDIR += jsonrpc-glib SUBDIR += judy SUBDIR += jwasm SUBDIR += k8048 @@ -1587,7 +1588,6 @@ SUBDIR += libsmraw SUBDIR += libsoup SUBDIR += libsoup-gnome - SUBDIR += libsoup-reference SUBDIR += libspark2012 SUBDIR += libspice-server SUBDIR += libstatgrab @@ -6244,6 +6244,7 @@ SUBDIR += tclvfs SUBDIR += tclxml SUBDIR += tdl + SUBDIR += template-glib SUBDIR += terminality SUBDIR += tevent SUBDIR += tex-kpathsea diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile index aca56a92c291..8e4627ff89a1 100644 --- a/devel/anjuta/Makefile +++ b/devel/anjuta/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= anjuta -PORTVERSION= 3.18.2 -PORTREVISION= 6 +PORTVERSION= 3.28.0 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -14,6 +13,8 @@ COMMENT= Integrated Development Environment for C and C++ BUILD_DEPENDS= autogen:devel/autogen \ itstool:textproc/itstool LIB_DEPENDS+= libpcre.so:devel/pcre \ + libexpat.so:textproc/expat2 \ + libfribidi.so:converters/fribidi \ libgdl-3.so:x11-toolkits/gdl RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:misc/gnome-icon-theme \ autogen:devel/autogen \ @@ -38,7 +39,7 @@ gjs_CMD= ${LOCALBASE}/bin/gjs INSTALLS_ICONS= yes USE_LDCONFIG= yes -USE_GNOME= gtksourceview3 intlhack libgda5 libwnck3 vte3 +USE_GNOME= cairo gtksourceview3 intlhack libgda5 libwnck3 GNU_CONFIGURE= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include @@ -72,7 +73,6 @@ GLIB_SCHEMAS= org.gnome.anjuta.cvs.gschema.xml \ org.gnome.anjuta.snippets.gschema.xml \ org.gnome.anjuta.starter.gschema.xml \ org.gnome.anjuta.symbol-db.gschema.xml \ - org.gnome.anjuta.terminal.gschema.xml \ org.gnome.anjuta.tools.gschema.xml OPTIONS_SUB= yes @@ -89,6 +89,9 @@ GLADE_CONFIGURE_ENABLE= plugin-glade TERMINAL_USE= GNOME=vte3 TERMINAL_CONFIGURE_ENABLE= plugin-terminal +TERMINAL_LIB_DEPENDS= libgnutls.so:security/gnutls \ + libpcre2-8.so:devel/pcre2 +TERMINAL_VARS= GLIB_SCHEMAS+=org.gnome.anjuta.terminal.gschema.xml SVN_BUILD_DEPENDS= svn:devel/subversion SVN_LIB_DEPENDS= libapr-1.so:devel/apr1 \ @@ -96,10 +99,12 @@ SVN_LIB_DEPENDS= libapr-1.so:devel/apr1 \ SVN_RUN_DEPENDS= svn:devel/subversion SVN_CONFIGURE_ENABLE= plugin-subversion -DEVHELP_LIB_DEPENDS= libdevhelp-3.so:devel/devhelp +DEVHELP_LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \ + libwebkit2gtk-4.0.so:www/webkit2-gtk3 \ + libdevhelp-3.so:devel/devhelp DEVHELP_CONFIGURE_ENBABLE= plugin-devhelp -VALA_VER= 0.36 +VALA_VER= 0.40 VALA_BUILD_DEPENDS= vala>=${VALA_VER},1<${VALA_VER}.99,1:lang/vala VALA_RUN_DEPENDS= vala>=${VALA_VER},1<${VALA_VER}.99,1:lang/vala VALA_CONFIGURE_ENABLE= vala diff --git a/devel/anjuta/distinfo b/devel/anjuta/distinfo index 8cc1f788b5e5..efeced4809bb 100644 --- a/devel/anjuta/distinfo +++ b/devel/anjuta/distinfo @@ -1,2 +1,3 @@ -SHA256 (gnome3/anjuta-3.18.2.tar.xz) = be864f2f1807e1b870697f646294e997d221d5984a135245543b719e501cef8e -SIZE (gnome3/anjuta-3.18.2.tar.xz) = 6356972 +TIMESTAMP = 1536528098 +SHA256 (gnome3/anjuta-3.28.0.tar.xz) = b087b0a5857952d0edd24dae458616eb166a3257bc647d5279a9e71495544779 +SIZE (gnome3/anjuta-3.28.0.tar.xz) = 6382736 diff --git a/devel/anjuta/pkg-plist b/devel/anjuta/pkg-plist index 55afd3d2f61c..b8e2709062ca 100644 --- a/devel/anjuta/pkg-plist +++ b/devel/anjuta/pkg-plist @@ -154,7 +154,7 @@ lib/anjuta/anjuta-run-program.plugin lib/anjuta/anjuta-snippets-manager.plugin lib/anjuta/anjuta-starter.plugin %%SVN%%lib/anjuta/anjuta-subversion.plugin -lib/anjuta/anjuta-terminal.plugin +%%TERMINAL%%lib/anjuta/anjuta-terminal.plugin lib/anjuta/anjuta-tools.plugin %%VALA%%lib/anjuta/anjuta-vala.plugin lib/anjuta/dir-project.plugin @@ -195,7 +195,7 @@ lib/anjuta/libanjuta-sourceview.so lib/anjuta/libanjuta-starter.so %%SVN%%lib/anjuta/libanjuta-subversion.so lib/anjuta/libanjuta-symbol-db.so -lib/anjuta/libanjuta-terminal.so +%%TERMINAL%%lib/anjuta/libanjuta-terminal.so lib/anjuta/libanjuta-tools.so lib/anjuta/libdir-project.so lib/anjuta/libfile-manager.so @@ -248,7 +248,7 @@ man/man1/anjuta.1.gz %%DATADIR%%/glade/anjuta-run-program.ui %%SVN%%%%DATADIR%%/glade/anjuta-subversion.ui %%DATADIR%%/glade/anjuta-symbol-db.ui -%%DATADIR%%/glade/anjuta-terminal-plugin.ui +%%TERMINAL%%%%DATADIR%%/glade/anjuta-terminal-plugin.ui %%DATADIR%%/glade/anjuta-tools.ui %%VALA%%%%DATADIR%%/glade/anjuta-vala.ui %%DATADIR%%/glade/applogo.png @@ -467,13 +467,12 @@ man/man1/anjuta.1.gz %%DATADIR%%/ui/anjuta-sourceview.xml %%SVN%%%%DATADIR%%/ui/anjuta-subversion.xml %%DATADIR%%/ui/anjuta-symbol-db-plugin.xml -%%DATADIR%%/ui/anjuta-terminal-plugin.xml +%%TERMINAL%%%%DATADIR%%/ui/anjuta-terminal-plugin.xml %%DATADIR%%/ui/anjuta-tools.xml %%DATADIR%%/ui/anjuta.xml %%DATADIR%%/ui/file-manager.xml %%DATADIR%%/ui/snippets-manager-ui.xml %%DATADIR%%/welcome.txt -share/appdata/anjuta.appdata.xml share/applications/anjuta.desktop share/doc/anjuta/AUTHORS share/doc/anjuta/COPYING @@ -604,7 +603,6 @@ share/gtk-doc/html/libanjuta/distribution.html share/gtk-doc/html/libanjuta/header-block.html share/gtk-doc/html/libanjuta/home.png share/gtk-doc/html/libanjuta/index.html -share/gtk-doc/html/libanjuta/index.sgml share/gtk-doc/html/libanjuta/internationalization.html share/gtk-doc/html/libanjuta/left-insensitive.png share/gtk-doc/html/libanjuta/left.png @@ -794,6 +792,16 @@ share/help/ca/anjuta-manual/project-wizard-template.page share/help/ca/anjuta-manual/run-parameters-dialog.page share/help/ca/anjuta-manual/run-run.page share/help/ca/anjuta-manual/widget-index.page +share/help/cs/anjuta-faqs/editor-goto-error.page +share/help/cs/anjuta-faqs/editor-maximize.page +share/help/cs/anjuta-faqs/editor-scintilla.page +share/help/cs/anjuta-faqs/general-bugs.page +share/help/cs/anjuta-faqs/general-feature.page +share/help/cs/anjuta-faqs/general-name.page +share/help/cs/anjuta-faqs/general-windows.page +share/help/cs/anjuta-faqs/index.page +share/help/cs/anjuta-faqs/project-existing.page +share/help/cs/anjuta-faqs/project-resource.page share/help/cs/anjuta-manual/anjuta-code-assist.page share/help/cs/anjuta-manual/anjuta-code-help.page share/help/cs/anjuta-manual/anjuta-code-indentation.page @@ -1072,6 +1080,29 @@ share/help/el/anjuta-manual/project-wizard-template.page share/help/el/anjuta-manual/run-parameters-dialog.page share/help/el/anjuta-manual/run-run.page share/help/el/anjuta-manual/widget-index.page +share/help/es/anjuta-build-tutorial/figures/autotools-process.png +share/help/es/anjuta-build-tutorial/figures/build_preferences.png +share/help/es/anjuta-build-tutorial/figures/compilation-stages.png +share/help/es/anjuta-build-tutorial/figures/configure-dialog.png +share/help/es/anjuta-build-tutorial/figures/configure-process.png +share/help/es/anjuta-build-tutorial/figures/library-add-pkgconfig.png +share/help/es/anjuta-build-tutorial/figures/library-add-properties.png +share/help/es/anjuta-build-tutorial/figures/new-project-basic.png +share/help/es/anjuta-build-tutorial/figures/new-project-message.png +share/help/es/anjuta-build-tutorial/figures/new-project-options.png +share/help/es/anjuta-build-tutorial/figures/new-project-select.png +share/help/es/anjuta-build-tutorial/figures/new-project-summary.png +share/help/es/anjuta-build-tutorial/index.docbook +share/help/es/anjuta-faqs/editor-goto-error.page +share/help/es/anjuta-faqs/editor-maximize.page +share/help/es/anjuta-faqs/editor-scintilla.page +share/help/es/anjuta-faqs/general-bugs.page +share/help/es/anjuta-faqs/general-feature.page +share/help/es/anjuta-faqs/general-name.page +share/help/es/anjuta-faqs/general-windows.page +share/help/es/anjuta-faqs/index.page +share/help/es/anjuta-faqs/project-existing.page +share/help/es/anjuta-faqs/project-resource.page share/help/es/anjuta-manual/anjuta-code-assist.page share/help/es/anjuta-manual/anjuta-code-help.page share/help/es/anjuta-manual/anjuta-code-indentation.page @@ -1541,6 +1572,16 @@ share/help/oc/anjuta-manual/project-wizard-template.page share/help/oc/anjuta-manual/run-parameters-dialog.page share/help/oc/anjuta-manual/run-run.page share/help/oc/anjuta-manual/widget-index.page +share/help/pt_BR/anjuta-faqs/editor-goto-error.page +share/help/pt_BR/anjuta-faqs/editor-maximize.page +share/help/pt_BR/anjuta-faqs/editor-scintilla.page +share/help/pt_BR/anjuta-faqs/general-bugs.page +share/help/pt_BR/anjuta-faqs/general-feature.page +share/help/pt_BR/anjuta-faqs/general-name.page +share/help/pt_BR/anjuta-faqs/general-windows.page +share/help/pt_BR/anjuta-faqs/index.page +share/help/pt_BR/anjuta-faqs/project-existing.page +share/help/pt_BR/anjuta-faqs/project-resource.page share/help/pt_BR/anjuta-manual/anjuta-code-assist.page share/help/pt_BR/anjuta-manual/anjuta-code-help.page share/help/pt_BR/anjuta-manual/anjuta-code-indentation.page @@ -2044,6 +2085,7 @@ share/locale/es/LC_MESSAGES/anjuta.mo share/locale/eu/LC_MESSAGES/anjuta.mo share/locale/fi/LC_MESSAGES/anjuta.mo share/locale/fr/LC_MESSAGES/anjuta.mo +share/locale/fur/LC_MESSAGES/anjuta.mo share/locale/ga/LC_MESSAGES/anjuta.mo share/locale/gl/LC_MESSAGES/anjuta.mo share/locale/gu/LC_MESSAGES/anjuta.mo @@ -2095,6 +2137,7 @@ share/locale/vi/LC_MESSAGES/anjuta.mo share/locale/zh_CN/LC_MESSAGES/anjuta.mo share/locale/zh_HK/LC_MESSAGES/anjuta.mo share/locale/zh_TW/LC_MESSAGES/anjuta.mo +share/metainfo/anjuta.appdata.xml share/mime/packages/anjuta.xml share/pixmaps/anjuta/am-project-plugin-48.png share/pixmaps/anjuta/anjuta-attach-16.png @@ -2247,8 +2290,8 @@ share/pixmaps/anjuta/anjuta-swap-24.png share/pixmaps/anjuta/anjuta-symbol-db-plugin-16.png share/pixmaps/anjuta/anjuta-symbol-db-plugin-48.png share/pixmaps/anjuta/anjuta-symbol-db-plugin.svg -share/pixmaps/anjuta/anjuta-terminal-plugin-48.png -share/pixmaps/anjuta/anjuta-terminal-plugin.svg +%%TERMINAL%%share/pixmaps/anjuta/anjuta-terminal-plugin-48.png +%%TERMINAL%%share/pixmaps/anjuta/anjuta-terminal-plugin.svg share/pixmaps/anjuta/anjuta-tools-plugin-48.png share/pixmaps/anjuta/anjuta-tools-plugin.svg %%VALA%%share/pixmaps/anjuta/anjuta-vala.png diff --git a/devel/appstream-glib/Makefile b/devel/appstream-glib/Makefile index 21042a28b5c1..059706368b6d 100644 --- a/devel/appstream-glib/Makefile +++ b/devel/appstream-glib/Makefile @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= appstream-glib -PORTVERSION= 0.5.7 +PORTVERSION= 0.7.8 CATEGORIES= devel -#MASTER_SITES= http://people.freedesktop.org/~hughsient/appstream-glib/releases/ -MASTER_SITES= http://rainbow-runner.nl/freebsd/ -DIST_SUBDIR= gnome3 +MASTER_SITES= http://people.freedesktop.org/~hughsient/appstream-glib/releases/ +DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Library to help with AppStream metadata @@ -14,42 +13,34 @@ COMMENT= Library to help with AppStream metadata LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING +CONFLICTS_BUILD= appstream-glib-0.5.* + BUILD_DEPENDS= gtkdoc-check:textproc/gtk-doc \ gcab:archivers/gcab LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \ + libjson-glib-1.0.so:devel/json-glib \ libyaml.so:textproc/libyaml \ libuuid.so:misc/e2fsprogs-libuuid \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 RUN_DEPENDS= gcab:archivers/gcab -USES= gettext gperf gmake gnome libarchive libtool pathfix \ +USES= gettext gperf gnome libarchive meson \ pkgconfig sqlite tar:xz -USE_GNOME= gdkpixbuf2 glib20 gtk30 intlhack introspection:build \ +USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 introspection:build \ libxml2:build pango USE_LDCONFIG= yes -GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS= --with-xml-catalog=${LOCALBASE}/share/xml/catalog \ - --disable-rpm \ - --disable-ostree -INSTALL_TARGET= install-strip +MESON_ARGS= -Drpm=false \ + -Dalpm=false \ + -Dstemmer=false OPTIONS_DEFINE= MANPAGES OPTIONS_DEFAULT=MANPAGES OPTIONS_SUB= yes -MANPAGES_CONFIGURE_ENABLE= man -MANPAGES_BUILD_DEPENDS= docbook-xml>=0:textproc/docbook-xml \ + +MANPAGES_MESON_TRUE= man +MANPAGE_BUILD_DEPENDS= docbook-xml>=0:textproc/docbook-xml \ docbook-xsl>=0:textproc/docbook-xsl MANPAGES_USE= GNOME=libxslt:build -.include <bsd.port.options.mk> - -.if ${ARCH} == powerpc || ${ARCH} == powerpc64 -post-patch: - @${REINPLACE_CMD} -e 's|-Wtype-limits||g' \ - ${WRKSRC}/configure -.endif - .include <bsd.port.mk> diff --git a/devel/appstream-glib/distinfo b/devel/appstream-glib/distinfo index 1c018481e926..940336c7db6e 100644 --- a/devel/appstream-glib/distinfo +++ b/devel/appstream-glib/distinfo @@ -1,2 +1,3 @@ -SHA256 (gnome3/appstream-glib-0.5.7.tar.xz) = 6d7fe9c5a3dd4488398628ad283a6383cc5324a02f6ff504c73393adc4972264 -SIZE (gnome3/appstream-glib-0.5.7.tar.xz) = 1858904 +TIMESTAMP = 1526118345 +SHA256 (gnome/appstream-glib-0.7.8.tar.xz) = eb0e2cfd5a6070615efea4c87b1fc539f4566085aa5f5b41945f679d9d61dd4c +SIZE (gnome/appstream-glib-0.7.8.tar.xz) = 2244652 diff --git a/devel/appstream-glib/pkg-plist b/devel/appstream-glib/pkg-plist index e1e28a3c0e78..b0f981ede9d4 100644 --- a/devel/appstream-glib/pkg-plist +++ b/devel/appstream-glib/pkg-plist @@ -4,48 +4,49 @@ bin/appstream-util include/libappstream-builder/appstream-builder.h include/libappstream-builder/asb-app.h include/libappstream-glib/appstream-glib.h -include/libappstream-glib/as-app-gettext.h +include/libappstream-glib/as-agreement-section.h +include/libappstream-glib/as-agreement.h +include/libappstream-glib/as-app-builder.h include/libappstream-glib/as-app.h include/libappstream-glib/as-bundle.h include/libappstream-glib/as-checksum.h +include/libappstream-glib/as-content-rating.h include/libappstream-glib/as-enums.h +include/libappstream-glib/as-format.h include/libappstream-glib/as-icon.h include/libappstream-glib/as-image.h include/libappstream-glib/as-inf.h +include/libappstream-glib/as-launchable.h +include/libappstream-glib/as-markup.h +include/libappstream-glib/as-monitor.h include/libappstream-glib/as-node.h include/libappstream-glib/as-problem.h include/libappstream-glib/as-profile.h include/libappstream-glib/as-provide.h include/libappstream-glib/as-release.h +include/libappstream-glib/as-require.h +include/libappstream-glib/as-review.h include/libappstream-glib/as-screenshot.h include/libappstream-glib/as-store.h +include/libappstream-glib/as-suggest.h include/libappstream-glib/as-tag.h +include/libappstream-glib/as-translation.h include/libappstream-glib/as-utils.h include/libappstream-glib/as-version.h -lib/asb-plugins-5/libasb_plugin_absorb.a -lib/asb-plugins-5/libasb_plugin_absorb.so -lib/asb-plugins-5/libasb_plugin_appdata.a lib/asb-plugins-5/libasb_plugin_appdata.so -lib/asb-plugins-5/libasb_plugin_dbus.a -lib/asb-plugins-5/libasb_plugin_dbus.so -lib/asb-plugins-5/libasb_plugin_desktop.a lib/asb-plugins-5/libasb_plugin_desktop.so -lib/asb-plugins-5/libasb_plugin_font.a lib/asb-plugins-5/libasb_plugin_font.so -lib/asb-plugins-5/libasb_plugin_gettext.a lib/asb-plugins-5/libasb_plugin_gettext.so -lib/asb-plugins-5/libasb_plugin_hardcoded.a lib/asb-plugins-5/libasb_plugin_hardcoded.so +lib/asb-plugins-5/libasb_plugin_shell_extension.so lib/girepository-1.0/AppStreamBuilder-1.0.typelib lib/girepository-1.0/AppStreamGlib-1.0.typelib -lib/libappstream-builder.a lib/libappstream-builder.so lib/libappstream-builder.so.8 -lib/libappstream-builder.so.8.0.4 -lib/libappstream-glib.a +lib/libappstream-builder.so.8.0.10 lib/libappstream-glib.so lib/libappstream-glib.so.8 -lib/libappstream-glib.so.8.0.4 +lib/libappstream-glib.so.8.0.10 libdata/pkgconfig/appstream-builder.pc libdata/pkgconfig/appstream-glib.pc %%MANPAGES%%man/man1/appstream-builder.1.gz @@ -59,33 +60,6 @@ share/gettext/its/appdata.its share/gettext/its/appdata.loc share/gir-1.0/AppStreamBuilder-1.0.gir share/gir-1.0/AppStreamGlib-1.0.gir -share/gtk-doc/html/appstream-glib/AsApp.html -share/gtk-doc/html/appstream-glib/AsChecksum.html -share/gtk-doc/html/appstream-glib/AsIcon.html -share/gtk-doc/html/appstream-glib/AsImage.html -share/gtk-doc/html/appstream-glib/AsProblem.html -share/gtk-doc/html/appstream-glib/AsProvide.html -share/gtk-doc/html/appstream-glib/AsRelease.html -share/gtk-doc/html/appstream-glib/AsScreenshot.html -share/gtk-doc/html/appstream-glib/AsStore.html -share/gtk-doc/html/appstream-glib/annotation-glossary.html -share/gtk-doc/html/appstream-glib/appstream-glib-as-enums.html -share/gtk-doc/html/appstream-glib/appstream-glib-as-node.html -share/gtk-doc/html/appstream-glib/appstream-glib-as-tag.html -share/gtk-doc/html/appstream-glib/appstream-glib-as-utils.html -share/gtk-doc/html/appstream-glib/appstream-glib-as-version.html -share/gtk-doc/html/appstream-glib/appstream-glib.devhelp2 -share/gtk-doc/html/appstream-glib/home.png -share/gtk-doc/html/appstream-glib/index.html -share/gtk-doc/html/appstream-glib/index.sgml -share/gtk-doc/html/appstream-glib/left-insensitive.png -share/gtk-doc/html/appstream-glib/left.png -share/gtk-doc/html/appstream-glib/libappstream-glib.html -share/gtk-doc/html/appstream-glib/right-insensitive.png -share/gtk-doc/html/appstream-glib/right.png -share/gtk-doc/html/appstream-glib/style.css -share/gtk-doc/html/appstream-glib/up-insensitive.png -share/gtk-doc/html/appstream-glib/up.png share/installed-tests/appstream-glib/appdata-validate.test share/installed-tests/appstream-glib/destdir-check.test share/locale/ca/LC_MESSAGES/appstream-glib.mo @@ -96,10 +70,14 @@ share/locale/en_GB/LC_MESSAGES/appstream-glib.mo share/locale/es/LC_MESSAGES/appstream-glib.mo share/locale/fi/LC_MESSAGES/appstream-glib.mo share/locale/fr/LC_MESSAGES/appstream-glib.mo +share/locale/fur/LC_MESSAGES/appstream-glib.mo share/locale/gl/LC_MESSAGES/appstream-glib.mo share/locale/hu/LC_MESSAGES/appstream-glib.mo +share/locale/id/LC_MESSAGES/appstream-glib.mo share/locale/it/LC_MESSAGES/appstream-glib.mo share/locale/ko/LC_MESSAGES/appstream-glib.mo +share/locale/lt/LC_MESSAGES/appstream-glib.mo +share/locale/oc/LC_MESSAGES/appstream-glib.mo share/locale/pl/LC_MESSAGES/appstream-glib.mo share/locale/pt/LC_MESSAGES/appstream-glib.mo share/locale/pt_BR/LC_MESSAGES/appstream-glib.mo diff --git a/devel/dconf-editor/Makefile b/devel/dconf-editor/Makefile index 2d248b7ae0a6..1b6640480c0a 100644 --- a/devel/dconf-editor/Makefile +++ b/devel/dconf-editor/Makefile @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= dconf-editor -PORTVERSION= 3.22.1 +PORTVERSION= 3.28.0 CATEGORIES= devel gnome MASTER_SITES= GNOME -DIST_SUBDIR= gnome3 +DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Configuration database editor for GNOME @@ -19,12 +19,12 @@ LIB_DEPENDS= libdconf.so:devel/dconf PORTSCOUT= limitw:1,even -USES= gettext gmake gnome localbase pathfix \ - pkgconfig tar:xz -USE_GNOME= cairo intltool gtk30 libxml2 +USES= gettext gnome localbase meson \ + pkgconfig python:3.6+,build tar:xz +USE_GNOME= gtk30 USE_LDCONFIG= yes -GNU_CONFIGURE= yes -INSTALLS_ICONS= yes +BINARY_ALIAS= python3=${PYTHON_VERSION} + GLIB_SCHEMAS= ca.desrt.dconf-editor.gschema.xml .include <bsd.port.mk> diff --git a/devel/dconf-editor/distinfo b/devel/dconf-editor/distinfo index 5a4f63f547b5..8afcf7b0e050 100644 --- a/devel/dconf-editor/distinfo +++ b/devel/dconf-editor/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1477082413 -SHA256 (gnome3/dconf-editor-3.22.1.tar.xz) = 0a0e56a5dc7cc20cd7127901069939f0c8049b585f90e229ef753ee9b3a4c126 -SIZE (gnome3/dconf-editor-3.22.1.tar.xz) = 419100 +TIMESTAMP = 1526105706 +SHA256 (gnome/dconf-editor-3.28.0.tar.xz) = 455b53d827820efd28a176ee52e13eda5cda8cdf4e31e0145cfdd69931bf0c5a +SIZE (gnome/dconf-editor-3.28.0.tar.xz) = 417244 diff --git a/devel/dconf-editor/pkg-plist b/devel/dconf-editor/pkg-plist index a2f22aeaf18c..fc197f0c8d7c 100644 --- a/devel/dconf-editor/pkg-plist +++ b/devel/dconf-editor/pkg-plist @@ -1,74 +1,77 @@ bin/dconf-editor man/man1/dconf-editor.1.gz -share/appdata/ca.desrt.dconf-editor.appdata.xml share/applications/ca.desrt.dconf-editor.desktop +share/bash-completion/completions/dconf-editor share/dbus-1/services/ca.desrt.dconf-editor.service -share/icons/hicolor/16x16/apps/dconf-editor.png -share/icons/hicolor/22x22/apps/dconf-editor.png -share/icons/hicolor/24x24/apps/dconf-editor.png -share/icons/hicolor/256x256/apps/dconf-editor.png -share/icons/hicolor/32x32/apps/dconf-editor.png -share/icons/hicolor/48x48/apps/dconf-editor.png -share/icons/hicolor/64x64/apps/dconf-editor.png -share/icons/hicolor/scalable/apps/dconf-editor-symbolic.svg -share/locale/an/LC_MESSAGES/dconf.mo -share/locale/ar/LC_MESSAGES/dconf.mo -share/locale/as/LC_MESSAGES/dconf.mo -share/locale/be/LC_MESSAGES/dconf.mo -share/locale/bg/LC_MESSAGES/dconf.mo -share/locale/bn_IN/LC_MESSAGES/dconf.mo -share/locale/bs/LC_MESSAGES/dconf.mo -share/locale/ca/LC_MESSAGES/dconf.mo -share/locale/ca@valencia/LC_MESSAGES/dconf.mo -share/locale/cs/LC_MESSAGES/dconf.mo -share/locale/da/LC_MESSAGES/dconf.mo -share/locale/de/LC_MESSAGES/dconf.mo -share/locale/el/LC_MESSAGES/dconf.mo -share/locale/en_GB/LC_MESSAGES/dconf.mo -share/locale/eo/LC_MESSAGES/dconf.mo -share/locale/es/LC_MESSAGES/dconf.mo -share/locale/et/LC_MESSAGES/dconf.mo -share/locale/eu/LC_MESSAGES/dconf.mo -share/locale/fa/LC_MESSAGES/dconf.mo -share/locale/fi/LC_MESSAGES/dconf.mo -share/locale/fr/LC_MESSAGES/dconf.mo -share/locale/fur/LC_MESSAGES/dconf.mo -share/locale/gl/LC_MESSAGES/dconf.mo -share/locale/he/LC_MESSAGES/dconf.mo -share/locale/hi/LC_MESSAGES/dconf.mo -share/locale/hu/LC_MESSAGES/dconf.mo -share/locale/id/LC_MESSAGES/dconf.mo -share/locale/is/LC_MESSAGES/dconf.mo -share/locale/it/LC_MESSAGES/dconf.mo -share/locale/ja/LC_MESSAGES/dconf.mo -share/locale/kk/LC_MESSAGES/dconf.mo -share/locale/ko/LC_MESSAGES/dconf.mo -share/locale/lt/LC_MESSAGES/dconf.mo -share/locale/lv/LC_MESSAGES/dconf.mo -share/locale/ml/LC_MESSAGES/dconf.mo -share/locale/mr/LC_MESSAGES/dconf.mo -share/locale/nb/LC_MESSAGES/dconf.mo -share/locale/nl/LC_MESSAGES/dconf.mo -share/locale/oc/LC_MESSAGES/dconf.mo -share/locale/pa/LC_MESSAGES/dconf.mo -share/locale/pl/LC_MESSAGES/dconf.mo -share/locale/pt/LC_MESSAGES/dconf.mo -share/locale/pt_BR/LC_MESSAGES/dconf.mo -share/locale/ro/LC_MESSAGES/dconf.mo -share/locale/ru/LC_MESSAGES/dconf.mo -share/locale/sk/LC_MESSAGES/dconf.mo -share/locale/sl/LC_MESSAGES/dconf.mo -share/locale/sr/LC_MESSAGES/dconf.mo -share/locale/sr@latin/LC_MESSAGES/dconf.mo -share/locale/sv/LC_MESSAGES/dconf.mo -share/locale/ta/LC_MESSAGES/dconf.mo -share/locale/te/LC_MESSAGES/dconf.mo -share/locale/tg/LC_MESSAGES/dconf.mo -share/locale/th/LC_MESSAGES/dconf.mo -share/locale/tr/LC_MESSAGES/dconf.mo -share/locale/ug/LC_MESSAGES/dconf.mo -share/locale/uk/LC_MESSAGES/dconf.mo -share/locale/vi/LC_MESSAGES/dconf.mo -share/locale/zh_CN/LC_MESSAGES/dconf.mo -share/locale/zh_HK/LC_MESSAGES/dconf.mo -share/locale/zh_TW/LC_MESSAGES/dconf.mo +share/icons/hicolor/16x16/apps/ca.desrt.dconf-editor.png +share/icons/hicolor/22x22/apps/ca.desrt.dconf-editor.png +share/icons/hicolor/24x24/apps/ca.desrt.dconf-editor.png +share/icons/hicolor/256x256/apps/ca.desrt.dconf-editor.png +share/icons/hicolor/32x32/apps/ca.desrt.dconf-editor.png +share/icons/hicolor/48x48/apps/ca.desrt.dconf-editor.png +share/icons/hicolor/64x64/apps/ca.desrt.dconf-editor.png +share/icons/hicolor/scalable/apps/ca.desrt.dconf-editor-symbolic.svg +share/locale/an/LC_MESSAGES/dconf-editor.mo +share/locale/ar/LC_MESSAGES/dconf-editor.mo +share/locale/as/LC_MESSAGES/dconf-editor.mo +share/locale/be/LC_MESSAGES/dconf-editor.mo +share/locale/bg/LC_MESSAGES/dconf-editor.mo +share/locale/bn_IN/LC_MESSAGES/dconf-editor.mo +share/locale/bs/LC_MESSAGES/dconf-editor.mo +share/locale/ca/LC_MESSAGES/dconf-editor.mo +share/locale/ca@valencia/LC_MESSAGES/dconf-editor.mo +share/locale/cs/LC_MESSAGES/dconf-editor.mo +share/locale/da/LC_MESSAGES/dconf-editor.mo +share/locale/de/LC_MESSAGES/dconf-editor.mo +share/locale/el/LC_MESSAGES/dconf-editor.mo +share/locale/en_GB/LC_MESSAGES/dconf-editor.mo +share/locale/eo/LC_MESSAGES/dconf-editor.mo +share/locale/es/LC_MESSAGES/dconf-editor.mo +share/locale/et/LC_MESSAGES/dconf-editor.mo +share/locale/eu/LC_MESSAGES/dconf-editor.mo +share/locale/fa/LC_MESSAGES/dconf-editor.mo +share/locale/fi/LC_MESSAGES/dconf-editor.mo +share/locale/fr/LC_MESSAGES/dconf-editor.mo +share/locale/fur/LC_MESSAGES/dconf-editor.mo +share/locale/gl/LC_MESSAGES/dconf-editor.mo +share/locale/he/LC_MESSAGES/dconf-editor.mo +share/locale/hi/LC_MESSAGES/dconf-editor.mo +share/locale/hr/LC_MESSAGES/dconf-editor.mo +share/locale/hu/LC_MESSAGES/dconf-editor.mo +share/locale/id/LC_MESSAGES/dconf-editor.mo +share/locale/is/LC_MESSAGES/dconf-editor.mo +share/locale/it/LC_MESSAGES/dconf-editor.mo +share/locale/ja/LC_MESSAGES/dconf-editor.mo +share/locale/kk/LC_MESSAGES/dconf-editor.mo +share/locale/ko/LC_MESSAGES/dconf-editor.mo +share/locale/lt/LC_MESSAGES/dconf-editor.mo +share/locale/lv/LC_MESSAGES/dconf-editor.mo +share/locale/ml/LC_MESSAGES/dconf-editor.mo +share/locale/mr/LC_MESSAGES/dconf-editor.mo +share/locale/nb/LC_MESSAGES/dconf-editor.mo +share/locale/ne/LC_MESSAGES/dconf-editor.mo +share/locale/nl/LC_MESSAGES/dconf-editor.mo +share/locale/oc/LC_MESSAGES/dconf-editor.mo +share/locale/pa/LC_MESSAGES/dconf-editor.mo +share/locale/pl/LC_MESSAGES/dconf-editor.mo +share/locale/pt/LC_MESSAGES/dconf-editor.mo +share/locale/pt_BR/LC_MESSAGES/dconf-editor.mo +share/locale/ro/LC_MESSAGES/dconf-editor.mo +share/locale/ru/LC_MESSAGES/dconf-editor.mo +share/locale/sk/LC_MESSAGES/dconf-editor.mo +share/locale/sl/LC_MESSAGES/dconf-editor.mo +share/locale/sr/LC_MESSAGES/dconf-editor.mo +share/locale/sr@latin/LC_MESSAGES/dconf-editor.mo +share/locale/sv/LC_MESSAGES/dconf-editor.mo +share/locale/ta/LC_MESSAGES/dconf-editor.mo +share/locale/te/LC_MESSAGES/dconf-editor.mo +share/locale/tg/LC_MESSAGES/dconf-editor.mo +share/locale/th/LC_MESSAGES/dconf-editor.mo +share/locale/tr/LC_MESSAGES/dconf-editor.mo +share/locale/ug/LC_MESSAGES/dconf-editor.mo +share/locale/uk/LC_MESSAGES/dconf-editor.mo +share/locale/vi/LC_MESSAGES/dconf-editor.mo +share/locale/zh_CN/LC_MESSAGES/dconf-editor.mo +share/locale/zh_HK/LC_MESSAGES/dconf-editor.mo +share/locale/zh_TW/LC_MESSAGES/dconf-editor.mo +share/metainfo/ca.desrt.dconf-editor.appdata.xml diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile index 23323e2f5749..e7f4bdf9bd84 100644 --- a/devel/dconf/Makefile +++ b/devel/dconf/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= dconf -PORTVERSION= 0.26.1 +PORTVERSION= 0.28.0 CATEGORIES= devel gnome MASTER_SITES= GNOME DISTNAME= dconf-${PORTVERSION} @@ -20,24 +20,22 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus PORTSCOUT= limitw:1,even -USES= gettext gmake gnome localbase pathfix pkgconfig tar:xz +USES= gettext gnome localbase meson pkgconfig python:3.6+,build tar:xz USE_GNOME= glib20 libxslt:build USE_LDCONFIG= yes -GNU_CONFIGURE= yes +BINARY_ALIAS= python3=${PYTHON_VERSION} + +MESON_ARGS= -Denable-man=true post-patch: @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \ -e 's|"/etc"|"${PREFIX}/etc"|g' \ + ${WRKSRC}/docs/dconf-overview.xml \ ${WRKSRC}/engine/dconf-engine.c \ ${WRKSRC}/engine/dconf-engine-profile.c \ ${WRKSRC}/engine/dconf-engine-source-system.c \ - ${WRKSRC}/bin/dconf-update.c \ + ${WRKSRC}/bin/dconf-update.vala \ ${WRKSRC}/tests/engine.c - @${REINPLACE_CMD} -e 's|-Wno-unused-but-set-variable||g' \ - ${WRKSRC}/bin/Makefile.in \ - ${WRKSRC}/client/Makefile.in - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${WRKSRC}/docs/Makefile.in post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/dconf/db diff --git a/devel/dconf/distinfo b/devel/dconf/distinfo index ad61a0d84ff6..cf6716500d55 100644 --- a/devel/dconf/distinfo +++ b/devel/dconf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1507232441 -SHA256 (gnome3/dconf-0.26.1.tar.xz) = d583b1f7fc93b879e2956acc6a26ea05a445a0002158aeef80c8e378e1414535 -SIZE (gnome3/dconf-0.26.1.tar.xz) = 218516 +TIMESTAMP = 1525984843 +SHA256 (gnome3/dconf-0.28.0.tar.xz) = 61d3b3865ef58b729c3b39aa0979f886c014aa8362f93dcfc74bf5648ed9c742 +SIZE (gnome3/dconf-0.28.0.tar.xz) = 99340 diff --git a/devel/dconf/files/patch-docs_Makefile.in b/devel/dconf/files/patch-docs_Makefile.in deleted file mode 100644 index eb5f7d440b14..000000000000 --- a/devel/dconf/files/patch-docs_Makefile.in +++ /dev/null @@ -1,19 +0,0 @@ ---- docs/Makefile.in.orig 2017-10-03 13:54:54 UTC -+++ docs/Makefile.in -@@ -920,13 +920,13 @@ dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-loc - .PHONY : dist-hook-local docs - - %.1: %.xml -- $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_MAN_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< -+ $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_MAN_FLAGS) %%LOCALBASE%%/share/xsl/docbook/manpages/docbook.xsl $< - - dconf.1: dconf-tool.xml -- $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_MAN_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< -+ $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_MAN_FLAGS) %%LOCALBASE%%/share/xsl/docbook/manpages/docbook.xsl $< - - dconf.7: dconf-overview.xml -- $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_MAN_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< -+ $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_MAN_FLAGS) %%LOCALBASE%%/share/xsl/docbook/manpages/docbook.xsl $< - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/devel/dconf/files/patch-docs_meson.build b/devel/dconf/files/patch-docs_meson.build new file mode 100644 index 000000000000..c6642d8cd937 --- /dev/null +++ b/devel/dconf/files/patch-docs_meson.build @@ -0,0 +1,34 @@ +--- docs/meson.build.orig 2018-05-12 08:26:06.064672000 +0200 ++++ docs/meson.build 2018-05-12 08:27:30.954842000 +0200 +@@ -1,16 +1,18 @@ +-gnome.gtkdoc( +- meson.project_name(), +- main_xml: meson.project_name() + '-docs.xml', +- src_dir: [ +- common_inc, +- client_inc +- ], +- dependencies: libdconf_dep, +- scan_args: '--rebuild-types', +- gobject_typesfile: meson.project_name() + '.types', +- install: true, +- install_dir: join_paths(dconf_datadir, 'gtk-doc', 'html', meson.project_name()) +-) ++if get_option('enable-gtk-doc') ++ gnome.gtkdoc( ++ meson.project_name(), ++ main_xml: meson.project_name() + '-docs.xml', ++ src_dir: [ ++ common_inc, ++ client_inc ++ ], ++ dependencies: libdconf_dep, ++ scan_args: '--rebuild-types', ++ gobject_typesfile: meson.project_name() + '.types', ++ install: true, ++ install_dir: join_paths(dconf_datadir, 'gtk-doc', 'html', meson.project_name()) ++ ) ++endif + + if get_option('enable-man') + xsltproc = find_program('xsltproc', required: false) diff --git a/devel/dconf/files/patch-meson.build b/devel/dconf/files/patch-meson.build new file mode 100644 index 000000000000..0f0ad1e227fc --- /dev/null +++ b/devel/dconf/files/patch-meson.build @@ -0,0 +1,13 @@ +--- meson.build.orig 2018-05-12 08:27:37.460446000 +0200 ++++ meson.build 2018-05-12 08:27:52.259649000 +0200 +@@ -105,9 +105,5 @@ + subdir('gsettings') + subdir('client') + subdir('bin') +- +-if get_option('enable-gtk-doc') +- subdir('docs') +-endif +- ++subdir('docs') + subdir('tests') diff --git a/devel/dconf/files/patch-userconfigdir b/devel/dconf/files/patch-userconfigdir new file mode 100644 index 000000000000..30edbf22d67a --- /dev/null +++ b/devel/dconf/files/patch-userconfigdir @@ -0,0 +1,40 @@ +From e01be93304fdff9e4c5109ae50f1bc9e64524b0b Mon Sep 17 00:00:00 2001 +From: Sebastien Bacher <seb128@ubuntu.com> +Date: Thu, 29 Mar 2018 10:59:34 +0200 +Subject: Don't create the user config dir as world readable + +https://bugzilla.gnome.org/show_bug.cgi?id=792677 +--- + service/dconf-gvdb-utils.c | 2 +- + service/dconf-keyfile-writer.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/service/dconf-gvdb-utils.c b/service/dconf-gvdb-utils.c +index 0ff4bdc..099a9f3 100644 +--- service/dconf-gvdb-utils.c ++++ service/dconf-gvdb-utils.c +@@ -174,7 +174,7 @@ dconf_gvdb_utils_write_file (const gchar *filename, + * again, after mkdir(). + */ + dirname = g_path_get_dirname (filename); +- g_mkdir_with_parents (dirname, 0777); ++ g_mkdir_with_parents (dirname, 0700); + g_free (dirname); + + g_clear_error (error); +diff --git a/service/dconf-keyfile-writer.c b/service/dconf-keyfile-writer.c +index 88f0305..f4951bb 100644 +--- service/dconf-keyfile-writer.c ++++ service/dconf-keyfile-writer.c +@@ -207,7 +207,7 @@ dconf_keyfile_writer_begin (DConfWriter *writer, + * again, after mkdir(). + */ + dirname = g_path_get_dirname (kfw->lock_filename); +- g_mkdir_with_parents (dirname, 0777); ++ g_mkdir_with_parents (dirname, 0700); + g_free (dirname); + + kfw->lock_fd = open (kfw->lock_filename, O_RDWR | O_CREAT, 0666); +-- +cgit v0.12 + diff --git a/devel/dconf/pkg-plist b/devel/dconf/pkg-plist index ff0049e74c96..7884eb58e351 100644 --- a/devel/dconf/pkg-plist +++ b/devel/dconf/pkg-plist @@ -15,28 +15,6 @@ man/man1/dconf.1.gz man/man7/dconf.7.gz share/bash-completion/completions/dconf share/dbus-1/services/ca.desrt.dconf.service -share/gtk-doc/html/dconf/DConfClient.html -share/gtk-doc/html/dconf/annotation-glossary.html -share/gtk-doc/html/dconf/api-index-full.html -share/gtk-doc/html/dconf/ch01.html -share/gtk-doc/html/dconf/dconf-DConfChangeset.html -share/gtk-doc/html/dconf/dconf-DConfError.html -share/gtk-doc/html/dconf/dconf-dconf-Paths.html -share/gtk-doc/html/dconf/dconf-overview.html -share/gtk-doc/html/dconf/dconf-service.html -share/gtk-doc/html/dconf/dconf-tool.html -share/gtk-doc/html/dconf/dconf.devhelp2 -share/gtk-doc/html/dconf/home.png -share/gtk-doc/html/dconf/index.html -share/gtk-doc/html/dconf/left-insensitive.png -share/gtk-doc/html/dconf/left.png -share/gtk-doc/html/dconf/object-tree.html -share/gtk-doc/html/dconf/programs.html -share/gtk-doc/html/dconf/right-insensitive.png -share/gtk-doc/html/dconf/right.png -share/gtk-doc/html/dconf/style.css -share/gtk-doc/html/dconf/up-insensitive.png -share/gtk-doc/html/dconf/up.png share/vala/vapi/dconf.deps share/vala/vapi/dconf.vapi @dir %%ETCDIR%%/db diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile index 4373b7084bd3..7a6acb2c15b5 100644 --- a/devel/devhelp/Makefile +++ b/devel/devhelp/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= devhelp -PORTVERSION= 3.24.0 -PORTREVISION= 4 +PORTVERSION= 3.28.1 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -14,6 +13,7 @@ COMMENT= Developer help browser for GNOME 3 LICENSE= GPLv2 LICENSE_FILES= ${WRKSRC}/COPYING +BUILD_DEPENDS= itstool:textproc/itstool LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 diff --git a/devel/devhelp/distinfo b/devel/devhelp/distinfo index 4f5639f19e64..47c4b7353707 100644 --- a/devel/devhelp/distinfo +++ b/devel/devhelp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1496675768 -SHA256 (gnome3/devhelp-3.24.0.tar.xz) = 4858de1c815532ad160d1bf9facd28859972e3a052908a8edf73f866c8cce430 -SIZE (gnome3/devhelp-3.24.0.tar.xz) = 615460 +TIMESTAMP = 1525590439 +SHA256 (gnome3/devhelp-3.28.1.tar.xz) = da1ce2c66ba54908c2de5ae6b59255f02b13ca3bf98cf6c198c87c2c7fec4821 +SIZE (gnome3/devhelp-3.28.1.tar.xz) = 642992 diff --git a/devel/devhelp/files/patch-src_dh-book-manager.c b/devel/devhelp/files/patch-src_dh-book-manager.c deleted file mode 100644 index a9d8640db7d8..000000000000 --- a/devel/devhelp/files/patch-src_dh-book-manager.c +++ /dev/null @@ -1,13 +0,0 @@ ---- src/dh-book-manager.c.orig 2010-09-01 11:30:01.000000000 +0200 -+++ src/dh-book-manager.c 2010-09-01 11:31:03.000000000 +0200 -@@ -149,6 +149,10 @@ book_manager_add_books_in_data_dir (DhBo - dir = g_build_filename (data_dir, "devhelp", "books", NULL); - book_manager_add_from_dir (book_manager, dir); - g_free (dir); -+ -+ dir = g_build_filename (data_dir, "doc", NULL); -+ book_manager_add_from_dir (book_manager, dir); -+ g_free (dir); - } - - void diff --git a/devel/devhelp/pkg-plist b/devel/devhelp/pkg-plist index cafb9f0a0f7e..f75faa7db13d 100644 --- a/devel/devhelp/pkg-plist +++ b/devel/devhelp/pkg-plist @@ -1,63 +1,78 @@ bin/devhelp include/devhelp-3.0/devhelp/devhelp.h -include/devhelp-3.0/devhelp/dh-app.h include/devhelp-3.0/devhelp/dh-assistant-view.h -include/devhelp-3.0/devhelp/dh-assistant.h include/devhelp-3.0/devhelp/dh-book-manager.h include/devhelp-3.0/devhelp/dh-book-tree.h include/devhelp-3.0/devhelp/dh-book.h -include/devhelp-3.0/devhelp/dh-error.h +include/devhelp-3.0/devhelp/dh-completion.h +include/devhelp-3.0/devhelp/dh-enum-types.h +include/devhelp-3.0/devhelp/dh-init.h include/devhelp-3.0/devhelp/dh-keyword-model.h -include/devhelp-3.0/devhelp/dh-language.h include/devhelp-3.0/devhelp/dh-link.h include/devhelp-3.0/devhelp/dh-sidebar.h -include/devhelp-3.0/devhelp/dh-window.h lib/gedit/plugins/__pycache__/devhelp.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% lib/gedit/plugins/__pycache__/devhelp.cpython-%%PYTHON_SUFFIX%%.pyc lib/gedit/plugins/devhelp.plugin lib/gedit/plugins/devhelp.py lib/girepository-1.0/Devhelp-3.0.typelib lib/libdevhelp-3.so -lib/libdevhelp-3.so.3 -lib/libdevhelp-3.so.3.0.0 +lib/libdevhelp-3.so.5 +lib/libdevhelp-3.so.5.0.0 libdata/pkgconfig/libdevhelp-3.0.pc man/man1/devhelp.1.gz -share/GConf/gsettings/devhelp.convert -share/appdata/org.gnome.Devhelp.appdata.xml share/applications/org.gnome.Devhelp.desktop share/dbus-1/services/org.gnome.Devhelp.service %%DATADIR%%/assistant/assistant.css %%DATADIR%%/assistant/assistant.js -%%DATADIR%%/dtd/devhelp-1.dtd share/gir-1.0/Devhelp-3.0.gir -share/gtk-doc/html/devhelp-3/DhApp.html -share/gtk-doc/html/devhelp-3/DhAssistant.html share/gtk-doc/html/devhelp-3/DhAssistantView.html share/gtk-doc/html/devhelp-3/DhBook.html share/gtk-doc/html/devhelp-3/DhBookManager.html share/gtk-doc/html/devhelp-3/DhBookTree.html +share/gtk-doc/html/devhelp-3/DhCompletion.html share/gtk-doc/html/devhelp-3/DhKeywordModel.html -share/gtk-doc/html/devhelp-3/DhLanguage.html share/gtk-doc/html/devhelp-3/DhLink.html share/gtk-doc/html/devhelp-3/DhSidebar.html -share/gtk-doc/html/devhelp-3/DhWindow.html +share/gtk-doc/html/devhelp-3/annexes.html share/gtk-doc/html/devhelp-3/annotation-glossary.html +share/gtk-doc/html/devhelp-3/api-breaks.html share/gtk-doc/html/devhelp-3/api-index-full.html -share/gtk-doc/html/devhelp-3/ch01.html -share/gtk-doc/html/devhelp-3/deprecated-api-index.html +share/gtk-doc/html/devhelp-3/api-reference.html +share/gtk-doc/html/devhelp-3/assistant.html +share/gtk-doc/html/devhelp-3/data.html share/gtk-doc/html/devhelp-3/devhelp-3.devhelp2 -share/gtk-doc/html/devhelp-3/devhelp-DhError.html -share/gtk-doc/html/devhelp-3/devhelp-Initialization.html +share/gtk-doc/html/devhelp-3/devhelp-Initialization-and-Finalization.html +share/gtk-doc/html/devhelp-3/general.html share/gtk-doc/html/devhelp-3/home.png share/gtk-doc/html/devhelp-3/index.html share/gtk-doc/html/devhelp-3/left-insensitive.png share/gtk-doc/html/devhelp-3/left.png +share/gtk-doc/html/devhelp-3/misc.html share/gtk-doc/html/devhelp-3/object-tree.html share/gtk-doc/html/devhelp-3/right-insensitive.png share/gtk-doc/html/devhelp-3/right.png +share/gtk-doc/html/devhelp-3/side-panel.html share/gtk-doc/html/devhelp-3/style.css share/gtk-doc/html/devhelp-3/up-insensitive.png share/gtk-doc/html/devhelp-3/up.png +share/help/C/devhelp/index.page +share/help/C/devhelp/search.page +share/help/cs/devhelp/index.page +share/help/cs/devhelp/search.page +share/help/de/devhelp/index.page +share/help/de/devhelp/search.page +share/help/es/devhelp/index.page +share/help/es/devhelp/search.page +share/help/hr/devhelp/index.page +share/help/hr/devhelp/search.page +share/help/hu/devhelp/index.page +share/help/hu/devhelp/search.page +share/help/pl/devhelp/index.page +share/help/pl/devhelp/search.page +share/help/pt_BR/devhelp/index.page +share/help/pt_BR/devhelp/search.page +share/help/sv/devhelp/index.page +share/help/sv/devhelp/search.page share/icons/hicolor/16x16/apps/devhelp.png share/icons/hicolor/22x22/apps/devhelp.png share/icons/hicolor/24x24/apps/devhelp.png @@ -147,3 +162,4 @@ share/locale/vi/LC_MESSAGES/devhelp.mo share/locale/zh_CN/LC_MESSAGES/devhelp.mo share/locale/zh_HK/LC_MESSAGES/devhelp.mo share/locale/zh_TW/LC_MESSAGES/devhelp.mo +share/metainfo/org.gnome.Devhelp.appdata.xml diff --git a/devel/glade/Makefile b/devel/glade/Makefile index 17475e53c329..4f2430a8d6b9 100644 --- a/devel/glade/Makefile +++ b/devel/glade/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= glade -PORTVERSION= 3.18.3 -PORTREVISION= 3 +PORTVERSION= 3.22.1 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -23,23 +22,26 @@ PORTSCOUT= limitw:1,even USES= desktop-file-utils gettext gmake libtool \ localbase:ldflags pathfix pkgconfig tar:xz -USE_GNOME= gtk30 gnomedocutils intlhack -# introspection:build -# temp disable, introspection generation crashes with GNOME 3.15 -CONFIGURE_ARGS= --disable-introspection +USE_GNOME= cairo gtk30 gnomedocutils intlhack \ + introspection:build INSTALLS_ICONS= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -CPPFLAGS+= -Wno-error=format-nonliteral INSTALL_TARGET= install-strip DOCSDIR= ${PREFIX}/share/doc/gladeui-2 OPTIONS_SUB= yes -OPTIONS_DEFINE= PYTHON -OPTIONS_DEFAULT=PYTHON +OPTIONS_DEFINE= PYTHON WEBKIT +OPTIONS_DEFAULT=PYTHON WEBKIT + PYTHON_CONFIGURE_ENABLE= python PYTHON_USES= python:3.4+ PYTHON_USE= GNOME=pygobject3 +WEBKIT_DESC= Webkit glade support +WEBKIT_CONFIGURE_ENABLE= webkit2gtk +WEBKIT_LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \ + libwebkit2gtk-4.0.so:www/webkit2-gtk3 + .include <bsd.port.mk> diff --git a/devel/glade/distinfo b/devel/glade/distinfo index 9d8fc4cdc65f..bb2debc08bdd 100644 --- a/devel/glade/distinfo +++ b/devel/glade/distinfo @@ -1,2 +1,3 @@ -SHA256 (gnome3/glade-3.18.3.tar.xz) = ecdbce46e7fbfecd463be840b94fbf54d83723b3ebe075414cfd225ddab66452 -SIZE (gnome3/glade-3.18.3.tar.xz) = 3266400 +TIMESTAMP = 1523096445 +SHA256 (gnome3/glade-3.22.1.tar.xz) = dff89a2ef2eaf000ff2a46979978d03cb9202cb04668e01d0ea5c5bb5547e39a +SIZE (gnome3/glade-3.22.1.tar.xz) = 3592952 diff --git a/devel/glade/files/patch-configure b/devel/glade/files/patch-configure index dea446beb893..a8cd112ecdcf 100644 --- a/devel/glade/files/patch-configure +++ b/devel/glade/files/patch-configure @@ -1,24 +1,24 @@ ---- configure.orig 2011-04-06 10:16:19.000000000 +0200 -+++ configure 2011-04-06 10:34:06.000000000 +0200 -@@ -14541,7 +14541,7 @@ - $as_echo_n "checking for headers required to compile python extensions... " >&6; } - py_prefix=`$PYTHON -c "import sys; print sys.prefix"` - py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` +--- 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="-I${py_prefix}/include/python${PYTHON_VERSION}" - if test "$py_prefix" != "$py_exec_prefix"; then - PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" -@@ -14570,10 +14570,10 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libraries required to embed python" >&5 - $as_echo_n "checking for libraries required to embed python... " >&6; } - py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` + 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="-L${py_prefix}/lib -lpython${PYTHON_VERSION}" + 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="${py_prefix}/lib" + PYTHON_LIB_LOC=`$PYTHON -c "$am_python_print_lib_loc"` fi diff --git a/devel/glade/pkg-plist b/devel/glade/pkg-plist index 9f7525963bc4..a8d9c1acaa07 100644 --- a/devel/glade/pkg-plist +++ b/devel/glade/pkg-plist @@ -1,5 +1,6 @@ bin/glade bin/glade-previewer +include/libgladeui-2.0/gladeui/glade-adaptor-chooser.h include/libgladeui-2.0/gladeui/glade-app.h include/libgladeui-2.0/gladeui/glade-base-editor.h include/libgladeui-2.0/gladeui/glade-builtins.h @@ -35,304 +36,334 @@ include/libgladeui-2.0/gladeui/glade-widget-adaptor.h 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 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.1.3 +lib/libgladeui-2.so.6.5.1 libdata/pkgconfig/gladeui-2.0.pc man/man1/glade-previewer.1.gz man/man1/glade.1.gz -share/appdata/glade.appdata.xml share/applications/glade.desktop -share/glade/catalogs/glade-catalog.dtd -share/glade/catalogs/gtk+.xml -share/glade/catalogs/gtkunixprint.xml -share/glade/pixmaps/deprecated-16x16.png -share/glade/pixmaps/deprecated-22x22.png -share/glade/pixmaps/devhelp.png -share/glade/pixmaps/fixed-bg.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-aboutdialog.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-accelgroup.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-accellabel.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-action.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-actiongroup.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-adjustment.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-alignment.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-appchooserbutton.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-appchooserdialog.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-appchooserwidget.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-arrow.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-aspectframe.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-assistant.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-box.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-button.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-buttonbox.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-calendar.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-cellareabox.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-cellrendereraccel.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-cellrenderercombo.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-cellrendererpixbuf.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-cellrendererprogress.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-cellrendererspin.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-cellrendererspinner.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-cellrenderertext.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-cellrenderertoggle.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-checkbutton.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-checkmenuitem.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-colorbutton.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-colorselection.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-colorselectiondialog.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-combobox.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-comboboxtext.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-default.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-dialog.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-drawingarea.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-entry.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-entrybuffer.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-entrycompletion.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-eventbox.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-expander.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-filechooserbutton.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-filechooserdialog.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-filechooserwidget.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-filefilter.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-fixed.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-fontbutton.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-fontselection.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-fontselectiondialog.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-frame.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-grid.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-handlebox.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-hbox.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-hbuttonbox.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-hpaned.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-hscale.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-hscrollbar.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-hseparator.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-iconfactory.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-iconview.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-image.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-imagemenuitem.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-infobar.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-inputdialog.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-label.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-layout.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-levelbar.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-linkbutton.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-listbox.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-listboxrow.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-liststore.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-menu.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-menubar.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-menubutton.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-menuitem.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-menutoolbutton.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-messagedialog.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-notebook.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-offscreenwindow.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-overlay.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-pagesetupdialog.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-paned.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-placessidebar.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-printdialog.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-progressbar.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-radioaction.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-radiobutton.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-radiomenuitem.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-radiotoolbutton.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-recentaction.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-recentchooser.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-recentchooserdialog.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-recentchoosermenu.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-recentfilter.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-recentmanager.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-revealer.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-scale.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-scalebutton.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-scrollbar.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-scrolledwindow.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-searchentry.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-separator.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-separatormenuitem.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-separatortoolitem.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-sizegroup.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-spinbutton.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-spinner.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-statusbar.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-statusicon.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-switch.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-table.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-tearoffmenuitem.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-textbuffer.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-texttag.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-texttagtable.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-textview.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-toggleaction.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-togglebutton.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-toggletoolbutton.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-toolbar.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-toolbutton.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-toolitem.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-toolitemgroup.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-toolpalette.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-treemodelfilter.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-treemodelsort.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-treeselection.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-treestore.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-treeview.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-treeviewcolumn.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-vbox.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-vbuttonbox.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-viewport.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-volumebutton.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-vpaned.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-vscale.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-vscrollbar.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-vseparator.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-window.png -share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-windowgroup.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-aboutdialog.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-accelgroup.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-accellabel.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-action.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-actiongroup.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-adjustment.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-alignment.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-appchooserbutton.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-appchooserdialog.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-appchooserwidget.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-arrow.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-aspectframe.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-assistant.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-box.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-button.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-buttonbox.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-calendar.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-cellareabox.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-cellrendereraccel.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-cellrenderercombo.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-cellrendererpixbuf.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-cellrendererprogress.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-cellrendererspin.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-cellrendererspinner.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-cellrenderertext.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-cellrenderertoggle.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-checkbutton.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-checkmenuitem.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-colorbutton.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-colorselection.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-colorselectiondialog.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-combobox.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-comboboxtext.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-default.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-dialog.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-drawingarea.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-entry.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-entrybuffer.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-entrycompletion.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-eventbox.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-expander.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-filechooserbutton.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-filechooserdialog.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-filechooserwidget.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-filefilter.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-fixed.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-fontbutton.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-fontselection.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-fontselectiondialog.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-frame.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-grid.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-handlebox.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-hbox.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-hbuttonbox.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-hpaned.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-hscale.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-hscrollbar.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-hseparator.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-iconfactory.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-iconview.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-image.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-imagemenuitem.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-infobar.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-inputdialog.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-label.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-layout.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-levelbar.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-linkbutton.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-listbox.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-listboxrow.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-liststore.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-menu.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-menubar.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-menubutton.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-menuitem.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-menutoolbutton.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-messagedialog.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-notebook.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-offscreenwindow.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-overlay.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-pagesetupdialog.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-paned.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-placessidebar.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-printdialog.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-progressbar.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-radioaction.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-radiobutton.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-radiomenuitem.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-radiotoolbutton.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-recentaction.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-recentchooser.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-recentchooserdialog.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-recentchoosermenu.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-recentfilter.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-recentmanager.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-revealer.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-scale.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-scalebutton.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-scrollbar.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-scrolledwindow.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-searchentry.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-separator.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-separatormenuitem.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-separatortoolitem.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-sizegroup.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-spinbutton.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-spinner.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-statusbar.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-statusicon.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-switch.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-table.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-tearoffmenuitem.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-textbuffer.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-texttag.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-texttagtable.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-textview.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-toggleaction.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-togglebutton.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-toggletoolbutton.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-toolbar.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-toolbutton.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-toolitem.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-toolitemgroup.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-toolpalette.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-treemodelfilter.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-treemodelsort.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-treeselection.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-treestore.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-treeview.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-treeviewcolumn.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-vbox.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-vbuttonbox.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-viewport.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-volumebutton.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-vpaned.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-vscale.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-vscrollbar.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-vseparator.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-window.png -share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-windowgroup.png -share/glade/pixmaps/placeholder.png -share/glade/pixmaps/plus.png +share/gir-1.0/Gladeui-2.0.gir +%%DATADIR%%/catalogs/glade-catalog.dtd +%%DATADIR%%/catalogs/gtk+.xml +%%DATADIR%%/catalogs/gtkunixprint.xml +%%WEBKIT%%%%DATADIR%%/catalogs/webkit2gtk.xml +%%DATADIR%%/pixmaps/deprecated-16x16.png +%%DATADIR%%/pixmaps/deprecated-22x22.png +%%DATADIR%%/pixmaps/devhelp.png +%%DATADIR%%/pixmaps/fixed-bg.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-aboutdialog.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-accelgroup.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-accellabel.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-action.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-actionbar.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-actiongroup.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-adjustment.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-alignment.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-appchooserbutton.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-appchooserdialog.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-appchooserwidget.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-arrow.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-aspectframe.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-assistant.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-box.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-button.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-buttonbox.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-calendar.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-cellareabox.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-cellrendereraccel.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-cellrenderercombo.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-cellrendererpixbuf.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-cellrendererprogress.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-cellrendererspin.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-cellrendererspinner.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-cellrenderertext.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-cellrenderertoggle.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-checkbutton.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-checkmenuitem.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-colorbutton.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-colorselection.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-colorselectiondialog.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-combobox.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-comboboxtext.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-default.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-dialog.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-drawingarea.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-entry.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-entrybuffer.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-entrycompletion.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-eventbox.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-expander.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-filechooserbutton.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-filechooserdialog.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-filechooserwidget.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-filefilter.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-fixed.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-flowbox.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-flowboxchild.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-fontbutton.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-fontselection.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-fontselectiondialog.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-frame.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-glarea.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-grid.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-handlebox.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hbox.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hbuttonbox.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-headerbar.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hpaned.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hscale.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hscrollbar.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-hseparator.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-iconfactory.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-iconview.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-image.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-imagemenuitem.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-infobar.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-inputdialog.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-label.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-layout.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-levelbar.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-linkbutton.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-listbox.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-listboxrow.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-liststore.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-lockbutton.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-menu.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-menubar.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-menubutton.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-menuitem.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-menutoolbutton.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-messagedialog.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-modelbutton.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-notebook.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-offscreenwindow.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-overlay.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-pagesetupdialog.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-paned.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-placessidebar.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-popover.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-popovermenu.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-printdialog.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-progressbar.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-radioaction.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-radiobutton.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-radiomenuitem.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-radiotoolbutton.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-recentaction.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-recentchooser.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-recentchooserdialog.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-recentchoosermenu.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-recentfilter.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-recentmanager.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-revealer.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-scale.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-scalebutton.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-scrollbar.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-scrolledwindow.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-searchbar.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-searchentry.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-separator.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-separatormenuitem.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-separatortoolitem.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-sizegroup.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-spinbutton.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-spinner.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-stack.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-stacksidebar.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-stackswitcher.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-statusbar.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-statusicon.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-switch.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-table.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-tearoffmenuitem.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-textbuffer.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-texttag.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-texttagtable.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-textview.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-toggleaction.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-togglebutton.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-toggletoolbutton.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-toolbar.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-toolbutton.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-toolitem.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-toolitemgroup.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-toolpalette.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-treemodelfilter.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-treemodelsort.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-treeselection.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-treestore.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-treeview.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-treeviewcolumn.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vbox.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vbuttonbox.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-viewport.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-volumebutton.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vpaned.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vscale.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vscrollbar.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vseparator.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-window.png +%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-windowgroup.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-aboutdialog.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-accelgroup.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-accellabel.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-action.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-actionbar.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-actiongroup.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-adjustment.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-alignment.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-appchooserbutton.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-appchooserdialog.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-appchooserwidget.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-arrow.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-aspectframe.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-assistant.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-box.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-button.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-buttonbox.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-calendar.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-cellareabox.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-cellrendereraccel.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-cellrenderercombo.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-cellrendererpixbuf.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-cellrendererprogress.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-cellrendererspin.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-cellrendererspinner.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-cellrenderertext.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-cellrenderertoggle.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-checkbutton.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-checkmenuitem.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-colorbutton.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-colorselection.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-colorselectiondialog.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-combobox.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-comboboxtext.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-default.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-dialog.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-drawingarea.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-entry.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-entrybuffer.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-entrycompletion.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-eventbox.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-expander.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-filechooserbutton.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-filechooserdialog.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-filechooserwidget.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-filefilter.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-fixed.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-flowbox.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-flowboxchild.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-fontbutton.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-fontselection.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-fontselectiondialog.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-frame.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-glarea.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-grid.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-handlebox.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-hbox.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-hbuttonbox.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-headerbar.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-hpaned.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-hscale.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-hscrollbar.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-hseparator.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-iconfactory.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-iconview.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-image.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-imagemenuitem.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-infobar.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-inputdialog.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-label.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-layout.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-levelbar.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-linkbutton.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-listbox.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-listboxrow.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-liststore.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-lockbutton.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-menu.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-menubar.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-menubutton.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-menuitem.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-menutoolbutton.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-messagedialog.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-modelbutton.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-notebook.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-offscreenwindow.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-overlay.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-pagesetupdialog.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-paned.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-placessidebar.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-popover.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-popovermenu.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-printdialog.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-progressbar.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-radioaction.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-radiobutton.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-radiomenuitem.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-radiotoolbutton.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-recentaction.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-recentchooser.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-recentchooserdialog.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-recentchoosermenu.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-recentfilter.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-recentmanager.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-revealer.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-scale.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-scalebutton.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-scrollbar.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-scrolledwindow.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-searchbar.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-searchentry.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-separator.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-separatormenuitem.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-separatortoolitem.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-sizegroup.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-spinbutton.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-spinner.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-stack.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-stacksidebar.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-stackswitcher.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-statusbar.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-statusicon.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-switch.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-table.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-tearoffmenuitem.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-textbuffer.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-texttag.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-texttagtable.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-textview.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-toggleaction.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-togglebutton.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-toggletoolbutton.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-toolbar.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-toolbutton.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-toolitem.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-toolitemgroup.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-toolpalette.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-treemodelfilter.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-treemodelsort.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-treeselection.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-treestore.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-treeview.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-treeviewcolumn.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vbox.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vbuttonbox.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-viewport.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-volumebutton.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vpaned.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vscale.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vscrollbar.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-vseparator.png +%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-window.png +%%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 @@ -362,7 +393,6 @@ 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/index.sgml 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 @@ -420,9 +450,15 @@ share/help/it/glade/legal.xml share/help/ja/glade/figures/main-window.png share/help/ja/glade/index.docbook share/help/ja/glade/legal.xml +share/help/ko/glade/figures/main-window.png +share/help/ko/glade/index.docbook +share/help/ko/glade/legal.xml share/help/oc/glade/figures/main-window.png share/help/oc/glade/index.docbook share/help/oc/glade/legal.xml +share/help/pl/glade/figures/main-window.png +share/help/pl/glade/index.docbook +share/help/pl/glade/legal.xml share/help/pt_BR/glade/figures/main-window.png share/help/pt_BR/glade/index.docbook share/help/pt_BR/glade/legal.xml @@ -447,12 +483,15 @@ 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/locale/ar/LC_MESSAGES/glade.mo share/locale/ast/LC_MESSAGES/glade.mo share/locale/az/LC_MESSAGES/glade.mo share/locale/bg/LC_MESSAGES/glade.mo share/locale/bn/LC_MESSAGES/glade.mo share/locale/bn_IN/LC_MESSAGES/glade.mo +share/locale/bs/LC_MESSAGES/glade.mo share/locale/ca/LC_MESSAGES/glade.mo share/locale/ca@valencia/LC_MESSAGES/glade.mo share/locale/cs/LC_MESSAGES/glade.mo @@ -468,6 +507,7 @@ share/locale/et/LC_MESSAGES/glade.mo share/locale/eu/LC_MESSAGES/glade.mo share/locale/fi/LC_MESSAGES/glade.mo share/locale/fr/LC_MESSAGES/glade.mo +share/locale/fur/LC_MESSAGES/glade.mo share/locale/gl/LC_MESSAGES/glade.mo share/locale/gu/LC_MESSAGES/glade.mo share/locale/he/LC_MESSAGES/glade.mo @@ -477,6 +517,7 @@ share/locale/hy/LC_MESSAGES/glade.mo share/locale/id/LC_MESSAGES/glade.mo share/locale/it/LC_MESSAGES/glade.mo share/locale/ja/LC_MESSAGES/glade.mo +share/locale/kk/LC_MESSAGES/glade.mo share/locale/km/LC_MESSAGES/glade.mo share/locale/ko/LC_MESSAGES/glade.mo share/locale/lt/LC_MESSAGES/glade.mo @@ -487,6 +528,7 @@ share/locale/ml/LC_MESSAGES/glade.mo share/locale/mr/LC_MESSAGES/glade.mo share/locale/ms/LC_MESSAGES/glade.mo share/locale/nb/LC_MESSAGES/glade.mo +share/locale/ne/LC_MESSAGES/glade.mo share/locale/nl/LC_MESSAGES/glade.mo share/locale/nn/LC_MESSAGES/glade.mo share/locale/oc/LC_MESSAGES/glade.mo @@ -514,3 +556,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 diff --git a/devel/glib20-reference/pkg-plist b/devel/glib20-reference/pkg-plist index efbb51930954..866accc4b6a9 100644 --- a/devel/glib20-reference/pkg-plist +++ b/devel/glib20-reference/pkg-plist @@ -79,6 +79,7 @@ share/doc/gio/GPollableOutputStream.html share/doc/gio/GPropertyAction.html share/doc/gio/GProxy.html share/doc/gio/GProxyAddress.html +share/doc/gio/GProxyAddressEnumerator.html share/doc/gio/GProxyResolver.html share/doc/gio/GRemoteActionGroup.html share/doc/gio/GResolver.html @@ -94,6 +95,7 @@ share/doc/gio/GSimplePermission.html share/doc/gio/GSimpleProxyResolver.html share/doc/gio/GSocket.html share/doc/gio/GSocketAddress.html +share/doc/gio/GSocketAddressEnumerator.html share/doc/gio/GSocketClient.html share/doc/gio/GSocketConnectable.html share/doc/gio/GSocketConnection.html @@ -131,24 +133,6 @@ share/doc/gio/GVolumeMonitor.html share/doc/gio/GZlibCompressor.html share/doc/gio/GZlibDecompressor.html share/doc/gio/annotation-glossary.html -share/doc/gio/api-index-2-18.html -share/doc/gio/api-index-2-20.html -share/doc/gio/api-index-2-22.html -share/doc/gio/api-index-2-24.html -share/doc/gio/api-index-2-26.html -share/doc/gio/api-index-2-28.html -share/doc/gio/api-index-2-30.html -share/doc/gio/api-index-2-32.html -share/doc/gio/api-index-2-34.html -share/doc/gio/api-index-2-36.html -share/doc/gio/api-index-2-38.html -share/doc/gio/api-index-2-40.html -share/doc/gio/api-index-2-42.html -share/doc/gio/api-index-2-44.html -share/doc/gio/api-index-2-46.html -share/doc/gio/api-index-2-48.html -share/doc/gio/api-index-2-50.html -share/doc/gio/api-index-deprecated.html share/doc/gio/api-index-full.html share/doc/gio/application.html share/doc/gio/async.html @@ -252,32 +236,6 @@ share/doc/gio/volume_mon.html %%PORTDOCS%%%%DOCSDIR%%/Sorted_binary_tree_postorder.svg %%PORTDOCS%%%%DOCSDIR%%/Sorted_binary_tree_preorder.svg %%PORTDOCS%%%%DOCSDIR%%/annotation-glossary.html -%%PORTDOCS%%%%DOCSDIR%%/api-index-2-10.html -%%PORTDOCS%%%%DOCSDIR%%/api-index-2-12.html -%%PORTDOCS%%%%DOCSDIR%%/api-index-2-14.html -%%PORTDOCS%%%%DOCSDIR%%/api-index-2-16.html -%%PORTDOCS%%%%DOCSDIR%%/api-index-2-18.html -%%PORTDOCS%%%%DOCSDIR%%/api-index-2-2.html -%%PORTDOCS%%%%DOCSDIR%%/api-index-2-20.html -%%PORTDOCS%%%%DOCSDIR%%/api-index-2-22.html -%%PORTDOCS%%%%DOCSDIR%%/api-index-2-24.html -%%PORTDOCS%%%%DOCSDIR%%/api-index-2-26.html -%%PORTDOCS%%%%DOCSDIR%%/api-index-2-28.html -%%PORTDOCS%%%%DOCSDIR%%/api-index-2-30.html -%%PORTDOCS%%%%DOCSDIR%%/api-index-2-32.html -%%PORTDOCS%%%%DOCSDIR%%/api-index-2-34.html -%%PORTDOCS%%%%DOCSDIR%%/api-index-2-36.html -%%PORTDOCS%%%%DOCSDIR%%/api-index-2-38.html -%%PORTDOCS%%%%DOCSDIR%%/api-index-2-4.html -%%PORTDOCS%%%%DOCSDIR%%/api-index-2-40.html -%%PORTDOCS%%%%DOCSDIR%%/api-index-2-42.html -%%PORTDOCS%%%%DOCSDIR%%/api-index-2-44.html -%%PORTDOCS%%%%DOCSDIR%%/api-index-2-46.html -%%PORTDOCS%%%%DOCSDIR%%/api-index-2-48.html -%%PORTDOCS%%%%DOCSDIR%%/api-index-2-50.html -%%PORTDOCS%%%%DOCSDIR%%/api-index-2-6.html -%%PORTDOCS%%%%DOCSDIR%%/api-index-2-8.html -%%PORTDOCS%%%%DOCSDIR%%/api-index-deprecated.html %%PORTDOCS%%%%DOCSDIR%%/api-index-full.html %%PORTDOCS%%%%DOCSDIR%%/deprecated.html %%PORTDOCS%%%%DOCSDIR%%/file-name-encodings.png @@ -307,6 +265,7 @@ share/doc/gio/volume_mon.html %%PORTDOCS%%%%DOCSDIR%%/glib-File-Utilities.html %%PORTDOCS%%%%DOCSDIR%%/glib-GDateTime.html %%PORTDOCS%%%%DOCSDIR%%/glib-GTimeZone.html +%%PORTDOCS%%%%DOCSDIR%%/glib-GUuid.html %%PORTDOCS%%%%DOCSDIR%%/glib-GVariant.html %%PORTDOCS%%%%DOCSDIR%%/glib-GVariantType.html %%PORTDOCS%%%%DOCSDIR%%/glib-Glob-style-pattern-matching.html @@ -386,28 +345,6 @@ share/doc/gobject/GBinding.html share/doc/gobject/GTypeModule.html share/doc/gobject/GTypePlugin.html share/doc/gobject/annotation-glossary.html -share/doc/gobject/api-index-2-10.html -share/doc/gobject/api-index-2-12.html -share/doc/gobject/api-index-2-14.html -share/doc/gobject/api-index-2-18.html -share/doc/gobject/api-index-2-2.html -share/doc/gobject/api-index-2-22.html -share/doc/gobject/api-index-2-24.html -share/doc/gobject/api-index-2-26.html -share/doc/gobject/api-index-2-28.html -share/doc/gobject/api-index-2-30.html -share/doc/gobject/api-index-2-32.html -share/doc/gobject/api-index-2-34.html -share/doc/gobject/api-index-2-36.html -share/doc/gobject/api-index-2-38.html -share/doc/gobject/api-index-2-4.html -share/doc/gobject/api-index-2-40.html -share/doc/gobject/api-index-2-42.html -share/doc/gobject/api-index-2-44.html -share/doc/gobject/api-index-2-46.html -share/doc/gobject/api-index-2-6.html -share/doc/gobject/api-index-2-8.html -share/doc/gobject/api-index-deprecated.html share/doc/gobject/api-index-full.html share/doc/gobject/ch01s02.html share/doc/gobject/chapter-gobject.html diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index d42ca4a9c931..2d31b5cab27d 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= glib -PORTVERSION= 2.50.3 -PORTREVISION= 5 +PORTVERSION= 2.56.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= GNOME @@ -39,11 +39,11 @@ INSTALL_TARGET= install-strip SHEBANG_FILES= */*.pl -LIBVERSION= 0.5000.3 +LIBVERSION= 0.5600.1 PLIST_SUB+= LIBVERSION=${LIBVERSION} glib_MAN= gtester.1 gtester-report.1 glib-gettextize.1 -gio_MAN= gdbus.1 gsettings.1 gio-querymodules.1 \ +gio_MAN= gdbus.1 gsettings.1 gio-querymodules.1 gio.1 \ glib-compile-schemas.1 gapplication.1 \ glib-compile-resources.1 gresource.1 gdbus-codegen.1 gobject_MAN= glib-genmarshal.1 glib-mkenums.1 gobject-query.1 diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo index 2a2432db2305..767d2d841551 100644 --- a/devel/glib20/distinfo +++ b/devel/glib20/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1516046336 -SHA256 (gnome2/glib-2.50.3.tar.xz) = 82ee94bf4c01459b6b00cb9db0545c2237921e3060c0b74cff13fbc020cfd999 -SIZE (gnome2/glib-2.50.3.tar.xz) = 7589284 +TIMESTAMP = 1525371429 +SHA256 (gnome2/glib-2.56.1.tar.xz) = 40ef3f44f2c651c7a31aedee44259809b6f03d3d20be44545cd7d177221c0b8d +SIZE (gnome2/glib-2.56.1.tar.xz) = 8028716 diff --git a/devel/glib20/files/patch-gio_filemonitor b/devel/glib20/files/patch-gio_filemonitor deleted file mode 100644 index 883c7b1bbd8d..000000000000 --- a/devel/glib20/files/patch-gio_filemonitor +++ /dev/null @@ -1,1038 +0,0 @@ -# gio: Always purge kqueue subs from missing list -# https://gitlab.gnome.org/GNOME/glib/commit/e305fe971e4647d971428a772b7290b9c308a96f -# kqueue: Fix invalid emission of G_FILE_MONITOR_EVENT_MOVED event -# https://gitlab.gnome.org/GNOME/glib/commit/76072a2dde4a4acc8be8d3c47efbc6811ebe0c1e -# kqueue: Multiple fixes and simplifications -# https://gitlab.gnome.org/GNOME/glib/commit/aa39a0557c679fc345b0ba72a87c33152eb8ebcd -# gpollfilemonitor: Fix use-after-free caused by leaking GSource -# https://gitlab.gnome.org/GNOME/glib/commit/ba4a9538e14e8ba0ea037cab5f4b23aa47272a4c -# Reorder operations in _kqsub_cancel() to prevent races. -# https://gitlab.gnome.org/GNOME/glib/commit/ab179184b883ad378a420223f378071821f0c8b9 -# Convert gio/kqueue/Makefile.am to gio/kqueue/Makefile.in patch - ---- gio/gpollfilemonitor.c.orig 2016-10-22 05:17:34 UTC -+++ gio/gpollfilemonitor.c -@@ -50,7 +50,9 @@ g_poll_file_monitor_finalize (GObject* o - - poll_monitor = G_POLL_FILE_MONITOR (object); - -+ g_poll_file_monitor_cancel (G_FILE_MONITOR (poll_monitor)); - g_object_unref (poll_monitor->file); -+ g_clear_object (&poll_monitor->last_info); - - G_OBJECT_CLASS (g_poll_file_monitor_parent_class)->finalize (object); - } ---- gio/kqueue/Makefile.in.orig 2017-02-13 15:22:04 UTC -+++ gio/kqueue/Makefile.in -@@ -183,9 +183,8 @@ LTLIBRARIES = $(installed_test_LTLIBRARI - libkqueue_la_LIBADD = - am__objects_1 = - am_libkqueue_la_OBJECTS = libkqueue_la-gkqueuefilemonitor.lo \ -- libkqueue_la-kqueue-helper.lo libkqueue_la-kqueue-thread.lo \ -- libkqueue_la-kqueue-sub.lo libkqueue_la-kqueue-missing.lo \ -- libkqueue_la-kqueue-utils.lo libkqueue_la-kqueue-exclusions.lo \ -+ libkqueue_la-kqueue-helper.lo \ -+ libkqueue_la-kqueue-missing.lo \ - libkqueue_la-dep-list.lo $(am__objects_1) - libkqueue_la_OBJECTS = $(am_libkqueue_la_OBJECTS) - AM_V_lt = $(am__v_lt_@AM_V@) ---- gio/kqueue/gkqueuefilemonitor.c.orig 2016-10-22 05:18:22 UTC -+++ gio/kqueue/gkqueuefilemonitor.c -@@ -22,33 +22,73 @@ - - #include "config.h" - --#include "gkqueuefilemonitor.h" --#include "kqueue-helper.h" --#include "kqueue-exclusions.h" -+#include <sys/types.h> -+#include <sys/event.h> -+#include <sys/time.h> -+#include <sys/socket.h> -+#include <sys/stat.h> -+ -+#include <errno.h> -+#include <fcntl.h> -+#include <string.h> -+ -+#include <glib-object.h> -+#include <gio/gfilemonitor.h> -+#include <gio/glocalfilemonitor.h> -+#include <gio/giomodule.h> - #include <gio/gpollfilemonitor.h> - #include <gio/gfile.h> --#include <gio/giomodule.h> -+#include <glib-unix.h> -+#include "glib-private.h" - -+#include "kqueue-helper.h" -+#include "dep-list.h" - --struct _GKqueueFileMonitor -+G_LOCK_DEFINE_STATIC (kq_lock); -+static GSource *kq_source; -+static int kq_queue = -1; -+ -+#define G_TYPE_KQUEUE_FILE_MONITOR (g_kqueue_file_monitor_get_type ()) -+#define G_KQUEUE_FILE_MONITOR(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \ -+ G_TYPE_KQUEUE_FILE_MONITOR, GKqueueFileMonitor)) -+ -+typedef GLocalFileMonitorClass GKqueueFileMonitorClass; -+ -+typedef struct - { - GLocalFileMonitor parent_instance; - - kqueue_sub *sub; -- -+#ifndef O_EVTONLY - GFileMonitor *fallback; - GFile *fbfile; --}; -+#endif -+} GKqueueFileMonitor; -+ -+GType g_kqueue_file_monitor_get_type (void); -+G_DEFINE_TYPE_WITH_CODE (GKqueueFileMonitor, g_kqueue_file_monitor, G_TYPE_LOCAL_FILE_MONITOR, -+ g_io_extension_point_implement (G_LOCAL_FILE_MONITOR_EXTENSION_POINT_NAME, -+ g_define_type_id, -+ "kqueue", -+ 20)) -+ -+#ifndef O_EVTONLY -+#define O_KQFLAG O_RDONLY -+#else -+#define O_KQFLAG O_EVTONLY -+#endif -+ -+#define NOTE_ALL (NOTE_DELETE|NOTE_WRITE|NOTE_EXTEND|NOTE_ATTRIB|NOTE_RENAME) - - static gboolean g_kqueue_file_monitor_cancel (GFileMonitor* monitor); -+static gboolean g_kqueue_file_monitor_is_supported (void); - --G_DEFINE_TYPE_WITH_CODE (GKqueueFileMonitor, g_kqueue_file_monitor, G_TYPE_LOCAL_FILE_MONITOR, -- g_io_extension_point_implement (G_LOCAL_FILE_MONITOR_EXTENSION_POINT_NAME, -- g_define_type_id, -- "kqueue", -- 20)) -+static kqueue_sub *_kqsub_new (const gchar *, GLocalFileMonitor *, GFileMonitorSource *); -+static void _kqsub_free (kqueue_sub *); -+static gboolean _kqsub_cancel (kqueue_sub *); - - -+#ifndef O_EVTONLY - static void - _fallback_callback (GFileMonitor *unused, - GFile *first, -@@ -57,21 +97,41 @@ _fallback_callback (GFileMonitor *u - gpointer udata) - { - GKqueueFileMonitor *kq_mon = G_KQUEUE_FILE_MONITOR (udata); -- GFileMonitor *mon = G_FILE_MONITOR (kq_mon); -- g_assert (kq_mon != NULL); -- g_assert (mon != NULL); -- (void) unused; -- -- if (event == G_FILE_MONITOR_EVENT_CHANGED) -- { -- GLocalFileMonitor *local_monitor = G_LOCAL_FILE_MONITOR (kq_mon); - -- _kh_dir_diff (kq_mon->sub, local_monitor->source); -- } -- else -- g_file_monitor_emit_event (mon, first, second, event); -+ g_file_monitor_emit_event (G_FILE_MONITOR (kq_mon), first, second, event); - } - -+/* -+ * _ke_is_excluded: -+ * @full_path - a path to file to check. -+ * -+ * Returns: TRUE if the file should be excluded from the kqueue-powered -+ * monitoring, FALSE otherwise. -+ **/ -+gboolean -+_ke_is_excluded (const char *full_path) -+{ -+ GFile *f = NULL; -+ GMount *mount = NULL; -+ -+ f = g_file_new_for_path (full_path); -+ -+ if (f != NULL) { -+ mount = g_file_find_enclosing_mount (f, NULL, NULL); -+ g_object_unref (f); -+ } -+ -+ if ((mount != NULL && (g_mount_can_unmount (mount))) || g_str_has_prefix (full_path, "/mnt/")) -+ { -+ g_warning ("Excluding %s from kernel notification, falling back to poll", full_path); -+ if (mount) -+ g_object_unref (mount); -+ return TRUE; -+ } -+ -+ return FALSE; -+} -+#endif /* !O_EVTONLY */ - - static void - g_kqueue_file_monitor_finalize (GObject *object) -@@ -80,16 +140,18 @@ g_kqueue_file_monitor_finalize (GObject - - if (kqueue_monitor->sub) - { -- _kh_cancel_sub (kqueue_monitor->sub); -- _kh_sub_free (kqueue_monitor->sub); -+ _kqsub_cancel (kqueue_monitor->sub); -+ _kqsub_free (kqueue_monitor->sub); - kqueue_monitor->sub = NULL; - } - -+#ifndef O_EVTONLY - if (kqueue_monitor->fallback) - g_object_unref (kqueue_monitor->fallback); - - if (kqueue_monitor->fbfile) - g_object_unref (kqueue_monitor->fbfile); -+#endif - - if (G_OBJECT_CLASS (g_kqueue_file_monitor_parent_class)->finalize) - (*G_OBJECT_CLASS (g_kqueue_file_monitor_parent_class)->finalize) (object); -@@ -103,21 +165,25 @@ g_kqueue_file_monitor_start (GLocalFileM - GFileMonitorSource *source) - { - GKqueueFileMonitor *kqueue_monitor = G_KQUEUE_FILE_MONITOR (local_monitor); -- GObject *obj; -- GKqueueFileMonitorClass *klass; -- GObjectClass *parent_class; -- kqueue_sub *sub = NULL; -- gboolean ret_kh_startup = FALSE; -- const gchar *path = NULL; -- -- -- ret_kh_startup = _kh_startup (); -- g_assert (ret_kh_startup); -+ kqueue_sub *sub; -+ const gchar *path; - - path = filename; -- if (!path) -+ if (path == NULL) - path = dirname; - -+#ifndef O_EVTONLY -+ if (_ke_is_excluded (path)) -+ { -+ GFile *file = g_file_new_for_path (path); -+ kqueue_monitor->fbfile = file; -+ kqueue_monitor->fallback = _g_poll_file_monitor_new (file); -+ g_signal_connect (kqueue_monitor->fallback, "changed", -+ G_CALLBACK (_fallback_callback), kqueue_monitor); -+ return; -+ } -+#endif -+ - /* For a directory monitor, create a subscription object anyway. - * It will be used for directory diff calculation routines. - * Wait, directory diff in a GKqueueFileMonitor? -@@ -125,33 +191,13 @@ g_kqueue_file_monitor_start (GLocalFileM - * file, GIO uses a GKqueueFileMonitor object for that. If a directory - * will be created under that path, GKqueueFileMonitor will have to - * handle the directory notifications. */ -+ sub = _kqsub_new (path, local_monitor, source); -+ if (sub == NULL) -+ return; - -- sub = _kh_sub_new (path, TRUE, source); -- -- /* FIXME: what to do about errors here? we can't return NULL or another -- * kind of error and an assertion is probably too hard (same issue as in -- * the inotify backend) */ -- g_assert (sub != NULL); - kqueue_monitor->sub = sub; -- -- if (!_ke_is_excluded (path)) -- _kh_add_sub (sub); -- else -- { -- GFile *file = g_file_new_for_path (path); -- kqueue_monitor->fbfile = file; -- kqueue_monitor->fallback = _g_poll_file_monitor_new (file); -- g_signal_connect (kqueue_monitor->fallback, -- "changed", -- G_CALLBACK (_fallback_callback), -- kqueue_monitor); -- } --} -- --static gboolean --g_kqueue_file_monitor_is_supported (void) --{ -- return _kh_startup (); -+ if (!_kqsub_start_watching (sub)) -+ _km_add_missing (sub); - } - - static void -@@ -175,24 +221,218 @@ g_kqueue_file_monitor_init (GKqueueFileM - } - - static gboolean -+g_kqueue_file_monitor_callback (gint fd, GIOCondition condition, gpointer user_data) -+{ -+ gint64 now = g_source_get_time (kq_source); -+ kqueue_sub *sub; -+ GFileMonitorSource *source; -+ struct kevent ev; -+ struct timespec ts; -+ -+ memset (&ts, 0, sizeof(ts)); -+ while (kevent(fd, NULL, 0, &ev, 1, &ts) > 0) -+ { -+ GFileMonitorEvent mask = 0; -+ -+ if (ev.filter != EVFILT_VNODE || ev.udata == NULL) -+ continue; -+ -+ sub = ev.udata; -+ source = sub->source; -+ -+ if (ev.flags & EV_ERROR) -+ ev.fflags = NOTE_REVOKE; -+ -+ if (ev.fflags & (NOTE_DELETE | NOTE_REVOKE)) -+ { -+ _kqsub_cancel (sub); -+ _km_add_missing (sub); -+ } -+ -+ if (sub->is_dir && ev.fflags & (NOTE_WRITE | NOTE_EXTEND)) -+ { -+ _kh_dir_diff (sub); -+ ev.fflags &= ~(NOTE_WRITE | NOTE_EXTEND); -+ } -+ -+ if (ev.fflags & NOTE_DELETE) -+ { -+ mask = G_FILE_MONITOR_EVENT_DELETED; -+ } -+ else if (ev.fflags & NOTE_ATTRIB) -+ { -+ mask = G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED; -+ } -+ else if (ev.fflags & (NOTE_WRITE | NOTE_EXTEND)) -+ { -+ mask = G_FILE_MONITOR_EVENT_CHANGED; -+ } -+ else if (ev.fflags & NOTE_RENAME) -+ { -+ /* Since there’s apparently no way to get the new name of the -+ * file out of kqueue(), all we can do is say that this one has -+ * been deleted. */ -+ mask = G_FILE_MONITOR_EVENT_DELETED; -+ } -+ else if (ev.fflags & NOTE_REVOKE) -+ { -+ mask = G_FILE_MONITOR_EVENT_UNMOUNTED; -+ } -+ -+ if (mask) -+ g_file_monitor_source_handle_event (source, mask, NULL, NULL, NULL, now); -+ } -+ -+ return TRUE; -+} -+ -+static gboolean -+g_kqueue_file_monitor_is_supported (void) -+{ -+ int errsv; -+ -+ G_LOCK (kq_lock); -+ -+ if (kq_queue == -1) -+ { -+ kq_queue = kqueue (); -+ errsv = errno; -+ -+ if (kq_queue == -1) -+ { -+ g_warning ("Unable to create a kqueue: %s", g_strerror (errsv)); -+ G_UNLOCK (kq_lock); -+ return FALSE; -+ } -+ -+ kq_source = g_unix_fd_source_new (kq_queue, G_IO_IN); -+ g_source_set_callback (kq_source, (GSourceFunc) g_kqueue_file_monitor_callback, NULL, NULL); -+ g_source_attach (kq_source, GLIB_PRIVATE_CALL (g_get_worker_context) ()); -+ } -+ -+ G_UNLOCK (kq_lock); -+ -+ return TRUE; -+} -+ -+static gboolean - g_kqueue_file_monitor_cancel (GFileMonitor *monitor) - { - GKqueueFileMonitor *kqueue_monitor = G_KQUEUE_FILE_MONITOR (monitor); - - if (kqueue_monitor->sub) - { -- _kh_cancel_sub (kqueue_monitor->sub); -- _kh_sub_free (kqueue_monitor->sub); -+ _kqsub_cancel (kqueue_monitor->sub); -+ _kqsub_free (kqueue_monitor->sub); - kqueue_monitor->sub = NULL; - } -+#ifndef O_EVTONLY - else if (kqueue_monitor->fallback) - { - g_signal_handlers_disconnect_by_func (kqueue_monitor->fallback, _fallback_callback, kqueue_monitor); - g_file_monitor_cancel (kqueue_monitor->fallback); - } -+#endif - - if (G_FILE_MONITOR_CLASS (g_kqueue_file_monitor_parent_class)->cancel) - (*G_FILE_MONITOR_CLASS (g_kqueue_file_monitor_parent_class)->cancel) (monitor); - - return TRUE; - } -+ -+static kqueue_sub * -+_kqsub_new (const gchar *filename, GLocalFileMonitor *mon, GFileMonitorSource *source) -+{ -+ kqueue_sub *sub; -+ -+ sub = g_slice_new (kqueue_sub); -+ sub->filename = g_strdup (filename); -+ sub->mon = mon; -+ g_source_ref ((GSource *) source); -+ sub->source = source; -+ sub->fd = -1; -+ sub->deps = NULL; -+ sub->is_dir = 0; -+ -+ return sub; -+} -+ -+static void -+_kqsub_free (kqueue_sub *sub) -+{ -+ g_assert (sub->deps == NULL); -+ g_assert (sub->fd == -1); -+ -+ g_source_unref ((GSource *) sub->source); -+ g_free (sub->filename); -+ g_slice_free (kqueue_sub, sub); -+} -+ -+static gboolean -+_kqsub_cancel (kqueue_sub *sub) -+{ -+ struct kevent ev; -+ -+ /* Remove the event and close the file descriptor to automatically -+ * delete pending events. */ -+ if (sub->fd != -1) -+ { -+ EV_SET (&ev, sub->fd, EVFILT_VNODE, EV_DELETE, NOTE_ALL, 0, sub); -+ if (kevent (kq_queue, &ev, 1, NULL, 0, NULL) == -1) -+ { -+ g_warning ("Unable to remove event for %s: %s", sub->filename, g_strerror (errno)); -+ return FALSE; -+ } -+ close (sub->fd); -+ sub->fd = -1; -+ } -+ -+ _km_remove (sub); -+ -+ if (sub->deps) -+ { -+ dl_free (sub->deps); -+ sub->deps = NULL; -+ } -+ -+ return TRUE; -+} -+ -+gboolean -+_kqsub_start_watching (kqueue_sub *sub) -+{ -+ struct stat st; -+ struct kevent ev; -+ -+ sub->fd = open (sub->filename, O_KQFLAG); -+ if (sub->fd == -1) -+ return FALSE; -+ -+ if (fstat (sub->fd, &st) == -1) -+ { -+ g_warning ("fstat failed for %s: %s", sub->filename, g_strerror (errno)); -+ close (sub->fd); -+ sub->fd = -1; -+ return FALSE; -+ } -+ -+ sub->is_dir = (st.st_mode & S_IFDIR) ? 1 : 0; -+ if (sub->is_dir) -+ { -+ if (sub->deps) -+ dl_free (sub->deps); -+ -+ sub->deps = dl_listing (sub->filename); -+ } -+ -+ EV_SET (&ev, sub->fd, EVFILT_VNODE, EV_ADD | EV_CLEAR, NOTE_ALL, 0, sub); -+ if (kevent (kq_queue, &ev, 1, NULL, 0, NULL) == -1) -+ { -+ g_warning ("Unable to add event for %s: %s", sub->filename, g_strerror (errno)); -+ close (sub->fd); -+ sub->fd = -1; -+ return FALSE; -+ } -+ -+ return TRUE; -+} ---- gio/kqueue/kqueue-helper.c.orig 2016-10-22 05:18:22 UTC -+++ gio/kqueue/kqueue-helper.c -@@ -34,81 +34,6 @@ - #include <errno.h> - #include <pthread.h> - #include "kqueue-helper.h" --#include "kqueue-utils.h" --#include "kqueue-thread.h" --#include "kqueue-missing.h" --#include "kqueue-exclusions.h" -- --static gboolean kh_debug_enabled = FALSE; --#define KH_W if (kh_debug_enabled) g_warning -- --static GHashTable *subs_hash_table = NULL; --G_LOCK_DEFINE_STATIC (hash_lock); -- --static int kqueue_descriptor = -1; --static int kqueue_socket_pair[] = {-1, -1}; --static pthread_t kqueue_thread; -- -- --void _kh_file_appeared_cb (kqueue_sub *sub); -- --/** -- * accessor function for kqueue_descriptor -- **/ --int --get_kqueue_descriptor() --{ -- return kqueue_descriptor; --} -- --/** -- * convert_kqueue_events_to_gio: -- * @flags: a set of kqueue filter flags -- * @done: a pointer to #gboolean indicating that the -- * conversion has been done (out) -- * -- * Translates kqueue filter flags into GIO event flags. -- * -- * Returns: a #GFileMonitorEvent -- **/ --static GFileMonitorEvent --convert_kqueue_events_to_gio (uint32_t flags, gboolean *done) --{ -- g_assert (done != NULL); -- *done = FALSE; -- -- /* TODO: The following notifications should be emulated, if possible: -- * - G_FILE_MONITOR_EVENT_PRE_UNMOUNT -- */ -- if (flags & NOTE_DELETE) -- { -- *done = TRUE; -- return G_FILE_MONITOR_EVENT_DELETED; -- } -- if (flags & NOTE_ATTRIB) -- { -- *done = TRUE; -- return G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED; -- } -- if (flags & (NOTE_WRITE | NOTE_EXTEND)) -- { -- *done = TRUE; -- return G_FILE_MONITOR_EVENT_CHANGED; -- } -- if (flags & NOTE_RENAME) -- { -- *done = TRUE; -- return G_FILE_MONITOR_EVENT_MOVED; -- } -- if (flags & NOTE_REVOKE) -- { -- *done = TRUE; -- return G_FILE_MONITOR_EVENT_UNMOUNTED; -- } -- -- /* done is FALSE */ -- return 0; --} - - typedef struct { - kqueue_sub *sub; -@@ -236,323 +161,21 @@ static const traverse_cbs cbs = { - - - void --_kh_dir_diff (kqueue_sub *sub, GFileMonitorSource *source) -+_kh_dir_diff (kqueue_sub *sub) - { - dep_list *was; - handle_ctx ctx; - -- g_assert (sub != NULL); -- g_assert (source != NULL); -- - memset (&ctx, 0, sizeof (handle_ctx)); - ctx.sub = sub; -- ctx.source = source; -+ ctx.source = sub->source; - - was = sub->deps; - sub->deps = dl_listing (sub->filename); -- -+ - dl_calculate (was, sub->deps, &cbs, &ctx); - - dl_free (was); - } - - --/** -- * process_kqueue_notifications: -- * @gioc: unused. -- * @cond: unused. -- * @data: unused. -- * -- * Processes notifications, coming from the kqueue thread. -- * -- * Reads notifications from the command file descriptor, emits the -- * "changed" event on the appropriate monitor. -- * -- * A typical GIO Channel callback function. -- * -- * Returns: %TRUE -- **/ --static gboolean --process_kqueue_notifications (GIOChannel *gioc, -- GIOCondition cond, -- gpointer data) --{ -- struct kqueue_notification n; -- kqueue_sub *sub = NULL; -- GFileMonitorSource *source = NULL; -- GFileMonitorEvent mask = 0; -- -- g_assert (kqueue_socket_pair[0] != -1); -- if (!_ku_read (kqueue_socket_pair[0], &n, sizeof (struct kqueue_notification))) -- { -- KH_W ("Failed to read a kqueue notification, error %d", errno); -- return TRUE; -- } -- -- G_LOCK (hash_lock); -- sub = (kqueue_sub *) g_hash_table_lookup (subs_hash_table, GINT_TO_POINTER (n.fd)); -- G_UNLOCK (hash_lock); -- -- if (sub == NULL) -- { -- KH_W ("Got a notification for a deleted or non-existing subscription %d", -- n.fd); -- return TRUE; -- } -- -- source = sub->user_data; -- g_assert (source != NULL); -- -- if (n.flags & (NOTE_DELETE | NOTE_REVOKE)) -- { -- if (sub->deps) -- { -- dl_free (sub->deps); -- sub->deps = NULL; -- } -- _km_add_missing (sub); -- -- if (!(n.flags & NOTE_REVOKE)) -- { -- /* Note that NOTE_REVOKE is issued by the kqueue thread -- * on EV_ERROR kevent. In this case, a file descriptor is -- * already closed from the kqueue thread, no need to close -- * it manually */ -- _kh_cancel_sub (sub); -- } -- } -- -- if (sub->is_dir && n.flags & (NOTE_WRITE | NOTE_EXTEND)) -- { -- _kh_dir_diff (sub, source); -- n.flags &= ~(NOTE_WRITE | NOTE_EXTEND); -- } -- -- if (n.flags) -- { -- gboolean done = FALSE; -- mask = convert_kqueue_events_to_gio (n.flags, &done); -- if (done == TRUE) -- g_file_monitor_source_handle_event (source, mask, NULL, NULL, NULL, g_get_monotonic_time ()); -- } -- -- return TRUE; --} -- -- --/* -- * _kh_startup_impl: -- * @unused: unused -- * -- * Kqueue backend startup code. Should be called only once. -- * -- * Returns: %TRUE on success, %FALSE otherwise. -- **/ --static gpointer --_kh_startup_impl (gpointer unused) --{ -- GIOChannel *channel = NULL; -- gboolean result = FALSE; -- -- kqueue_descriptor = kqueue (); -- result = (kqueue_descriptor != -1); -- if (!result) -- { -- KH_W ("Failed to initialize kqueue\n!"); -- return GINT_TO_POINTER (FALSE); -- } -- -- result = socketpair (AF_UNIX, SOCK_STREAM, 0, kqueue_socket_pair); -- if (result != 0) -- { -- KH_W ("Failed to create socket pair\n!"); -- return GINT_TO_POINTER (FALSE) ; -- } -- -- result = pthread_create (&kqueue_thread, -- NULL, -- _kqueue_thread_func, -- &kqueue_socket_pair[1]); -- if (result != 0) -- { -- KH_W ("Failed to run kqueue thread\n!"); -- return GINT_TO_POINTER (FALSE); -- } -- -- _km_init (_kh_file_appeared_cb); -- -- channel = g_io_channel_unix_new (kqueue_socket_pair[0]); -- g_io_add_watch (channel, G_IO_IN, process_kqueue_notifications, NULL); -- -- subs_hash_table = g_hash_table_new (g_direct_hash, g_direct_equal); -- -- KH_W ("started gio kqueue backend\n"); -- return GINT_TO_POINTER (TRUE); --} -- -- --/* -- * _kh_startup: -- * Kqueue backend initialization. -- * -- * Returns: %TRUE on success, %FALSE otherwise. -- **/ --gboolean --_kh_startup (void) --{ -- static GOnce init_once = G_ONCE_INIT; -- g_once (&init_once, _kh_startup_impl, NULL); -- return GPOINTER_TO_INT (init_once.retval); --} -- -- --/** -- * _kh_start_watching: -- * @sub: a #kqueue_sub -- * -- * Starts watching on a subscription. -- * -- * Returns: %TRUE on success, %FALSE otherwise. -- **/ --gboolean --_kh_start_watching (kqueue_sub *sub) --{ -- g_assert (kqueue_socket_pair[0] != -1); -- g_assert (sub != NULL); -- g_assert (sub->filename != NULL); -- -- /* kqueue requires a file descriptor to monitor. Sad but true */ --#if defined (O_EVTONLY) -- sub->fd = open (sub->filename, O_EVTONLY); --#else -- sub->fd = open (sub->filename, O_RDONLY); --#endif -- -- if (sub->fd == -1) -- { -- KH_W ("failed to open file %s (error %d)", sub->filename, errno); -- return FALSE; -- } -- -- _ku_file_information (sub->fd, &sub->is_dir, NULL); -- if (sub->is_dir) -- { -- /* I know, it is very bad to make such decisions in this way and here. -- * We already do have an user_data at the #kqueue_sub, and it may point to -- * GKqueueFileMonitor or GKqueueDirectoryMonitor. For a directory case, -- * we need to scan in contents for the further diffs. Ideally this process -- * should be delegated to the GKqueueDirectoryMonitor, but for now I will -- * do it in a dirty way right here. */ -- if (sub->deps) -- dl_free (sub->deps); -- -- sub->deps = dl_listing (sub->filename); -- } -- -- G_LOCK (hash_lock); -- g_hash_table_insert (subs_hash_table, GINT_TO_POINTER (sub->fd), sub); -- G_UNLOCK (hash_lock); -- -- _kqueue_thread_push_fd (sub->fd); -- -- /* Bump the kqueue thread. It will pick up a new sub entry to monitor */ -- if (!_ku_write (kqueue_socket_pair[0], "A", 1)) -- KH_W ("Failed to bump the kqueue thread (add fd, error %d)", errno); -- return TRUE; --} -- -- --/** -- * _kh_add_sub: -- * @sub: a #kqueue_sub -- * -- * Adds a subscription for monitoring. -- * -- * This funciton tries to start watching a subscription with -- * _kh_start_watching(). On failure, i.e. when a file does not exist yet, -- * the subscription will be added to a list of missing files to continue -- * watching when the file will appear. -- * -- * Returns: %TRUE -- **/ --gboolean --_kh_add_sub (kqueue_sub *sub) --{ -- g_assert (sub != NULL); -- -- if (!_kh_start_watching (sub)) -- _km_add_missing (sub); -- -- return TRUE; --} -- -- --/** -- * _kh_cancel_sub: -- * @sub a #kqueue_sub -- * -- * Stops monitoring on a subscription. -- * -- * Returns: %TRUE -- **/ --gboolean --_kh_cancel_sub (kqueue_sub *sub) --{ -- gboolean missing = FALSE; -- g_assert (kqueue_socket_pair[0] != -1); -- g_assert (sub != NULL); -- -- G_LOCK (hash_lock); -- missing = !g_hash_table_remove (subs_hash_table, GINT_TO_POINTER (sub->fd)); -- G_UNLOCK (hash_lock); -- -- if (missing) -- { -- /* If there were no fd for this subscription, file is still -- * missing. */ -- KH_W ("Removing subscription from missing"); -- _km_remove (sub); -- } -- else -- { -- /* fd will be closed in the kqueue thread */ -- _kqueue_thread_remove_fd (sub->fd); -- -- /* Bump the kqueue thread. It will pick up a new sub entry to remove*/ -- if (!_ku_write (kqueue_socket_pair[0], "R", 1)) -- KH_W ("Failed to bump the kqueue thread (remove fd, error %d)", errno); -- } -- -- return TRUE; --} -- -- --/** -- * _kh_file_appeared_cb: -- * @sub: a #kqueue_sub -- * -- * A callback function for kqueue-missing subsystem. -- * -- * Signals that a missing file has finally appeared in the filesystem. -- * Emits %G_FILE_MONITOR_EVENT_CREATED. -- **/ --void --_kh_file_appeared_cb (kqueue_sub *sub) --{ -- GFile* child; -- -- g_assert (sub != NULL); -- g_assert (sub->filename); -- -- if (!g_file_test (sub->filename, G_FILE_TEST_EXISTS)) -- return; -- -- child = g_file_new_for_path (sub->filename); -- -- g_file_monitor_emit_event (G_FILE_MONITOR (sub->user_data), -- child, -- NULL, -- G_FILE_MONITOR_EVENT_CREATED); -- -- g_object_unref (child); --} ---- gio/kqueue/kqueue-helper.h.orig 2016-10-22 05:18:22 UTC -+++ gio/kqueue/kqueue-helper.h -@@ -23,16 +23,31 @@ - #ifndef __KQUEUE_HELPER_H - #define __KQUEUE_HELPER_H - --#include "kqueue-sub.h" - #include <gio/glocalfilemonitor.h> - #include <gio/gfilemonitor.h> - --gboolean _kh_startup (void); --gboolean _kh_add_sub (kqueue_sub *sub); --gboolean _kh_cancel_sub (kqueue_sub *sub); -+#include "dep-list.h" - --gboolean _kh_start_watching (kqueue_sub *sub); -+/** -+ * kqueue_sub: -+ * @filename: a name of the file to monitor -+ * @fd: the associated file descriptor (used by kqueue) -+ * -+ * Represents a subscription on a file or directory. -+ */ -+typedef struct -+{ -+ GLocalFileMonitor *mon; -+ GFileMonitorSource *source; -+ gchar* filename; -+ int fd; -+ dep_list* deps; -+ int is_dir; -+} kqueue_sub; - --void _kh_dir_diff (kqueue_sub *sub, GFileMonitorSource *source); -+gboolean _kqsub_start_watching (kqueue_sub *sub); -+void _kh_dir_diff (kqueue_sub *sub); -+void _km_add_missing (kqueue_sub *sub); -+void _km_remove (kqueue_sub *sub); - - #endif /* __KQUEUE_HELPER_H */ ---- gio/kqueue/kqueue-missing.c.orig 2016-10-22 05:18:22 UTC -+++ gio/kqueue/kqueue-missing.c -@@ -23,12 +23,12 @@ - #include <glib.h> - - #include "kqueue-helper.h" --#include "kqueue-sub.h" --#include "kqueue-missing.h" - - - #define SCAN_MISSING_TIME 4 /* 1/4 Hz */ - -+void _kh_file_appeared_cb (kqueue_sub *sub); -+ - static gboolean km_scan_missing (gpointer user_data); - - static gboolean km_debug_enabled = FALSE; -@@ -38,21 +38,6 @@ static GSList *missing_subs_list = NULL; - G_LOCK_DEFINE_STATIC (missing_lock); - - static volatile gboolean scan_missing_running = FALSE; --static on_create_cb file_appeared_callback; -- -- --/** -- * _km_init: -- * @cb: a callback function. It will be called when a watched file -- * will appear. -- * -- * Initialize the kqueue-missing module (optional). -- **/ --void --_km_init (on_create_cb cb) --{ -- file_appeared_callback = cb; --} - - - /** -@@ -83,6 +68,35 @@ _km_add_missing (kqueue_sub *sub) - } - } - -+/** -+ * _kh_file_appeared_cb: -+ * @sub: a #kqueue_sub -+ * -+ * A callback function for kqueue-missing subsystem. -+ * -+ * Signals that a missing file has finally appeared in the filesystem. -+ * Emits %G_FILE_MONITOR_EVENT_CREATED. -+ **/ -+void -+_kh_file_appeared_cb (kqueue_sub *sub) -+{ -+ GFile *child; -+ -+ g_assert (sub != NULL); -+ g_assert (sub->filename); -+ -+ if (!g_file_test (sub->filename, G_FILE_TEST_EXISTS)) -+ return; -+ -+ child = g_file_new_for_path (sub->filename); -+ -+ g_file_monitor_emit_event (G_FILE_MONITOR (sub->mon), -+ child, -+ NULL, -+ G_FILE_MONITOR_EVENT_CREATED); -+ -+ g_object_unref (child); -+} - - /** - * km_scan_missing: -@@ -114,11 +128,10 @@ km_scan_missing (gpointer user_data) - g_assert (sub != NULL); - g_assert (sub->filename != NULL); - -- if (_kh_start_watching (sub)) -+ if (_kqsub_start_watching (sub)) - { - KM_W ("file %s now exists, starting watching", sub->filename); -- if (file_appeared_callback) -- file_appeared_callback (sub); -+ _kh_file_appeared_cb (sub); - not_missing = g_slist_prepend (not_missing, head); - } - } diff --git a/devel/glib20/files/patch-gio_glib-compile-schemas.c b/devel/glib20/files/patch-gio_glib-compile-schemas.c index e92fac5baff8..cdf50e71996a 100644 --- a/devel/glib20/files/patch-gio_glib-compile-schemas.c +++ b/devel/glib20/files/patch-gio_glib-compile-schemas.c @@ -1,6 +1,6 @@ ---- gio/glib-compile-schemas.c.orig 2012-06-14 16:39:22.000000000 +0200 -+++ gio/glib-compile-schemas.c 2012-06-14 16:39:55.000000000 +0200 -@@ -1204,11 +1204,13 @@ +--- gio/glib-compile-schemas.c.orig 2017-08-07 16:58:31.000000000 +0200 ++++ gio/glib-compile-schemas.c 2017-09-15 09:25:19.746310000 +0200 +@@ -1219,6 +1219,7 @@ parse_state_start_schema (ParseState *state, return; } @@ -8,8 +8,10 @@ if (path && (g_str_has_prefix (path, "/apps/") || g_str_has_prefix (path, "/desktop/") || g_str_has_prefix (path, "/system/"))) - g_printerr ("warning: Schema '%s' has path '%s'. Paths starting with " - "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path); +@@ -1231,6 +1232,7 @@ parse_state_start_schema (ParseState *state, + g_printerr ("%s\n", message); + g_free (message); + } +#endif state->schema_state = schema_state_new (path, gettext_domain, diff --git a/devel/glib20/files/patch-gio_glocalfileoutputstream.c b/devel/glib20/files/patch-gio_glocalfileoutputstream.c deleted file mode 100644 index 9a373188836e..000000000000 --- a/devel/glib20/files/patch-gio_glocalfileoutputstream.c +++ /dev/null @@ -1,38 +0,0 @@ -From 45d4b59e3f7ef7b41db08f0c11ee5000126cfedb Mon Sep 17 00:00:00 2001 -From: Ting-Wei Lan <lantw@src.gnome.org> -Date: Sun, 4 Dec 2016 15:02:54 +0800 -Subject: [PATCH] glocalfileoutputstream: Fix symlink writing on FreeBSD and - NetBSD - -FreeBSD, DragonflyBSD and NetBSD support O_NOFOLLOW, but they use error -numbers that are different from what POSIX standard specifies. They are -not going to change the behavior, and existing programs on these systems -already take advantage of this difference. To support them, we have to -add a check in GIO to use different error numbers on these systems. - -https://bugzilla.gnome.org/show_bug.cgi?id=775593 ---- - gio/glocalfileoutputstream.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/gio/glocalfileoutputstream.c b/gio/glocalfileoutputstream.c -index 81184a671..4b3733cce 100644 ---- gio/glocalfileoutputstream.c -+++ gio/glocalfileoutputstream.c -@@ -763,7 +763,13 @@ handle_overwrite_open (const char *filename, - #ifdef O_NOFOLLOW - is_symlink = FALSE; - fd = g_open (filename, open_flags | O_NOFOLLOW, mode); -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) -+ if (fd == -1 && errno == EMLINK) -+#elif defined(__NetBSD__) -+ if (fd == -1 && errno == EFTYPE) -+#else - if (fd == -1 && errno == ELOOP) -+#endif - { - /* Could be a symlink, or it could be a regular ELOOP error, - * but then the next open will fail too. */ --- -2.13.0 - diff --git a/devel/glib20/files/patch-gio_kqueue-kqueue-missing.c b/devel/glib20/files/patch-gio_kqueue-kqueue-missing.c new file mode 100644 index 000000000000..8cf553223e79 --- /dev/null +++ b/devel/glib20/files/patch-gio_kqueue-kqueue-missing.c @@ -0,0 +1,93 @@ +--- gio/kqueue/kqueue-missing.c.orig 2018-04-09 22:48:45.637366000 +0200 ++++ gio/kqueue/kqueue-missing.c 2018-04-09 22:48:55.840341000 +0200 +@@ -23,12 +23,12 @@ + #include <glib.h> + + #include "kqueue-helper.h" +-#include "kqueue-sub.h" +-#include "kqueue-missing.h" + + + #define SCAN_MISSING_TIME 4 /* 1/4 Hz */ + ++void _kh_file_appeared_cb (kqueue_sub *sub); ++ + static gboolean km_scan_missing (gpointer user_data); + + static gboolean km_debug_enabled = FALSE; +@@ -38,24 +38,9 @@ static GSList *missing_subs_list = NULL; + G_LOCK_DEFINE_STATIC (missing_lock); + + static volatile gboolean scan_missing_running = FALSE; +-static on_create_cb file_appeared_callback; + + + /** +- * _km_init: +- * @cb: a callback function. It will be called when a watched file +- * will appear. +- * +- * Initialize the kqueue-missing module (optional). +- **/ +-void +-_km_init (on_create_cb cb) +-{ +- file_appeared_callback = cb; +-} +- +- +-/** + * _km_add_missing: + * @sub: a #kqueue_sub + * +@@ -83,7 +68,36 @@ _km_add_missing (kqueue_sub *sub) + } + } + ++/** ++ * _kh_file_appeared_cb: ++ * @sub: a #kqueue_sub ++ * ++ * A callback function for kqueue-missing subsystem. ++ * ++ * Signals that a missing file has finally appeared in the filesystem. ++ * Emits %G_FILE_MONITOR_EVENT_CREATED. ++ **/ ++void ++_kh_file_appeared_cb (kqueue_sub *sub) ++{ ++ GFile *child; + ++ g_assert (sub != NULL); ++ g_assert (sub->filename); ++ ++ if (!g_file_test (sub->filename, G_FILE_TEST_EXISTS)) ++ return; ++ ++ child = g_file_new_for_path (sub->filename); ++ ++ g_file_monitor_emit_event (G_FILE_MONITOR (sub->mon), ++ child, ++ NULL, ++ G_FILE_MONITOR_EVENT_CREATED); ++ ++ g_object_unref (child); ++} ++ + /** + * km_scan_missing: + * @user_data: unused +@@ -114,11 +128,10 @@ km_scan_missing (gpointer user_data) + g_assert (sub != NULL); + g_assert (sub->filename != NULL); + +- if (_kh_start_watching (sub)) ++ if (_kqsub_start_watching (sub)) + { + KM_W ("file %s now exists, starting watching", sub->filename); +- if (file_appeared_callback) +- file_appeared_callback (sub); ++ _kh_file_appeared_cb (sub); + not_missing = g_slist_prepend (not_missing, head); + } + } diff --git a/devel/glib20/files/patch-gio_kqueue_Makefile.in b/devel/glib20/files/patch-gio_kqueue_Makefile.in new file mode 100644 index 000000000000..4e2a220ba9f7 --- /dev/null +++ b/devel/glib20/files/patch-gio_kqueue_Makefile.in @@ -0,0 +1,87 @@ +--- gio/kqueue/Makefile.in.orig 2018-04-09 23:09:21.018712000 +0200 ++++ gio/kqueue/Makefile.in 2018-04-09 23:09:38.517739000 +0200 +@@ -183,9 +183,7 @@ LTLIBRARIES = $(installed_test_LTLIBRARIES) $(noinst_L + libkqueue_la_LIBADD = + am__objects_1 = + am_libkqueue_la_OBJECTS = libkqueue_la-gkqueuefilemonitor.lo \ +- libkqueue_la-kqueue-helper.lo libkqueue_la-kqueue-thread.lo \ +- libkqueue_la-kqueue-sub.lo libkqueue_la-kqueue-missing.lo \ +- libkqueue_la-kqueue-utils.lo libkqueue_la-kqueue-exclusions.lo \ ++ libkqueue_la-kqueue-helper.lo libkqueue_la-kqueue-missing.lo \ + libkqueue_la-dep-list.lo $(am__objects_1) + libkqueue_la_OBJECTS = $(am_libkqueue_la_OBJECTS) + AM_V_lt = $(am__v_lt_@AM_V@) +@@ -777,19 +775,9 @@ all_test_ltlibs = $(test_ltlibraries) $(uninstalled_te + @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test) + libkqueue_la_SOURCES = \ + gkqueuefilemonitor.c \ +- gkqueuefilemonitor.h \ + kqueue-helper.c \ + kqueue-helper.h \ +- kqueue-thread.c \ +- kqueue-thread.h \ +- kqueue-sub.c \ +- kqueue-sub.h \ + kqueue-missing.c \ +- kqueue-missing.h \ +- kqueue-utils.c \ +- kqueue-utils.h \ +- kqueue-exclusions.c \ +- kqueue-exclusions.h \ + dep-list.c \ + dep-list.h \ + $(NULL) +@@ -1009,12 +997,8 @@ distclean-compile: + + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkqueue_la-dep-list.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkqueue_la-gkqueuefilemonitor.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkqueue_la-kqueue-exclusions.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkqueue_la-kqueue-helper.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkqueue_la-kqueue-missing.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkqueue_la-kqueue-sub.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkqueue_la-kqueue-thread.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkqueue_la-kqueue-utils.Plo@am__quote@ + + .c.o: + @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@@ -1054,40 +1038,12 @@ libkqueue_la-kqueue-helper.lo: kqueue-helper.c + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -c -o libkqueue_la-kqueue-helper.lo `test -f 'kqueue-helper.c' || echo '$(srcdir)/'`kqueue-helper.c + +-libkqueue_la-kqueue-thread.lo: kqueue-thread.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -MT libkqueue_la-kqueue-thread.lo -MD -MP -MF $(DEPDIR)/libkqueue_la-kqueue-thread.Tpo -c -o libkqueue_la-kqueue-thread.lo `test -f 'kqueue-thread.c' || echo '$(srcdir)/'`kqueue-thread.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkqueue_la-kqueue-thread.Tpo $(DEPDIR)/libkqueue_la-kqueue-thread.Plo +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kqueue-thread.c' object='libkqueue_la-kqueue-thread.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -c -o libkqueue_la-kqueue-thread.lo `test -f 'kqueue-thread.c' || echo '$(srcdir)/'`kqueue-thread.c +- +-libkqueue_la-kqueue-sub.lo: kqueue-sub.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -MT libkqueue_la-kqueue-sub.lo -MD -MP -MF $(DEPDIR)/libkqueue_la-kqueue-sub.Tpo -c -o libkqueue_la-kqueue-sub.lo `test -f 'kqueue-sub.c' || echo '$(srcdir)/'`kqueue-sub.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkqueue_la-kqueue-sub.Tpo $(DEPDIR)/libkqueue_la-kqueue-sub.Plo +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kqueue-sub.c' object='libkqueue_la-kqueue-sub.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -c -o libkqueue_la-kqueue-sub.lo `test -f 'kqueue-sub.c' || echo '$(srcdir)/'`kqueue-sub.c +- + libkqueue_la-kqueue-missing.lo: kqueue-missing.c + @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -MT libkqueue_la-kqueue-missing.lo -MD -MP -MF $(DEPDIR)/libkqueue_la-kqueue-missing.Tpo -c -o libkqueue_la-kqueue-missing.lo `test -f 'kqueue-missing.c' || echo '$(srcdir)/'`kqueue-missing.c + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkqueue_la-kqueue-missing.Tpo $(DEPDIR)/libkqueue_la-kqueue-missing.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kqueue-missing.c' object='libkqueue_la-kqueue-missing.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -c -o libkqueue_la-kqueue-missing.lo `test -f 'kqueue-missing.c' || echo '$(srcdir)/'`kqueue-missing.c +- +-libkqueue_la-kqueue-utils.lo: kqueue-utils.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -MT libkqueue_la-kqueue-utils.lo -MD -MP -MF $(DEPDIR)/libkqueue_la-kqueue-utils.Tpo -c -o libkqueue_la-kqueue-utils.lo `test -f 'kqueue-utils.c' || echo '$(srcdir)/'`kqueue-utils.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkqueue_la-kqueue-utils.Tpo $(DEPDIR)/libkqueue_la-kqueue-utils.Plo +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kqueue-utils.c' object='libkqueue_la-kqueue-utils.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -c -o libkqueue_la-kqueue-utils.lo `test -f 'kqueue-utils.c' || echo '$(srcdir)/'`kqueue-utils.c +- +-libkqueue_la-kqueue-exclusions.lo: kqueue-exclusions.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -MT libkqueue_la-kqueue-exclusions.lo -MD -MP -MF $(DEPDIR)/libkqueue_la-kqueue-exclusions.Tpo -c -o libkqueue_la-kqueue-exclusions.lo `test -f 'kqueue-exclusions.c' || echo '$(srcdir)/'`kqueue-exclusions.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkqueue_la-kqueue-exclusions.Tpo $(DEPDIR)/libkqueue_la-kqueue-exclusions.Plo +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kqueue-exclusions.c' object='libkqueue_la-kqueue-exclusions.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -c -o libkqueue_la-kqueue-exclusions.lo `test -f 'kqueue-exclusions.c' || echo '$(srcdir)/'`kqueue-exclusions.c + + libkqueue_la-dep-list.lo: dep-list.c + @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -MT libkqueue_la-dep-list.lo -MD -MP -MF $(DEPDIR)/libkqueue_la-dep-list.Tpo -c -o libkqueue_la-dep-list.lo `test -f 'dep-list.c' || echo '$(srcdir)/'`dep-list.c diff --git a/devel/glib20/files/patch-gio_kqueue_gkqueuefilemonitor.c b/devel/glib20/files/patch-gio_kqueue_gkqueuefilemonitor.c new file mode 100644 index 000000000000..e1166c9d71d1 --- /dev/null +++ b/devel/glib20/files/patch-gio_kqueue_gkqueuefilemonitor.c @@ -0,0 +1,463 @@ +--- gio/kqueue/gkqueuefilemonitor.c.orig 2018-04-07 04:10:22.000000000 +0200 ++++ gio/kqueue/gkqueuefilemonitor.c 2018-05-03 20:21:55.830634000 +0200 +@@ -22,33 +22,73 @@ + + #include "config.h" + +-#include "gkqueuefilemonitor.h" +-#include "kqueue-helper.h" +-#include "kqueue-exclusions.h" ++#include <sys/types.h> ++#include <sys/event.h> ++#include <sys/time.h> ++#include <sys/socket.h> ++#include <sys/stat.h> ++ ++#include <errno.h> ++#include <fcntl.h> ++#include <string.h> ++ ++#include <glib-object.h> ++#include <gio/gfilemonitor.h> ++#include <gio/glocalfilemonitor.h> ++#include <gio/giomodule.h> + #include <gio/gpollfilemonitor.h> + #include <gio/gfile.h> +-#include <gio/giomodule.h> ++#include <glib-unix.h> ++#include "glib-private.h" + ++#include "kqueue-helper.h" ++#include "dep-list.h" + +-struct _GKqueueFileMonitor ++G_LOCK_DEFINE_STATIC (kq_lock); ++static GSource *kq_source; ++static int kq_queue = -1; ++ ++#define G_TYPE_KQUEUE_FILE_MONITOR (g_kqueue_file_monitor_get_type ()) ++#define G_KQUEUE_FILE_MONITOR(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \ ++ G_TYPE_KQUEUE_FILE_MONITOR, GKqueueFileMonitor)) ++ ++typedef GLocalFileMonitorClass GKqueueFileMonitorClass; ++ ++typedef struct + { + GLocalFileMonitor parent_instance; + + kqueue_sub *sub; +- ++#ifndef O_EVTONLY + GFileMonitor *fallback; + GFile *fbfile; +-}; ++#endif ++} GKqueueFileMonitor; + ++GType g_kqueue_file_monitor_get_type (void); ++G_DEFINE_TYPE_WITH_CODE (GKqueueFileMonitor, g_kqueue_file_monitor, G_TYPE_LOCAL_FILE_MONITOR, ++ g_io_extension_point_implement (G_LOCAL_FILE_MONITOR_EXTENSION_POINT_NAME, ++ g_define_type_id, ++ "kqueue", ++ 20)) ++ ++#ifndef O_EVTONLY ++#define O_KQFLAG O_RDONLY ++#else ++#define O_KQFLAG O_EVTONLY ++#endif ++ ++#define NOTE_ALL (NOTE_DELETE|NOTE_WRITE|NOTE_EXTEND|NOTE_ATTRIB|NOTE_RENAME) ++ + static gboolean g_kqueue_file_monitor_cancel (GFileMonitor* monitor); ++static gboolean g_kqueue_file_monitor_is_supported (void); + +-G_DEFINE_TYPE_WITH_CODE (GKqueueFileMonitor, g_kqueue_file_monitor, G_TYPE_LOCAL_FILE_MONITOR, +- g_io_extension_point_implement (G_LOCAL_FILE_MONITOR_EXTENSION_POINT_NAME, +- g_define_type_id, +- "kqueue", +- 20)) ++static kqueue_sub *_kqsub_new (const gchar *, GLocalFileMonitor *, GFileMonitorSource *); ++static void _kqsub_free (kqueue_sub *); ++static gboolean _kqsub_cancel (kqueue_sub *); + + ++#ifndef O_EVTONLY + static void + _fallback_callback (GFileMonitor *unused, + GFile *first, +@@ -57,22 +97,42 @@ _fallback_callback (GFileMonitor *unused, + gpointer udata) + { + GKqueueFileMonitor *kq_mon = G_KQUEUE_FILE_MONITOR (udata); +- GFileMonitor *mon = G_FILE_MONITOR (kq_mon); +- g_assert (kq_mon != NULL); +- g_assert (mon != NULL); +- (void) unused; + +- if (event == G_FILE_MONITOR_EVENT_CHANGED) +- { +- GLocalFileMonitor *local_monitor = G_LOCAL_FILE_MONITOR (kq_mon); +- +- _kh_dir_diff (kq_mon->sub, local_monitor->source); +- } +- else +- g_file_monitor_emit_event (mon, first, second, event); ++ g_file_monitor_emit_event (G_FILE_MONITOR (kq_mon), first, second, event); + } + ++/* ++ * _ke_is_excluded: ++ * @full_path - a path to file to check. ++ * ++ * Returns: TRUE if the file should be excluded from the kqueue-powered ++ * monitoring, FALSE otherwise. ++ **/ ++gboolean ++_ke_is_excluded (const char *full_path) ++{ ++ GFile *f = NULL; ++ GMount *mount = NULL; + ++ f = g_file_new_for_path (full_path); ++ ++ if (f != NULL) { ++ mount = g_file_find_enclosing_mount (f, NULL, NULL); ++ g_object_unref (f); ++ } ++ ++ if ((mount != NULL && (g_mount_can_unmount (mount))) || g_str_has_prefix (full_path, "/mnt/")) ++ { ++ g_warning ("Excluding %s from kernel notification, falling back to poll", full_path); ++ if (mount) ++ g_object_unref (mount); ++ return TRUE; ++ } ++ ++ return FALSE; ++} ++#endif /* !O_EVTONLY */ ++ + static void + g_kqueue_file_monitor_finalize (GObject *object) + { +@@ -80,16 +140,18 @@ g_kqueue_file_monitor_finalize (GObject *object) + + if (kqueue_monitor->sub) + { +- _kh_cancel_sub (kqueue_monitor->sub); +- _kh_sub_free (kqueue_monitor->sub); ++ _kqsub_cancel (kqueue_monitor->sub); ++ _kqsub_free (kqueue_monitor->sub); + kqueue_monitor->sub = NULL; + } + ++#ifndef O_EVTONLY + if (kqueue_monitor->fallback) + g_object_unref (kqueue_monitor->fallback); + + if (kqueue_monitor->fbfile) + g_object_unref (kqueue_monitor->fbfile); ++#endif + + if (G_OBJECT_CLASS (g_kqueue_file_monitor_parent_class)->finalize) + (*G_OBJECT_CLASS (g_kqueue_file_monitor_parent_class)->finalize) (object); +@@ -103,21 +165,25 @@ g_kqueue_file_monitor_start (GLocalFileMonitor *local_ + GFileMonitorSource *source) + { + GKqueueFileMonitor *kqueue_monitor = G_KQUEUE_FILE_MONITOR (local_monitor); +- GObject *obj; +- GKqueueFileMonitorClass *klass; +- GObjectClass *parent_class; +- kqueue_sub *sub = NULL; +- gboolean ret_kh_startup = FALSE; +- const gchar *path = NULL; ++ kqueue_sub *sub; ++ const gchar *path; + +- +- ret_kh_startup = _kh_startup (); +- g_assert (ret_kh_startup); +- + path = filename; +- if (!path) ++ if (path == NULL) + path = dirname; + ++#ifndef O_EVTONLY ++ if (_ke_is_excluded (path)) ++ { ++ GFile *file = g_file_new_for_path (path); ++ kqueue_monitor->fbfile = file; ++ kqueue_monitor->fallback = _g_poll_file_monitor_new (file); ++ g_signal_connect (kqueue_monitor->fallback, "changed", ++ G_CALLBACK (_fallback_callback), kqueue_monitor); ++ return; ++ } ++#endif ++ + /* For a directory monitor, create a subscription object anyway. + * It will be used for directory diff calculation routines. + * Wait, directory diff in a GKqueueFileMonitor? +@@ -125,35 +191,15 @@ g_kqueue_file_monitor_start (GLocalFileMonitor *local_ + * file, GIO uses a GKqueueFileMonitor object for that. If a directory + * will be created under that path, GKqueueFileMonitor will have to + * handle the directory notifications. */ ++ sub = _kqsub_new (path, local_monitor, source); ++ if (sub == NULL) ++ return; + +- sub = _kh_sub_new (path, TRUE, source); +- +- /* FIXME: what to do about errors here? we can't return NULL or another +- * kind of error and an assertion is probably too hard (same issue as in +- * the inotify backend) */ +- g_assert (sub != NULL); + kqueue_monitor->sub = sub; +- +- if (!_ke_is_excluded (path)) +- _kh_add_sub (sub); +- else +- { +- GFile *file = g_file_new_for_path (path); +- kqueue_monitor->fbfile = file; +- kqueue_monitor->fallback = _g_poll_file_monitor_new (file); +- g_signal_connect (kqueue_monitor->fallback, +- "changed", +- G_CALLBACK (_fallback_callback), +- kqueue_monitor); +- } ++ if (!_kqsub_start_watching (sub)) ++ _km_add_missing (sub); + } + +-static gboolean +-g_kqueue_file_monitor_is_supported (void) +-{ +- return _kh_startup (); +-} +- + static void + g_kqueue_file_monitor_class_init (GKqueueFileMonitorClass *klass) + { +@@ -175,24 +221,218 @@ g_kqueue_file_monitor_init (GKqueueFileMonitor *monito + } + + static gboolean ++g_kqueue_file_monitor_callback (gint fd, GIOCondition condition, gpointer user_data) ++{ ++ gint64 now = g_source_get_time (kq_source); ++ kqueue_sub *sub; ++ GFileMonitorSource *source; ++ struct kevent ev; ++ struct timespec ts; ++ ++ memset (&ts, 0, sizeof(ts)); ++ while (kevent(fd, NULL, 0, &ev, 1, &ts) > 0) ++ { ++ GFileMonitorEvent mask = 0; ++ ++ if (ev.filter != EVFILT_VNODE || ev.udata == NULL) ++ continue; ++ ++ sub = ev.udata; ++ source = sub->source; ++ ++ if (ev.flags & EV_ERROR) ++ ev.fflags = NOTE_REVOKE; ++ ++ if (ev.fflags & (NOTE_DELETE | NOTE_REVOKE)) ++ { ++ _kqsub_cancel (sub); ++ _km_add_missing (sub); ++ } ++ ++ if (sub->is_dir && ev.fflags & (NOTE_WRITE | NOTE_EXTEND)) ++ { ++ _kh_dir_diff (sub); ++ ev.fflags &= ~(NOTE_WRITE | NOTE_EXTEND); ++ } ++ ++ if (ev.fflags & NOTE_DELETE) ++ { ++ mask = G_FILE_MONITOR_EVENT_DELETED; ++ } ++ else if (ev.fflags & NOTE_ATTRIB) ++ { ++ mask = G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED; ++ } ++ else if (ev.fflags & (NOTE_WRITE | NOTE_EXTEND)) ++ { ++ mask = G_FILE_MONITOR_EVENT_CHANGED; ++ } ++ else if (ev.fflags & NOTE_RENAME) ++ { ++ /* Since there’s apparently no way to get the new name of the ++ * file out of kqueue(), all we can do is say that this one has ++ * been deleted. */ ++ mask = G_FILE_MONITOR_EVENT_DELETED; ++ } ++ else if (ev.fflags & NOTE_REVOKE) ++ { ++ mask = G_FILE_MONITOR_EVENT_UNMOUNTED; ++ } ++ ++ if (mask) ++ g_file_monitor_source_handle_event (source, mask, NULL, NULL, NULL, now); ++ } ++ ++ return TRUE; ++} ++ ++static gboolean ++g_kqueue_file_monitor_is_supported (void) ++{ ++ int errsv; ++ ++ G_LOCK (kq_lock); ++ ++ if (kq_queue == -1) ++ { ++ kq_queue = kqueue (); ++ errsv = errno; ++ ++ if (kq_queue == -1) ++ { ++ g_warning ("Unable to create a kqueue: %s", g_strerror (errsv)); ++ G_UNLOCK (kq_lock); ++ return FALSE; ++ } ++ ++ kq_source = g_unix_fd_source_new (kq_queue, G_IO_IN); ++ g_source_set_callback (kq_source, (GSourceFunc) g_kqueue_file_monitor_callback, NULL, NULL); ++ g_source_attach (kq_source, GLIB_PRIVATE_CALL (g_get_worker_context) ()); ++ } ++ ++ G_UNLOCK (kq_lock); ++ ++ return TRUE; ++} ++ ++static gboolean + g_kqueue_file_monitor_cancel (GFileMonitor *monitor) + { + GKqueueFileMonitor *kqueue_monitor = G_KQUEUE_FILE_MONITOR (monitor); + + if (kqueue_monitor->sub) + { +- _kh_cancel_sub (kqueue_monitor->sub); +- _kh_sub_free (kqueue_monitor->sub); ++ _kqsub_cancel (kqueue_monitor->sub); ++ _kqsub_free (kqueue_monitor->sub); + kqueue_monitor->sub = NULL; + } ++#ifndef O_EVTONLY + else if (kqueue_monitor->fallback) + { + g_signal_handlers_disconnect_by_func (kqueue_monitor->fallback, _fallback_callback, kqueue_monitor); + g_file_monitor_cancel (kqueue_monitor->fallback); + } ++#endif + + if (G_FILE_MONITOR_CLASS (g_kqueue_file_monitor_parent_class)->cancel) + (*G_FILE_MONITOR_CLASS (g_kqueue_file_monitor_parent_class)->cancel) (monitor); ++ ++ return TRUE; ++} ++ ++static kqueue_sub * ++_kqsub_new (const gchar *filename, GLocalFileMonitor *mon, GFileMonitorSource *source) ++{ ++ kqueue_sub *sub; ++ ++ sub = g_slice_new (kqueue_sub); ++ sub->filename = g_strdup (filename); ++ sub->mon = mon; ++ g_source_ref ((GSource *) source); ++ sub->source = source; ++ sub->fd = -1; ++ sub->deps = NULL; ++ sub->is_dir = 0; ++ ++ return sub; ++} ++ ++static void ++_kqsub_free (kqueue_sub *sub) ++{ ++ g_assert (sub->deps == NULL); ++ g_assert (sub->fd == -1); ++ ++ g_source_unref ((GSource *) sub->source); ++ g_free (sub->filename); ++ g_slice_free (kqueue_sub, sub); ++} ++ ++static gboolean ++_kqsub_cancel (kqueue_sub *sub) ++{ ++ struct kevent ev; ++ ++ /* Remove the event and close the file descriptor to automatically ++ * delete pending events. */ ++ if (sub->fd != -1) ++ { ++ EV_SET (&ev, sub->fd, EVFILT_VNODE, EV_DELETE, NOTE_ALL, 0, sub); ++ if (kevent (kq_queue, &ev, 1, NULL, 0, NULL) == -1) ++ { ++ g_warning ("Unable to remove event for %s: %s", sub->filename, g_strerror (errno)); ++ return FALSE; ++ } ++ close (sub->fd); ++ sub->fd = -1; ++ } ++ ++ _km_remove (sub); ++ ++ if (sub->deps) ++ { ++ dl_free (sub->deps); ++ sub->deps = NULL; ++ } ++ ++ return TRUE; ++} ++ ++gboolean ++_kqsub_start_watching (kqueue_sub *sub) ++{ ++ struct stat st; ++ struct kevent ev; ++ ++ sub->fd = open (sub->filename, O_KQFLAG); ++ if (sub->fd == -1) ++ return FALSE; ++ ++ if (fstat (sub->fd, &st) == -1) ++ { ++ g_warning ("fstat failed for %s: %s", sub->filename, g_strerror (errno)); ++ close (sub->fd); ++ sub->fd = -1; ++ return FALSE; ++ } ++ ++ sub->is_dir = (st.st_mode & S_IFDIR) ? 1 : 0; ++ if (sub->is_dir) ++ { ++ if (sub->deps) ++ dl_free (sub->deps); ++ ++ sub->deps = dl_listing (sub->filename); ++ } ++ ++ EV_SET (&ev, sub->fd, EVFILT_VNODE, EV_ADD | EV_CLEAR, NOTE_ALL, 0, sub); ++ if (kevent (kq_queue, &ev, 1, NULL, 0, NULL) == -1) ++ { ++ g_warning ("Unable to add event for %s: %s", sub->filename, g_strerror (errno)); ++ close (sub->fd); ++ sub->fd = -1; ++ return FALSE; ++ } + + return TRUE; + } diff --git a/devel/glib20/files/patch-gio_kqueue_kqueue-helper.c b/devel/glib20/files/patch-gio_kqueue_kqueue-helper.c new file mode 100644 index 000000000000..1dbae54548bf --- /dev/null +++ b/devel/glib20/files/patch-gio_kqueue_kqueue-helper.c @@ -0,0 +1,409 @@ +--- gio/kqueue/kqueue-helper.c.orig 2018-01-08 21:00:49.000000000 +0100 ++++ gio/kqueue/kqueue-helper.c 2018-04-09 22:46:58.181986000 +0200 +@@ -34,84 +34,7 @@ + #include <errno.h> + #include <pthread.h> + #include "kqueue-helper.h" +-#include "kqueue-utils.h" +-#include "kqueue-thread.h" +-#include "kqueue-missing.h" +-#include "kqueue-exclusions.h" + +-static gboolean kh_debug_enabled = FALSE; +-#define KH_W if (kh_debug_enabled) g_warning +- +-static GHashTable *subs_hash_table = NULL; +-G_LOCK_DEFINE_STATIC (hash_lock); +- +-static int kqueue_descriptor = -1; +-static int kqueue_socket_pair[] = {-1, -1}; +-static pthread_t kqueue_thread; +- +- +-void _kh_file_appeared_cb (kqueue_sub *sub); +- +-/** +- * accessor function for kqueue_descriptor +- **/ +-int +-get_kqueue_descriptor() +-{ +- return kqueue_descriptor; +-} +- +-/** +- * convert_kqueue_events_to_gio: +- * @flags: a set of kqueue filter flags +- * @done: a pointer to #gboolean indicating that the +- * conversion has been done (out) +- * +- * Translates kqueue filter flags into GIO event flags. +- * +- * Returns: a #GFileMonitorEvent +- **/ +-static GFileMonitorEvent +-convert_kqueue_events_to_gio (uint32_t flags, gboolean *done) +-{ +- g_assert (done != NULL); +- *done = FALSE; +- +- /* TODO: The following notifications should be emulated, if possible: +- * - G_FILE_MONITOR_EVENT_PRE_UNMOUNT +- */ +- if (flags & NOTE_DELETE) +- { +- *done = TRUE; +- return G_FILE_MONITOR_EVENT_DELETED; +- } +- if (flags & NOTE_ATTRIB) +- { +- *done = TRUE; +- return G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED; +- } +- if (flags & (NOTE_WRITE | NOTE_EXTEND)) +- { +- *done = TRUE; +- return G_FILE_MONITOR_EVENT_CHANGED; +- } +- if (flags & NOTE_RENAME) +- { +- /* Since there’s apparently no way to get the new name of the file out of +- * kqueue(), all we can do is say that this one has been deleted. */ +- *done = TRUE; +- return G_FILE_MONITOR_EVENT_DELETED; +- } +- if (flags & NOTE_REVOKE) +- { +- *done = TRUE; +- return G_FILE_MONITOR_EVENT_UNMOUNTED; +- } +- +- /* done is FALSE */ +- return 0; +-} +- + typedef struct { + kqueue_sub *sub; + GFileMonitorSource *source; +@@ -238,318 +161,21 @@ static const traverse_cbs cbs = { + + + void +-_kh_dir_diff (kqueue_sub *sub, GFileMonitorSource *source) ++_kh_dir_diff (kqueue_sub *sub) + { + dep_list *was; + handle_ctx ctx; + +- g_assert (sub != NULL); +- g_assert (source != NULL); +- + memset (&ctx, 0, sizeof (handle_ctx)); + ctx.sub = sub; +- ctx.source = source; ++ ctx.source = sub->source; + + was = sub->deps; + sub->deps = dl_listing (sub->filename); +- ++ + dl_calculate (was, sub->deps, &cbs, &ctx); + + dl_free (was); + } + + +-/** +- * process_kqueue_notifications: +- * @gioc: unused. +- * @cond: unused. +- * @data: unused. +- * +- * Processes notifications, coming from the kqueue thread. +- * +- * Reads notifications from the command file descriptor, emits the +- * "changed" event on the appropriate monitor. +- * +- * A typical GIO Channel callback function. +- * +- * Returns: %TRUE +- **/ +-static gboolean +-process_kqueue_notifications (GIOChannel *gioc, +- GIOCondition cond, +- gpointer data) +-{ +- struct kqueue_notification n; +- kqueue_sub *sub = NULL; +- GFileMonitorSource *source = NULL; +- GFileMonitorEvent mask = 0; +- +- g_assert (kqueue_socket_pair[0] != -1); +- if (!_ku_read (kqueue_socket_pair[0], &n, sizeof (struct kqueue_notification))) +- { +- KH_W ("Failed to read a kqueue notification, error %d", errno); +- return TRUE; +- } +- +- G_LOCK (hash_lock); +- sub = (kqueue_sub *) g_hash_table_lookup (subs_hash_table, GINT_TO_POINTER (n.fd)); +- G_UNLOCK (hash_lock); +- +- if (sub == NULL) +- { +- KH_W ("Got a notification for a deleted or non-existing subscription %d", +- n.fd); +- return TRUE; +- } +- +- source = sub->user_data; +- g_assert (source != NULL); +- +- if (n.flags & (NOTE_DELETE | NOTE_REVOKE)) +- { +- if (sub->deps) +- { +- dl_free (sub->deps); +- sub->deps = NULL; +- } +- _km_add_missing (sub); +- +- if (!(n.flags & NOTE_REVOKE)) +- { +- /* Note that NOTE_REVOKE is issued by the kqueue thread +- * on EV_ERROR kevent. In this case, a file descriptor is +- * already closed from the kqueue thread, no need to close +- * it manually */ +- _kh_cancel_sub (sub); +- } +- } +- +- if (sub->is_dir && n.flags & (NOTE_WRITE | NOTE_EXTEND)) +- { +- _kh_dir_diff (sub, source); +- n.flags &= ~(NOTE_WRITE | NOTE_EXTEND); +- } +- +- if (n.flags) +- { +- gboolean done = FALSE; +- mask = convert_kqueue_events_to_gio (n.flags, &done); +- if (done == TRUE) +- g_file_monitor_source_handle_event (source, mask, NULL, NULL, NULL, g_get_monotonic_time ()); +- } +- +- return TRUE; +-} +- +- +-/* +- * _kh_startup_impl: +- * @unused: unused +- * +- * Kqueue backend startup code. Should be called only once. +- * +- * Returns: %TRUE on success, %FALSE otherwise. +- **/ +-static gpointer +-_kh_startup_impl (gpointer unused) +-{ +- GIOChannel *channel = NULL; +- gboolean result = FALSE; +- +- kqueue_descriptor = kqueue (); +- result = (kqueue_descriptor != -1); +- if (!result) +- { +- KH_W ("Failed to initialize kqueue\n!"); +- return GINT_TO_POINTER (FALSE); +- } +- +- result = socketpair (AF_UNIX, SOCK_STREAM, 0, kqueue_socket_pair); +- if (result != 0) +- { +- KH_W ("Failed to create socket pair\n!"); +- return GINT_TO_POINTER (FALSE) ; +- } +- +- result = pthread_create (&kqueue_thread, +- NULL, +- _kqueue_thread_func, +- &kqueue_socket_pair[1]); +- if (result != 0) +- { +- KH_W ("Failed to run kqueue thread\n!"); +- return GINT_TO_POINTER (FALSE); +- } +- +- _km_init (_kh_file_appeared_cb); +- +- channel = g_io_channel_unix_new (kqueue_socket_pair[0]); +- g_io_add_watch (channel, G_IO_IN, process_kqueue_notifications, NULL); +- +- subs_hash_table = g_hash_table_new (g_direct_hash, g_direct_equal); +- +- KH_W ("started gio kqueue backend\n"); +- return GINT_TO_POINTER (TRUE); +-} +- +- +-/* +- * _kh_startup: +- * Kqueue backend initialization. +- * +- * Returns: %TRUE on success, %FALSE otherwise. +- **/ +-gboolean +-_kh_startup (void) +-{ +- static GOnce init_once = G_ONCE_INIT; +- g_once (&init_once, _kh_startup_impl, NULL); +- return GPOINTER_TO_INT (init_once.retval); +-} +- +- +-/** +- * _kh_start_watching: +- * @sub: a #kqueue_sub +- * +- * Starts watching on a subscription. +- * +- * Returns: %TRUE on success, %FALSE otherwise. +- **/ +-gboolean +-_kh_start_watching (kqueue_sub *sub) +-{ +- g_assert (kqueue_socket_pair[0] != -1); +- g_assert (sub != NULL); +- g_assert (sub->filename != NULL); +- +- /* kqueue requires a file descriptor to monitor. Sad but true */ +-#if defined (O_EVTONLY) +- sub->fd = open (sub->filename, O_EVTONLY); +-#else +- sub->fd = open (sub->filename, O_RDONLY); +-#endif +- +- if (sub->fd == -1) +- { +- KH_W ("failed to open file %s (error %d)", sub->filename, errno); +- return FALSE; +- } +- +- _ku_file_information (sub->fd, &sub->is_dir, NULL); +- if (sub->is_dir) +- { +- /* I know, it is very bad to make such decisions in this way and here. +- * We already do have an user_data at the #kqueue_sub, and it may point to +- * GKqueueFileMonitor or GKqueueDirectoryMonitor. For a directory case, +- * we need to scan in contents for the further diffs. Ideally this process +- * should be delegated to the GKqueueDirectoryMonitor, but for now I will +- * do it in a dirty way right here. */ +- if (sub->deps) +- dl_free (sub->deps); +- +- sub->deps = dl_listing (sub->filename); +- } +- +- G_LOCK (hash_lock); +- g_hash_table_insert (subs_hash_table, GINT_TO_POINTER (sub->fd), sub); +- G_UNLOCK (hash_lock); +- +- _kqueue_thread_push_fd (sub->fd); +- +- /* Bump the kqueue thread. It will pick up a new sub entry to monitor */ +- if (!_ku_write (kqueue_socket_pair[0], "A", 1)) +- KH_W ("Failed to bump the kqueue thread (add fd, error %d)", errno); +- return TRUE; +-} +- +- +-/** +- * _kh_add_sub: +- * @sub: a #kqueue_sub +- * +- * Adds a subscription for monitoring. +- * +- * This funciton tries to start watching a subscription with +- * _kh_start_watching(). On failure, i.e. when a file does not exist yet, +- * the subscription will be added to a list of missing files to continue +- * watching when the file will appear. +- * +- * Returns: %TRUE +- **/ +-gboolean +-_kh_add_sub (kqueue_sub *sub) +-{ +- g_assert (sub != NULL); +- +- if (!_kh_start_watching (sub)) +- _km_add_missing (sub); +- +- return TRUE; +-} +- +- +-/** +- * _kh_cancel_sub: +- * @sub a #kqueue_sub +- * +- * Stops monitoring on a subscription. +- * +- * Returns: %TRUE +- **/ +-gboolean +-_kh_cancel_sub (kqueue_sub *sub) +-{ +- gboolean removed = FALSE; +- g_assert (kqueue_socket_pair[0] != -1); +- g_assert (sub != NULL); +- +- _km_remove (sub); +- +- G_LOCK (hash_lock); +- removed = g_hash_table_remove (subs_hash_table, GINT_TO_POINTER (sub->fd)); +- G_UNLOCK (hash_lock); +- +- if (removed) +- { +- /* fd will be closed in the kqueue thread */ +- _kqueue_thread_remove_fd (sub->fd); +- +- /* Bump the kqueue thread. It will pick up a new sub entry to remove*/ +- if (!_ku_write (kqueue_socket_pair[0], "R", 1)) +- KH_W ("Failed to bump the kqueue thread (remove fd, error %d)", errno); +- } +- +- return TRUE; +-} +- +- +-/** +- * _kh_file_appeared_cb: +- * @sub: a #kqueue_sub +- * +- * A callback function for kqueue-missing subsystem. +- * +- * Signals that a missing file has finally appeared in the filesystem. +- * Emits %G_FILE_MONITOR_EVENT_CREATED. +- **/ +-void +-_kh_file_appeared_cb (kqueue_sub *sub) +-{ +- GFile* child; +- +- g_assert (sub != NULL); +- g_assert (sub->filename); +- +- if (!g_file_test (sub->filename, G_FILE_TEST_EXISTS)) +- return; +- +- child = g_file_new_for_path (sub->filename); +- +- g_file_monitor_emit_event (G_FILE_MONITOR (sub->user_data), +- child, +- NULL, +- G_FILE_MONITOR_EVENT_CREATED); +- +- g_object_unref (child); +-} diff --git a/devel/glib20/files/patch-gio_kqueue_kqueue-helper.h b/devel/glib20/files/patch-gio_kqueue_kqueue-helper.h new file mode 100644 index 000000000000..053e895488e7 --- /dev/null +++ b/devel/glib20/files/patch-gio_kqueue_kqueue-helper.h @@ -0,0 +1,40 @@ +--- gio/kqueue/kqueue-helper.h.orig 2018-04-09 22:47:22.070991000 +0200 ++++ gio/kqueue/kqueue-helper.h 2018-04-09 22:47:44.329479000 +0200 +@@ -23,16 +23,31 @@ + #ifndef __KQUEUE_HELPER_H + #define __KQUEUE_HELPER_H + +-#include "kqueue-sub.h" + #include <gio/glocalfilemonitor.h> + #include <gio/gfilemonitor.h> + +-gboolean _kh_startup (void); +-gboolean _kh_add_sub (kqueue_sub *sub); +-gboolean _kh_cancel_sub (kqueue_sub *sub); ++#include "dep-list.h" + +-gboolean _kh_start_watching (kqueue_sub *sub); ++/** ++ * kqueue_sub: ++ * @filename: a name of the file to monitor ++ * @fd: the associated file descriptor (used by kqueue) ++ * ++ * Represents a subscription on a file or directory. ++ */ ++typedef struct ++{ ++ GLocalFileMonitor *mon; ++ GFileMonitorSource *source; ++ gchar* filename; ++ int fd; ++ dep_list* deps; ++ int is_dir; ++} kqueue_sub; + +-void _kh_dir_diff (kqueue_sub *sub, GFileMonitorSource *source); ++gboolean _kqsub_start_watching (kqueue_sub *sub); ++void _kh_dir_diff (kqueue_sub *sub); ++void _km_add_missing (kqueue_sub *sub); ++void _km_remove (kqueue_sub *sub); + + #endif /* __KQUEUE_HELPER_H */ diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist index 36680c32ac60..dbd16babc670 100644 --- a/devel/glib20/pkg-plist +++ b/devel/glib20/pkg-plist @@ -13,9 +13,6 @@ bin/gresource bin/gsettings bin/gtester bin/gtester-report -share/bash-completion/completions/gdbus -share/bash-completion/completions/gsettings -share/bash-completion/completions/gresource include/gio-unix-2.0/gio/gdesktopappinfo.h include/gio-unix-2.0/gio/gfiledescriptorbased.h include/gio-unix-2.0/gio/gunixconnection.h @@ -251,6 +248,7 @@ include/glib-2.0/glib/gtypes.h include/glib-2.0/glib/gunicode.h include/glib-2.0/glib/gurifuncs.h include/glib-2.0/glib/gutils.h +include/glib-2.0/glib/guuid.h include/glib-2.0/glib/gvariant.h include/glib-2.0/glib/gvarianttype.h include/glib-2.0/glib/gversion.h @@ -310,6 +308,7 @@ man/man1/gapplication.1.gz man/man1/gdbus-codegen.1.gz man/man1/gdbus.1.gz man/man1/gio-querymodules.1.gz +man/man1/gio.1.gz man/man1/glib-compile-resources.1.gz man/man1/glib-compile-schemas.1.gz man/man1/glib-genmarshal.1.gz @@ -324,38 +323,42 @@ share/aclocal/glib-2.0.m4 share/aclocal/glib-gettext.m4 share/aclocal/gsettings.m4 share/bash-completion/completions/gapplication +share/bash-completion/completions/gdbus +share/bash-completion/completions/gresource +share/bash-completion/completions/gsettings share/gdb/auto-load%%RESETPREFIX%%/lib/libglib-2.0.so.%%LIBVERSION%%-gdb.py share/gdb/auto-load%%RESETPREFIX%%/lib/libgobject-2.0.so.%%LIBVERSION%%-gdb.py share/gettext/its/gschema.its share/gettext/its/gschema.loc -share/glib-2.0/codegen/__init__.py -share/glib-2.0/codegen/__init__.pyc -share/glib-2.0/codegen/__init__.pyo -share/glib-2.0/codegen/codegen.py -share/glib-2.0/codegen/codegen.pyc -share/glib-2.0/codegen/codegen.pyo -share/glib-2.0/codegen/codegen_docbook.py -share/glib-2.0/codegen/codegen_docbook.pyc -share/glib-2.0/codegen/codegen_docbook.pyo -share/glib-2.0/codegen/codegen_main.py -share/glib-2.0/codegen/codegen_main.pyc -share/glib-2.0/codegen/codegen_main.pyo -share/glib-2.0/codegen/config.py -share/glib-2.0/codegen/config.pyc -share/glib-2.0/codegen/config.pyo -share/glib-2.0/codegen/dbustypes.py -share/glib-2.0/codegen/dbustypes.pyc -share/glib-2.0/codegen/dbustypes.pyo -share/glib-2.0/codegen/parser.py -share/glib-2.0/codegen/parser.pyc -share/glib-2.0/codegen/parser.pyo -share/glib-2.0/codegen/utils.py -share/glib-2.0/codegen/utils.pyc -share/glib-2.0/codegen/utils.pyo -share/glib-2.0/gdb/glib_gdb.py -share/glib-2.0/gdb/gobject_gdb.py -share/glib-2.0/gettext/po/Makefile.in.in -share/glib-2.0/schemas/gschema.dtd +%%DATADIR%%-2.0/codegen/__init__.py +%%DATADIR%%-2.0/codegen/__init__.pyc +%%DATADIR%%-2.0/codegen/__init__.%%PYTHON_PYOEXTENSION%% +%%DATADIR%%-2.0/codegen/codegen.py +%%DATADIR%%-2.0/codegen/codegen.pyc +%%DATADIR%%-2.0/codegen/codegen.%%PYTHON_PYOEXTENSION%% +%%DATADIR%%-2.0/codegen/codegen_docbook.py +%%DATADIR%%-2.0/codegen/codegen_docbook.pyc +%%DATADIR%%-2.0/codegen/codegen_docbook.%%PYTHON_PYOEXTENSION%% +%%DATADIR%%-2.0/codegen/codegen_main.py +%%DATADIR%%-2.0/codegen/codegen_main.pyc +%%DATADIR%%-2.0/codegen/codegen_main.%%PYTHON_PYOEXTENSION%% +%%DATADIR%%-2.0/codegen/config.py +%%DATADIR%%-2.0/codegen/config.pyc +%%DATADIR%%-2.0/codegen/config.%%PYTHON_PYOEXTENSION%% +%%DATADIR%%-2.0/codegen/dbustypes.py +%%DATADIR%%-2.0/codegen/dbustypes.pyc +%%DATADIR%%-2.0/codegen/dbustypes.%%PYTHON_PYOEXTENSION%% +%%DATADIR%%-2.0/codegen/parser.py +%%DATADIR%%-2.0/codegen/parser.pyc +%%DATADIR%%-2.0/codegen/parser.%%PYTHON_PYOEXTENSION%% +%%DATADIR%%-2.0/codegen/utils.py +%%DATADIR%%-2.0/codegen/utils.pyc +%%DATADIR%%-2.0/codegen/utils.%%PYTHON_PYOEXTENSION%% +%%DATADIR%%-2.0/gdb/glib_gdb.py +%%DATADIR%%-2.0/gdb/gobject_gdb.py +%%DATADIR%%-2.0/gettext/po/Makefile.in.in +%%DATADIR%%-2.0/schemas/gschema.dtd +%%DATADIR%%-2.0/valgrind/glib.supp %%NLS%%share/locale/af/LC_MESSAGES/glib20.mo %%NLS%%share/locale/am/LC_MESSAGES/glib20.mo %%NLS%%share/locale/an/LC_MESSAGES/glib20.mo @@ -387,6 +390,7 @@ share/glib-2.0/schemas/gschema.dtd %%NLS%%share/locale/fa/LC_MESSAGES/glib20.mo %%NLS%%share/locale/fi/LC_MESSAGES/glib20.mo %%NLS%%share/locale/fr/LC_MESSAGES/glib20.mo +%%NLS%%share/locale/fur/LC_MESSAGES/glib20.mo %%NLS%%share/locale/ga/LC_MESSAGES/glib20.mo %%NLS%%share/locale/gd/LC_MESSAGES/glib20.mo %%NLS%%share/locale/gl/LC_MESSAGES/glib20.mo diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile index e03f624fed39..28c19fd7fa59 100644 --- a/devel/glibmm/Makefile +++ b/devel/glibmm/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= glibmm -PORTVERSION= 2.50.1 -PORTREVISION= 2 +PORTVERSION= 2.56.0 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= GNOME diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo index 86cab145a27f..03f702dd3b3b 100644 --- a/devel/glibmm/distinfo +++ b/devel/glibmm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1491335750 -SHA256 (gnome2/glibmm-2.50.1.tar.xz) = 1fd85051da9cb402cc8348cec72dfe4d79f9345df4a1dbf68703a4ded45846a4 -SIZE (gnome2/glibmm-2.50.1.tar.xz) = 6444576 +TIMESTAMP = 1523034335 +SHA256 (gnome2/glibmm-2.56.0.tar.xz) = 6e74fcba0d245451c58fc8a196e9d103789bc510e1eee1a9b1e816c5209e79a9 +SIZE (gnome2/glibmm-2.56.0.tar.xz) = 6859520 diff --git a/devel/glibmm/pkg-plist b/devel/glibmm/pkg-plist index 18a31fb635cc..34b8580e8384 100644 --- a/devel/glibmm/pkg-plist +++ b/devel/glibmm/pkg-plist @@ -371,6 +371,7 @@ include/glibmm-%%VERSION%%/glibmm/value_custom.h include/glibmm-%%VERSION%%/glibmm/valuearray.h include/glibmm-%%VERSION%%/glibmm/variant.h include/glibmm-%%VERSION%%/glibmm/variant_basictypes.h +include/glibmm-%%VERSION%%/glibmm/variantdbusstring.h include/glibmm-%%VERSION%%/glibmm/variantdict.h include/glibmm-%%VERSION%%/glibmm/variantiter.h include/glibmm-%%VERSION%%/glibmm/varianttype.h diff --git a/devel/gnome-builder/Makefile b/devel/gnome-builder/Makefile index 71a9bfe97ca9..c7f921a0cdc1 100644 --- a/devel/gnome-builder/Makefile +++ b/devel/gnome-builder/Makefile @@ -1,47 +1,85 @@ # $FreeBSD$ PORTNAME= gnome-builder -PORTVERSION= 3.16.2 -PORTREVISION= 1 +PORTVERSION= 3.28.3 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 -MAINTAINER= rm@FreeBSD.org +MAINTAINER= gnome@FreeBSD.org COMMENT= IDE for writing software for GNOME LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= intltool-update:textproc/intltool \ - llvm-config35:devel/llvm35 \ - clang35:lang/clang35 -LIB_DEPENDS= libgit2-glib-1.0.so:devel/libgit2-glib \ +LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ + libjson-glib-1.0.so:devel/json-glib \ libpeas-1.0.so:devel/libpeas \ + libjsonrpc-glib-1.0.so:devel/jsonrpc-glib \ + libtemplate_glib-1.0.so:devel/template-glib \ + libdazzle-1.0.so:x11-toolkits/libdazzle \ + libenchant-2.so:textproc/enchant2 \ + libgspell-1.so:textproc/gspell \ + libwebkit2gtk-4.0.so:www/webkit2-gtk3 \ libdevhelp-3.so:devel/devhelp \ - libgjs.so:lang/gjs \ - libpcre.so:devel/pcre + libgit2-glib-1.0.so:devel/libgit2-glib \ + libpcre.so:devel/pcre \ + libvala-0.40.so:lang/vala PORTSCOUT= limitw:1,even PORTDOCS= * -USES= cpe gettext gmake libtool pathfix python:3.4+ pkgconfig tar:xz -USE_GNOME= glib20 gtk30 gtksourceview3 gtk-update-icon-cache pygobject3 -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--disable-debug \ - ac_cv_path_PYTHON3_CONFIG=${PYTHON_CMD}-config +CONFLICTS_BUILD= gnome-builder-3.16.* + +USES= compiler:c++11-lang cpe desktop-file-utils gettext gnome meson pkgconfig python:3.6+,build tar:xz +USE_GNOME= cairo gtksourceview3 introspection libxml2 vte3 USE_LDCONFIG= yes INSTALLS_ICONS= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -INSTALL_TARGET= install-strip CPE_VENDOR= gnome +BINARY_ALIAS= python3=${PYTHON_VERSION} + +MESON_ARGS= -Dwith_flatpak=false \ + -Dwith_sysprof=false \ + -Dwith_qemu=false \ + -Dwith_jhbuild=false + +PLIST_SUB+= PORTVER=${PORTVERSION} -GLIB_SCHEMAS= org.gnome.builder.editor.gschema.xml \ +GLIB_SCHEMAS= org.gnome.builder.build.gschema.xml \ + org.gnome.builder.code-insight.gschema.xml \ + org.gnome.builder.editor.gschema.xml \ org.gnome.builder.editor.language.gschema.xml \ - org.gnome.builder.experimental.gschema.xml \ - org.gnome.builder.project-tree.gschema.xml + org.gnome.builder.extension-type.gschema.xml \ + org.gnome.builder.gnome-code-assistance.gschema.xml \ + org.gnome.builder.gschema.xml \ + org.gnome.builder.plugin.gschema.xml \ + org.gnome.builder.plugins.color_picker_plugin.gschema.xml \ + org.gnome.builder.plugins.eslint.gschema.xml \ + org.gnome.builder.project-tree.gschema.xml \ + org.gnome.builder.project.gschema.xml \ + org.gnome.builder.terminal.gschema.xml \ + org.gnome.builder.workbench.gschema.xml + +OPTIONS_SUB= YES +OPTIONS_DEFINE= CLANG DOCS +OPTIONS_DEFAULT= CLANG + +# track the latest llvm/clang version, the config script picks the newest available +LLVM_VER= 60 +CLANG_DESC= Build the clang plugin +CLANG_MESON_TRUE= with_clang +CLANG_BUILD_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} +CLANG_RUN_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} + +# jedi plugin with dependancies doesn't work +MESON_ARGS+= -Dwith_jedi=false +#RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ +# ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ +# ${PYTHON_PKGNAMEPREFIX}jedi>0:devel/py-jedi@${PY_FLAVOR} -OPTIONS_DEFINE= DOCS +# 11.1 and older has issues with vala generated code. +post-patch: + ${REINPLACE_CMD} -e '/-Werror=return-type/d' \ + ${WRKSRC}/meson.build .include <bsd.port.mk> diff --git a/devel/gnome-builder/distinfo b/devel/gnome-builder/distinfo index a8c3cc15b4f5..df4903bb685f 100644 --- a/devel/gnome-builder/distinfo +++ b/devel/gnome-builder/distinfo @@ -1,2 +1,3 @@ -SHA256 (gnome3/gnome-builder-3.16.2.tar.xz) = 29bce3b39a0745c8ad538ee5051754b14d6d946f382bcc149a44ee53557cbbfd -SIZE (gnome3/gnome-builder-3.16.2.tar.xz) = 1683324 +TIMESTAMP = 1529614786 +SHA256 (gnome3/gnome-builder-3.28.3.tar.xz) = a62b72efebf0080c6899824edcfaaa1e1e1c5d05e8b4390414a7dc78a30b726f +SIZE (gnome3/gnome-builder-3.28.3.tar.xz) = 9309888 diff --git a/devel/gnome-builder/files/patch-libide_git_ide-git-buffer-change-monitor.c b/devel/gnome-builder/files/patch-libide_git_ide-git-buffer-change-monitor.c deleted file mode 100644 index 540a2e4bdad7..000000000000 --- a/devel/gnome-builder/files/patch-libide_git_ide-git-buffer-change-monitor.c +++ /dev/null @@ -1,14 +0,0 @@ -Upstream patch to fix build with more fresh libgit2 library we have in ports. -Should be removed after updating to 3.18.0 - ---- libide/git/ide-git-buffer-change-monitor.c.orig 2015-04-08 06:43:25 UTC -+++ libide/git/ide-git-buffer-change-monitor.c -@@ -621,7 +621,7 @@ ide_git_buffer_change_monitor_calculate_ - data = g_bytes_get_data (diff->content, &data_len); - - ggit_diff_blob_to_buffer (diff->blob, relative_path, data, data_len, relative_path, -- NULL, NULL, NULL, diff_line_cb, (gpointer)diff->state, error); -+ NULL, NULL, NULL, NULL, diff_line_cb, (gpointer)diff->state, error); - - return ((*error) == NULL); - } diff --git a/devel/gnome-builder/files/patch-src_dialogs_gb-new-project-dialog.c b/devel/gnome-builder/files/patch-src_dialogs_gb-new-project-dialog.c deleted file mode 100644 index 531b5ec8e227..000000000000 --- a/devel/gnome-builder/files/patch-src_dialogs_gb-new-project-dialog.c +++ /dev/null @@ -1,46 +0,0 @@ -Upstream patch to fix build with more fresh libgit2 library we have in ports. -Should be removed after updating to 3.18.0 - ---- src/dialogs/gb-new-project-dialog.c.orig 2015-04-08 20:10:45 UTC -+++ src/dialogs/gb-new-project-dialog.c -@@ -188,6 +188,7 @@ gb_new_project_dialog__clone_worker (GTa - g_autoptr(GFile) workdir = NULL; - CloneRequest *req = task_data; - GgitCloneOptions *clone_options; -+ GgitFetchOptions *fetch_options; - GgitRemoteCallbacks *callbacks; - IdeProgress *progress; - GError *error = NULL; -@@ -197,21 +198,25 @@ gb_new_project_dialog__clone_worker (GTa - g_assert (req != NULL); - g_assert (!cancellable || G_IS_CANCELLABLE (cancellable)); - -- clone_options = ggit_clone_options_new (); -- ggit_clone_options_set_is_bare (clone_options, FALSE); -- ggit_clone_options_set_checkout_branch (clone_options, "master"); -- - callbacks = g_object_new (IDE_TYPE_GIT_REMOTE_CALLBACKS, NULL); - progress = ide_git_remote_callbacks_get_progress (IDE_GIT_REMOTE_CALLBACKS (callbacks)); - g_object_bind_property (progress, "fraction", - self->clone_progress, "fraction", - G_BINDING_SYNC_CREATE); -- ggit_clone_options_set_remote_callbacks (clone_options, callbacks); -+ -+ fetch_options = ggit_fetch_options_new (); -+ ggit_fetch_options_set_remote_callbacks (fetch_options, callbacks); -+ -+ clone_options = ggit_clone_options_new (); -+ ggit_clone_options_set_is_bare (clone_options, FALSE); -+ ggit_clone_options_set_checkout_branch (clone_options, "master"); -+ ggit_clone_options_set_fetch_options (clone_options, fetch_options); -+ g_clear_pointer (&fetch_options, ggit_fetch_options_free); - - repository = ggit_repository_clone (req->uri, req->location, clone_options, &error); - -- g_object_unref (callbacks); -- ggit_clone_options_free (clone_options); -+ g_clear_object (&callbacks); -+ g_clear_object (&clone_options); - - if (repository == NULL) - { diff --git a/devel/gnome-builder/files/patch-src_libide_meson.build b/devel/gnome-builder/files/patch-src_libide_meson.build new file mode 100644 index 000000000000..74b2828c3e9f --- /dev/null +++ b/devel/gnome-builder/files/patch-src_libide_meson.build @@ -0,0 +1,10 @@ +--- src/libide/meson.build.orig 2018-05-10 18:55:17.502214000 +0200 ++++ src/libide/meson.build 2018-05-10 18:55:58.276485000 +0200 +@@ -206,6 +206,7 @@ + libtemplate_glib_dep, + libvte_dep, + libxml2_dep, ++ cc.find_library('m', required: true), + ] + + if get_option('with_webkit') diff --git a/devel/gnome-builder/pkg-plist b/devel/gnome-builder/pkg-plist index 595a8d6a97ca..fcfc4c67a648 100644 --- a/devel/gnome-builder/pkg-plist +++ b/devel/gnome-builder/pkg-plist @@ -1,34 +1,403 @@ bin/gnome-builder -lib/libide-1.0.so -lib/girepository-1.0/Ide-1.0.typelib -libdata/pkgconfig/libide-1.0.pc -share/appdata/org.gnome.Builder.appdata.xml +include/gnome-builder/gstyle/gstyle-animation.h +include/gnome-builder/gstyle/gstyle-cielab.h +include/gnome-builder/gstyle/gstyle-color-component.h +include/gnome-builder/gstyle/gstyle-color-convert.h +include/gnome-builder/gstyle/gstyle-color-filter.h +include/gnome-builder/gstyle/gstyle-color-item.h +include/gnome-builder/gstyle/gstyle-color-panel-actions.h +include/gnome-builder/gstyle/gstyle-color-panel-private.h +include/gnome-builder/gstyle/gstyle-color-panel.h +include/gnome-builder/gstyle/gstyle-color-plane.h +include/gnome-builder/gstyle/gstyle-color-predefined.h +include/gnome-builder/gstyle/gstyle-color-scale.h +include/gnome-builder/gstyle/gstyle-color-widget-actions.h +include/gnome-builder/gstyle/gstyle-color-widget.h +include/gnome-builder/gstyle/gstyle-color.h +include/gnome-builder/gstyle/gstyle-colorlexer.h +include/gnome-builder/gstyle/gstyle-css-provider.h +include/gnome-builder/gstyle/gstyle-eyedropper.h +include/gnome-builder/gstyle/gstyle-hsv.h +include/gnome-builder/gstyle/gstyle-palette-widget.h +include/gnome-builder/gstyle/gstyle-palette.h +include/gnome-builder/gstyle/gstyle-private.h +include/gnome-builder/gstyle/gstyle-rename-popover.h +include/gnome-builder/gstyle/gstyle-revealer.h +include/gnome-builder/gstyle/gstyle-slidein.h +include/gnome-builder/gstyle/gstyle-types.h +include/gnome-builder/gstyle/gstyle-utils.h +include/gnome-builder/gstyle/gstyle-xyz.h +include/gnome-builder/libide/application/ide-application-addin.h +include/gnome-builder/libide/application/ide-application-credits.h +include/gnome-builder/libide/application/ide-application-tool.h +include/gnome-builder/libide/application/ide-application.h +include/gnome-builder/libide/buffers/ide-buffer-addin.h +include/gnome-builder/libide/buffers/ide-buffer-change-monitor.h +include/gnome-builder/libide/buffers/ide-buffer-manager.h +include/gnome-builder/libide/buffers/ide-buffer.h +include/gnome-builder/libide/buffers/ide-unsaved-file.h +include/gnome-builder/libide/buffers/ide-unsaved-files.h +include/gnome-builder/libide/buildconfig/ide-buildconfig-configuration-provider.h +include/gnome-builder/libide/buildconfig/ide-buildconfig-configuration.h +include/gnome-builder/libide/buildsystem/ide-build-log.h +include/gnome-builder/libide/buildsystem/ide-build-manager.h +include/gnome-builder/libide/buildsystem/ide-build-pipeline-addin.h +include/gnome-builder/libide/buildsystem/ide-build-pipeline.h +include/gnome-builder/libide/buildsystem/ide-build-stage-launcher.h +include/gnome-builder/libide/buildsystem/ide-build-stage-mkdirs.h +include/gnome-builder/libide/buildsystem/ide-build-stage-transfer.h +include/gnome-builder/libide/buildsystem/ide-build-stage.h +include/gnome-builder/libide/buildsystem/ide-build-system-discovery.h +include/gnome-builder/libide/buildsystem/ide-build-system.h +include/gnome-builder/libide/buildsystem/ide-build-target-provider.h +include/gnome-builder/libide/buildsystem/ide-build-target.h +include/gnome-builder/libide/buildsystem/ide-build-utils.h +include/gnome-builder/libide/buildsystem/ide-compile-commands.h +include/gnome-builder/libide/buildsystem/ide-dependency-updater.h +include/gnome-builder/libide/buildsystem/ide-environment-variable.h +include/gnome-builder/libide/buildsystem/ide-environment.h +include/gnome-builder/libide/config/ide-configuration-manager.h +include/gnome-builder/libide/config/ide-configuration-provider.h +include/gnome-builder/libide/config/ide-configuration.h +include/gnome-builder/libide/debugger/ide-debug-manager.h +include/gnome-builder/libide/debugger/ide-debugger-breakpoint.h +include/gnome-builder/libide/debugger/ide-debugger-breakpoints.h +include/gnome-builder/libide/debugger/ide-debugger-frame.h +include/gnome-builder/libide/debugger/ide-debugger-instruction.h +include/gnome-builder/libide/debugger/ide-debugger-library.h +include/gnome-builder/libide/debugger/ide-debugger-register.h +include/gnome-builder/libide/debugger/ide-debugger-thread-group.h +include/gnome-builder/libide/debugger/ide-debugger-thread.h +include/gnome-builder/libide/debugger/ide-debugger-types.h +include/gnome-builder/libide/debugger/ide-debugger-variable.h +include/gnome-builder/libide/debugger/ide-debugger.h +include/gnome-builder/libide/devices/ide-deploy-strategy.h +include/gnome-builder/libide/devices/ide-device-info.h +include/gnome-builder/libide/devices/ide-device-manager.h +include/gnome-builder/libide/devices/ide-device-provider.h +include/gnome-builder/libide/devices/ide-device.h +include/gnome-builder/libide/diagnostics/ide-diagnostic-provider.h +include/gnome-builder/libide/diagnostics/ide-diagnostic.h +include/gnome-builder/libide/diagnostics/ide-diagnostics-manager.h +include/gnome-builder/libide/diagnostics/ide-diagnostics.h +include/gnome-builder/libide/diagnostics/ide-fixit.h +include/gnome-builder/libide/diagnostics/ide-source-location.h +include/gnome-builder/libide/diagnostics/ide-source-range.h +include/gnome-builder/libide/directory/ide-directory-build-system.h +include/gnome-builder/libide/directory/ide-directory-vcs.h +include/gnome-builder/libide/doap/ide-doap-person.h +include/gnome-builder/libide/doap/ide-doap.h +include/gnome-builder/libide/documentation/ide-documentation-info.h +include/gnome-builder/libide/documentation/ide-documentation-proposal.h +include/gnome-builder/libide/documentation/ide-documentation-provider.h +include/gnome-builder/libide/documentation/ide-documentation.h +include/gnome-builder/libide/editor/ide-editor-addin.h +include/gnome-builder/libide/editor/ide-editor-perspective.h +include/gnome-builder/libide/editor/ide-editor-search.h +include/gnome-builder/libide/editor/ide-editor-sidebar.h +include/gnome-builder/libide/editor/ide-editor-utilities.h +include/gnome-builder/libide/editor/ide-editor-view-addin.h +include/gnome-builder/libide/editor/ide-editor-view.h +include/gnome-builder/libide/files/ide-file-settings.defs +include/gnome-builder/libide/files/ide-file-settings.h +include/gnome-builder/libide/files/ide-file.h +include/gnome-builder/libide/files/ide-indent-style.h +include/gnome-builder/libide/files/ide-spaces-style.h +include/gnome-builder/libide/formatting/ide-formatter-options.h +include/gnome-builder/libide/formatting/ide-formatter.h +include/gnome-builder/libide/genesis/ide-genesis-addin.h +include/gnome-builder/libide/greeter/ide-greeter-section.h +include/gnome-builder/libide/highlighting/ide-highlight-engine.h +include/gnome-builder/libide/highlighting/ide-highlight-index.h +include/gnome-builder/libide/highlighting/ide-highlighter.h +include/gnome-builder/libide/ide-context.h +include/gnome-builder/libide/ide-debug.h +include/gnome-builder/libide/ide-enums.h +include/gnome-builder/libide/ide-global.h +include/gnome-builder/libide/ide-object.h +include/gnome-builder/libide/ide-pausable.h +include/gnome-builder/libide/ide-service.h +include/gnome-builder/libide/ide-types.h +include/gnome-builder/libide/ide-version-macros.h +include/gnome-builder/libide/ide-version.h +include/gnome-builder/libide/ide.h +include/gnome-builder/libide/langserv/ide-langserv-client.h +include/gnome-builder/libide/langserv/ide-langserv-completion-provider.h +include/gnome-builder/libide/langserv/ide-langserv-diagnostic-provider.h +include/gnome-builder/libide/langserv/ide-langserv-formatter.h +include/gnome-builder/libide/langserv/ide-langserv-highlighter.h +include/gnome-builder/libide/langserv/ide-langserv-rename-provider.h +include/gnome-builder/libide/langserv/ide-langserv-symbol-node.h +include/gnome-builder/libide/langserv/ide-langserv-symbol-resolver.h +include/gnome-builder/libide/langserv/ide-langserv-symbol-tree.h +include/gnome-builder/libide/langserv/ide-langserv-util.h +include/gnome-builder/libide/layout/ide-layout-grid-column.h +include/gnome-builder/libide/layout/ide-layout-grid.h +include/gnome-builder/libide/layout/ide-layout-pane.h +include/gnome-builder/libide/layout/ide-layout-stack-addin.h +include/gnome-builder/libide/layout/ide-layout-stack-header.h +include/gnome-builder/libide/layout/ide-layout-stack.h +include/gnome-builder/libide/layout/ide-layout-transient-sidebar.h +include/gnome-builder/libide/layout/ide-layout-view.h +include/gnome-builder/libide/layout/ide-layout.h +include/gnome-builder/libide/local/ide-local-device.h +include/gnome-builder/libide/logging/ide-log.h +include/gnome-builder/libide/plugins/ide-extension-adapter.h +include/gnome-builder/libide/plugins/ide-extension-set-adapter.h +include/gnome-builder/libide/preferences/ide-preferences-addin.h +include/gnome-builder/libide/preferences/ide-preferences-perspective.h +include/gnome-builder/libide/preferences/ide-preferences-window.h +include/gnome-builder/libide/projects/ide-project-edit.h +include/gnome-builder/libide/projects/ide-project-info.h +include/gnome-builder/libide/projects/ide-project-item.h +include/gnome-builder/libide/projects/ide-project.h +include/gnome-builder/libide/projects/ide-recent-projects.h +include/gnome-builder/libide/rename/ide-rename-provider.h +include/gnome-builder/libide/runner/ide-run-button.h +include/gnome-builder/libide/runner/ide-run-manager.h +include/gnome-builder/libide/runner/ide-runner-addin.h +include/gnome-builder/libide/runner/ide-runner.h +include/gnome-builder/libide/runtimes/ide-runtime-manager.h +include/gnome-builder/libide/runtimes/ide-runtime-provider.h +include/gnome-builder/libide/runtimes/ide-runtime.h +include/gnome-builder/libide/search/ide-search-engine.h +include/gnome-builder/libide/search/ide-search-entry.h +include/gnome-builder/libide/search/ide-search-provider.h +include/gnome-builder/libide/search/ide-search-reducer.h +include/gnome-builder/libide/search/ide-search-result.h +include/gnome-builder/libide/search/ide-tagged-entry.h +include/gnome-builder/libide/snippets/ide-source-snippet-chunk.h +include/gnome-builder/libide/snippets/ide-source-snippet-context.h +include/gnome-builder/libide/snippets/ide-source-snippet.h +include/gnome-builder/libide/snippets/ide-source-snippets-manager.h +include/gnome-builder/libide/snippets/ide-source-snippets.h +include/gnome-builder/libide/sourceview/ide-completion-item.h +include/gnome-builder/libide/sourceview/ide-completion-provider.h +include/gnome-builder/libide/sourceview/ide-completion-results.h +include/gnome-builder/libide/sourceview/ide-cursor.h +include/gnome-builder/libide/sourceview/ide-indenter.h +include/gnome-builder/libide/sourceview/ide-language.h +include/gnome-builder/libide/sourceview/ide-source-map.h +include/gnome-builder/libide/sourceview/ide-source-style-scheme.h +include/gnome-builder/libide/sourceview/ide-source-view-mode.h +include/gnome-builder/libide/sourceview/ide-source-view.h +include/gnome-builder/libide/subprocess/ide-subprocess-launcher.h +include/gnome-builder/libide/subprocess/ide-subprocess-supervisor.h +include/gnome-builder/libide/subprocess/ide-subprocess.h +include/gnome-builder/libide/symbols/ide-code-index-entries.h +include/gnome-builder/libide/symbols/ide-code-index-entry.h +include/gnome-builder/libide/symbols/ide-code-indexer.h +include/gnome-builder/libide/symbols/ide-symbol-node.h +include/gnome-builder/libide/symbols/ide-symbol-resolver.h +include/gnome-builder/libide/symbols/ide-symbol-tree.h +include/gnome-builder/libide/symbols/ide-symbol.h +include/gnome-builder/libide/symbols/ide-tags-builder.h +include/gnome-builder/libide/template/ide-project-template.h +include/gnome-builder/libide/template/ide-template-base.h +include/gnome-builder/libide/template/ide-template-provider.h +include/gnome-builder/libide/terminal/ide-terminal-search.h +include/gnome-builder/libide/terminal/ide-terminal-util.h +include/gnome-builder/libide/terminal/ide-terminal.h +include/gnome-builder/libide/testing/ide-test-manager.h +include/gnome-builder/libide/testing/ide-test-provider.h +include/gnome-builder/libide/testing/ide-test.h +include/gnome-builder/libide/threading/ide-task.h +include/gnome-builder/libide/threading/ide-thread-pool.h +include/gnome-builder/libide/transfers/ide-pkcon-transfer.h +include/gnome-builder/libide/transfers/ide-transfer-button.h +include/gnome-builder/libide/transfers/ide-transfer-manager.h +include/gnome-builder/libide/transfers/ide-transfer-row.h +include/gnome-builder/libide/transfers/ide-transfer.h +include/gnome-builder/libide/transfers/ide-transfers-button.h +include/gnome-builder/libide/transfers/ide-transfers-progress-icon.h +include/gnome-builder/libide/util/ide-cell-renderer-fancy.h +include/gnome-builder/libide/util/ide-fancy-tree-view.h +include/gnome-builder/libide/util/ide-flatpak.h +include/gnome-builder/libide/util/ide-glib.h +include/gnome-builder/libide/util/ide-gtk.h +include/gnome-builder/libide/util/ide-line-reader.h +include/gnome-builder/libide/util/ide-list-inline.h +include/gnome-builder/libide/util/ide-posix.h +include/gnome-builder/libide/util/ide-progress.h +include/gnome-builder/libide/util/ide-ref-ptr.h +include/gnome-builder/libide/util/ide-settings.h +include/gnome-builder/libide/util/ide-uri.h +include/gnome-builder/libide/vcs/ide-vcs-config.h +include/gnome-builder/libide/vcs/ide-vcs-file-info.h +include/gnome-builder/libide/vcs/ide-vcs-initializer.h +include/gnome-builder/libide/vcs/ide-vcs-monitor.h +include/gnome-builder/libide/vcs/ide-vcs-uri.h +include/gnome-builder/libide/vcs/ide-vcs.h +include/gnome-builder/libide/workbench/ide-omni-bar.h +include/gnome-builder/libide/workbench/ide-perspective.h +include/gnome-builder/libide/workbench/ide-workbench-addin.h +include/gnome-builder/libide/workbench/ide-workbench-header-bar.h +include/gnome-builder/libide/workbench/ide-workbench-message.h +include/gnome-builder/libide/workbench/ide-workbench.h +include/gnome-builder/libide/workers/ide-worker.h +lib/gnome-builder/girepository-1.0/Gstyle-1.0.typelib +lib/gnome-builder/girepository-1.0/Ide-1.0.typelib +lib/gnome-builder/libgnome-builder-plugins.so +lib/gnome-builder/libgstyle-private.so +lib/gnome-builder/libgstyle-private.so.0 +lib/gnome-builder/libgstyle-private.so.0.0.0 +lib/gnome-builder/libide-1.0.so +lib/gnome-builder/pkgconfig/libide-1.0.pc +lib/gnome-builder/plugins/cargo.plugin +lib/gnome-builder/plugins/cargo_plugin.py +lib/gnome-builder/plugins/eslint.plugin +lib/gnome-builder/plugins/eslint_plugin.py +lib/gnome-builder/plugins/find-other-file.plugin +lib/gnome-builder/plugins/find_other_file.py +lib/gnome-builder/plugins/gjs_symbols.plugin +lib/gnome-builder/plugins/gjs_symbols.py +lib/gnome-builder/plugins/go-langserv.plugin +lib/gnome-builder/plugins/go_langserver_plugin.py +lib/gnome-builder/plugins/html-preview.plugin +lib/gnome-builder/plugins/html_preview.gresource +lib/gnome-builder/plugins/html_preview.py +lib/gnome-builder/plugins/libvala-pack-plugin.so +lib/gnome-builder/plugins/make.plugin +lib/gnome-builder/plugins/make_plugin.gresource +lib/gnome-builder/plugins/make_plugin.py +lib/gnome-builder/plugins/meson-templates.plugin +lib/gnome-builder/plugins/meson_templates.gresource +lib/gnome-builder/plugins/meson_templates.py +lib/gnome-builder/plugins/mono.plugin +lib/gnome-builder/plugins/mono_plugin.py +lib/gnome-builder/plugins/npm.plugin +lib/gnome-builder/plugins/npm_plugin.py +lib/gnome-builder/plugins/phpize.plugin +lib/gnome-builder/plugins/phpize_plugin.py +lib/gnome-builder/plugins/python-gi-imports-completion.plugin +lib/gnome-builder/plugins/python_gi_imports_completion.py +lib/gnome-builder/plugins/rust-langserv.plugin +lib/gnome-builder/plugins/rust_langserv_plugin.py +lib/gnome-builder/plugins/rustup.plugin +lib/gnome-builder/plugins/rustup_plugin.gresource +lib/gnome-builder/plugins/rustup_plugin.py +lib/gnome-builder/plugins/vala-pack.plugin +lib/gnome-builder/plugins/valgrind.plugin +lib/gnome-builder/plugins/valgrind_plugin.gresource +lib/gnome-builder/plugins/valgrind_plugin.py +%%PYTHON_SITELIBDIR%%/gi/overrides/Ide.py share/applications/org.gnome.Builder.desktop share/dbus-1/services/org.gnome.Builder.service -share/gir-1.0/Ide-1.0.gir +%%DATADIR%%/fonts/BuilderBlocks.ttf +%%DATADIR%%/gir-1.0/Gstyle-1.0.gir +%%DATADIR%%/gir-1.0/Ide-1.0.gir +%%DATADIR%%/vapi/gstyle-private.deps +%%DATADIR%%/vapi/gstyle-private.vapi +%%DATADIR%%/vapi/libide-1.0.deps +%%DATADIR%%/vapi/libide-1.0.vapi share/gtksourceview-3.0/styles/builder-dark.xml share/gtksourceview-3.0/styles/builder.xml -share/icons/hicolor/16x16/apps/builder.png -share/icons/hicolor/24x24/apps/builder.png -share/icons/hicolor/256x256/apps/builder.png -share/icons/hicolor/32x32/apps/builder.png -share/icons/hicolor/48x48/apps/builder.png -share/icons/hicolor/512x512/apps/builder.png -share/icons/hicolor/scalable/apps/builder-symbolic.svg +share/icons/hicolor/16x16/actions/builder-build-configure-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/builder-build-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/builder-debugger-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/builder-documentation-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/builder-editor-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/builder-move-left-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/builder-move-right-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/builder-split-tab-left-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/builder-split-tab-right-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/builder-split-tab-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/builder-unit-tests-fail-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/builder-unit-tests-pass-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/builder-unit-tests-running-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/builder-unit-tests-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/builder-vcs-git-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/builder-view-bottom-pane-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/builder-view-left-pane-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/builder-view-right-pane-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/debug-breakpoint-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/debug-continue-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/debug-execute-from-cursor-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/debug-execute-to-cursor-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/debug-step-in-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/debug-step-out-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/debug-step-over-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/gesture-two-finger-swipe-left.symbolic.png +share/icons/hicolor/16x16/actions/gesture-two-finger-swipe-right.symbolic.png +share/icons/hicolor/16x16/actions/lang-class-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/lang-define-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/lang-enum-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/lang-enum-value-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/lang-function-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/lang-include-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/lang-method-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/lang-namespace-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/lang-struct-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/lang-typedef-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/lang-union-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/lang-variable-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/struct-field-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/ui-attributes-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/ui-child-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/ui-item-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/ui-menu-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/ui-object-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/ui-packing-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/ui-property-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/ui-section-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/ui-signal-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/ui-style-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/ui-submenu-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/ui-template-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/xml-attribute-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/xml-cdata-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/xml-comment-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/xml-declaration-symbolic.symbolic.png +share/icons/hicolor/16x16/actions/xml-element-symbolic.symbolic.png +share/icons/hicolor/16x16/apps/org.gnome.Builder-symbolic.symbolic.png +share/icons/hicolor/16x16/apps/org.gnome.Builder.png +share/icons/hicolor/24x24/apps/org.gnome.Builder.png +share/icons/hicolor/256x256/apps/org.gnome.Builder.png +share/icons/hicolor/32x32/apps/org.gnome.Builder.png +share/icons/hicolor/48x48/apps/org.gnome.Builder.png +share/icons/hicolor/512x512/apps/org.gnome.Builder-symbolic.symbolic.png +share/icons/hicolor/512x512/apps/org.gnome.Builder.png share/locale/bs/LC_MESSAGES/gnome-builder.mo +share/locale/ca/LC_MESSAGES/gnome-builder.mo +share/locale/ca@valencia/LC_MESSAGES/gnome-builder.mo share/locale/cs/LC_MESSAGES/gnome-builder.mo +share/locale/da/LC_MESSAGES/gnome-builder.mo share/locale/de/LC_MESSAGES/gnome-builder.mo +share/locale/el/LC_MESSAGES/gnome-builder.mo +share/locale/en_GB/LC_MESSAGES/gnome-builder.mo +share/locale/eo/LC_MESSAGES/gnome-builder.mo share/locale/es/LC_MESSAGES/gnome-builder.mo +share/locale/fi/LC_MESSAGES/gnome-builder.mo share/locale/fr/LC_MESSAGES/gnome-builder.mo +share/locale/fur/LC_MESSAGES/gnome-builder.mo share/locale/gl/LC_MESSAGES/gnome-builder.mo share/locale/he/LC_MESSAGES/gnome-builder.mo +share/locale/hu/LC_MESSAGES/gnome-builder.mo share/locale/id/LC_MESSAGES/gnome-builder.mo +share/locale/it/LC_MESSAGES/gnome-builder.mo +share/locale/ja/LC_MESSAGES/gnome-builder.mo +share/locale/kk/LC_MESSAGES/gnome-builder.mo share/locale/ko/LC_MESSAGES/gnome-builder.mo +share/locale/lt/LC_MESSAGES/gnome-builder.mo +share/locale/lv/LC_MESSAGES/gnome-builder.mo +share/locale/ml/LC_MESSAGES/gnome-builder.mo +share/locale/nb/LC_MESSAGES/gnome-builder.mo +share/locale/ne/LC_MESSAGES/gnome-builder.mo +share/locale/nl/LC_MESSAGES/gnome-builder.mo +share/locale/oc/LC_MESSAGES/gnome-builder.mo share/locale/pl/LC_MESSAGES/gnome-builder.mo +share/locale/pt/LC_MESSAGES/gnome-builder.mo +share/locale/pt_BR/LC_MESSAGES/gnome-builder.mo +share/locale/ro/LC_MESSAGES/gnome-builder.mo +share/locale/ru/LC_MESSAGES/gnome-builder.mo +share/locale/sk/LC_MESSAGES/gnome-builder.mo share/locale/sl/LC_MESSAGES/gnome-builder.mo share/locale/sr/LC_MESSAGES/gnome-builder.mo +share/locale/sr@latin/LC_MESSAGES/gnome-builder.mo +share/locale/sv/LC_MESSAGES/gnome-builder.mo share/locale/tr/LC_MESSAGES/gnome-builder.mo share/locale/uk/LC_MESSAGES/gnome-builder.mo +share/locale/zh_CN/LC_MESSAGES/gnome-builder.mo share/locale/zh_TW/LC_MESSAGES/gnome-builder.mo -@postexec /usr/local/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || /usr/bin/true -@postunexec /usr/local/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || /usr/bin/true +share/metainfo/org.gnome.Builder.appdata.xml +@dir share/icons/hicolor/symbolic diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile index 70404cdf6bc8..f28e5edeaab5 100644 --- a/devel/gobject-introspection/Makefile +++ b/devel/gobject-introspection/Makefile @@ -2,18 +2,19 @@ # $FreeBSD$ PORTNAME= gobject-introspection -PORTVERSION= 1.50.0 -PORTREVISION= 1 +PORTVERSION= 1.56.1 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= GNOME -DIST_SUBDIR= gnome3 +DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Generate interface introspection data for GObject libraries LICENSE= GPLv2+ LGPL20+ -LICENSE_COMB= dual +LICENSE_COMB= multi +LICENSE_FILE_LGPL2+= ${WRKSRC}/COPYING.LGPL +LICENSE_FILE_GPLv2+= ${WRKSRC}/COPYING.GPL # we need cairo otherwise the generated Cairo gir is broken BUILD_DEPENDS= cairo-trace:graphics/cairo @@ -22,7 +23,7 @@ LIB_DEPENDS= libffi.so:devel/libffi PORTSCOUT= limitw:1,even USES= bison gettext gmake gnome libtool localbase pathfix \ - pkgconfig python:2.7 tar:xz + pkgconfig python:3.4+ tar:xz GNU_CONFIGURE= yes USE_GNOME= glib20 USE_LDCONFIG= yes @@ -32,8 +33,4 @@ INSTALL_TARGET= install-strip # Force it to put the .cache in ${WRKSRC} instead of ~/.cache. ports/143260 MAKE_ENV= HOME=${WRKDIR} -post-patch: - @${REINPLACE_CMD} -e 's|'gcc'|'cc'|g' \ - ${WRKSRC}/giscanner/dumper.py - .include <bsd.port.mk> diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo index 8774b86d809f..1c74755dca5a 100644 --- a/devel/gobject-introspection/distinfo +++ b/devel/gobject-introspection/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1491127543 -SHA256 (gnome3/gobject-introspection-1.50.0.tar.xz) = 1c6597c666f543c70ef3d7c893ab052968afae620efdc080c36657f4226337c5 -SIZE (gnome3/gobject-introspection-1.50.0.tar.xz) = 1415700 +TIMESTAMP = 1525378740 +SHA256 (gnome/gobject-introspection-1.56.1.tar.xz) = 5b2875ccff99ff7baab63a34b67f8c920def240e178ff50add809e267d9ea24b +SIZE (gnome/gobject-introspection-1.56.1.tar.xz) = 1397812 diff --git a/devel/gobject-introspection/files/patch-giscanner_scannerlexer.l b/devel/gobject-introspection/files/patch-giscanner_scannerlexer.l deleted file mode 100644 index 178293f90c0d..000000000000 --- a/devel/gobject-introspection/files/patch-giscanner_scannerlexer.l +++ /dev/null @@ -1,11 +0,0 @@ ---- giscanner/scannerlexer.l.orig 2017-04-17 10:01:31 UTC -+++ giscanner/scannerlexer.l -@@ -164,6 +164,8 @@ stringtext ([^\\\"])|(\\.) - "__inline__" { return INLINE; } - "__inline" { return INLINE; } - "__nonnull" { if (!parse_ignored_macro()) REJECT; } -+"_Nonnull" { /* Ignore */ } -+"_Nullable" { /* Ignore */ } - "_Noreturn" { /* Ignore */ } - "__signed" { return SIGNED; } - "__signed__" { return SIGNED; } diff --git a/devel/gobject-introspection/pkg-plist b/devel/gobject-introspection/pkg-plist index 8337d1c7ca55..e3487dfb9d61 100644 --- a/devel/gobject-introspection/pkg-plist +++ b/devel/gobject-introspection/pkg-plist @@ -42,40 +42,76 @@ lib/girepository-1.0/xft-2.0.typelib lib/girepository-1.0/xlib-2.0.typelib lib/girepository-1.0/xrandr-1.3.typelib lib/gobject-introspection/giscanner/__init__.py -lib/gobject-introspection/giscanner/__init__.pyc -lib/gobject-introspection/giscanner/__init__.pyo +lib/gobject-introspection/giscanner/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +lib/gobject-introspection/giscanner/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc +lib/gobject-introspection/giscanner/__pycache__/annotationmain.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +lib/gobject-introspection/giscanner/__pycache__/annotationmain.cpython-%%PYTHON_SUFFIX%%.pyc +lib/gobject-introspection/giscanner/__pycache__/annotationparser.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +lib/gobject-introspection/giscanner/__pycache__/annotationparser.cpython-%%PYTHON_SUFFIX%%.pyc +lib/gobject-introspection/giscanner/__pycache__/ast.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +lib/gobject-introspection/giscanner/__pycache__/ast.cpython-%%PYTHON_SUFFIX%%.pyc +lib/gobject-introspection/giscanner/__pycache__/cachestore.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +lib/gobject-introspection/giscanner/__pycache__/cachestore.cpython-%%PYTHON_SUFFIX%%.pyc +lib/gobject-introspection/giscanner/__pycache__/ccompiler.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +lib/gobject-introspection/giscanner/__pycache__/ccompiler.cpython-%%PYTHON_SUFFIX%%.pyc +lib/gobject-introspection/giscanner/__pycache__/codegen.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +lib/gobject-introspection/giscanner/__pycache__/codegen.cpython-%%PYTHON_SUFFIX%%.pyc +lib/gobject-introspection/giscanner/__pycache__/docmain.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +lib/gobject-introspection/giscanner/__pycache__/docmain.cpython-%%PYTHON_SUFFIX%%.pyc +lib/gobject-introspection/giscanner/__pycache__/docwriter.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +lib/gobject-introspection/giscanner/__pycache__/docwriter.cpython-%%PYTHON_SUFFIX%%.pyc +lib/gobject-introspection/giscanner/__pycache__/dumper.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +lib/gobject-introspection/giscanner/__pycache__/dumper.cpython-%%PYTHON_SUFFIX%%.pyc +lib/gobject-introspection/giscanner/__pycache__/gdumpparser.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +lib/gobject-introspection/giscanner/__pycache__/gdumpparser.cpython-%%PYTHON_SUFFIX%%.pyc +lib/gobject-introspection/giscanner/__pycache__/girparser.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +lib/gobject-introspection/giscanner/__pycache__/girparser.cpython-%%PYTHON_SUFFIX%%.pyc +lib/gobject-introspection/giscanner/__pycache__/girwriter.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +lib/gobject-introspection/giscanner/__pycache__/girwriter.cpython-%%PYTHON_SUFFIX%%.pyc +lib/gobject-introspection/giscanner/__pycache__/introspectablepass.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +lib/gobject-introspection/giscanner/__pycache__/introspectablepass.cpython-%%PYTHON_SUFFIX%%.pyc +lib/gobject-introspection/giscanner/__pycache__/libtoolimporter.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +lib/gobject-introspection/giscanner/__pycache__/libtoolimporter.cpython-%%PYTHON_SUFFIX%%.pyc +lib/gobject-introspection/giscanner/__pycache__/maintransformer.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +lib/gobject-introspection/giscanner/__pycache__/maintransformer.cpython-%%PYTHON_SUFFIX%%.pyc +lib/gobject-introspection/giscanner/__pycache__/message.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +lib/gobject-introspection/giscanner/__pycache__/message.cpython-%%PYTHON_SUFFIX%%.pyc +lib/gobject-introspection/giscanner/__pycache__/msvccompiler.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +lib/gobject-introspection/giscanner/__pycache__/msvccompiler.cpython-%%PYTHON_SUFFIX%%.pyc +lib/gobject-introspection/giscanner/__pycache__/scannermain.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +lib/gobject-introspection/giscanner/__pycache__/scannermain.cpython-%%PYTHON_SUFFIX%%.pyc +lib/gobject-introspection/giscanner/__pycache__/sectionparser.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +lib/gobject-introspection/giscanner/__pycache__/sectionparser.cpython-%%PYTHON_SUFFIX%%.pyc +lib/gobject-introspection/giscanner/__pycache__/shlibs.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +lib/gobject-introspection/giscanner/__pycache__/shlibs.cpython-%%PYTHON_SUFFIX%%.pyc +lib/gobject-introspection/giscanner/__pycache__/sourcescanner.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +lib/gobject-introspection/giscanner/__pycache__/sourcescanner.cpython-%%PYTHON_SUFFIX%%.pyc +lib/gobject-introspection/giscanner/__pycache__/testcodegen.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +lib/gobject-introspection/giscanner/__pycache__/testcodegen.cpython-%%PYTHON_SUFFIX%%.pyc +lib/gobject-introspection/giscanner/__pycache__/transformer.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +lib/gobject-introspection/giscanner/__pycache__/transformer.cpython-%%PYTHON_SUFFIX%%.pyc +lib/gobject-introspection/giscanner/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +lib/gobject-introspection/giscanner/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc +lib/gobject-introspection/giscanner/__pycache__/xmlwriter.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +lib/gobject-introspection/giscanner/__pycache__/xmlwriter.cpython-%%PYTHON_SUFFIX%%.pyc lib/gobject-introspection/giscanner/_giscanner.a lib/gobject-introspection/giscanner/_giscanner.so lib/gobject-introspection/giscanner/annotationmain.py -lib/gobject-introspection/giscanner/annotationmain.pyc -lib/gobject-introspection/giscanner/annotationmain.pyo lib/gobject-introspection/giscanner/annotationparser.py -lib/gobject-introspection/giscanner/annotationparser.pyc -lib/gobject-introspection/giscanner/annotationparser.pyo lib/gobject-introspection/giscanner/ast.py -lib/gobject-introspection/giscanner/ast.pyc -lib/gobject-introspection/giscanner/ast.pyo lib/gobject-introspection/giscanner/cachestore.py -lib/gobject-introspection/giscanner/cachestore.pyc -lib/gobject-introspection/giscanner/cachestore.pyo lib/gobject-introspection/giscanner/ccompiler.py -lib/gobject-introspection/giscanner/ccompiler.pyc -lib/gobject-introspection/giscanner/ccompiler.pyo lib/gobject-introspection/giscanner/codegen.py -lib/gobject-introspection/giscanner/codegen.pyc -lib/gobject-introspection/giscanner/codegen.pyo lib/gobject-introspection/giscanner/collections/__init__.py -lib/gobject-introspection/giscanner/collections/__init__.pyc -lib/gobject-introspection/giscanner/collections/__init__.pyo +lib/gobject-introspection/giscanner/collections/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +lib/gobject-introspection/giscanner/collections/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc +lib/gobject-introspection/giscanner/collections/__pycache__/counter.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +lib/gobject-introspection/giscanner/collections/__pycache__/counter.cpython-%%PYTHON_SUFFIX%%.pyc +lib/gobject-introspection/giscanner/collections/__pycache__/ordereddict.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +lib/gobject-introspection/giscanner/collections/__pycache__/ordereddict.cpython-%%PYTHON_SUFFIX%%.pyc lib/gobject-introspection/giscanner/collections/counter.py -lib/gobject-introspection/giscanner/collections/counter.pyc -lib/gobject-introspection/giscanner/collections/counter.pyo lib/gobject-introspection/giscanner/collections/ordereddict.py -lib/gobject-introspection/giscanner/collections/ordereddict.pyc -lib/gobject-introspection/giscanner/collections/ordereddict.pyo lib/gobject-introspection/giscanner/docmain.py -lib/gobject-introspection/giscanner/docmain.pyc -lib/gobject-introspection/giscanner/docmain.pyo lib/gobject-introspection/giscanner/doctemplates/C/callback.tmpl lib/gobject-introspection/giscanner/doctemplates/C/class.tmpl lib/gobject-introspection/giscanner/doctemplates/C/constructor.tmpl @@ -122,59 +158,23 @@ lib/gobject-introspection/giscanner/doctemplates/base.tmpl lib/gobject-introspection/giscanner/doctemplates/class.tmpl lib/gobject-introspection/giscanner/doctemplates/namespace.tmpl lib/gobject-introspection/giscanner/docwriter.py -lib/gobject-introspection/giscanner/docwriter.pyc -lib/gobject-introspection/giscanner/docwriter.pyo lib/gobject-introspection/giscanner/dumper.py -lib/gobject-introspection/giscanner/dumper.pyc -lib/gobject-introspection/giscanner/dumper.pyo lib/gobject-introspection/giscanner/gdumpparser.py -lib/gobject-introspection/giscanner/gdumpparser.pyc -lib/gobject-introspection/giscanner/gdumpparser.pyo lib/gobject-introspection/giscanner/girparser.py -lib/gobject-introspection/giscanner/girparser.pyc -lib/gobject-introspection/giscanner/girparser.pyo lib/gobject-introspection/giscanner/girwriter.py -lib/gobject-introspection/giscanner/girwriter.pyc -lib/gobject-introspection/giscanner/girwriter.pyo lib/gobject-introspection/giscanner/introspectablepass.py -lib/gobject-introspection/giscanner/introspectablepass.pyc -lib/gobject-introspection/giscanner/introspectablepass.pyo lib/gobject-introspection/giscanner/libtoolimporter.py -lib/gobject-introspection/giscanner/libtoolimporter.pyc -lib/gobject-introspection/giscanner/libtoolimporter.pyo lib/gobject-introspection/giscanner/maintransformer.py -lib/gobject-introspection/giscanner/maintransformer.pyc -lib/gobject-introspection/giscanner/maintransformer.pyo lib/gobject-introspection/giscanner/message.py -lib/gobject-introspection/giscanner/message.pyc -lib/gobject-introspection/giscanner/message.pyo lib/gobject-introspection/giscanner/msvccompiler.py -lib/gobject-introspection/giscanner/msvccompiler.pyc -lib/gobject-introspection/giscanner/msvccompiler.pyo lib/gobject-introspection/giscanner/scannermain.py -lib/gobject-introspection/giscanner/scannermain.pyc -lib/gobject-introspection/giscanner/scannermain.pyo lib/gobject-introspection/giscanner/sectionparser.py -lib/gobject-introspection/giscanner/sectionparser.pyc -lib/gobject-introspection/giscanner/sectionparser.pyo lib/gobject-introspection/giscanner/shlibs.py -lib/gobject-introspection/giscanner/shlibs.pyc -lib/gobject-introspection/giscanner/shlibs.pyo lib/gobject-introspection/giscanner/sourcescanner.py -lib/gobject-introspection/giscanner/sourcescanner.pyc -lib/gobject-introspection/giscanner/sourcescanner.pyo lib/gobject-introspection/giscanner/testcodegen.py -lib/gobject-introspection/giscanner/testcodegen.pyc -lib/gobject-introspection/giscanner/testcodegen.pyo lib/gobject-introspection/giscanner/transformer.py -lib/gobject-introspection/giscanner/transformer.pyc -lib/gobject-introspection/giscanner/transformer.pyo lib/gobject-introspection/giscanner/utils.py -lib/gobject-introspection/giscanner/utils.pyc -lib/gobject-introspection/giscanner/utils.pyo lib/gobject-introspection/giscanner/xmlwriter.py -lib/gobject-introspection/giscanner/xmlwriter.pyc -lib/gobject-introspection/giscanner/xmlwriter.pyo lib/libgirepository-1.0.a lib/libgirepository-1.0.so lib/libgirepository-1.0.so.1 @@ -196,6 +196,7 @@ share/gir-1.0/Gio-2.0.gir share/gir-1.0/cairo-1.0.gir share/gir-1.0/fontconfig-2.0.gir share/gir-1.0/freetype2-2.0.gir +share/gir-1.0/gir-1.2.rnc share/gir-1.0/libxml2-2.0.gir share/gir-1.0/win32-1.0.gir share/gir-1.0/xfixes-4.0.gir diff --git a/devel/gsettings-desktop-schemas/Makefile b/devel/gsettings-desktop-schemas/Makefile index 1236b9ff9628..78512fb71655 100644 --- a/devel/gsettings-desktop-schemas/Makefile +++ b/devel/gsettings-desktop-schemas/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gsettings-desktop-schemas -PORTVERSION= 3.18.1 +PORTVERSION= 3.28.0 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -11,17 +11,14 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Collection of globally shared GSetting schemas LICENSE= LGPL21 - -RUN_DEPENDS= ${LOCALBASE}/etc/fonts/conf.avail/31-cantarell.conf:x11-fonts/cantarell-fonts +LICENSE_FILE= ${WRKSRC}/COPYING PORTSCOUT= limitw:1,even -USES= gettext gmake gnome pathfix perl5 pkgconfig tar:xz +USES= gettext gmake gnome localbase pathfix perl5 pkgconfig tar:xz USE_PERL5= build USE_GNOME= intltool glib20 introspection:build GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib GLIB_SCHEMAS= org.gnome.desktop.a11y.applications.gschema.xml \ org.gnome.desktop.a11y.gschema.xml \ @@ -30,6 +27,7 @@ GLIB_SCHEMAS= org.gnome.desktop.a11y.applications.gschema.xml \ org.gnome.desktop.a11y.mouse.gschema.xml \ org.gnome.desktop.app-folders.gschema.xml \ org.gnome.desktop.background.gschema.xml \ + org.gnome.desktop.calendar.gschema.xml \ org.gnome.desktop.default-applications.gschema.xml \ org.gnome.desktop.datetime.gschema.xml \ org.gnome.desktop.enums.xml \ diff --git a/devel/gsettings-desktop-schemas/distinfo b/devel/gsettings-desktop-schemas/distinfo index 6889cd98b960..d6636ab9950f 100644 --- a/devel/gsettings-desktop-schemas/distinfo +++ b/devel/gsettings-desktop-schemas/distinfo @@ -1,2 +1,3 @@ -SHA256 (gnome3/gsettings-desktop-schemas-3.18.1.tar.xz) = 258713b2a3dc6b6590971bcfc81f98d78ea9827d60e2f55ffbe40d9cd0f99a1a -SIZE (gnome3/gsettings-desktop-schemas-3.18.1.tar.xz) = 573792 +TIMESTAMP = 1524854589 +SHA256 (gnome3/gsettings-desktop-schemas-3.28.0.tar.xz) = 4cb4cd7790b77e5542ec75275237613ad22f3a1f2f41903a298cf6cc996a9167 +SIZE (gnome3/gsettings-desktop-schemas-3.28.0.tar.xz) = 648296 diff --git a/devel/gsettings-desktop-schemas/pkg-plist b/devel/gsettings-desktop-schemas/pkg-plist index e770fadc2947..92a4172e89af 100644 --- a/devel/gsettings-desktop-schemas/pkg-plist +++ b/devel/gsettings-desktop-schemas/pkg-plist @@ -19,12 +19,15 @@ share/locale/es/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/eu/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/fi/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/fr/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/fur/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/gl/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/gu/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/he/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/hi/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/hr/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/hu/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/id/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/is/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/it/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/ja/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/kk/LC_MESSAGES/gsettings-desktop-schemas.mo @@ -32,20 +35,23 @@ share/locale/lt/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/lv/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/ml/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/nb/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/ne/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/nl/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/oc/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/or/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/pa/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/pl/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/pt/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/pt_BR/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/ro/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/ru/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/sk/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/sl/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/sr/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/sr@latin/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/sv/LC_MESSAGES/gsettings-desktop-schemas.mo -share/locale/tr/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/tg/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/tr/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/ug/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/uk/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/vi/LC_MESSAGES/gsettings-desktop-schemas.mo diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile index f18c7669f2e4..cd72a7b68d14 100644 --- a/devel/gtranslator/Makefile +++ b/devel/gtranslator/Makefile @@ -3,6 +3,7 @@ PORTNAME= gtranslator PORTVERSION= 2.91.7 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= GNOME @@ -32,6 +33,7 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-debug \ --with-gda=5.0 \ + --without-dictionary \ --enable-compile-warnings=no INSTALL_TARGET= install-strip @@ -40,22 +42,4 @@ GLIB_SCHEMAS= org.gnome.gtranslator.gschema.xml \ org.gnome.gtranslator.plugins.open-tran.gschema.xml \ org.gnome.gtranslator.plugins.translation-memory.gschema.xml -OPTIONS_DEFINE= DICT -OPTIONS_DEFAULT=DICT -DICT_DESC= Build dictionary plugin - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDICT} -BUILD_DEPENDS+= gnome-dictionary>=3.4.0:deskutils/gnome-dictionary -LIB_DEPENDS+= libgdict-1.0.so:deskutils/gnome-dictionary -RUN_DEPENDS+= gnome-dictionary>=3.4.0:deskutils/gnome-dictionary -GLIB_SCHEMAS+= org.gnome.gtranslator.plugins.dictionary.gschema.xml -CONFIGURE_ARGS+=--with-dictionary -PLIST_SUB+= DICT="" -.else -CONFIGURE_ARGS+=--without-dictionary -PLIST_SUB+= DICT="@comment " -.endif - .include <bsd.port.mk> diff --git a/devel/gtranslator/pkg-plist b/devel/gtranslator/pkg-plist index 82605493ff92..2747c479a46f 100644 --- a/devel/gtranslator/pkg-plist +++ b/devel/gtranslator/pkg-plist @@ -27,15 +27,12 @@ lib/gtranslator/plugins/charmap/panel.pyo lib/gtranslator/plugins/gtr-alternate-language.plugin lib/gtranslator/plugins/gtr-charmap.plugin lib/gtranslator/plugins/gtr-codeview.plugin -%%DICT%%lib/gtranslator/plugins/gtr-dict.plugin lib/gtranslator/plugins/gtr-fullscreen.plugin lib/gtranslator/plugins/gtr-insert-params.plugin lib/gtranslator/plugins/gtr-open-tran.plugin lib/gtranslator/plugins/gtr-translation-memory.plugin lib/gtranslator/plugins/libalternatelang.a lib/gtranslator/plugins/libalternatelang.so -%%DICT%%lib/gtranslator/plugins/libdict.a -%%DICT%%lib/gtranslator/plugins/libdict.so lib/gtranslator/plugins/libfullscreen.a lib/gtranslator/plugins/libfullscreen.so lib/gtranslator/plugins/libinsertparams.a @@ -86,7 +83,6 @@ share/applications/gtranslator.desktop %%DATADIR%%/gir-1.0/Gtranslator-3.0.gir %%DATADIR%%/pixmaps/debian.png %%DATADIR%%/pixmaps/fedora.png -%%DATADIR%%/pixmaps/gnome-dictionary.png %%DATADIR%%/pixmaps/gnome.png %%DATADIR%%/pixmaps/gtranslator-fuzzy-next.png %%DATADIR%%/pixmaps/gtranslator-fuzzy-prev.png diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile index 062bf12442ba..d49783ab2b7b 100644 --- a/devel/gvfs/Makefile +++ b/devel/gvfs/Makefile @@ -2,32 +2,35 @@ # $FreeBSD$ PORTNAME= gvfs -PORTVERSION= 1.26.3 -PORTREVISION= 10 +PORTVERSION= 1.30.4 CATEGORIES= devel gnome MASTER_SITES= GNOME -DIST_SUBDIR= gnome3 +DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME virtual file system +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + BUILD_DEPENDS= docbook-xsl>=0:textproc/docbook-xsl LIB_DEPENDS= libdbus-1.so:devel/dbus \ libsoup-gnome-2.4.so:devel/libsoup-gnome \ + libsoup-2.4.so:devel/libsoup \ libgcrypt.so:security/libgcrypt \ libgcr-base-3.so:security/gcr \ - libsecret-1.so:security/libsecret - + libsecret-1.so:security/libsecret \ + libp11-kit.so:security/p11-kit \ + libgpg-error.so:security/libgpg-error \ + libcdio.so:sysutils/libcdio \ + libjson-glib-1.0.so:devel/json-glib PORTSCOUT= limitw:1,even -USES= gettext gmake gnome libarchive libtool pathfix pkgconfig tar:xz +USES= gettext gmake gnome libarchive libtool localbase \ + pathfix pkgconfig tar:xz USE_GNOME= glib20 intlhack libxslt:build GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS= --disable-bluray - -CONFIGURE_ARGS+=\ +CONFIGURE_ARGS= --disable-bluray \ --disable-gudev \ --disable-libsystemd-login \ --disable-udisks2 \ @@ -35,7 +38,9 @@ CONFIGURE_ARGS+=\ --disable-udev \ --disable-goa \ --disable-libmtp \ - --disable-gtk + --disable-gtk \ + --disable-libsystemd-login \ + --disable-admin INSTALL_TARGET= install-strip diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo index 0f0dc0da8099..1cb5d0655c7a 100644 --- a/devel/gvfs/distinfo +++ b/devel/gvfs/distinfo @@ -1,2 +1,3 @@ -SHA256 (gnome3/gvfs-1.26.3.tar.xz) = a70f75fa60d66f3f478c0c8aec43d0e43455a8cc75a4dfa8029e51c816401b4a -SIZE (gnome3/gvfs-1.26.3.tar.xz) = 1682264 +TIMESTAMP = 1526113308 +SHA256 (gnome/gvfs-1.30.4.tar.xz) = 981e0aca7f4e2e99860137f9fd99c335fa72a764156d253caf1069380a8e3afa +SIZE (gnome/gvfs-1.30.4.tar.xz) = 1895304 diff --git a/devel/gvfs/pkg-plist b/devel/gvfs/pkg-plist index b31c4192c149..d7dfe16c40b0 100644 --- a/devel/gvfs/pkg-plist +++ b/devel/gvfs/pkg-plist @@ -79,6 +79,7 @@ share/bash-completion/completions/gvfs-ls share/bash-completion/completions/gvfs-mkdir share/bash-completion/completions/gvfs-monitor-dir share/bash-completion/completions/gvfs-monitor-file +share/bash-completion/completions/gvfs-mount share/bash-completion/completions/gvfs-move share/bash-completion/completions/gvfs-open share/bash-completion/completions/gvfs-rename @@ -89,6 +90,8 @@ share/bash-completion/completions/gvfs-trash share/bash-completion/completions/gvfs-tree share/dbus-1/services/org.gtk.vfs.Daemon.service share/dbus-1/services/org.gtk.vfs.Metadata.service +share/polkit-1/actions/org.gtk.vfs.file-operations.policy +share/polkit-1/rules.d/org.gtk.vfs.file-operations.rules %%AFC%%share/dbus-1/services/org.gtk.vfs.AfcVolumeMonitor.service %%GPHOTO2%%share/dbus-1/services/org.gtk.vfs.GPhoto2VolumeMonitor.service %%HAL%%share/dbus-1/services/org.gtk.vfs.HalVolumeMonitor.service diff --git a/devel/json-glib/Makefile b/devel/json-glib/Makefile index da03803008a1..f84b7343829c 100644 --- a/devel/json-glib/Makefile +++ b/devel/json-glib/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= json-glib -PORTVERSION= 1.2.8 +PORTVERSION= 1.4.2 CATEGORIES= devel MASTER_SITES= GNOME @@ -10,22 +10,24 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= JSON (RFC 4627) interface for Glib LICENSE= LGPL21 +LICENSE_FILE= ${WRKSRC}/COPYING + +USES= gettext localbase meson pkgconfig tar:xz +USE_GNOME= glib20 +USE_LDCONFIG= yes + +PORTDOCS= * OPTIONS_DEFINE= GIR DOCS OPTIONS_DEFAULT=GIR OPTIONS_SUB= yes + GIR_DESC= Build introspection data GIR_USE= gnome=introspection -GIR_CONFIGURE_ENABLE=introspection - -USES= gmake libtool pathfix pkgconfig tar:xz -USE_GNOME= glib20 gnomeprefix -GNU_CONFIGURE= yes -USE_LDCONFIG= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -INSTALL_TARGET= install-strip +GIR_MESON_TRUE= introspection -PORTDOCS= * +post-install: + @${RM} -r ${STAGEDIR}${PREFIX}/libexec/installed-tests + @${RM} -r ${STAGEDIR}${PREFIX}/share/installed-tests .include <bsd.port.mk> diff --git a/devel/json-glib/distinfo b/devel/json-glib/distinfo index c40049e51324..2de7a8e90f25 100644 --- a/devel/json-glib/distinfo +++ b/devel/json-glib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1491082169 -SHA256 (json-glib-1.2.8.tar.xz) = fd55a9037d39e7a10f0db64309f5f0265fa32ec962bf85066087b83a2807f40a -SIZE (json-glib-1.2.8.tar.xz) = 604336 +TIMESTAMP = 1506973453 +SHA256 (json-glib-1.4.2.tar.xz) = 2d7709a44749c7318599a6829322e081915bdc73f5be5045882ed120bb686dc8 +SIZE (json-glib-1.4.2.tar.xz) = 163576 diff --git a/devel/json-glib/pkg-plist b/devel/json-glib/pkg-plist index 0790fb3a03c5..7eb2fb7d2bdc 100644 --- a/devel/json-glib/pkg-plist +++ b/devel/json-glib/pkg-plist @@ -17,7 +17,7 @@ include/json-glib-1.0/json-glib/json-version.h %%GIR%%share/gir-1.0/Json-1.0.gir lib/libjson-glib-1.0.so lib/libjson-glib-1.0.so.0 -lib/libjson-glib-1.0.so.0.200.8 +lib/libjson-glib-1.0.so.0.400.2 libdata/pkgconfig/json-glib-1.0.pc share/locale/as/LC_MESSAGES/json-glib-1.0.mo share/locale/bg/LC_MESSAGES/json-glib-1.0.mo @@ -49,6 +49,7 @@ share/locale/lt/LC_MESSAGES/json-glib-1.0.mo share/locale/lv/LC_MESSAGES/json-glib-1.0.mo share/locale/ml/LC_MESSAGES/json-glib-1.0.mo share/locale/nb/LC_MESSAGES/json-glib-1.0.mo +share/locale/ne/LC_MESSAGES/json-glib-1.0.mo share/locale/oc/LC_MESSAGES/json-glib-1.0.mo share/locale/or/LC_MESSAGES/json-glib-1.0.mo share/locale/pa/LC_MESSAGES/json-glib-1.0.mo diff --git a/devel/jsonrpc-glib/Makefile b/devel/jsonrpc-glib/Makefile new file mode 100644 index 000000000000..5caf1bd1413d --- /dev/null +++ b/devel/jsonrpc-glib/Makefile @@ -0,0 +1,20 @@ +# $FreeBSD$ + +PORTNAME= jsonrpc-glib +PORTVERSION= 3.28.1 +CATEGORIES= devel +MASTER_SITES= GNOME + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Staging and stabilizing for facy Glib and Gtk+ features + +LICENSE= LGPL21 +LICENSE_FILE= ${WRKSRC}/COPYING + +BUILD_DEPENDS= valac:lang/vala +LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib + +USES= gnome meson pkgconfig tar:xz +USE_GNOME= glib20 introspection:build + +.include <bsd.port.mk> diff --git a/devel/jsonrpc-glib/distinfo b/devel/jsonrpc-glib/distinfo new file mode 100644 index 000000000000..8cb13c6d71c5 --- /dev/null +++ b/devel/jsonrpc-glib/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1529614407 +SHA256 (jsonrpc-glib-3.28.1.tar.xz) = cf2ac25944c3990904d63999deea3add38d99ea2fad16f335a996fd9a8706e2b +SIZE (jsonrpc-glib-3.28.1.tar.xz) = 40328 diff --git a/devel/jsonrpc-glib/pkg-descr b/devel/jsonrpc-glib/pkg-descr new file mode 100644 index 000000000000..7157ba386428 --- /dev/null +++ b/devel/jsonrpc-glib/pkg-descr @@ -0,0 +1,2 @@ + +WWW: diff --git a/devel/jsonrpc-glib/pkg-plist b/devel/jsonrpc-glib/pkg-plist new file mode 100644 index 000000000000..463adf009ca7 --- /dev/null +++ b/devel/jsonrpc-glib/pkg-plist @@ -0,0 +1,17 @@ +include/jsonrpc-glib-1.0/jsonrpc-client.h +include/jsonrpc-glib-1.0/jsonrpc-glib.h +include/jsonrpc-glib-1.0/jsonrpc-input-stream-private.h +include/jsonrpc-glib-1.0/jsonrpc-input-stream.h +include/jsonrpc-glib-1.0/jsonrpc-message.h +include/jsonrpc-glib-1.0/jsonrpc-output-stream.h +include/jsonrpc-glib-1.0/jsonrpc-server.h +include/jsonrpc-glib-1.0/jsonrpc-version-macros.h +include/jsonrpc-glib-1.0/jsonrpc-version.h +lib/girepository-1.0/Jsonrpc-1.0.typelib +lib/libjsonrpc-glib-1.0.so +lib/libjsonrpc-glib-1.0.so.1 +lib/libjsonrpc-glib-1.0.so.1.2800.1 +libdata/pkgconfig/jsonrpc-glib-1.0.pc +share/gir-1.0/Jsonrpc-1.0.gir +share/vala/vapi/jsonrpc-glib-1.0.deps +share/vala/vapi/jsonrpc-glib-1.0.vapi diff --git a/devel/libgdata/Makefile b/devel/libgdata/Makefile index e874b0085def..0d9f0c19e232 100644 --- a/devel/libgdata/Makefile +++ b/devel/libgdata/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libgdata -PORTVERSION= 0.17.8 +PORTVERSION= 0.17.9 CATEGORIES= devel MASTER_SITES= GNOME @@ -12,7 +12,8 @@ COMMENT= GLib based implimentation of the GData protocol LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= uhttpmock>0:net/uhttpmock +BUILD_DEPENDS= uhttpmock>0:net/uhttpmock \ + valac:lang/vala LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \ libjson-glib-1.0.so:devel/json-glib \ libp11-kit.so:security/p11-kit \ diff --git a/devel/libgdata/distinfo b/devel/libgdata/distinfo index 84eba8a01c2d..d3529e9c5bd5 100644 --- a/devel/libgdata/distinfo +++ b/devel/libgdata/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1495263502 -SHA256 (libgdata-0.17.8.tar.xz) = e5e735bfac219c6cbe4a14df481cb3cb4b1c4b8b5e70f9a105a884035bc3a161 -SIZE (libgdata-0.17.8.tar.xz) = 1464812 +TIMESTAMP = 1506774542 +SHA256 (libgdata-0.17.9.tar.xz) = 85c4f7674c0098ffaf060ae01b6b832cb277b3673d54ace3bdedaad6b127453a +SIZE (libgdata-0.17.9.tar.xz) = 1434700 diff --git a/devel/libgdata/pkg-plist b/devel/libgdata/pkg-plist index 2a2afd65e132..fc88d3178a4e 100644 --- a/devel/libgdata/pkg-plist +++ b/devel/libgdata/pkg-plist @@ -66,6 +66,7 @@ include/libgdata/gdata/services/documents/gdata-documents-entry.h include/libgdata/gdata/services/documents/gdata-documents-enums.h include/libgdata/gdata/services/documents/gdata-documents-feed.h include/libgdata/gdata/services/documents/gdata-documents-folder.h +include/libgdata/gdata/services/documents/gdata-documents-metadata.h include/libgdata/gdata/services/documents/gdata-documents-pdf.h include/libgdata/gdata/services/documents/gdata-documents-presentation.h include/libgdata/gdata/services/documents/gdata-documents-query.h @@ -107,7 +108,7 @@ lib/girepository-1.0/GData-0.0.typelib lib/libgdata.a lib/libgdata.so lib/libgdata.so.22 -lib/libgdata.so.22.2.1 +lib/libgdata.so.22.3.0 libdata/pkgconfig/libgdata.pc share/doc/gdata/GDataAPPCategories.html share/doc/gdata/GDataAccessHandler.html @@ -138,6 +139,7 @@ share/doc/gdata/GDataDocumentsDrawing.html share/doc/gdata/GDataDocumentsEntry.html share/doc/gdata/GDataDocumentsFeed.html share/doc/gdata/GDataDocumentsFolder.html +share/doc/gdata/GDataDocumentsMetadata.html share/doc/gdata/GDataDocumentsPdf.html share/doc/gdata/GDataDocumentsPresentation.html share/doc/gdata/GDataDocumentsQuery.html @@ -234,30 +236,6 @@ share/doc/gdata/gdata-running.html share/doc/gdata/gdata.devhelp2 share/doc/gdata/home.png share/doc/gdata/index.html -share/doc/gdata/ix01.html -share/doc/gdata/ix02.html -share/doc/gdata/ix03.html -share/doc/gdata/ix04.html -share/doc/gdata/ix05.html -share/doc/gdata/ix06.html -share/doc/gdata/ix07.html -share/doc/gdata/ix08.html -share/doc/gdata/ix09.html -share/doc/gdata/ix10.html -share/doc/gdata/ix11.html -share/doc/gdata/ix12.html -share/doc/gdata/ix13.html -share/doc/gdata/ix14.html -share/doc/gdata/ix15.html -share/doc/gdata/ix16.html -share/doc/gdata/ix17.html -share/doc/gdata/ix18.html -share/doc/gdata/ix19.html -share/doc/gdata/ix20.html -share/doc/gdata/ix21.html -share/doc/gdata/ix22.html -share/doc/gdata/ix23.html -share/doc/gdata/ix24.html share/doc/gdata/left-insensitive.png share/doc/gdata/left.png share/doc/gdata/pt01.html diff --git a/devel/libgee/Makefile b/devel/libgee/Makefile index 97ae8c19ef60..1e41fe45504a 100644 --- a/devel/libgee/Makefile +++ b/devel/libgee/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libgee -PORTVERSION= 0.18.1 +PORTVERSION= 0.20.1 CATEGORIES= devel MASTER_SITES= GNOME diff --git a/devel/libgee/distinfo b/devel/libgee/distinfo index bc929ceb9b10..a49b83afe245 100644 --- a/devel/libgee/distinfo +++ b/devel/libgee/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1479643330 -SHA256 (libgee-0.18.1.tar.xz) = 99686bbe5a9c89ba9502c25f61314ee8efa0dd2a1159c9a639afc1458c2839a2 -SIZE (libgee-0.18.1.tar.xz) = 677908 +TIMESTAMP = 1525759866 +SHA256 (libgee-0.20.1.tar.xz) = bb2802d29a518e8c6d2992884691f06ccfcc25792a5686178575c7111fea4630 +SIZE (libgee-0.20.1.tar.xz) = 681464 diff --git a/devel/libgee/pkg-plist b/devel/libgee/pkg-plist index 7d2fbc42be40..6b0de67578e3 100644 --- a/devel/libgee/pkg-plist +++ b/devel/libgee/pkg-plist @@ -2,7 +2,7 @@ include/gee-0.8/gee.h lib/girepository-1.0/Gee-0.8.typelib lib/libgee-0.8.so lib/libgee-0.8.so.2 -lib/libgee-0.8.so.2.5.1 +lib/libgee-0.8.so.2.6.1 libdata/pkgconfig/gee-0.8.pc share/gir-1.0/Gee-0.8.gir share/vala/vapi/gee-0.8.vapi diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile index 056258f8bcae..f0c8916520f6 100644 --- a/devel/libgtop/Makefile +++ b/devel/libgtop/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libgtop -PORTVERSION= 2.32.0 +PORTVERSION= 2.38.0 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -10,7 +10,8 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME top library -BROKEN_aarch64= Fails to link: missing sbrk +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING USE_PERL5= build USE_XORG= xau diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo index 954f99efeb8f..11c09d538669 100644 --- a/devel/libgtop/distinfo +++ b/devel/libgtop/distinfo @@ -1,2 +1,3 @@ -SHA256 (gnome2/libgtop-2.32.0.tar.xz) = 8443246332f22b33e389f565825b58cd9623fb7625bf874d404354b705ad178e -SIZE (gnome2/libgtop-2.32.0.tar.xz) = 665224 +TIMESTAMP = 1505473610 +SHA256 (gnome2/libgtop-2.38.0.tar.xz) = 4f6c0e62bb438abfd16b4559cd2eca0251de19e291c888cdc4dc88e5ffebb612 +SIZE (gnome2/libgtop-2.38.0.tar.xz) = 729700 diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_netload.c b/devel/libgtop/files/patch-sysdeps_freebsd_netload.c deleted file mode 100644 index 455774b37ebc..000000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_netload.c +++ /dev/null @@ -1,332 +0,0 @@ ---- sysdeps/freebsd/netload.c.orig 2015-08-17 20:59:37.000000000 +0200 -+++ sysdeps/freebsd/netload.c 2015-08-28 09:50:02.522090000 +0200 -@@ -1,7 +1,9 @@ - /* Copyright (C) 1998-99 Martin Baulig -+ Copyright (C) 2014 Gleb Smirnoff - This file is part of LibGTop 1.0. - - Contributed by Martin Baulig <martin@home-of-linux.org>, October 1998. -+ Contributed by Gleb Smirnoff <glebius@FreeBSD.org>, September 2014 - - LibGTop is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by -@@ -26,22 +28,12 @@ - - #include <glibtop_suid.h> - --#include <string.h> -- --#include <sys/types.h> --#include <sys/socket.h> - #include <sys/ioctl.h> -- -+#include <sys/sockio.h> -+#include <netinet/in.h> - #include <net/if.h> - #include <net/if_dl.h> --#include <net/if_types.h> -- --#ifdef HAVE_NET_IF_VAR_H --#include <net/if_var.h> --#endif -- --#include <netinet/in.h> --#include <netinet/in_var.h> -+#include <ifaddrs.h> - - static const unsigned long _glibtop_sysdeps_netload = - (1L << GLIBTOP_NETLOAD_IF_FLAGS) + -@@ -64,24 +56,11 @@ static const unsigned long _glibtop_sysd - (1L << GLIBTOP_NETLOAD_ADDRESS6) + - (1L << GLIBTOP_NETLOAD_SCOPE6); - --/* nlist structure for kernel access */ --static struct nlist nlst [] = -- { -- { "_ifnet" -- }, -- { 0 } -- }; -- - /* Init function. */ - - void - _glibtop_init_netload_p (glibtop *server) - { -- if (kvm_nlist (server->machine->kd, nlst) < 0) { -- glibtop_warn_io_r (server, "kvm_nlist"); -- return; -- } -- - server->sysdeps.netload = _glibtop_sysdeps_netload; - } - -@@ -91,154 +70,125 @@ void - glibtop_get_netload_p (glibtop *server, glibtop_netload *buf, - const char *interface) - { -- struct ifnet ifnet; -- u_long ifnetaddr; -- struct sockaddr *sa = NULL; -- -- union { -- struct ifaddr ifa; -- struct in_ifaddr in; -- } ifaddr; -+ struct ifaddrs *ifap, *ifa; - - memset (buf, 0, sizeof (glibtop_netload)); - -- if (server->sysdeps.netload == 0) return; -+ if (server->sysdeps.netload == 0) -+ return; -+ -+ if (getifaddrs(&ifap) != 0) { -+ glibtop_warn_io_r (server, "getifaddrs"); -+ return; -+ } - -- if (kvm_read (server->machine->kd, nlst [0].n_value, -- &ifnetaddr, sizeof (ifnetaddr)) != sizeof (ifnetaddr)) { -- glibtop_warn_io_r (server, "kvm_read (ifnet)"); -- return; -- } -- -- for (/* NOP */; ifnetaddr; ifnetaddr = (u_long) ifnet.if_link.tqe_next) -- { -- struct sockaddr_in *sin; -- register char *cp; -- u_long ifaddraddr; -- -- if (kvm_read (server->machine->kd, ifnetaddr, &ifnet, -- sizeof (ifnet)) != sizeof (ifnet)) { -- glibtop_warn_io_r (server, -- "kvm_read (ifnetaddr)"); -- break; -- } -+#define IFA_STAT(s) (((struct if_data *)ifa->ifa_data)->ifi_ ## s) - -- if (strcmp (ifnet.if_xname, interface) != 0) -+ for (ifa = ifap; ifa; ifa = ifa->ifa_next) { -+ if (strcmp (ifa->ifa_name, interface) != 0) - continue; -- -- if (ifnet.if_flags & IFF_UP) -- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_UP); -- if (ifnet.if_flags & IFF_BROADCAST) -- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_BROADCAST); -- if (ifnet.if_flags & IFF_DEBUG) -- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_DEBUG); -- if (ifnet.if_flags & IFF_LOOPBACK) -- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LOOPBACK); -- if (ifnet.if_flags & IFF_POINTOPOINT) -- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_POINTOPOINT); --#ifdef IFF_DRV_RUNNING -- if (ifnet.if_drv_flags & IFF_DRV_RUNNING) --#else -- if (ifnet.if_flags & IFF_RUNNING) --#endif -- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_RUNNING); -- if (ifnet.if_flags & IFF_NOARP) -- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_NOARP); -- if (ifnet.if_flags & IFF_PROMISC) -- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_PROMISC); -- if (ifnet.if_flags & IFF_ALLMULTI) -- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALLMULTI); --#ifdef IFF_DRV_OACTIVE -- if (ifnet.if_drv_flags & IFF_DRV_OACTIVE) --#else -- if (ifnet.if_flags & IFF_OACTIVE) --#endif -- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_OACTIVE); -- if (ifnet.if_flags & IFF_SIMPLEX) -- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_SIMPLEX); -- if (ifnet.if_flags & IFF_LINK0) -- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK0); -- if (ifnet.if_flags & IFF_LINK1) -- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK1); -- if (ifnet.if_flags & IFF_LINK2) -- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK2); -- if (ifnet.if_flags & IFF_ALTPHYS) -- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALTPHYS); -- if (ifnet.if_flags & IFF_MULTICAST) -- buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_MULTICAST); -- -- buf->packets_in = ifnet.if_ipackets; -- buf->packets_out = ifnet.if_opackets; -- buf->packets_total = buf->packets_in + buf->packets_out; -- -- buf->bytes_in = ifnet.if_ibytes; -- buf->bytes_out = ifnet.if_obytes; -- buf->bytes_total = buf->bytes_in + buf->bytes_out; -- -- buf->errors_in = ifnet.if_ierrors; -- buf->errors_out = ifnet.if_oerrors; -- buf->errors_total = buf->errors_in + buf->errors_out; -- -- buf->collisions = ifnet.if_collisions; -- buf->flags = _glibtop_sysdeps_netload; -- -- for (ifaddraddr = (u_long) ifnet.if_addrhead.tqh_first; ifaddraddr; ifaddraddr = (u_long) ifaddr.ifa.ifa_link.tqe_next) { -- if ((kvm_read (server->machine->kd, ifaddraddr, &ifaddr, -- sizeof (ifaddr)) != sizeof (ifaddr))) { -- glibtop_warn_io_r (server, -- "kvm_read (ifaddraddr)"); -- break; -- } -- --#define CP(x) ((char *)(x)) -- cp = (CP(ifaddr.ifa.ifa_addr) - CP(ifaddraddr)) + -- CP(&ifaddr); -- sa = (struct sockaddr *)cp; -- -- if (sa->sa_family == AF_LINK) { -- struct sockaddr_dl *dl = (struct sockaddr_dl *) sa; -- -- memcpy (buf->hwaddress, LLADDR (dl), -- sizeof (buf->hwaddress)); -- buf->flags |= GLIBTOP_NETLOAD_HWADDRESS; -- } else if (sa->sa_family == AF_INET) { -- sin = (struct sockaddr_in *)sa; -- /* Commenting out to "fix" #13345. */ -- buf->subnet = htonl (ifaddr.in.ia_subnet); -- buf->address = sin->sin_addr.s_addr; -- buf->mtu = ifnet.if_mtu; -- -- buf->flags |= _glibtop_sysdeps_netload_data; -- } else if (sa->sa_family == AF_INET6) { -- struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) sa; -- int in6fd; -- -- memcpy (buf->address6, &sin6->sin6_addr, -- sizeof (buf->address6)); -- buf->scope6 = (guint8) sin6->sin6_scope_id; -- buf->flags |= _glibtop_sysdeps_netload6; -- -- in6fd = socket (AF_INET6, SOCK_DGRAM, 0); -- if (in6fd >= 0) { -- struct in6_ifreq ifr; -- -- memset (&ifr, 0, sizeof (ifr)); -- ifr.ifr_addr = *sin6; -- g_strlcpy (ifr.ifr_name, interface, -- sizeof (ifr.ifr_name)); -- if (ioctl (in6fd, SIOCGIFNETMASK_IN6, -- (char *) &ifr) >= 0) { -- memcpy (buf->prefix6, -- &ifr.ifr_addr.sin6_addr, -- sizeof (buf->prefix6)); -- buf->flags |= GLIBTOP_NETLOAD_PREFIX6; -- } -- close (in6fd); -- } -- } -- } /* end of for ( ifaddraddr ) */ - -- /* found the interface anyway */ -- break; -- } /* end of for ( ifnetaddr ) */ -+ switch (ifa->ifa_addr->sa_family) { -+ case AF_LINK: { -+ struct sockaddr_dl *sdl; -+ struct ifreq ifr; -+ int s, flags; -+ -+ s = socket(AF_INET, SOCK_DGRAM, 0); -+ if (s < 0) { -+ glibtop_warn_io_r(server, "socket(AF_INET)"); -+ break; -+ } -+ memset(&ifr, 0, sizeof(ifr)); -+ (void)strlcpy(ifr.ifr_name, ifa->ifa_name, -+ sizeof(ifr.ifr_name)); -+ if (ioctl(s, SIOCGIFFLAGS, (caddr_t)&ifr) < 0) { -+ glibtop_warn_io_r(server, "ioctl(SIOCGIFFLAGS)"); -+ close(s); -+ break; -+ } -+ close(s); -+ -+ flags = (ifr.ifr_flags & 0xffff) | (ifr.ifr_flagshigh << 16); -+ -+ if (flags & IFF_UP) -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_UP); -+ if (flags & IFF_BROADCAST) -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_BROADCAST); -+ if (flags & IFF_DEBUG) -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_DEBUG); -+ if (flags & IFF_LOOPBACK) -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LOOPBACK); -+ if (flags & IFF_POINTOPOINT) -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_POINTOPOINT); -+ if (flags & IFF_RUNNING) -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_RUNNING); -+ if (flags & IFF_NOARP) -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_NOARP); -+ if (flags & IFF_PROMISC) -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_PROMISC); -+ if (flags & IFF_ALLMULTI) -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALLMULTI); -+ if (flags & IFF_SIMPLEX) -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_SIMPLEX); -+ if (flags & IFF_LINK0) -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK0); -+ if (flags & IFF_LINK1) -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK1); -+ if (flags & IFF_LINK2) -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK2); -+ if (flags & IFF_ALTPHYS) -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALTPHYS); -+ if (flags & IFF_MULTICAST) -+ buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_MULTICAST); -+ -+ buf->packets_in = IFA_STAT(ipackets); -+ buf->packets_out = IFA_STAT(opackets); -+ buf->packets_total = buf->packets_in + buf->packets_out; -+ -+ buf->bytes_in = IFA_STAT(ibytes); -+ buf->bytes_out = IFA_STAT(obytes); -+ buf->bytes_total = buf->bytes_in + buf->bytes_out; -+ -+ buf->errors_in = IFA_STAT(ierrors); -+ buf->errors_out = IFA_STAT(oerrors); -+ buf->errors_total = buf->errors_in + buf->errors_out; -+ -+ buf->collisions = IFA_STAT(collisions); -+ buf->flags = _glibtop_sysdeps_netload; -+ -+ sdl = (struct sockaddr_dl *)ifa->ifa_addr; -+ memcpy(buf->hwaddress, LLADDR(sdl), -+ sizeof(buf->hwaddress)); -+ buf->mtu = IFA_STAT(mtu); -+ buf->flags |= GLIBTOP_NETLOAD_HWADDRESS; -+ break; -+ } -+ case AF_INET: { -+ struct sockaddr_in *sin; -+ -+ sin = (struct sockaddr_in *)ifa->ifa_addr; -+ buf->address = sin->sin_addr.s_addr; -+ sin = (struct sockaddr_in *)ifa->ifa_netmask; -+ buf->subnet = sin->sin_addr.s_addr & buf->address; -+ buf->flags |= _glibtop_sysdeps_netload_data; -+ break; -+ } -+ case AF_INET6: { -+ struct sockaddr_in6 *sin6; -+ -+ sin6 = (struct sockaddr_in6 *)ifa->ifa_addr; -+ memcpy(buf->address6, &sin6->sin6_addr, -+ sizeof(buf->address6)); -+ buf->scope6 = (guint8 )sin6->sin6_scope_id; -+ buf->flags |= _glibtop_sysdeps_netload6; -+ sin6 = (struct sockaddr_in6 *)ifa->ifa_netmask; -+ memcpy(buf->prefix6, &sin6->sin6_addr, -+ sizeof(buf->prefix6)); -+ buf->flags |= GLIBTOP_NETLOAD_PREFIX6; -+ break; -+ } -+ } // switch() end -+ } -+ freeifaddrs(ifap); - } diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist index 306440256e77..6c57a56a0190 100644 --- a/devel/libgtop/pkg-plist +++ b/devel/libgtop/pkg-plist @@ -18,6 +18,7 @@ include/libgtop-2.0/glibtop/parameter.h include/libgtop-2.0/glibtop/ppp.h include/libgtop-2.0/glibtop/procaffinity.h include/libgtop-2.0/glibtop/procargs.h +include/libgtop-2.0/glibtop/procio.h include/libgtop-2.0/glibtop/prockernel.h include/libgtop-2.0/glibtop/proclist.h include/libgtop-2.0/glibtop/procmap.h @@ -44,12 +45,11 @@ include/libgtop-2.0/libgtopconfig.h lib/girepository-1.0/GTop-2.0.typelib lib/libgtop-2.0.a lib/libgtop-2.0.so -lib/libgtop-2.0.so.10 -lib/libgtop-2.0.so.10.0.0 +lib/libgtop-2.0.so.11 +lib/libgtop-2.0.so.11.0.0 libdata/pkgconfig/libgtop-2.0.pc %%DOCSDIR%%/home.png %%DOCSDIR%%/index.html -%%DOCSDIR%%/index.sgml %%DOCSDIR%%/left-insensitive.png %%DOCSDIR%%/left.png %%DOCSDIR%%/libgtop-Close.html @@ -97,89 +97,89 @@ libdata/pkgconfig/libgtop-2.0.pc %%DOCSDIR%%/up-insensitive.png %%DOCSDIR%%/up.png share/gir-1.0/GTop-2.0.gir -share/locale/am/LC_MESSAGES/libgtop-2.0.mo -share/locale/ar/LC_MESSAGES/libgtop-2.0.mo -share/locale/as/LC_MESSAGES/libgtop-2.0.mo -share/locale/ast/LC_MESSAGES/libgtop-2.0.mo -share/locale/az/LC_MESSAGES/libgtop-2.0.mo -share/locale/be/LC_MESSAGES/libgtop-2.0.mo -share/locale/bg/LC_MESSAGES/libgtop-2.0.mo -share/locale/bn/LC_MESSAGES/libgtop-2.0.mo -share/locale/bn_IN/LC_MESSAGES/libgtop-2.0.mo -share/locale/bs/LC_MESSAGES/libgtop-2.0.mo -share/locale/ca/LC_MESSAGES/libgtop-2.0.mo -share/locale/ca@valencia/LC_MESSAGES/libgtop-2.0.mo -share/locale/cs/LC_MESSAGES/libgtop-2.0.mo -share/locale/cy/LC_MESSAGES/libgtop-2.0.mo -share/locale/da/LC_MESSAGES/libgtop-2.0.mo -share/locale/de/LC_MESSAGES/libgtop-2.0.mo -share/locale/dz/LC_MESSAGES/libgtop-2.0.mo -share/locale/el/LC_MESSAGES/libgtop-2.0.mo -share/locale/en@shaw/LC_MESSAGES/libgtop-2.0.mo -share/locale/en_CA/LC_MESSAGES/libgtop-2.0.mo -share/locale/en_GB/LC_MESSAGES/libgtop-2.0.mo -share/locale/eo/LC_MESSAGES/libgtop-2.0.mo -share/locale/es/LC_MESSAGES/libgtop-2.0.mo -share/locale/et/LC_MESSAGES/libgtop-2.0.mo -share/locale/eu/LC_MESSAGES/libgtop-2.0.mo -share/locale/fa/LC_MESSAGES/libgtop-2.0.mo -share/locale/fi/LC_MESSAGES/libgtop-2.0.mo -share/locale/fr/LC_MESSAGES/libgtop-2.0.mo -share/locale/fur/LC_MESSAGES/libgtop-2.0.mo -share/locale/ga/LC_MESSAGES/libgtop-2.0.mo -share/locale/gl/LC_MESSAGES/libgtop-2.0.mo -share/locale/gu/LC_MESSAGES/libgtop-2.0.mo -share/locale/he/LC_MESSAGES/libgtop-2.0.mo -share/locale/hi/LC_MESSAGES/libgtop-2.0.mo -share/locale/hr/LC_MESSAGES/libgtop-2.0.mo -share/locale/hu/LC_MESSAGES/libgtop-2.0.mo -share/locale/id/LC_MESSAGES/libgtop-2.0.mo -share/locale/it/LC_MESSAGES/libgtop-2.0.mo -share/locale/ja/LC_MESSAGES/libgtop-2.0.mo -share/locale/ka/LC_MESSAGES/libgtop-2.0.mo -share/locale/kn/LC_MESSAGES/libgtop-2.0.mo -share/locale/ko/LC_MESSAGES/libgtop-2.0.mo -share/locale/ku/LC_MESSAGES/libgtop-2.0.mo -share/locale/ky/LC_MESSAGES/libgtop-2.0.mo -share/locale/la/LC_MESSAGES/libgtop-2.0.mo -share/locale/lt/LC_MESSAGES/libgtop-2.0.mo -share/locale/lv/LC_MESSAGES/libgtop-2.0.mo -share/locale/mai/LC_MESSAGES/libgtop-2.0.mo -share/locale/mg/LC_MESSAGES/libgtop-2.0.mo -share/locale/mi/LC_MESSAGES/libgtop-2.0.mo -share/locale/mk/LC_MESSAGES/libgtop-2.0.mo -share/locale/ml/LC_MESSAGES/libgtop-2.0.mo -share/locale/mn/LC_MESSAGES/libgtop-2.0.mo -share/locale/mr/LC_MESSAGES/libgtop-2.0.mo -share/locale/ms/LC_MESSAGES/libgtop-2.0.mo -share/locale/nb/LC_MESSAGES/libgtop-2.0.mo -share/locale/ne/LC_MESSAGES/libgtop-2.0.mo -share/locale/nl/LC_MESSAGES/libgtop-2.0.mo -share/locale/nn/LC_MESSAGES/libgtop-2.0.mo -share/locale/oc/LC_MESSAGES/libgtop-2.0.mo -share/locale/or/LC_MESSAGES/libgtop-2.0.mo -share/locale/pa/LC_MESSAGES/libgtop-2.0.mo -share/locale/pl/LC_MESSAGES/libgtop-2.0.mo -share/locale/pt/LC_MESSAGES/libgtop-2.0.mo -share/locale/pt_BR/LC_MESSAGES/libgtop-2.0.mo -share/locale/ro/LC_MESSAGES/libgtop-2.0.mo -share/locale/ru/LC_MESSAGES/libgtop-2.0.mo -share/locale/rw/LC_MESSAGES/libgtop-2.0.mo -share/locale/sk/LC_MESSAGES/libgtop-2.0.mo -share/locale/sl/LC_MESSAGES/libgtop-2.0.mo -share/locale/sq/LC_MESSAGES/libgtop-2.0.mo -share/locale/sr/LC_MESSAGES/libgtop-2.0.mo -share/locale/sr@latin/LC_MESSAGES/libgtop-2.0.mo -share/locale/sv/LC_MESSAGES/libgtop-2.0.mo -share/locale/ta/LC_MESSAGES/libgtop-2.0.mo -share/locale/te/LC_MESSAGES/libgtop-2.0.mo -share/locale/tg/LC_MESSAGES/libgtop-2.0.mo -share/locale/th/LC_MESSAGES/libgtop-2.0.mo -share/locale/tr/LC_MESSAGES/libgtop-2.0.mo -share/locale/ug/LC_MESSAGES/libgtop-2.0.mo -share/locale/uk/LC_MESSAGES/libgtop-2.0.mo -share/locale/vi/LC_MESSAGES/libgtop-2.0.mo -share/locale/xh/LC_MESSAGES/libgtop-2.0.mo -share/locale/zh_CN/LC_MESSAGES/libgtop-2.0.mo -share/locale/zh_HK/LC_MESSAGES/libgtop-2.0.mo -share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo +share/locale/am/LC_MESSAGES/libgtop.mo +share/locale/ar/LC_MESSAGES/libgtop.mo +share/locale/as/LC_MESSAGES/libgtop.mo +share/locale/ast/LC_MESSAGES/libgtop.mo +share/locale/az/LC_MESSAGES/libgtop.mo +share/locale/be/LC_MESSAGES/libgtop.mo +share/locale/bg/LC_MESSAGES/libgtop.mo +share/locale/bn/LC_MESSAGES/libgtop.mo +share/locale/bn_IN/LC_MESSAGES/libgtop.mo +share/locale/bs/LC_MESSAGES/libgtop.mo +share/locale/ca/LC_MESSAGES/libgtop.mo +share/locale/ca@valencia/LC_MESSAGES/libgtop.mo +share/locale/cs/LC_MESSAGES/libgtop.mo +share/locale/cy/LC_MESSAGES/libgtop.mo +share/locale/da/LC_MESSAGES/libgtop.mo +share/locale/de/LC_MESSAGES/libgtop.mo +share/locale/dz/LC_MESSAGES/libgtop.mo +share/locale/el/LC_MESSAGES/libgtop.mo +share/locale/en@shaw/LC_MESSAGES/libgtop.mo +share/locale/en_CA/LC_MESSAGES/libgtop.mo +share/locale/en_GB/LC_MESSAGES/libgtop.mo +share/locale/eo/LC_MESSAGES/libgtop.mo +share/locale/es/LC_MESSAGES/libgtop.mo +share/locale/et/LC_MESSAGES/libgtop.mo +share/locale/eu/LC_MESSAGES/libgtop.mo +share/locale/fa/LC_MESSAGES/libgtop.mo +share/locale/fi/LC_MESSAGES/libgtop.mo +share/locale/fr/LC_MESSAGES/libgtop.mo +share/locale/fur/LC_MESSAGES/libgtop.mo +share/locale/ga/LC_MESSAGES/libgtop.mo +share/locale/gl/LC_MESSAGES/libgtop.mo +share/locale/gu/LC_MESSAGES/libgtop.mo +share/locale/he/LC_MESSAGES/libgtop.mo +share/locale/hi/LC_MESSAGES/libgtop.mo +share/locale/hr/LC_MESSAGES/libgtop.mo +share/locale/hu/LC_MESSAGES/libgtop.mo +share/locale/id/LC_MESSAGES/libgtop.mo +share/locale/it/LC_MESSAGES/libgtop.mo +share/locale/ja/LC_MESSAGES/libgtop.mo +share/locale/ka/LC_MESSAGES/libgtop.mo +share/locale/kn/LC_MESSAGES/libgtop.mo +share/locale/ko/LC_MESSAGES/libgtop.mo +share/locale/ku/LC_MESSAGES/libgtop.mo +share/locale/ky/LC_MESSAGES/libgtop.mo +share/locale/la/LC_MESSAGES/libgtop.mo +share/locale/lt/LC_MESSAGES/libgtop.mo +share/locale/lv/LC_MESSAGES/libgtop.mo +share/locale/mai/LC_MESSAGES/libgtop.mo +share/locale/mg/LC_MESSAGES/libgtop.mo +share/locale/mi/LC_MESSAGES/libgtop.mo +share/locale/mk/LC_MESSAGES/libgtop.mo +share/locale/ml/LC_MESSAGES/libgtop.mo +share/locale/mn/LC_MESSAGES/libgtop.mo +share/locale/mr/LC_MESSAGES/libgtop.mo +share/locale/ms/LC_MESSAGES/libgtop.mo +share/locale/nb/LC_MESSAGES/libgtop.mo +share/locale/ne/LC_MESSAGES/libgtop.mo +share/locale/nl/LC_MESSAGES/libgtop.mo +share/locale/nn/LC_MESSAGES/libgtop.mo +share/locale/oc/LC_MESSAGES/libgtop.mo +share/locale/or/LC_MESSAGES/libgtop.mo +share/locale/pa/LC_MESSAGES/libgtop.mo +share/locale/pl/LC_MESSAGES/libgtop.mo +share/locale/pt/LC_MESSAGES/libgtop.mo +share/locale/pt_BR/LC_MESSAGES/libgtop.mo +share/locale/ro/LC_MESSAGES/libgtop.mo +share/locale/ru/LC_MESSAGES/libgtop.mo +share/locale/rw/LC_MESSAGES/libgtop.mo +share/locale/sk/LC_MESSAGES/libgtop.mo +share/locale/sl/LC_MESSAGES/libgtop.mo +share/locale/sq/LC_MESSAGES/libgtop.mo +share/locale/sr/LC_MESSAGES/libgtop.mo +share/locale/sr@latin/LC_MESSAGES/libgtop.mo +share/locale/sv/LC_MESSAGES/libgtop.mo +share/locale/ta/LC_MESSAGES/libgtop.mo +share/locale/te/LC_MESSAGES/libgtop.mo +share/locale/tg/LC_MESSAGES/libgtop.mo +share/locale/th/LC_MESSAGES/libgtop.mo +share/locale/tr/LC_MESSAGES/libgtop.mo +share/locale/ug/LC_MESSAGES/libgtop.mo +share/locale/uk/LC_MESSAGES/libgtop.mo +share/locale/vi/LC_MESSAGES/libgtop.mo +share/locale/xh/LC_MESSAGES/libgtop.mo +share/locale/zh_CN/LC_MESSAGES/libgtop.mo +share/locale/zh_HK/LC_MESSAGES/libgtop.mo +share/locale/zh_TW/LC_MESSAGES/libgtop.mo diff --git a/devel/libical/Makefile b/devel/libical/Makefile index 4d19005e2907..98f71071e6fd 100644 --- a/devel/libical/Makefile +++ b/devel/libical/Makefile @@ -2,25 +2,31 @@ # $FreeBSD$ PORTNAME= libical -PORTVERSION= 2.0.0 -DISTVERSIONPREFIX= v -PORTREVISION= 6 +PORTVERSION= 3.0.3 CATEGORIES= devel +MASTER_SITES= https://github.com/libical/libical/releases/download/v${PORTVERSION}/ MAINTAINER= gnome@FreeBSD.org COMMENT= Implementation of the IETF Calendaring and Scheduling protocols -LICENSE= LGPL21 MPL10 +LICENSE= LGPL21 MPL20 LICENSE_COMB= dual LIB_DEPENDS= libicuuc.so:devel/icu CFLAGS_amd64= -fPIC -USES= cmake compiler:c++11-lib pathfix perl5 -USE_GITHUB= yes -USE_GNOME= introspection:build +USES= cmake compiler:c++11-lib gnome pathfix perl5 pkgconfig USE_PERL5= build USE_LDCONFIG= yes +MAKE_JOBS_UNSAFE= yes + +BUILD_DEPENDS= valac:lang/vala \ + gtkdoc-scan:textproc/gtk-doc +USE_GNOME= introspection:build glib20 libxml2 +CMAKE_ARGS+= -DGOBJECT_INTROSPECTION=true \ + -DICAL_GLIB_VAPI=true \ + -DICAL_BUILD_DOCS=false + .include <bsd.port.mk> diff --git a/devel/libical/distinfo b/devel/libical/distinfo index 57f59d50b79c..a3020c1eacf4 100644 --- a/devel/libical/distinfo +++ b/devel/libical/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1490973722 -SHA256 (libical-libical-v2.0.0_GH0.tar.gz) = 20f4a98475052e1200d2691ba50b27969e4bedc6e50bffd5e2fa81f4ac90de9a -SIZE (libical-libical-v2.0.0_GH0.tar.gz) = 699099 +TIMESTAMP = 1522599892 +SHA256 (libical-3.0.3.tar.gz) = 5b91eb8ad2d2dcada39d2f81d5e3ac15895823611dc7df91df39a35586f39241 +SIZE (libical-3.0.3.tar.gz) = 866624 diff --git a/devel/libical/files/patch-src_libical_icaltz-util.c b/devel/libical/files/patch-src_libical_icaltz-util.c deleted file mode 100644 index 1f36e84e6e26..000000000000 --- a/devel/libical/files/patch-src_libical_icaltz-util.c +++ /dev/null @@ -1,520 +0,0 @@ ---- src/libical/icaltz-util.c.orig 2018-03-09 22:23:47 UTC -+++ src/libical/icaltz-util.c -@@ -4,20 +4,18 @@ - * - * Copyright 2007, Novell, Inc. - * -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of version 2 of the GNU Lesser General Public -- * License as published by the Free Software Foundation. -+ * This library is free software; you can redistribute it and/or modify -+ * it under the terms of either: - * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU Lesser General Public License for more details. -+ * The LGPL as published by the Free Software Foundation, version -+ * 2.1, available at: http://www.gnu.org/licenses/lgpl-2.1.html - * -- * * You should have received a copy of the GNU Lesser General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, -- * Boston, MA 02110-1301, USA. -+ * Or: -+ * -+ * The Mozilla Public License Version 2.0. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ - */ -+//krazy:excludeall=cpp - - #ifdef HAVE_CONFIG_H - #include <config.h> -@@ -93,9 +91,9 @@ typedef struct - char charcnt[4]; - } tzinfo; - --static char *zdir = NULL; -+static const char *zdir = NULL; - --static char *search_paths[] = { -+static const char *search_paths[] = { - "/usr/share/zoneinfo", - "/usr/lib/zoneinfo", - "/etc/zoneinfo", -@@ -144,6 +142,7 @@ static int decode(const void *ptr) - const unsigned char *p = ptr; - int result = *p & (1 << (CHAR_BIT - 1)) ? ~0 : 0; - -+ /* cppcheck-suppress shiftNegative */ - result = (result << 8) | *p++; - result = (result << 8) | *p++; - result = (result << 8) | *p++; -@@ -153,9 +152,9 @@ static int decode(const void *ptr) - } - } - --static char *zname_from_stridx(char *str, long idx) -+static char *zname_from_stridx(char *str, size_t idx) - { -- long i; -+ size_t i; - size_t size; - char *ret; - -@@ -164,7 +163,7 @@ static char *zname_from_stridx(char *str - i++; - } - -- size = (size_t)(i - idx); -+ size = i - idx; - str += idx; - ret = (char *)malloc(size + 1); - ret = strncpy(ret, str, size); -@@ -197,45 +196,6 @@ const char *icaltzutil_get_zone_director - return zdir; - } - --static void find_transidx(time_t *transitions, ttinfo *types, -- int *trans_idx, long int num_trans, -- int *stdidx, int *dstidx) --{ -- time_t now, year_start; -- int i, found = 0; -- struct icaltimetype itime; -- -- now = time(NULL); -- itime = icaltime_from_timet(now, 0); -- itime.month = itime.day = 1; -- itime.hour = itime.minute = itime.second = 0; -- year_start = icaltime_as_timet(itime); -- -- /* Set this by default */ -- *stdidx = (num_trans - 1); -- -- for (i = (num_trans - 1); i >= 0; --i) { -- if (year_start < transitions[i]) { -- int idx; -- found = 1; -- idx = trans_idx[i]; -- (types[idx].isdst) ? (*dstidx = i) : (*stdidx = i); -- } -- } -- -- /* If the transition found is the last among the list, prepare to use the last two transtions. -- * Using this will most likely throw the DTSTART of the resulting component off by 1 or 2 days -- * but it would set right by the adjustment made. -- * NOTE: We need to use the last two transitions only because there is no data for the future -- * transitions. -- */ -- if (found && (*dstidx == -1)) { -- *dstidx = ((*stdidx) - 1); -- } -- -- return; --} -- - static int calculate_pos(icaltimetype icaltime) - { - static int r_pos[] = {1, 2, 3, -2, -1}; -@@ -251,22 +211,6 @@ static int calculate_pos(icaltimetype ic - return r_pos[pos]; - } - --#if defined(USE_INTEROPERABLE_VTIMEZONES) --static int _s_use_exact_timezones = 0; --#else --static int _s_use_exact_timezones = 1; --#endif -- --void icaltzutil_set_exact_vtimezones_support(int on) --{ -- _s_use_exact_timezones = (on != 0); --} -- --int icaltzutil_get_exact_vtimezones_support(void) --{ -- return _s_use_exact_timezones; --} -- - static void adjust_dtstart_day_to_rrule(icalcomponent *comp, struct icalrecurrencetype rule) - { - time_t now, year_start; -@@ -274,13 +218,13 @@ static void adjust_dtstart_day_to_rrule( - icalrecur_iterator *iter; - - now = time(NULL); -- itime = icaltime_from_timet(now, 0); -+ itime = icaltime_from_timet_with_zone(now, 0, NULL); - itime.month = itime.day = 1; - itime.hour = itime.minute = itime.second = 0; - year_start = icaltime_as_timet(itime); - - comp_start = icalcomponent_get_dtstart(comp); -- start = icaltime_from_timet(year_start, 0); -+ start = icaltime_from_timet_with_zone(year_start, 0, NULL); - - iter = icalrecur_iterator_new(rule, start); - iter_start = icalrecur_iterator_next(iter); -@@ -298,9 +242,8 @@ icalcomponent *icaltzutil_fetch_timezone - size_t i, num_trans, num_chars, num_leaps, num_isstd, num_isgmt; - size_t num_types = 0; - size_t size; -- time_t trans; -- int dstidx = -1, stdidx = -1, pos, sign, zidx, zp_idx; -- icalcomponent *std_comp = NULL; -+ int pos, sign; -+ time_t now = time(NULL); - - const char *zonedir; - FILE *f = NULL; -@@ -313,12 +256,22 @@ icalcomponent *icaltzutil_fetch_timezone - leap *leaps = NULL; - char *tzid = NULL; - -- time_t start, end; - int idx, prev_idx; -- icalcomponent *tz_comp = NULL, *comp = NULL, *dst_comp; -+ icalcomponent *tz_comp = NULL, *comp = NULL; - icalproperty *icalprop; -- icaltimetype dtstart, icaltime; -- struct icalrecurrencetype ical_recur; -+ icaltimetype icaltime; -+ struct icalrecurrencetype standard_recur; -+ struct icalrecurrencetype daylight_recur; -+ icaltimetype prev_standard_time = icaltime_null_time(); -+ icaltimetype prev_daylight_time = icaltime_null_time(); -+ icaltimetype prev_prev_standard_time; -+ icaltimetype prev_prev_daylight_time; -+ long prev_standard_gmtoff; -+ long prev_daylight_gmtoff; -+ icalcomponent *cur_standard_comp = NULL; -+ icalcomponent *cur_daylight_comp = NULL; -+ icalproperty *cur_standard_rrule_property; -+ icalproperty *cur_daylight_rrule_property; - - if (icaltimezone_get_builtin_tzdata()) { - goto error; -@@ -448,15 +401,8 @@ icalcomponent *icaltzutil_fetch_timezone - /* Read all the contents now */ - - for (i = 0; i < num_types; i++) { -- types[i].zname = zname_from_stridx(znames, (long)types[i].abbr); -- } -- -- if (!_s_use_exact_timezones) { -- if (num_trans != 0) { -- find_transidx(transitions, types, trans_idx, (long int)num_trans, &stdidx, &dstidx); -- } else { -- stdidx = 0; -- } -+ /* coverity[tainted_data] */ -+ types[i].zname = zname_from_stridx(znames, types[i].abbr); - } - - tz_comp = icalcomponent_new(ICAL_VTIMEZONE_COMPONENT); -@@ -476,140 +422,202 @@ icalcomponent *icaltzutil_fetch_timezone - icalproperty_set_x_name(icalprop, "X-LIC-LOCATION"); - icalcomponent_add_property(tz_comp, icalprop); - -- if (!_s_use_exact_timezones) { -- if (stdidx != -1) { -- if (num_trans != 0) { -- zidx = trans_idx[stdidx]; -+ prev_idx = 0; -+ if (num_trans == 0) { -+ prev_idx = idx = 0; -+ } else { -+ idx = trans_idx[0]; -+ } -+ -+ for (i = 1; i < num_trans; i++) { -+ int by_day; -+ int is_new_comp = 0; -+ time_t start; -+ struct icalrecurrencetype *recur; -+ -+ prev_idx = idx; -+ idx = trans_idx[i]; -+ start = transitions[i] + types[prev_idx].gmtoff; -+ -+ icaltime = icaltime_from_timet_with_zone(start, 0, NULL); -+ pos = calculate_pos(icaltime); -+ pos < 0 ? (sign = -1): (sign = 1); -+ by_day = sign * ((abs(pos) * 8) + icaltime_day_of_week(icaltime)); -+ -+ // Figure out if the rule has changed since the previous year -+ // If it has, update the recurrence rule of the current component and create a new component -+ // If it the current component was only valid for one year then remove the recurrence rule -+ if (types[idx].isdst) { -+ if (cur_daylight_comp) { -+ // Check if the pattern for daylight has changed -+ // If it has, create a new component and update UNTIL of previous component's RRULE -+ if (daylight_recur.by_month[0] != icaltime.month || -+ daylight_recur.by_day[0] != by_day || -+ types[prev_idx].gmtoff != prev_daylight_gmtoff) { -+ // Set UNTIL of the previous component's recurrence -+ icaltime_adjust(&prev_daylight_time, 0, 0, 0, -types[prev_idx].gmtoff); -+ prev_daylight_time.is_utc = 1; -+ -+ daylight_recur.until = prev_daylight_time; -+ icalproperty_set_rrule(cur_daylight_rrule_property, daylight_recur); -+ -+ cur_daylight_comp = icalcomponent_new(ICAL_XDAYLIGHT_COMPONENT); -+ is_new_comp = 1; -+ } - } else { -- zidx = 0; -+ cur_daylight_comp = icalcomponent_new(ICAL_XDAYLIGHT_COMPONENT); -+ is_new_comp = 1; - } - -- std_comp = icalcomponent_new(ICAL_XSTANDARD_COMPONENT); -- icalprop = icalproperty_new_tzname(types[zidx].zname); -- icalcomponent_add_property(std_comp, icalprop); -+ comp = cur_daylight_comp; -+ recur = &daylight_recur; - -- if (dstidx != -1) { -- zp_idx = trans_idx[stdidx-1]; -+ if (icaltime_is_null_time(prev_daylight_time)) { -+ prev_prev_daylight_time = icaltime; - } else { -- zp_idx = zidx; -+ prev_prev_daylight_time = prev_daylight_time; - } -- /* DTSTART localtime uses TZOFFSETFROM UTC offset */ -- if (num_trans != 0) { -- trans = transitions[stdidx] + types[zp_idx].gmtoff; -+ -+ prev_daylight_time = icaltime; -+ prev_daylight_gmtoff = types[prev_idx].gmtoff; -+ } else { -+ if (cur_standard_comp) { -+ // Check if the pattern for standard has changed -+ // If it has, create a new component and update UNTIL -+ // of the previous component's RRULE -+ if (standard_recur.by_month[0] != icaltime.month || -+ standard_recur.by_day[0] != by_day || -+ types[prev_idx].gmtoff != prev_standard_gmtoff) { -+ icaltime_adjust(&prev_standard_time, 0, 0, 0, -types[prev_idx].gmtoff); -+ prev_standard_time.is_utc = 1; -+ -+ standard_recur.until = prev_standard_time; -+ icalproperty_set_rrule(cur_standard_rrule_property, standard_recur); -+ -+ cur_standard_comp = icalcomponent_new(ICAL_XSTANDARD_COMPONENT); -+ is_new_comp = 1; -+ -+ // Are we transitioning on the daylight date? -+ // If so, that means the time zone is switching off of DST -+ // We need to set UNTIL for the daylight component -+ if (cur_daylight_comp && daylight_recur.by_month[0] == icaltime.month && -+ daylight_recur.by_day[0] == by_day) { -+ icaltime_adjust(&prev_daylight_time, 0, 0, 0, -types[prev_idx].gmtoff); -+ prev_daylight_time.is_utc = 1; -+ -+ daylight_recur.until = prev_daylight_time; -+ icalproperty_set_rrule(cur_daylight_rrule_property, daylight_recur); -+ } -+ } - } else { -- trans = (time_t)types[zp_idx].gmtoff; -+ cur_standard_comp = icalcomponent_new(ICAL_XSTANDARD_COMPONENT); -+ is_new_comp = 1; - } -- icaltime = icaltime_from_timet(trans, 0); -- dtstart = icaltime; -- dtstart.year = 1970; -- dtstart.minute = dtstart.second = 0; -- icalprop = icalproperty_new_dtstart(dtstart); -- icalcomponent_add_property(std_comp, icalprop); - -- /* If DST changes are present use RRULE */ -- if (dstidx != -1) { -- icalrecurrencetype_clear(&ical_recur); -- ical_recur.freq = ICAL_YEARLY_RECURRENCE; -- ical_recur.by_month[0] = icaltime.month; -- pos = calculate_pos(icaltime); -- pos < 0 ? (sign = -1): (sign = 1); -- ical_recur.by_day[0] = sign * ((abs(pos) * 8) + icaltime_day_of_week(icaltime)); -- icalprop = icalproperty_new_rrule(ical_recur); -- icalcomponent_add_property(std_comp, icalprop); -+ comp = cur_standard_comp; -+ recur = &standard_recur; - -- adjust_dtstart_day_to_rrule(std_comp, ical_recur); -+ if (icaltime_is_null_time(prev_standard_time)) { -+ prev_prev_standard_time = icaltime; -+ } else { -+ prev_prev_standard_time = prev_standard_time; - } -- icalprop = icalproperty_new_tzoffsetfrom(types[zp_idx].gmtoff); -- icalcomponent_add_property(std_comp, icalprop); -- icalprop = icalproperty_new_tzoffsetto(types[zidx].gmtoff); -- icalcomponent_add_property(std_comp, icalprop); -- icalcomponent_add_component(tz_comp, std_comp); -- } else { -- icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR); -+ -+ prev_standard_time = icaltime; -+ prev_standard_gmtoff = types[prev_idx].gmtoff; - } - -- if (dstidx != -1) { -- zidx = trans_idx[dstidx]; -- zp_idx = trans_idx[dstidx-1]; -- dst_comp = icalcomponent_new(ICAL_XDAYLIGHT_COMPONENT); -- icalprop = icalproperty_new_tzname(types[zidx].zname); -- icalcomponent_add_property(dst_comp, icalprop); -+ if (is_new_comp) { -+ icalprop = icalproperty_new_tzname(types[idx].zname); -+ icalcomponent_add_property(comp, icalprop); -+ icalprop = icalproperty_new_dtstart(icaltime); -+ icalcomponent_add_property(comp, icalprop); -+ icalprop = icalproperty_new_tzoffsetfrom(types[prev_idx].gmtoff); -+ icalcomponent_add_property(comp, icalprop); -+ icalprop = icalproperty_new_tzoffsetto(types[idx].gmtoff); -+ icalcomponent_add_property(comp, icalprop); - -- /* DTSTART localtime uses TZOFFSETFROM UTC offset */ -- if (num_trans != 0) { -- trans = transitions[dstidx] + types[zp_idx].gmtoff; -+ // Determine the recurrence rule for the current set of changes -+ icalrecurrencetype_clear(recur); -+ recur->freq = ICAL_YEARLY_RECURRENCE; -+ recur->by_month[0] = icaltime.month; -+ recur->by_day[0] = by_day; -+ icalprop = icalproperty_new_rrule(*recur); -+ icalcomponent_add_property(comp, icalprop); -+ -+ if (types[idx].isdst) { -+ cur_daylight_rrule_property = icalprop; - } else { -- trans = (time_t)types[zp_idx].gmtoff; -+ cur_standard_rrule_property = icalprop; - } - -- icaltime = icaltime_from_timet(trans, 0); -- dtstart = icaltime; -- dtstart.year = 1970; -- dtstart.minute = dtstart.second = 0; -- icalprop = icalproperty_new_dtstart(dtstart); -- icalcomponent_add_property(dst_comp, icalprop); -+ adjust_dtstart_day_to_rrule(comp, *recur); - -- icalrecurrencetype_clear(&ical_recur); -- ical_recur.freq = ICAL_YEARLY_RECURRENCE; -- ical_recur.by_month[0] = icaltime.month; -- pos = calculate_pos(icaltime); -- pos < 0 ? (sign = -1): (sign = 1); -- ical_recur.by_day[0] = sign * ((abs(pos) * 8) + icaltime_day_of_week(icaltime)); -- icalprop = icalproperty_new_rrule(ical_recur); -- icalcomponent_add_property(dst_comp, icalprop); -+ icalcomponent_add_component(tz_comp, comp); -+ } -+ } - -- adjust_dtstart_day_to_rrule(dst_comp, ical_recur); -+ // Check if the last daylight or standard date was before now -+ // If so, set the UNTIL date to the second-to-last transition date -+ // and then insert a new component to indicate the time zone doesn't transition anymore -+ if (cur_daylight_comp && icaltime_as_timet(prev_daylight_time) < now) { -+ icaltime_adjust(&prev_prev_daylight_time, 0, 0, 0, -prev_daylight_gmtoff); -+ prev_prev_daylight_time.is_utc = 1; - -- icalprop = icalproperty_new_tzoffsetfrom(types[zp_idx].gmtoff); -- icalcomponent_add_property(dst_comp, icalprop); -+ daylight_recur.until = prev_prev_daylight_time; -+ icalproperty_set_rrule(cur_daylight_rrule_property, daylight_recur); - -- icalprop = icalproperty_new_tzoffsetto(types[zidx].gmtoff); -- icalcomponent_add_property(dst_comp, icalprop); -+ comp = icalcomponent_new(ICAL_XDAYLIGHT_COMPONENT); -+ icalprop = icalproperty_new_tzname(types[idx].zname); -+ icalcomponent_add_property(comp, icalprop); -+ icalprop = icalproperty_new_dtstart(prev_daylight_time); -+ icalcomponent_add_property(comp, icalprop); -+ icalprop = icalproperty_new_tzoffsetfrom(types[prev_idx].gmtoff); -+ icalcomponent_add_property(comp, icalprop); -+ icalprop = icalproperty_new_tzoffsetto(types[idx].gmtoff); -+ icalcomponent_add_property(comp, icalprop); -+ icalcomponent_add_component(tz_comp, comp); -+ } - -- icalcomponent_add_component(tz_comp, dst_comp); -- } -- } else { /*exact vtimezones*/ -- prev_idx = 0; -- if (num_trans == 0) { -- prev_idx = idx = 0; -+ if (cur_standard_comp && icaltime_as_timet(prev_standard_time) < now) { -+ icaltime_adjust(&prev_prev_standard_time, 0, 0, 0, -prev_standard_gmtoff); -+ prev_prev_standard_time.is_utc = 1; -+ -+ standard_recur.until = prev_prev_standard_time; -+ icalproperty_set_rrule(cur_standard_rrule_property, standard_recur); -+ -+ comp = icalcomponent_new(ICAL_XSTANDARD_COMPONENT); -+ icalprop = icalproperty_new_tzname(types[idx].zname); -+ icalcomponent_add_property(comp, icalprop); -+ icalprop = icalproperty_new_dtstart(prev_standard_time); -+ icalcomponent_add_property(comp, icalprop); -+ icalprop = icalproperty_new_tzoffsetfrom(types[prev_idx].gmtoff); -+ icalcomponent_add_property(comp, icalprop); -+ icalprop = icalproperty_new_tzoffsetto(types[idx].gmtoff); -+ icalcomponent_add_property(comp, icalprop); -+ icalcomponent_add_component(tz_comp, comp); -+ } -+ -+ if (num_trans <= 1) { -+ time_t start; -+ -+ if (num_trans == 1) { -+ start = transitions[0] + types[prev_idx].gmtoff; - } else { -- idx = trans_idx[0]; -+ start = 0; - } -- start = 0; -- for (i = 1; i < num_trans; i++, start = end) { -- prev_idx = idx; -- idx = trans_idx[i]; -- end = transitions[i] + types[prev_idx].gmtoff; -- /* don't bother starting until the epoch */ -- if (0 > end) -- continue; - -- if (types[prev_idx].isdst) { -- comp = icalcomponent_new(ICAL_XDAYLIGHT_COMPONENT); -- } else { -- comp = icalcomponent_new(ICAL_XSTANDARD_COMPONENT); -- } -- icalprop = icalproperty_new_tzname(types[prev_idx].zname); -- icalcomponent_add_property(comp, icalprop); -- dtstart = icaltime_from_timet(start, 0); -- icalprop = icalproperty_new_dtstart(dtstart); -- icalcomponent_add_property(comp, icalprop); -- icalprop = icalproperty_new_tzoffsetfrom(types[idx].gmtoff); -- icalcomponent_add_property(comp, icalprop); -- icalprop = icalproperty_new_tzoffsetto(types[prev_idx].gmtoff); -- icalcomponent_add_property(comp, icalprop); -- icalcomponent_add_component(tz_comp, comp); -- } -- /* finally, add a last zone with no end date */ -+ // This time zone doesn't transition, insert a single VTIMEZONE component - if (types[idx].isdst) { - comp = icalcomponent_new(ICAL_XDAYLIGHT_COMPONENT); - } else { - comp = icalcomponent_new(ICAL_XSTANDARD_COMPONENT); - } -+ - icalprop = icalproperty_new_tzname(types[idx].zname); - icalcomponent_add_property(comp, icalprop); -- dtstart = icaltime_from_timet(start, 0); -- icalprop = icalproperty_new_dtstart(dtstart); -+ icaltime = icaltime_from_timet_with_zone(start, 0, NULL); -+ icalprop = icalproperty_new_dtstart(icaltime); - icalcomponent_add_property(comp, icalprop); - icalprop = icalproperty_new_tzoffsetfrom(types[prev_idx].gmtoff); - icalcomponent_add_property(comp, icalprop); diff --git a/devel/libical/files/patch-src_libical_icaltz-util.h b/devel/libical/files/patch-src_libical_icaltz-util.h deleted file mode 100644 index a7f08285e907..000000000000 --- a/devel/libical/files/patch-src_libical_icaltz-util.h +++ /dev/null @@ -1,41 +0,0 @@ ---- src/libical/icaltz-util.h.orig 2018-03-09 22:29:13 UTC -+++ src/libical/icaltz-util.h -@@ -4,19 +4,16 @@ - * - * Copyright 2007, Novell, Inc. - * -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of version 2 of the GNU Lesser General Public -- * License as published by the Free Software Foundation. -+ * This library is free software; you can redistribute it and/or modify -+ * it under the terms of either: - * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU Lesser General Public License for more details. -+ * The LGPL as published by the Free Software Foundation, version -+ * 2.1, available at: http://www.gnu.org/licenses/lgpl-2.1.html - * -- * You should have received a copy of the GNU Lesser General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, -- * Boston, MA 02110-1301, USA. -+ * Or: -+ * -+ * The Mozilla Public License Version 2.0. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ - */ - - #ifndef ICALTZUTIL_H -@@ -35,10 +32,4 @@ LIBICAL_ICAL_EXPORT const char *icaltzut - - LIBICAL_ICAL_EXPORT icalcomponent *icaltzutil_fetch_timezone(const char *location); - --/* set @p on to 0 if inter-operable vtimezones are desired; else exact timezones are in-effect */ --LIBICAL_ICAL_EXPORT void icaltzutil_set_exact_vtimezones_support(int on); -- --/* return 1 if exact vtimezones are in-effect; else inter-operable vtimezones are in-effect */ --LIBICAL_ICAL_EXPORT int icaltzutil_get_exact_vtimezones_support(void); -- - #endif diff --git a/devel/libical/files/patch-src_test_timezones.c b/devel/libical/files/patch-src_test_timezones.c deleted file mode 100644 index 40dd7d43b172..000000000000 --- a/devel/libical/files/patch-src_test_timezones.c +++ /dev/null @@ -1,82 +0,0 @@ ---- src/test/timezones.c.orig 2018-03-09 22:35:51 UTC -+++ src/test/timezones.c -@@ -1,15 +1,16 @@ - /* - ====================================================================== - -- The contents of this file are subject to the Mozilla Public License -- Version 1.0 (the "License"); you may not use this file except in -- compliance with the License. You may obtain a copy of the License at -- http://www.mozilla.org/MPL/ -+ This library is free software; you can redistribute it and/or modify -+ it under the terms of either: - -- Software distributed under the License is distributed on an "AS IS" -- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See -- the License for the specific language governing rights and -- limitations under the License. -+ The LGPL as published by the Free Software Foundation, version -+ 2.1, available at: http://www.gnu.org/licenses/lgpl-2.1.html -+ -+ Or: -+ -+ The Mozilla Public License Version 2.0. You may obtain a copy of -+ the License at http://www.mozilla.org/MPL/ - - ======================================================================*/ - -@@ -56,6 +57,9 @@ int main() - for (i = 0; i < timezones->num_elements; i++) { - zone = (icaltimezone *)icalarray_element_at(timezones, i); - zone_location = (char *)icaltimezone_get_location(zone); -+ zonedef_printed = 0; -+ if (!zone_location) -+ continue; - - /* - * select this location for glibc: needs support for TZ=<location> -@@ -66,7 +70,7 @@ int main() - #else - new_tz[0] = '\0'; - strncat(new_tz, "TZ=", 255); -- strncat(new_tz, zone_location, 255); -+ strncat(new_tz, zone_location, 255 - strlen(new_tz)); - putenv(new_tz); - #endif - tzset(); -@@ -106,7 +110,9 @@ int main() - if (verbose || curr_failed != failed) { - struct tm utc_tm; - -- gmtime_r(&curr_time, &utc_tm); -+ if (!gmtime_r(&curr_time, &utc_tm)) -+ memset(&utc_tm, 0, sizeof(utc_tm)); -+ - printf( - "%s: day %03d: %s: %04d-%02d-%02d %02d:%02d:%02d UTC = " - "libc %04d-%02d-%02d %02d:%02d:%02d dst %d", -@@ -131,7 +137,7 @@ int main() - printf("\n"); - failed = curr_failed; - -- if (!zonedef_printed) { -+ if (failed && !zonedef_printed) { - icalcomponent *comp = icaltimezone_get_component(zone); - - if (comp) { -@@ -153,14 +159,8 @@ int main() - percent_failed = total_failed * 100 / (total_failed + total_okay); - printf(" *** Summary: %lu zones tested, %u days failed, %u okay => %u%% failed ***\n", - (unsigned long)timezones->num_elements, total_failed, total_okay, percent_failed); -- -- if (!icaltzutil_get_exact_vtimezones_support()) { -- if (!percent_failed) { -- ret = 0; -- printf(" *** Expect some small error rate with inter-operable vtimezones *** \n"); -- } -- } - } - -+ icaltimezone_free_builtin_timezones(); - return ret; - } diff --git a/devel/libical/pkg-plist b/devel/libical/pkg-plist index 3d6ab68fc976..252368efc2db 100644 --- a/devel/libical/pkg-plist +++ b/devel/libical/pkg-plist @@ -1,3 +1,39 @@ +include/libical-glib/i-cal-array.h +include/libical-glib/i-cal-attach.h +include/libical-glib/i-cal-comp-iter.h +include/libical-glib/i-cal-component.h +include/libical-glib/i-cal-datetimeperiod-type.h +include/libical-glib/i-cal-derived-parameter.h +include/libical-glib/i-cal-derived-property.h +include/libical-glib/i-cal-derived-value.h +include/libical-glib/i-cal-duration-type.h +include/libical-glib/i-cal-enums.h +include/libical-glib/i-cal-error.h +include/libical-glib/i-cal-forward-declarations.h +include/libical-glib/i-cal-geo-type.h +include/libical-glib/i-cal-langbind.h +include/libical-glib/i-cal-memory.h +include/libical-glib/i-cal-mime.h +include/libical-glib/i-cal-object.h +include/libical-glib/i-cal-parameter.h +include/libical-glib/i-cal-parser.h +include/libical-glib/i-cal-period-type.h +include/libical-glib/i-cal-property.h +include/libical-glib/i-cal-recur-iterator.h +include/libical-glib/i-cal-recur.h +include/libical-glib/i-cal-recurrence-type.h +include/libical-glib/i-cal-reqstat-type.h +include/libical-glib/i-cal-restriction.h +include/libical-glib/i-cal-time-span.h +include/libical-glib/i-cal-time.h +include/libical-glib/i-cal-timetype.h +include/libical-glib/i-cal-timezone-phase.h +include/libical-glib/i-cal-timezone.h +include/libical-glib/i-cal-timezonetype.h +include/libical-glib/i-cal-trigger-type.h +include/libical-glib/i-cal-unknowntokenhandling.h +include/libical-glib/i-cal-value.h +include/libical-glib/libical-glib.h include/libical/ical.h include/libical/icalarray.h include/libical/icalattach.h @@ -55,24 +91,34 @@ lib/cmake/LibIcal/LibIcalConfig.cmake lib/cmake/LibIcal/LibIcalConfigVersion.cmake lib/cmake/LibIcal/LibIcalTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/LibIcal/LibIcalTargets.cmake +lib/girepository-1.0/ICalGLib-3.0.typelib +lib/girepository-1.0/libical-3.0.3.typelib +lib/libical-glib.a +lib/libical-glib.so +lib/libical-glib.so.3 +lib/libical-glib.so.3.0.3 lib/libical.a lib/libical.so -lib/libical.so.2 -lib/libical.so.2.0.0 +lib/libical.so.3 +lib/libical.so.3.0.3 lib/libical_cxx.a lib/libical_cxx.so -lib/libical_cxx.so.2 -lib/libical_cxx.so.2.0.0 +lib/libical_cxx.so.3 +lib/libical_cxx.so.3.0.3 lib/libicalss.a lib/libicalss.so -lib/libicalss.so.2 -lib/libicalss.so.2.0.0 +lib/libicalss.so.3 +lib/libicalss.so.3.0.3 lib/libicalss_cxx.a lib/libicalss_cxx.so -lib/libicalss_cxx.so.2 -lib/libicalss_cxx.so.2.0.0 +lib/libicalss_cxx.so.3 +lib/libicalss_cxx.so.3.0.3 lib/libicalvcal.a lib/libicalvcal.so -lib/libicalvcal.so.2 -lib/libicalvcal.so.2.0.0 +lib/libicalvcal.so.3 +lib/libicalvcal.so.3.0.3 +libdata/pkgconfig/libical-glib.pc libdata/pkgconfig/libical.pc +share/gir-1.0/ICalGLib-3.0.gir +share/gir-1.0/libical-3.0.3.gir +share/vala/vapi/libical-glib.vapi diff --git a/devel/libpeas/Makefile b/devel/libpeas/Makefile index 575d0c5a9760..689c94f308d6 100644 --- a/devel/libpeas/Makefile +++ b/devel/libpeas/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libpeas -PORTVERSION= 1.20.0 +PORTVERSION= 1.22.0 PORTREVISION?= 0 CATEGORIES= devel gnome MASTER_SITES= GNOME @@ -30,8 +30,6 @@ USE_GNOME= cairo gtk30 intlhack introspection USE_LDCONFIG= yes INSTALLS_ICONS= yes GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip CONFIGURE_ARGS+=--disable-glade-catalog PLIST= ${.CURDIR}/pkg-plist diff --git a/devel/libpeas/distinfo b/devel/libpeas/distinfo index ff275de3961f..718f5645e1b5 100644 --- a/devel/libpeas/distinfo +++ b/devel/libpeas/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1496672649 -SHA256 (gnome3/libpeas-1.20.0.tar.xz) = f392fffe2dc00072a51bb2a1b274224a06bdc5f9c3b3c0ac4816909e9933d354 -SIZE (gnome3/libpeas-1.20.0.tar.xz) = 557872 +TIMESTAMP = 1516305648 +SHA256 (gnome3/libpeas-1.22.0.tar.xz) = 5b2fc0f53962b25bca131a5ec0139e6fef8e254481b6e777975f7a1d2702a962 +SIZE (gnome3/libpeas-1.22.0.tar.xz) = 561332 diff --git a/devel/libpeas/pkg-plist b/devel/libpeas/pkg-plist index e7a1841467e7..94334b7cc9ad 100644 --- a/devel/libpeas/pkg-plist +++ b/devel/libpeas/pkg-plist @@ -5,22 +5,22 @@ include/libpeas-1.0/libpeas-gtk/peas-gtk-plugin-manager-view.h include/libpeas-1.0/libpeas-gtk/peas-gtk-plugin-manager.h include/libpeas-1.0/libpeas-gtk/peas-gtk.h include/libpeas-1.0/libpeas/peas-activatable.h +include/libpeas-1.0/libpeas/peas-autocleanups.h include/libpeas-1.0/libpeas/peas-engine.h include/libpeas-1.0/libpeas/peas-extension-base.h include/libpeas-1.0/libpeas/peas-extension-set.h include/libpeas-1.0/libpeas/peas-extension.h include/libpeas-1.0/libpeas/peas-object-module.h -include/libpeas-1.0/libpeas/peas-autocleanups.h include/libpeas-1.0/libpeas/peas-plugin-info.h include/libpeas-1.0/libpeas/peas.h lib/girepository-1.0/Peas-1.0.typelib lib/girepository-1.0/PeasGtk-1.0.typelib lib/libpeas-1.0.so lib/libpeas-1.0.so.0 -lib/libpeas-1.0.so.0.2000.0 +lib/libpeas-1.0.so.0.2200.0 lib/libpeas-gtk-1.0.so lib/libpeas-gtk-1.0.so.0 -lib/libpeas-gtk-1.0.so.0.2000.0 +lib/libpeas-gtk-1.0.so.0.2200.0 lib/peas-demo/plugins/helloworld/helloworld.plugin lib/peas-demo/plugins/helloworld/libhelloworld.so lib/peas-demo/plugins/secondtime/libsecondtime.so @@ -93,6 +93,7 @@ share/locale/gl/LC_MESSAGES/libpeas.mo share/locale/gu/LC_MESSAGES/libpeas.mo share/locale/he/LC_MESSAGES/libpeas.mo share/locale/hi/LC_MESSAGES/libpeas.mo +share/locale/hr/LC_MESSAGES/libpeas.mo share/locale/hu/LC_MESSAGES/libpeas.mo share/locale/id/LC_MESSAGES/libpeas.mo share/locale/is/LC_MESSAGES/libpeas.mo diff --git a/devel/libsoup-reference/Makefile b/devel/libsoup-reference/Makefile deleted file mode 100644 index c7afa52936fb..000000000000 --- a/devel/libsoup-reference/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# Created by: Jean-Yves Lefort <jylefort@FreeBSD.org> -# $FreeBSD$ - -PORTREVISION= 0 - -.include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk" diff --git a/devel/libsoup-reference/pkg-descr b/devel/libsoup-reference/pkg-descr deleted file mode 100644 index 66848372fd8c..000000000000 --- a/devel/libsoup-reference/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -This port contains the programming reference for devel/libsoup. diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile index 4499159db03e..5e10e68eb116 100644 --- a/devel/libsoup/Makefile +++ b/devel/libsoup/Makefile @@ -2,34 +2,31 @@ # $FreeBSD$ PORTNAME= libsoup -PORTVERSION= 2.54.1 -PORTREVISION= 0 +PORTVERSION= 2.62.2 CATEGORIES= devel gnome MASTER_SITES= GNOME -DIST_SUBDIR= gnome2 +DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= SOAP (Simple Object Access Protocol) implementation in C +LICENSE= LGPL20 +LICENSE_FILE= ${WRKSRC}/COPYING + BUILD_DEPENDS= glib-networking>=2.29.18:net/glib-networking LIB_DEPENDS= libgcrypt.so:security/libgcrypt RUN_DEPENDS= glib-networking>=2.29.18:net/glib-networking -USES= tar:xz PORTSCOUT= limitw:1,even -.if !defined(REFERENCE_PORT) - -USES+= gettext gmake gnome libtool pathfix pkgconfig \ - python:build sqlite:3 tar:xz +USES= gettext gmake gnome libtool localbase pathfix \ + pkgconfig python:3.6+,build sqlite ssl tar:xz USE_GNOME= glib20 intlhack introspection:build \ libxml2 referencehack USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-more-warnings \ --disable-vala -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip LIBVERSION= 1.8.0 @@ -46,7 +43,7 @@ CONFIGURE_ARGS+=--without-gnome post-patch: @${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|env python|env ${PYTHON_VERSION}|g' \ + @${REINPLACE_CMD} -e 's|env python3|env ${PYTHON_VERSION}|g' \ ${WRKSRC}/libsoup/tld-parser.py @${REINPLACE_CMD} -e 's|DATADIRNAME=lib|DATADIRNAME=share|g' \ ${WRKSRC}/configure @@ -74,5 +71,3 @@ post-install: .endif .include <bsd.port.mk> - -.endif diff --git a/devel/libsoup/distinfo b/devel/libsoup/distinfo index a7c35a9cf0af..0d462d8a2a16 100644 --- a/devel/libsoup/distinfo +++ b/devel/libsoup/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1508503209 -SHA256 (gnome2/libsoup-2.54.1.tar.xz) = 47b42c232034734d66e5f093025843a5d8cc4b2357c011085a2fd04ef02dd633 -SIZE (gnome2/libsoup-2.54.1.tar.xz) = 1793108 +TIMESTAMP = 1525958761 +SHA256 (gnome/libsoup-2.62.2.tar.xz) = 9e536fe3da60b25d2c63addb84a9d5072d00b0d8b8cbeabc629a6bcd63f879b6 +SIZE (gnome/libsoup-2.62.2.tar.xz) = 1848752 diff --git a/devel/libsoup/files/patch-libsoup_soup-auth-negotiate.c b/devel/libsoup/files/patch-libsoup_soup-auth-negotiate.c index 3c08db164cbf..c1fed6510cf1 100644 --- a/devel/libsoup/files/patch-libsoup_soup-auth-negotiate.c +++ b/devel/libsoup/files/patch-libsoup_soup-auth-negotiate.c @@ -1,10 +1,11 @@ ---- libsoup/soup-auth-negotiate.c.orig 2016-03-14 16:19:35 UTC -+++ libsoup/soup-auth-negotiate.c -@@ -14,7 +14,6 @@ +--- libsoup/soup-auth-negotiate.c.orig 2016-04-07 16:25:20.853309000 +0200 ++++ libsoup/soup-auth-negotiate.c 2016-04-07 16:25:49.465869000 +0200 +@@ -11,6 +11,8 @@ + #endif + + #include <string.h> ++#include <time.h> ++#include <stdint.h> #ifdef LIBSOUP_HAVE_GSSAPI #include <gssapi/gssapi.h> --#include <gssapi/gssapi_krb5.h> - #endif /* LIBSOUP_HAVE_GSSAPI */ - - #include "soup-auth-negotiate.h" diff --git a/devel/libsoup/files/patch-libsoup_soup-filter-input-stream.c b/devel/libsoup/files/patch-libsoup_soup-filter-input-stream.c deleted file mode 100644 index 17d2f9043552..000000000000 --- a/devel/libsoup/files/patch-libsoup_soup-filter-input-stream.c +++ /dev/null @@ -1,49 +0,0 @@ -From 03c91c76daf70ee227f38304c5e45a155f45073d Mon Sep 17 00:00:00 2001 -From: Dan Winship <danw@gnome.org> -Date: Thu, 3 Aug 2017 09:56:43 -0400 -Subject: Fix chunked decoding buffer overrun (CVE-2017-2885) - -https://bugzilla.gnome.org/show_bug.cgi?id=785774 ---- libsoup/soup-filter-input-stream.c.orig 2016-02-05 15:05:33 UTC -+++ libsoup/soup-filter-input-stream.c -@@ -201,7 +201,7 @@ soup_filter_input_stream_read_until (SoupFilterInputSt - GCancellable *cancellable, - GError **error) - { -- gssize nread; -+ gssize nread, read_length; - guint8 *p, *buf, *end; - gboolean eof = FALSE; - GError *my_error = NULL; -@@ -254,10 +254,11 @@ soup_filter_input_stream_read_until (SoupFilterInputSt - } else - buf = fstream->priv->buf->data; - -- /* Scan for the boundary */ -- end = buf + fstream->priv->buf->len; -- if (!eof) -- end -= boundary_length; -+ /* Scan for the boundary within the range we can possibly return. */ -+ if (include_boundary) -+ end = buf + MIN (fstream->priv->buf->len, length) - boundary_length; -+ else -+ end = buf + MIN (fstream->priv->buf->len - boundary_length, length); - for (p = buf; p <= end; p++) { - if (*p == *(guint8*)boundary && - !memcmp (p, boundary, boundary_length)) { -@@ -271,10 +272,9 @@ soup_filter_input_stream_read_until (SoupFilterInputSt - if (!*got_boundary && fstream->priv->buf->len < length && !eof) - goto fill_buffer; - -- /* Return everything up to 'p' (which is either just after the boundary if -- * include_boundary is TRUE, just before the boundary if include_boundary is -- * FALSE, @boundary_len - 1 bytes before the end of the buffer, or end-of- -- * file). -- */ -- return read_from_buf (fstream, buffer, p - buf); -+ if (eof && !*got_boundary) -+ read_length = MIN (fstream->priv->buf->len, length); -+ else -+ read_length = p - buf; -+ return read_from_buf (fstream, buffer, read_length); - } diff --git a/devel/libsoup/pkg-plist b/devel/libsoup/pkg-plist index 46279573fcc6..03d2654a6ca5 100644 --- a/devel/libsoup/pkg-plist +++ b/devel/libsoup/pkg-plist @@ -98,7 +98,6 @@ share/gtk-doc/html/libsoup-%%VERSION%%/ch04.html share/gtk-doc/html/libsoup-%%VERSION%%/ch05.html share/gtk-doc/html/libsoup-%%VERSION%%/home.png share/gtk-doc/html/libsoup-%%VERSION%%/index.html -share/gtk-doc/html/libsoup-%%VERSION%%/index.sgml share/gtk-doc/html/libsoup-%%VERSION%%/ix01.html share/gtk-doc/html/libsoup-%%VERSION%%/left-insensitive.png share/gtk-doc/html/libsoup-%%VERSION%%/left.png @@ -142,10 +141,12 @@ share/locale/eu/LC_MESSAGES/libsoup.mo share/locale/fa/LC_MESSAGES/libsoup.mo share/locale/fr/LC_MESSAGES/libsoup.mo share/locale/fur/LC_MESSAGES/libsoup.mo +share/locale/gd/LC_MESSAGES/libsoup.mo share/locale/gl/LC_MESSAGES/libsoup.mo share/locale/gu/LC_MESSAGES/libsoup.mo share/locale/he/LC_MESSAGES/libsoup.mo share/locale/hi/LC_MESSAGES/libsoup.mo +share/locale/hr/LC_MESSAGES/libsoup.mo share/locale/hu/LC_MESSAGES/libsoup.mo share/locale/id/LC_MESSAGES/libsoup.mo share/locale/it/LC_MESSAGES/libsoup.mo @@ -157,6 +158,7 @@ share/locale/lv/LC_MESSAGES/libsoup.mo share/locale/ml/LC_MESSAGES/libsoup.mo share/locale/mr/LC_MESSAGES/libsoup.mo share/locale/nb/LC_MESSAGES/libsoup.mo +share/locale/ne/LC_MESSAGES/libsoup.mo share/locale/nl/LC_MESSAGES/libsoup.mo share/locale/oc/LC_MESSAGES/libsoup.mo share/locale/or/LC_MESSAGES/libsoup.mo diff --git a/devel/mm-common/Makefile b/devel/mm-common/Makefile index da4e943051d9..112e52e01417 100644 --- a/devel/mm-common/Makefile +++ b/devel/mm-common/Makefile @@ -1,15 +1,17 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/devel/mm-common/Makefile 19953 2014-10-15 08:51:31Z gusi $ PORTNAME= mm-common -PORTVERSION= 0.9.9 +PORTVERSION= 0.9.12 CATEGORIES= devel gnome MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= Common build infrastructure for the GNOME C++ binding libraries +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + LIB_DEPENDS= libcurl.so:ftp/curl USES= gmake pathfix tar:xz diff --git a/devel/mm-common/distinfo b/devel/mm-common/distinfo index eadab227e3fd..1671b14fc5ef 100644 --- a/devel/mm-common/distinfo +++ b/devel/mm-common/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1491087794 -SHA256 (mm-common-0.9.9.tar.xz) = 9d00bc77e77794e0bd2ae68132c4b4136aa115d255e34b310f7449b29db50b7a -SIZE (mm-common-0.9.9.tar.xz) = 264156 +TIMESTAMP = 1525590628 +SHA256 (mm-common-0.9.12.tar.xz) = ceffdcce1e5b52742884c233ec604bf6fded12eea9da077ce7a62c02c87e7c0b +SIZE (mm-common-0.9.12.tar.xz) = 304588 diff --git a/devel/mm-common/pkg-plist b/devel/mm-common/pkg-plist index 672054dbc568..c7793d632d6b 100644 --- a/devel/mm-common/pkg-plist +++ b/devel/mm-common/pkg-plist @@ -1,6 +1,7 @@ bin/mm-common-prepare libdata/pkgconfig/mm-common-util.pc man/man1/mm-common-prepare.1.gz +share/aclocal/mm-ax_cxx_compile_stdcxx.m4 share/aclocal/mm-ax_cxx_compile_stdcxx_11.m4 share/aclocal/mm-common.m4 share/aclocal/mm-dietlib.m4 diff --git a/devel/py-gobject3/pkg-plist b/devel/py-gobject3/pkg-plist index 40b8fc717ec7..fb9eed5429d9 100644 --- a/devel/py-gobject3/pkg-plist +++ b/devel/py-gobject3/pkg-plist @@ -1,78 +1,78 @@ %%PYTHON_SITELIBDIR%%/gi/__init__.py %%PYTHON_SITELIBDIR%%/gi/__init__.pyc -%%PYTHON_SITELIBDIR%%/gi/__init__.pyo -%%PYTHON_SITELIBDIR%%/gi/_error.py -%%PYTHON_SITELIBDIR%%/gi/_error.pyc -%%PYTHON_SITELIBDIR%%/gi/_error.pyo +%%PYTHON_SITELIBDIR%%/gi/__init__.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/gi/_constants.py %%PYTHON_SITELIBDIR%%/gi/_constants.pyc -%%PYTHON_SITELIBDIR%%/gi/_constants.pyo +%%PYTHON_SITELIBDIR%%/gi/_constants.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/gi/_error.py +%%PYTHON_SITELIBDIR%%/gi/_error.pyc +%%PYTHON_SITELIBDIR%%/gi/_error.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/gi/_gi.so %%PYTHON_SITELIBDIR%%/gi/_gi_cairo.so -%%PYTHON_SITELIBDIR%%/gi/_gobject/__init__.py -%%PYTHON_SITELIBDIR%%/gi/_gobject/__init__.pyc -%%PYTHON_SITELIBDIR%%/gi/_gobject/__init__.pyo %%PYTHON_SITELIBDIR%%/gi/_option.py %%PYTHON_SITELIBDIR%%/gi/_option.pyc -%%PYTHON_SITELIBDIR%%/gi/_option.pyo +%%PYTHON_SITELIBDIR%%/gi/_option.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/gi/_ossighelper.py +%%PYTHON_SITELIBDIR%%/gi/_ossighelper.pyc +%%PYTHON_SITELIBDIR%%/gi/_ossighelper.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/gi/_propertyhelper.py %%PYTHON_SITELIBDIR%%/gi/_propertyhelper.pyc -%%PYTHON_SITELIBDIR%%/gi/_propertyhelper.pyo +%%PYTHON_SITELIBDIR%%/gi/_propertyhelper.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/gi/_signalhelper.py %%PYTHON_SITELIBDIR%%/gi/_signalhelper.pyc -%%PYTHON_SITELIBDIR%%/gi/_signalhelper.pyo +%%PYTHON_SITELIBDIR%%/gi/_signalhelper.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/gi/docstring.py %%PYTHON_SITELIBDIR%%/gi/docstring.pyc -%%PYTHON_SITELIBDIR%%/gi/docstring.pyo +%%PYTHON_SITELIBDIR%%/gi/docstring.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/gi/importer.py %%PYTHON_SITELIBDIR%%/gi/importer.pyc -%%PYTHON_SITELIBDIR%%/gi/importer.pyo +%%PYTHON_SITELIBDIR%%/gi/importer.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/gi/module.py %%PYTHON_SITELIBDIR%%/gi/module.pyc -%%PYTHON_SITELIBDIR%%/gi/module.pyo +%%PYTHON_SITELIBDIR%%/gi/module.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/gi/overrides/GIMarshallingTests.py %%PYTHON_SITELIBDIR%%/gi/overrides/GIMarshallingTests.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/GIMarshallingTests.pyo +%%PYTHON_SITELIBDIR%%/gi/overrides/GIMarshallingTests.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/gi/overrides/GLib.py %%PYTHON_SITELIBDIR%%/gi/overrides/GLib.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/GLib.pyo +%%PYTHON_SITELIBDIR%%/gi/overrides/GLib.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/gi/overrides/GObject.py %%PYTHON_SITELIBDIR%%/gi/overrides/GObject.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/GObject.pyo +%%PYTHON_SITELIBDIR%%/gi/overrides/GObject.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/gi/overrides/Gdk.py %%PYTHON_SITELIBDIR%%/gi/overrides/Gdk.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/Gdk.pyo +%%PYTHON_SITELIBDIR%%/gi/overrides/Gdk.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/gi/overrides/Gio.py %%PYTHON_SITELIBDIR%%/gi/overrides/Gio.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/Gio.pyo +%%PYTHON_SITELIBDIR%%/gi/overrides/Gio.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.py %%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.pyo +%%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/gi/overrides/Pango.py %%PYTHON_SITELIBDIR%%/gi/overrides/Pango.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/Pango.pyo +%%PYTHON_SITELIBDIR%%/gi/overrides/Pango.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/gi/overrides/__init__.py %%PYTHON_SITELIBDIR%%/gi/overrides/__init__.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/__init__.pyo +%%PYTHON_SITELIBDIR%%/gi/overrides/__init__.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.py %%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.pyo +%%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/gi/pygtkcompat.py %%PYTHON_SITELIBDIR%%/gi/pygtkcompat.pyc -%%PYTHON_SITELIBDIR%%/gi/pygtkcompat.pyo +%%PYTHON_SITELIBDIR%%/gi/pygtkcompat.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/gi/repository/__init__.py %%PYTHON_SITELIBDIR%%/gi/repository/__init__.pyc -%%PYTHON_SITELIBDIR%%/gi/repository/__init__.pyo +%%PYTHON_SITELIBDIR%%/gi/repository/__init__.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/gi/types.py %%PYTHON_SITELIBDIR%%/gi/types.pyc -%%PYTHON_SITELIBDIR%%/gi/types.pyo -%%PYTHON_SITELIBDIR%%/pygobject-%%VERSION%%-py%%PYTHON_VER%%-%%OPSYS%%-%%UNAME_R%%-%%UNAME_M%%.egg-info +%%PYTHON_SITELIBDIR%%/gi/types.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/pygobject-%%VERSION%%-py%%PYTHON_VER%%.egg-info %%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.py %%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.pyc -%%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.pyo +%%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/pygtkcompat/generictreemodel.py %%PYTHON_SITELIBDIR%%/pygtkcompat/generictreemodel.pyc -%%PYTHON_SITELIBDIR%%/pygtkcompat/generictreemodel.pyo +%%PYTHON_SITELIBDIR%%/pygtkcompat/generictreemodel.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.py %%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.pyc -%%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.pyo +%%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.%%PYTHON_PYOEXTENSION%% diff --git a/devel/py-gobject3/pkg-plist-py3 b/devel/py-gobject3/pkg-plist-py3 index 210fa58ba17c..d58ea474cd95 100644 --- a/devel/py-gobject3/pkg-plist-py3 +++ b/devel/py-gobject3/pkg-plist-py3 @@ -1,34 +1,34 @@ %%PYTHON_SITELIBDIR%%/gi/__init__.py -%%PYTHON_SITELIBDIR%%/gi/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/gi/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/__pycache__/_error.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/__pycache__/_error.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/__pycache__/_constants.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/gi/__pycache__/_constants.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/__pycache__/_option.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/__pycache__/_constants.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/__pycache__/_error.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/gi/__pycache__/_error.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/gi/__pycache__/_option.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/__pycache__/_propertyhelper.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/__pycache__/_option.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/__pycache__/_ossighelper.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/gi/__pycache__/_ossighelper.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/gi/__pycache__/_propertyhelper.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/__pycache__/_signalhelper.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/__pycache__/_propertyhelper.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/gi/__pycache__/_signalhelper.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/__pycache__/docstring.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/__pycache__/_signalhelper.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/gi/__pycache__/docstring.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/__pycache__/importer.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/__pycache__/docstring.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/gi/__pycache__/importer.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/__pycache__/module.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/__pycache__/importer.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/gi/__pycache__/module.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/__pycache__/module.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/gi/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/__pycache__/types.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/gi/__pycache__/types.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/gi/__pycache__/types.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/gi/_constants.py %%PYTHON_SITELIBDIR%%/gi/_error.py %%PYTHON_SITELIBDIR%%/gi/_gi.so %%PYTHON_SITELIBDIR%%/gi/_gi_cairo.so -%%PYTHON_SITELIBDIR%%/gi/_gobject/__init__.py -%%PYTHON_SITELIBDIR%%/gi/_gobject/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/_gobject/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/gi/_option.py +%%PYTHON_SITELIBDIR%%/gi/_ossighelper.py %%PYTHON_SITELIBDIR%%/gi/_propertyhelper.py %%PYTHON_SITELIBDIR%%/gi/_signalhelper.py %%PYTHON_SITELIBDIR%%/gi/docstring.py @@ -42,37 +42,37 @@ %%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.py %%PYTHON_SITELIBDIR%%/gi/overrides/Pango.py %%PYTHON_SITELIBDIR%%/gi/overrides/__init__.py -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GIMarshallingTests.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GIMarshallingTests.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GLib.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GIMarshallingTests.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GLib.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GObject.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GLib.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GObject.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gdk.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GObject.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gdk.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gio.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gdk.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gio.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gtk.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gio.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gtk.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Pango.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gtk.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Pango.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Pango.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/keysyms.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/keysyms.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/keysyms.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.py %%PYTHON_SITELIBDIR%%/gi/pygtkcompat.py %%PYTHON_SITELIBDIR%%/gi/repository/__init__.py -%%PYTHON_SITELIBDIR%%/gi/repository/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/gi/repository/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/gi/repository/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/gi/types.py -%%PYTHON_SITELIBDIR%%/pygobject-%%VERSION%%-py%%PYTHON_VER%%-%%OPSYS%%-%%UNAME_R%%-%%UNAME_M%%.egg-info +%%PYTHON_SITELIBDIR%%/pygobject-%%VERSION%%-py%%PYTHON_VER%%.egg-info %%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.py -%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/generictreemodel.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/generictreemodel.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/generictreemodel.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/pygtkcompat/generictreemodel.py %%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.py diff --git a/devel/pygobject3-common/Makefile b/devel/pygobject3-common/Makefile index 931f8479898e..3cc70b9c4a6d 100644 --- a/devel/pygobject3-common/Makefile +++ b/devel/pygobject3-common/Makefile @@ -2,14 +2,14 @@ # $FreeBSD$ PORTNAME= gobject -PORTVERSION= 3.18.2 +PORTVERSION= 3.28.3 PORTREVISION= 0 CATEGORIES= devel python MASTER_SITES= GNOME/sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} PKGNAMEPREFIX?= py PKGNAMESUFFIX?= 3-common DISTNAME= pygobject-${PORTVERSION} -DIST_SUBDIR= gnome3 +DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Common files for the Python bindings for GObject @@ -50,8 +50,8 @@ do-install: .else PORTSCOUT= ignore:1 -USES+= gnome -USE_GNOME+= glib20 introspection +USES+= gettext-runtime gnome +USE_GNOME+= cairo glib20 introspection LIB_DEPENDS+= libffi.so:devel/libffi RUN_DEPENDS+= pygobject3-common>=0:devel/pygobject3-common diff --git a/devel/pygobject3-common/distinfo b/devel/pygobject3-common/distinfo index 8abc26274c2e..66dc442b8988 100644 --- a/devel/pygobject3-common/distinfo +++ b/devel/pygobject3-common/distinfo @@ -1,2 +1,3 @@ -SHA256 (gnome3/pygobject-3.18.2.tar.xz) = 2a3cad1517916b74e131e6002c3824361aee0671ffb0d55ded119477fc1c2c5f -SIZE (gnome3/pygobject-3.18.2.tar.xz) = 730220 +TIMESTAMP = 1527917161 +SHA256 (gnome/pygobject-3.28.3.tar.xz) = 3dd3e21015d06e00482ea665fc1733b77e754a6ab656a5db5d7f7bfaf31ad0b0 +SIZE (gnome/pygobject-3.28.3.tar.xz) = 1005368 diff --git a/devel/template-glib/Makefile b/devel/template-glib/Makefile new file mode 100644 index 000000000000..f05cae09c24e --- /dev/null +++ b/devel/template-glib/Makefile @@ -0,0 +1,16 @@ +# $FreeBSD$ + +PORTNAME= template-glib +PORTVERSION= 3.28.0 +CATEGORIES= devel +MASTER_SITES= GNOME + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Templating library for GLib + +BUILD_DEPENDS= valac:lang/vala + +USES= bison gettext gnome meson pkgconfig tar:xz +USE_GNOME= glib20 introspection + +.include <bsd.port.mk> diff --git a/devel/template-glib/distinfo b/devel/template-glib/distinfo new file mode 100644 index 000000000000..5e33a94e5d9f --- /dev/null +++ b/devel/template-glib/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1525968626 +SHA256 (template-glib-3.28.0.tar.xz) = 6c74426efd4358fd91a52c32ed030c0cad1633f900fd55ac81a8b3e4026171a1 +SIZE (template-glib-3.28.0.tar.xz) = 54320 diff --git a/devel/template-glib/pkg-descr b/devel/template-glib/pkg-descr new file mode 100644 index 000000000000..ac1d834bcde6 --- /dev/null +++ b/devel/template-glib/pkg-descr @@ -0,0 +1,7 @@ +Template-GLib is a templating library for GLib. + +It includes a simple template format along with integration into +GObject-Introspection for properties and methods. It separates the parsing +of templates and the expansion of templates for faster expansion. You can +also define scope, custom functions, and more with the embedded expression +language. diff --git a/devel/template-glib/pkg-plist b/devel/template-glib/pkg-plist new file mode 100644 index 000000000000..5ce51a49ee27 --- /dev/null +++ b/devel/template-glib/pkg-plist @@ -0,0 +1,33 @@ +include/template-glib-1.0/tmpl-debug.h +include/template-glib-1.0/tmpl-enums.h +include/template-glib-1.0/tmpl-error.h +include/template-glib-1.0/tmpl-expr-types.h +include/template-glib-1.0/tmpl-expr.h +include/template-glib-1.0/tmpl-glib.h +include/template-glib-1.0/tmpl-scope.h +include/template-glib-1.0/tmpl-symbol.h +include/template-glib-1.0/tmpl-template-locator.h +include/template-glib-1.0/tmpl-template.h +include/template-glib-1.0/tmpl-version-macros.h +include/template-glib-1.0/tmpl-version.h +lib/girepository-1.0/Template-1.0.typelib +lib/libtemplate_glib-1.0.so +lib/libtemplate_glib-1.0.so.0 +lib/libtemplate_glib-1.0.so.0.2800.0 +libdata/pkgconfig/template-glib-1.0.pc +share/gir-1.0/Template-1.0.gir +share/locale/cs/LC_MESSAGES/template-glib.mo +share/locale/de/LC_MESSAGES/template-glib.mo +share/locale/el/LC_MESSAGES/template-glib.mo +share/locale/es/LC_MESSAGES/template-glib.mo +share/locale/fur/LC_MESSAGES/template-glib.mo +share/locale/hu/LC_MESSAGES/template-glib.mo +share/locale/id/LC_MESSAGES/template-glib.mo +share/locale/pl/LC_MESSAGES/template-glib.mo +share/locale/pt/LC_MESSAGES/template-glib.mo +share/locale/pt_BR/LC_MESSAGES/template-glib.mo +share/locale/sl/LC_MESSAGES/template-glib.mo +share/locale/sr/LC_MESSAGES/template-glib.mo +share/locale/sv/LC_MESSAGES/template-glib.mo +share/vala/vapi/template-glib-1.0.deps +share/vala/vapi/template-glib-1.0.vapi diff --git a/devel/xfce4-vala/Makefile b/devel/xfce4-vala/Makefile index 5127c23263b3..f4b46726a2d1 100644 --- a/devel/xfce4-vala/Makefile +++ b/devel/xfce4-vala/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfce4-vala PORTVERSION= 4.10.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel xfce MASTER_SITES= XFCE/src/bindings/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 @@ -19,6 +19,6 @@ GNU_CONFIGURE= yes USES= pkgconfig gmake pathfix xfce tar:bzip2 USE_XFCE= panel -CONFIGURE_ARGS= --with-vala-api=0.36 +CONFIGURE_ARGS= --with-vala-api=0.40 .include <bsd.port.mk> |