diff options
| author | kwm <kwm@FreeBSD.org> | 2015-08-06 03:13:24 +0800 |
|---|---|---|
| committer | kwm <kwm@FreeBSD.org> | 2015-08-06 03:13:24 +0800 |
| commit | bc6e07a29987571d80b4d847a2dc03a3b52e9d60 (patch) | |
| tree | e398c7b6ea5203fd3953999e6dd9d6c83c9ec931 /devel | |
| parent | ef524082a34d7a98c929937172fd0785d168ad45 (diff) | |
| download | freebsd-ports-gnome-bc6e07a29987571d80b4d847a2dc03a3b52e9d60.tar.gz freebsd-ports-gnome-bc6e07a29987571d80b4d847a2dc03a3b52e9d60.tar.zst freebsd-ports-gnome-bc6e07a29987571d80b4d847a2dc03a3b52e9d60.zip | |
The FreeBSD GNOME team proudly presents GNOME 3.16 for FreeBSD.
The offical GNOME 3.16 release notes can be found at https://help.gnome.org/misc/release-notes/3.16/
Upgrade instructions for port users:
Delete the old tracker package with:
# pkg delete -f tracker
And user port upgrade tool of choice to upgrade.
Thanks to Antoine Brodin for running the exp-runs.
This release was made possible by the following people:
Gustau Perez
Ting-Wei_Lan
PR: 201980
Diffstat (limited to 'devel')
73 files changed, 987 insertions, 1759 deletions
diff --git a/devel/Makefile b/devel/Makefile index 58b93f1743e2..1f856585ea45 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -64,7 +64,6 @@ SUBDIR += apache-ant SUBDIR += api-sanity-autotest SUBDIR += apiextractor - SUBDIR += appdata-tools SUBDIR += appstream-glib SUBDIR += apr1 SUBDIR += apr2 diff --git a/devel/anjuta-extras/Makefile b/devel/anjuta-extras/Makefile index a9d4aedf85f1..f9dec3f00e03 100644 --- a/devel/anjuta-extras/Makefile +++ b/devel/anjuta-extras/Makefile @@ -16,8 +16,9 @@ USES= gettext gmake libtool pkgconfig tar:xz USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GNOME= gtk30 intltool libxml2 -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +INSTALL_TARGET= install-strip GLIB_SCHEMAS= org.gnome.anjuta.plugins.scintilla.gschema.xml \ org.gnome.anjuta.plugins.scratchbox.gschema.xml diff --git a/devel/anjuta-extras/files/patch-plugins_scintilla_aneditor.cxx b/devel/anjuta-extras/files/patch-plugins_scintilla_aneditor.cxx new file mode 100644 index 000000000000..846195939a5e --- /dev/null +++ b/devel/anjuta-extras/files/patch-plugins_scintilla_aneditor.cxx @@ -0,0 +1,22 @@ +From 959807c25e3547b019448b0877bae54dd6c04a9d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=A9bastien=20Granjoux?= <seb.sfo@free.fr> +Date: Mon, 11 Nov 2013 10:51:05 +0100 +Subject: bgo #711771 - The edge-column variable is not taken into account by + anjuta for scintilla editor + + +diff --git a/plugins/scintilla/aneditor.cxx b/plugins/scintilla/aneditor.cxx +index 0fa9acc..d61e4e1 100644 +--- plugins/scintilla/aneditor.cxx ++++ plugins/scintilla/aneditor.cxx +@@ -2656,7 +2656,6 @@ void AnEditor::ReadProperties(const char *fileForExt, char **typedef_hl) { + int visibleLines = props->GetInt("visible.policy.lines"); + SendEditor(SCI_SETVISIBLEPOLICY, visibleStrict | visibleSlop, visibleLines); + +- SendEditor(SCI_SETEDGECOLUMN, props->GetInt("edge.column", 0)); + SendEditor(SCI_SETEDGEMODE, props->GetInt("edge.mode", EDGE_NONE)); + SendEditor(SCI_SETEDGECOLOUR, + ColourOfProperty(props, "edge.colour", ColourDesired(0xff, 0xda, 0xda))); +-- +cgit v0.10.1 + diff --git a/devel/anjuta-extras/files/patch-plugins_scintilla_properties_styles.properties b/devel/anjuta-extras/files/patch-plugins_scintilla_properties_styles.properties new file mode 100644 index 000000000000..6820dbfaf5ca --- /dev/null +++ b/devel/anjuta-extras/files/patch-plugins_scintilla_properties_styles.properties @@ -0,0 +1,25 @@ +From 088d3da478e876836efb386bfafd0b23c0de8d82 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=A9bastien=20Granjoux?= <seb.sfo@free.fr> +Date: Sat, 9 Nov 2013 22:34:18 +0100 +Subject: cintilla: bgo #690373 - The syntax-highlighting for Gtk types does + not work from version 3.x + + +diff --git a/plugins/scintilla/properties/styles.properties b/plugins/scintilla/properties/styles.properties +index 6d6e455..3e5331f 100644 +--- plugins/scintilla/properties/styles.properties ++++ plugins/scintilla/properties/styles.properties +@@ -8222,8 +8222,8 @@ keywords.$(file.patterns.yaml)=true false yes no + style.cpp.17=$(style.anjuta.comment) + # Comment keyword error + style.cpp.18=$(style.anjuta.comment) +-# Libraries symbols +-#style.cpp.19=$(style.anjuta.syskeyword) ++# Libraries symbols (needed to highlight library functions by example GTK+) ++ style.cpp.19=$(style.anjuta.syskeyword) + # Raw strings for C++0x + style.cpp.20=$(style.anjuta.string) + # Triple-quoted strings for Vala +-- +cgit v0.10.1 + diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile index 0463ee591308..5d25b26668c2 100644 --- a/devel/anjuta/Makefile +++ b/devel/anjuta/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= anjuta -PORTVERSION= 3.14.1 +PORTVERSION= 3.16.0 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -23,6 +23,8 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc gmake:${PORTSDIR}/devel/gmake \ yelp>=3.0.0:${PORTSDIR}/x11/yelp +PORTSCOUT= limitw:1,even + USES= bison desktop-file-utils gettext gmake libtool pathfix \ perl5 pkgconfig python shared-mime-info shebangfix tar:xz SHEBANG_FILES= plugins/project-wizard/templates/js_minimal/src/main.js \ @@ -71,45 +73,33 @@ GLIB_SCHEMAS= org.gnome.anjuta.cvs.gschema.xml \ org.gnome.anjuta.terminal.gschema.xml \ org.gnome.anjuta.tools.gschema.xml -OPTIONS_DEFINE= SVN DEVHELP VALA -OPTIONS_DEFAULT=SVN DEVHELP VALA +OPTIONS_SUB= yes +OPTIONS_DEFINE= SVN DEVHELP VALA GLADE TERMINAL +OPTIONS_DEFAULT=SVN DEVHELP VALA GLADE TERMINAL SVN_DESC= Subversion plugin DEVHELP_DESC= Devhelp plugin VALA_DESC= Vala support +GLADE_DESC= Build glade plugin +TERMINAL_DESC= Build build-in terminal + +GLADE_LIB_DEPENDS= libgladeui-2.so:${PORTSDIR}/devel/glade +GLADE_CONFIGURE_ENABLE= plugin-glade -.include <bsd.port.options.mk> +TERMINAL_USE= GNOME=vte3 +TERMINAL_CONFIGURE_ENABLE= plugin-terminal -.if ${PORT_OPTIONS:MSVN} -BUILD_DEPENDS+= svn:${PORTSDIR}/devel/subversion -LIB_DEPENDS+= libapr-1.so:${PORTSDIR}/devel/apr1 -LIB_DEPENDS+= libneon.so:${PORTSDIR}/www/neon -RUN_DEPENDS+= svn:${PORTSDIR}/devel/subversion -PLIST_SUB+= SVN="" -.else -CONFIGURE_ARGS+=--disable-plugin-subversion -PLIST_SUB+= SVN="@comment " -.endif +SVN_BUILD_DEPENDS= svn:${PORTSDIR}/devel/subversion +SVN_LIB_DEPENDS= libapr-1.so:${PORTSDIR}/devel/apr1 \ + libneon.so:${PORTSDIR}/www/neon +SVN_RUN_DEPENDS= svn:${PORTSDIR}/devel/subversion +SVN_CONFIGURE_ENABLE= plugin-subversion -.if ${PORT_OPTIONS:MDEVHELP} -LIB_DEPENDS+= libdevhelp-3.so:${PORTSDIR}/devel/devhelp -PLIST_SUB+= DEVHELP="" -.else -CONFIGURE_ARGS+=--disable-plugin-devhelp -# XXX Even if we disable the devhelp plugin it gets build and installed. -# See if versions beyond 2.26.1.0 still do this. -#PLIST_SUB+= DEVHELP="@comment " -PLIST_SUB+= DEVHELP="" -.endif +DEVHELP_LIB_DEPENDS= libdevhelp-3.so:${PORTSDIR}/devel/devhelp +DEVHELP_CONFIGURE_ENBABLE= plugin-devhelp -.if ${PORT_OPTIONS:MVALA} -CONFIGURE_ARGS+=--enable-vala -BUILD_DEPENDS+= vala>=0.14.0:${PORTSDIR}/lang/vala -RUN_DEPENDS+= vala>=0.14.0:${PORTSDIR}/lang/vala -PLIST_SUB+= VALA="" -.else -CONFIGURE_ARGS+=--disable-vala -PLIST_SUB+= VALA="@comment " -.endif +VALA_BUILD_DEPENDS= vala>=0.14.0:${PORTSDIR}/lang/vala +VALA_RUN_DEPENDS= vala>=0.14.0:${PORTSDIR}/lang/vala +VALA_CONFIGURE_ENABLE= vala post-patch: @${REINPLACE_CMD} -e 's|"make|"gmake|g' \ diff --git a/devel/anjuta/distinfo b/devel/anjuta/distinfo index c04e412a2d5e..d68b54e5a9a4 100644 --- a/devel/anjuta/distinfo +++ b/devel/anjuta/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/anjuta-3.14.1.tar.xz) = b26cd75ddb603c3cca4348e277d17360e511d75bd77ee2ef52047b75408e617b -SIZE (gnome3/anjuta-3.14.1.tar.xz) = 6310008 +SHA256 (gnome3/anjuta-3.16.0.tar.xz) = 77432a01b37b46f5558bf4cc435f9a023abf17c5273d472e17dff1f9b3d9943c +SIZE (gnome3/anjuta-3.16.0.tar.xz) = 6311980 diff --git a/devel/anjuta/files/patch-plugins_gdb_debugger.c b/devel/anjuta/files/patch-plugins_gdb_debugger.c index c34212fe35fc..e6cdd10dd7f7 100644 --- a/devel/anjuta/files/patch-plugins_gdb_debugger.c +++ b/devel/anjuta/files/patch-plugins_gdb_debugger.c @@ -5,7 +5,7 @@ #define GDB_PROMPT "(gdb)" #define FILE_BUFFER_SIZE 1024 -#define GDB_PATH "gdb" -+#define GDB_PATH "/usr/local/bin/gdb" ++#define GDB_PATH "/usr/local/bin/gdb791" #define MAX_CHILDREN 25 /* Limit the number of variable children * returned by debugger */ #define SUMMARY_MAX_LENGTH 90 /* Should be smaller than 4K to be displayed diff --git a/devel/anjuta/pkg-plist b/devel/anjuta/pkg-plist index 6ba1e02a26fc..00bf2c10f402 100644 --- a/devel/anjuta/pkg-plist +++ b/devel/anjuta/pkg-plist @@ -134,6 +134,7 @@ lib/anjuta/anjuta-devhelp.plugin lib/anjuta/anjuta-document-manager.plugin lib/anjuta/anjuta-file-wizard.plugin lib/anjuta/anjuta-gdb.plugin +%%GLADE%%lib/anjuta/anjuta-glade.plugin lib/anjuta/anjuta-indentation-c-style.plugin lib/anjuta/anjuta-indentation-python-style.plugin lib/anjuta/anjuta-jhbuild.plugin @@ -172,6 +173,7 @@ lib/anjuta/libanjuta-document-manager.so lib/anjuta/libanjuta-file-wizard.so lib/anjuta/libanjuta-gdb.so lib/anjuta/libanjuta-git.so +%%GLADE%%lib/anjuta/libanjuta-glade.so lib/anjuta/libanjuta-indentation-c-style.so lib/anjuta/libanjuta-indentation-python-style.so lib/anjuta/libanjuta-jhbuild.so @@ -232,6 +234,7 @@ man/man1/anjuta.1.gz %%DATADIR%%/glade/anjuta-file-wizard.ui %%DATADIR%%/glade/anjuta-gdb.ui %%DATADIR%%/glade/anjuta-git.ui +%%GLADE%%%%DATADIR%%/glade/anjuta-glade.ui %%DATADIR%%/glade/anjuta-indentation-c-style.ui %%DATADIR%%/glade/anjuta-indentation-python-style.ui %%DATADIR%%/glade/anjuta-language-cpp-java.ui @@ -449,6 +452,7 @@ man/man1/anjuta.1.gz %%DATADIR%%/ui/anjuta-devhelp.ui %%DATADIR%%/ui/anjuta-document-manager.xml %%DATADIR%%/ui/anjuta-git.xml +%%GLADE%%%%DATADIR%%/ui/anjuta-glade.xml %%DATADIR%%/ui/anjuta-indentation-c-style.xml %%DATADIR%%/ui/anjuta-indentation-python-style.xml %%DATADIR%%/ui/anjuta-language-javascript.xml @@ -2029,6 +2033,7 @@ share/locale/ast/LC_MESSAGES/anjuta.mo share/locale/az/LC_MESSAGES/anjuta.mo share/locale/be@latin/LC_MESSAGES/anjuta.mo share/locale/bg/LC_MESSAGES/anjuta.mo +share/locale/bs/LC_MESSAGES/anjuta.mo share/locale/ca/LC_MESSAGES/anjuta.mo share/locale/ca@valencia/LC_MESSAGES/anjuta.mo share/locale/cs/LC_MESSAGES/anjuta.mo @@ -2173,6 +2178,14 @@ share/pixmaps/anjuta/anjuta-git-tasks-16.png share/pixmaps/anjuta/anjuta-git-tasks-24.png share/pixmaps/anjuta/anjuta-git-tasks-48.png share/pixmaps/anjuta/anjuta-git-tasks.svg +%%GLADE%%share/pixmaps/anjuta/anjuta-glade-palette-16.png +%%GLADE%%share/pixmaps/anjuta/anjuta-glade-palette-24.png +%%GLADE%%share/pixmaps/anjuta/anjuta-glade-palette.svg +%%GLADE%%share/pixmaps/anjuta/anjuta-glade-plugin-48.png +%%GLADE%%share/pixmaps/anjuta/anjuta-glade-plugin.svg +%%GLADE%%share/pixmaps/anjuta/anjuta-glade-widgets-16.png +%%GLADE%%share/pixmaps/anjuta/anjuta-glade-widgets-24.png +%%GLADE%%share/pixmaps/anjuta/anjuta-glade-widgets.svg share/pixmaps/anjuta/anjuta-go-history-next-16.png share/pixmaps/anjuta/anjuta-go-history-next-24.png share/pixmaps/anjuta/anjuta-go-history-prev-16.png diff --git a/devel/appdata-tools/Makefile b/devel/appdata-tools/Makefile deleted file mode 100644 index f6cb94205acc..000000000000 --- a/devel/appdata-tools/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# Created by: Gustau Perez <gustau.perez@gmail.com> -# $FreeBSD$ -# $MCom: ports/trunk/devel/appdata-tools/Makefile 20031 2014-11-02 21:47:55Z kwm $ - -PORTNAME= appdata-tools -PORTVERSION= 0.1.8 -PORTREVISION= 1 -CATEGORIES= devel -DIST_SUBDIR= gnome3 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= AppData is a subset of AppStream - -LIB_DEPENDS= libsoup-2.4.so:${PORTSDIR}/devel/libsoup \ - libappstream-glib.so:${PORTSDIR}/devel/appstream-glib - -GH_ACCOUNT= hughsie -GH_TAGNAME= c1238e3 - -GNU_CONFIGURE= yes -PATHFIX_MAKEFILEIN= Makefile.am -#CONFIGURE_ARGS= --enable-introspection=yes -USE_GITHUB= yes -USES= autoreconf:build gettext gmake libtool pathfix pkgconfig -USE_GNOME= gdkpixbuf2 glib20 intltool introspection:build -USE_LDCONFIG= yes - -post-patch: - @${REINPLACE_CMD} -e 's|-Wclobbered||g ; \ - s|-Wempty-body||g ; \ - s|-Wignored-qualifiers||g ; \ - s|-Wtype-limits||g ; \ - s|-Wmissing-parameter-type||g' \ - ${WRKSRC}/configure.ac - -pre-configure: - (cd ${WRKSRC} && ${SETENV} NOCONFIGURE=yes ${SH} ./autogen.sh) - ${REINPLACE_CMD} 's/DATADIRNAME=lib/DATADIRNAME=share/' \ - ${WRKSRC}/configure - -.include <bsd.port.mk> diff --git a/devel/appdata-tools/distinfo b/devel/appdata-tools/distinfo deleted file mode 100644 index dc1212e39405..000000000000 --- a/devel/appdata-tools/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (gnome3/hughsie-appdata-tools-0.1.8-c1238e3_GH0.tar.gz) = 22ecad9ec2537161789f4254b9fbd3d5771589511db4e5046941b50d30750c4e -SIZE (gnome3/hughsie-appdata-tools-0.1.8-c1238e3_GH0.tar.gz) = 113523 diff --git a/devel/appdata-tools/pkg-descr b/devel/appdata-tools/pkg-descr deleted file mode 100644 index 1a988ac7b21d..000000000000 --- a/devel/appdata-tools/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -AppData is a subset of AppStream - -WWW: http://people.freedesktop.org/~hughsient/appdata/ diff --git a/devel/appdata-tools/pkg-plist b/devel/appdata-tools/pkg-plist deleted file mode 100644 index 85be8b92e00d..000000000000 --- a/devel/appdata-tools/pkg-plist +++ /dev/null @@ -1,7 +0,0 @@ -bin/appdata-validate -share/aclocal/appdata-xml.m4 -share/appdata/schema/appdata.rnc -share/appdata/schema/appdata.xsd -share/appdata/schema/schema-locating-rules.xml -share/emacs/site-lisp/site-start.d/appdata-rng-init.el -share/locale/en_GB/LC_MESSAGES/appdata-tools.mo diff --git a/devel/appstream-glib/Makefile b/devel/appstream-glib/Makefile index a8ea52bd990e..9dd7146d2f38 100644 --- a/devel/appstream-glib/Makefile +++ b/devel/appstream-glib/Makefile @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= appstream-glib -PORTVERSION= 0.2.6 -PORTREVISION= 3 +PORTVERSION= 0.4.1 CATEGORIES= devel +MASTER_SITES= http://people.freedesktop.org/~hughsient/appstream-glib/releases/ DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org @@ -13,37 +13,45 @@ COMMENT= Library to help with AppStream metadata LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= gtkdoc-check:${PORTSDIR}/textproc/gtk-doc -LIB_DEPENDS= libsoup-2.4.so:${PORTSDIR}/devel/libsoup - -GH_ACCOUNT= hughsie -GH_TAGNAME= f4f3230 - -USES= autoreconf:build gettext gmake libtool pathfix pkgconfig -USE_GNOME= gdkpixbuf2 glib20 gtk30 introspection:build +BUILD_DEPENDS= gtkdoc-check:${PORTSDIR}/textproc/gtk-doc \ + gcab:${PORTSDIR}/archivers/gcab +LIB_DEPENDS= libsoup-2.4.so:${PORTSDIR}/devel/libsoup \ + libyaml.so:${PORTSDIR}/textproc/libyaml \ + libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ + libfreetype.so:${PORTSDIR}/print/freetype2 +RUN_DEPENDS= gcab:${PORTSDIR}/archivers/gcab + +USES= gettext gperf gmake libtool pathfix pkgconfig tar:xz +USE_GNOME= gdkpixbuf2 glib20 gtk30 intlhack introspection:build \ + libxml2:build pango USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_SQLITE= 3 -USE_GITHUB= yes -PATHFIX_MAKEFILEIN= Makefile.am +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 +OPTIONS_DEFINE= MANPAGES +OPTIONS_DEFAULT=MANPAGES +OPTIONS_SUB= yes +MANPAGES_CONFIGURE_ENABLE= man +MANPAGE_BUILD_DEPENDS= docbook-xml>=0:${PORTSDIR}/textproc/docbook-xml \ + docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl +MANPAGES_USE= GNOME=libxslt:build + .include <bsd.port.options.mk> -.if ${OSVERSION} < 1000000 +.if !exists(/usr/libdata/pkgconfig/libarchive.pc) LIB_DEPENDS+= libarchive.so.13:${PORTSDIR}/archivers/libarchive -.else -CONFIGURE_ENV+= LIBARCHIVE_CFLAGS=" " \ - LIBARCHIVE_LIBS="-larchive" .endif +.if ${OSVERSION} < 1000000 && ${OPSYS} == FreeBSD post-patch: - @${REINPLACE_CMD} -e 's|-Wtype-limits||g' \ - ${WRKSRC}/configure.ac - -pre-configure: - (cd ${WRKSRC} && ${SETENV} NOCONFIGURE=yes ${SH} ./autogen.sh) - ${REINPLACE_CMD} 's/DATADIRNAME=lib/DATADIRNAME=share/' \ + ${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 c690adbb5164..70c43a6eeb41 100644 --- a/devel/appstream-glib/distinfo +++ b/devel/appstream-glib/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/hughsie-appstream-glib-0.2.6-f4f3230_GH0.tar.gz) = 022e64bbe0406530f5b1615beebf17d7dc38284a375165f042773f10d972cbb7 -SIZE (gnome3/hughsie-appstream-glib-0.2.6-f4f3230_GH0.tar.gz) = 1754989 +SHA256 (gnome3/appstream-glib-0.4.1.tar.xz) = e999383cd7ab1875b345f738789cb0fe55faa5caebdf4de6507aead649592ada +SIZE (gnome3/appstream-glib-0.4.1.tar.xz) = 1822324 diff --git a/devel/appstream-glib/pkg-plist b/devel/appstream-glib/pkg-plist index 8bc0d2508ff8..8e0fa7da2936 100644 --- a/devel/appstream-glib/pkg-plist +++ b/devel/appstream-glib/pkg-plist @@ -1,11 +1,15 @@ +bin/appdata-validate bin/appstream-builder 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.h +include/libappstream-glib/as-bundle.h include/libappstream-glib/as-enums.h +include/libappstream-glib/as-icon.h include/libappstream-glib/as-image.h +include/libappstream-glib/as-inf.h include/libappstream-glib/as-node.h include/libappstream-glib/as-problem.h include/libappstream-glib/as-provide.h @@ -15,57 +19,88 @@ include/libappstream-glib/as-store.h include/libappstream-glib/as-tag.h include/libappstream-glib/as-utils.h include/libappstream-glib/as-version.h -lib/asb-plugins/libasb_plugin_absorb.a -lib/asb-plugins/libasb_plugin_absorb.so -lib/asb-plugins/libasb_plugin_appdata.a -lib/asb-plugins/libasb_plugin_appdata.so -lib/asb-plugins/libasb_plugin_blacklist.a -lib/asb-plugins/libasb_plugin_blacklist.so -lib/asb-plugins/libasb_plugin_dbus.a -lib/asb-plugins/libasb_plugin_dbus.so -lib/asb-plugins/libasb_plugin_desktop.a -lib/asb-plugins/libasb_plugin_desktop.so -lib/asb-plugins/libasb_plugin_font.a -lib/asb-plugins/libasb_plugin_font.so -lib/asb-plugins/libasb_plugin_gettext.a -lib/asb-plugins/libasb_plugin_gettext.so -lib/asb-plugins/libasb_plugin_gir.a -lib/asb-plugins/libasb_plugin_gir.so -lib/asb-plugins/libasb_plugin_gresource.a -lib/asb-plugins/libasb_plugin_gresource.so -lib/asb-plugins/libasb_plugin_gstreamer.a -lib/asb-plugins/libasb_plugin_gstreamer.so -lib/asb-plugins/libasb_plugin_hardcoded.a -lib/asb-plugins/libasb_plugin_hardcoded.so -lib/asb-plugins/libasb_plugin_ibus_sql.a -lib/asb-plugins/libasb_plugin_ibus_sql.so -lib/asb-plugins/libasb_plugin_ibus_xml.a -lib/asb-plugins/libasb_plugin_ibus_xml.so -lib/asb-plugins/libasb_plugin_kde_notifyrc.a -lib/asb-plugins/libasb_plugin_kde_notifyrc.so -lib/asb-plugins/libasb_plugin_kde_services.a -lib/asb-plugins/libasb_plugin_kde_services.so -lib/asb-plugins/libasb_plugin_metainfo.a -lib/asb-plugins/libasb_plugin_metainfo.so -lib/asb-plugins/libasb_plugin_nm.a -lib/asb-plugins/libasb_plugin_nm.so +lib/asb-plugins-2/libasb_plugin_absorb.a +lib/asb-plugins-2/libasb_plugin_absorb.so +lib/asb-plugins-2/libasb_plugin_appdata.a +lib/asb-plugins-2/libasb_plugin_appdata.so +lib/asb-plugins-2/libasb_plugin_blacklist.a +lib/asb-plugins-2/libasb_plugin_blacklist.so +lib/asb-plugins-2/libasb_plugin_dbus.a +lib/asb-plugins-2/libasb_plugin_dbus.so +lib/asb-plugins-2/libasb_plugin_desktop.a +lib/asb-plugins-2/libasb_plugin_desktop.so +lib/asb-plugins-2/libasb_plugin_firmware.a +lib/asb-plugins-2/libasb_plugin_firmware.so +lib/asb-plugins-2/libasb_plugin_font.a +lib/asb-plugins-2/libasb_plugin_font.so +lib/asb-plugins-2/libasb_plugin_gettext.a +lib/asb-plugins-2/libasb_plugin_gettext.so +lib/asb-plugins-2/libasb_plugin_gir.a +lib/asb-plugins-2/libasb_plugin_gir.so +lib/asb-plugins-2/libasb_plugin_gresource.a +lib/asb-plugins-2/libasb_plugin_gresource.so +lib/asb-plugins-2/libasb_plugin_gstreamer.a +lib/asb-plugins-2/libasb_plugin_gstreamer.so +lib/asb-plugins-2/libasb_plugin_hardcoded.a +lib/asb-plugins-2/libasb_plugin_hardcoded.so +lib/asb-plugins-2/libasb_plugin_ibus_sql.a +lib/asb-plugins-2/libasb_plugin_ibus_sql.so +lib/asb-plugins-2/libasb_plugin_ibus_xml.a +lib/asb-plugins-2/libasb_plugin_ibus_xml.so +lib/asb-plugins-2/libasb_plugin_kde_notifyrc.a +lib/asb-plugins-2/libasb_plugin_kde_notifyrc.so +lib/asb-plugins-2/libasb_plugin_kde_services.a +lib/asb-plugins-2/libasb_plugin_kde_services.so +lib/asb-plugins-2/libasb_plugin_metainfo.a +lib/asb-plugins-2/libasb_plugin_metainfo.so +lib/asb-plugins-2/libasb_plugin_nm.a +lib/asb-plugins-2/libasb_plugin_nm.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.1 -lib/libappstream-builder.so.1.5.6 +lib/libappstream-builder.so.7 +lib/libappstream-builder.so.7.0.5 lib/libappstream-glib.a lib/libappstream-glib.so -lib/libappstream-glib.so.1 -lib/libappstream-glib.so.1.5.6 +lib/libappstream-glib.so.7 +lib/libappstream-glib.so.7.0.5 libdata/pkgconfig/appstream-builder.pc libdata/pkgconfig/appstream-glib.pc +%%MANPAGES%%man/man1/appstream-builder.1.gz +%%MANPAGES%%man/man1/appstream-util.1.gz +share/aclocal/appdata-xml.m4 share/aclocal/appstream-xml.m4 share/bash-completion/completions/appstream-builder share/bash-completion/completions/appstream-util 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/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/ru/LC_MESSAGES/appstream-glib.mo diff --git a/devel/dconf-editor/Makefile b/devel/dconf-editor/Makefile index e182682b4915..df919913d6c9 100644 --- a/devel/dconf-editor/Makefile +++ b/devel/dconf-editor/Makefile @@ -1,20 +1,28 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/devel/dconf-editor/Makefile 19571 2014-04-25 18:12:46Z kwm $ -PORTNAME= dconf -PORTREVISION= 0 -PKGNAMESUFFIX= -editor +PORTNAME= dconf-editor +PORTVERSION= 3.16.1 +CATEGORIES= devel gnome +MASTER_SITES= GNOME +DIST_SUBDIR= gnome3 -COMMENT= configuration editor for dconf +MAINTAINER= gnome@FreeBSD.org +COMMENT= Configuration database editor for GNOME -DCONF_SLAVE= editor +BUILD_DEPENDS= dconf>=0.23.2:${PORTSDIR}/devel/dconf \ + vala>=0.18.1:${PORTSDIR}/lang/vala +LIB_DEPENDS= libdconf.so:${PORTSDIR}/devel/dconf -MASTERDIR= ${.CURDIR}/../dconf +PORTSCOUT= limitw:1,even -PLIST= ${.CURDIR}/pkg-plist +USES= gettext gmake pathfix pkgconfig tar:xz +USE_GNOME= intltool gtk30 libxml2 +USE_LDCONFIG= yes +GNU_CONFIGURE= yes +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib +INSTALLS_ICONS= yes +GLIB_SCHEMAS= ca.desrt.dconf-editor.gschema.xml -BUILD_WRKSRC= ${WRKSRC}/editor -INSTALL_WRKSRC= ${WRKSRC}/editor - -.include "${MASTERDIR}/Makefile" +.include <bsd.port.mk> diff --git a/devel/dconf-editor/distinfo b/devel/dconf-editor/distinfo new file mode 100644 index 000000000000..571ad53cdc56 --- /dev/null +++ b/devel/dconf-editor/distinfo @@ -0,0 +1,2 @@ +SHA256 (gnome3/dconf-editor-3.16.1.tar.xz) = 085d1d4f2acc0400b096d0dfbfcb118fd0de61a5647010ce988b2e04d7f3856e +SIZE (gnome3/dconf-editor-3.16.1.tar.xz) = 255532 diff --git a/devel/dconf-editor/pkg-descr b/devel/dconf-editor/pkg-descr new file mode 100644 index 000000000000..e7e6396c0bd9 --- /dev/null +++ b/devel/dconf-editor/pkg-descr @@ -0,0 +1,3 @@ +Editor for the dconf configuration system. + +WWW: http://live.gnome.org/dconf diff --git a/devel/dconf-editor/pkg-plist b/devel/dconf-editor/pkg-plist index 4a3fa2bf45ba..5d1fb266b684 100644 --- a/devel/dconf-editor/pkg-plist +++ b/devel/dconf-editor/pkg-plist @@ -1,13 +1,8 @@ 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/dbus-1/services/ca.desrt.dconf-editor.service -share/icons/HighContrast/16x16/apps/dconf-editor.png -share/icons/HighContrast/22x22/apps/dconf-editor.png -share/icons/HighContrast/24x24/apps/dconf-editor.png -share/icons/HighContrast/256x256/apps/dconf-editor.png -share/icons/HighContrast/32x32/apps/dconf-editor.png -share/icons/HighContrast/48x48/apps/dconf-editor.png share/icons/hicolor/16x16/apps/dconf-editor.png share/icons/hicolor/22x22/apps/dconf-editor.png share/icons/hicolor/24x24/apps/dconf-editor.png @@ -15,3 +10,63 @@ 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/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/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 diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile index 0a324205240d..a56960b1eb41 100644 --- a/devel/dconf/Makefile +++ b/devel/dconf/Makefile @@ -1,10 +1,8 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/devel/dconf/Makefile 20031 2014-11-02 21:47:55Z kwm $ -PORTNAME?= dconf -PORTVERSION= 0.22.0 -PORTREVISION?= 1 +PORTNAME= dconf +PORTVERSION= 0.24.0 CATEGORIES= devel gnome MASTER_SITES= GNOME DISTNAME= dconf-${PORTVERSION} @@ -18,23 +16,12 @@ BUILD_DEPENDS= vala>=0.18.1:${PORTSDIR}/lang/vala \ LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus USES= gettext gmake pathfix pkgconfig tar:xz -USE_GNOME= glib20 intltool +USE_GNOME= glib20 USE_LDCONFIG= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -DCONF_SLAVE?= no - -.if ${DCONF_SLAVE} == editor -USE_GNOME+= gtk30 -INSTALLS_ICONS= yes -GLIB_SCHEMAS= ca.desrt.dconf-editor.gschema.xml -LIB_DEPENDS+= libdconf.so:${PORTSDIR}/devel/dconf -.else -CONFIGURE_ARGS+=--disable-editor -.endif - post-patch: @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \ ${WRKSRC}/engine/dconf-engine.c \ @@ -42,21 +29,14 @@ post-patch: ${WRKSRC}/engine/dconf-engine-source-system.c \ ${WRKSRC}/bin/dconf-update.c \ ${WRKSRC}/tests/engine.c - @${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|g' \ - ${WRKSRC}/editor/dconf-model.c - @${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|g' \ - ${WRKSRC}/editor/dconf-model.vala @${REINPLACE_CMD} -e 's|-Wno-unused-but-set-variable||g' \ ${WRKSRC}/bin/Makefile.in \ - ${WRKSRC}/client/Makefile.in \ - ${WRKSRC}/editor/Makefile.in + ${WRKSRC}/client/Makefile.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/docs/Makefile.in -.if ${DCONF_SLAVE} == no post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/dconf/db @${MKDIR} ${STAGEDIR}${PREFIX}/etc/dconf/profile -.endif .include <bsd.port.mk> diff --git a/devel/dconf/distinfo b/devel/dconf/distinfo index 40bd5627a34e..1174509a313a 100644 --- a/devel/dconf/distinfo +++ b/devel/dconf/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/dconf-0.22.0.tar.xz) = 0a277cb0c3f09e77d9413c5a9b3577fc2b5d6e941b59b44940392e024a224b8e -SIZE (gnome3/dconf-0.22.0.tar.xz) = 393260 +SHA256 (gnome3/dconf-0.24.0.tar.xz) = 4373e0ced1f4d7d68d518038796c073696280e22957babb29feb0267c630fec2 +SIZE (gnome3/dconf-0.24.0.tar.xz) = 218512 diff --git a/devel/dconf/files/patch-editor_Makefile.in b/devel/dconf/files/patch-editor_Makefile.in deleted file mode 100644 index f9935dd33e93..000000000000 --- a/devel/dconf/files/patch-editor_Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- editor/Makefile.orig.in 2013-03-26 19:20:12.623348896 +0000 -+++ editor/Makefile.in 2013-03-26 19:21:40.077341977 +0000 -@@ -72,7 +72,7 @@ - dconf_editor-dconf-view.$(OBJEXT) - dconf_editor_OBJECTS = $(am_dconf_editor_OBJECTS) - am__DEPENDENCIES_1 = --dconf_editor_DEPENDENCIES = ../client/libdconf.so.1 \ -+dconf_editor_DEPENDENCIES = -ldconf \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) - dconf_editor_LINK = $(CCLD) $(dconf_editor_CFLAGS) $(CFLAGS) \ -@@ -297,7 +297,7 @@ - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/client - dconf_editor_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg gmodule-2.0 --pkg libxml-2.0 --pkg dconf - dconf_editor_LDADD = \ -- ../client/libdconf.so.1 \ -+ -ldconf \ - $(gtk_LIBS) \ - $(gee_LIBS) \ - $(gmodule_LIBS) \ diff --git a/devel/dconf/pkg-plist b/devel/dconf/pkg-plist index aa35523310f7..532d45651c05 100644 --- a/devel/dconf/pkg-plist +++ b/devel/dconf/pkg-plist @@ -1,38 +1,35 @@ bin/dconf +include/dconf-dbus-1/dconf-dbus-1.h include/dconf/client/dconf-client.h include/dconf/common/dconf-changeset.h include/dconf/common/dconf-error.h -include/dconf-dbus-1/dconf-dbus-1.h include/dconf/common/dconf-paths.h include/dconf/dconf.h lib/gio/modules/libdconfsettings.so -lib/libdconf.so -lib/libdconf.so.1 -lib/libdconf.so.1.0.0 lib/libdconf-dbus-1.so lib/libdconf-dbus-1.so.0 lib/libdconf-dbus-1.so.0.0.0 -libdata/pkgconfig/dconf.pc +lib/libdconf.so +lib/libdconf.so.1 +lib/libdconf.so.1.0.0 libdata/pkgconfig/dconf-dbus-1.pc +libdata/pkgconfig/dconf.pc libexec/dconf-service -man/man1/dconf-editor.1.gz man/man1/dconf-service.1.gz 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-editor.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/programs.html -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.devhelp2 share/gtk-doc/html/dconf/home.png share/gtk-doc/html/dconf/index.html @@ -40,70 +37,15 @@ share/gtk-doc/html/dconf/index.sgml 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/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/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/it/LC_MESSAGES/dconf.mo -share/locale/ja/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/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/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/vala/vapi/dconf.deps share/vala/vapi/dconf.vapi -@dir etc/dconf/db -@dir etc/dconf/profile +@dir %%ETCDIR%%/db +@dir %%ETCDIR%%/profile @exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true @unexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile index fde3dc15a6f2..a0a67b00acee 100644 --- a/devel/devhelp/Makefile +++ b/devel/devhelp/Makefile @@ -1,9 +1,8 @@ # Created by: Adam Weinberger <adamw@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/devel/devhelp/Makefile 19980 2014-10-17 06:01:57Z gusi $ PORTNAME= devhelp -PORTVERSION= 3.14.0 +PORTVERSION= 3.16.1 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -11,10 +10,13 @@ DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Developer help browser for GNOME 3 -LIB_DEPENDS= libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 +LIB_DEPENDS= libwebkit2gtk-4.0.so:${PORTSDIR}/www/webkit2-gtk3 -USES= gettext gmake libtool pathfix pkgconfig tar:xz -USE_GNOME= gnomeprefix gtk30 intlhack libxslt +PORTSCOUT= limitw:1,even + +USES= compiler:c++11-lib gettext gmake libtool pathfix \ + pkgconfig tar:xz +USE_GNOME= gtk30 intlhack libxslt USE_XORG= x11 GNU_CONFIGURE= yes INSTALLS_ICONS= yes diff --git a/devel/devhelp/distinfo b/devel/devhelp/distinfo index cefa015059f9..87da235900f6 100644 --- a/devel/devhelp/distinfo +++ b/devel/devhelp/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/devhelp-3.14.0.tar.xz) = a78884cf81c1fb18fc8356c62271292591d5ca62c58b045dee30c6fc278e7083 -SIZE (gnome3/devhelp-3.14.0.tar.xz) = 465860 +SHA256 (gnome3/devhelp-3.16.1.tar.xz) = 673c34e6851c2848e6257da8de5edc222d41e1dbf110501bd29d7f6810f41345 +SIZE (gnome3/devhelp-3.16.1.tar.xz) = 469172 diff --git a/devel/devhelp/pkg-plist b/devel/devhelp/pkg-plist index d78f660f21e8..38e20daf96c9 100644 --- a/devel/devhelp/pkg-plist +++ b/devel/devhelp/pkg-plist @@ -19,15 +19,16 @@ libdata/pkgconfig/libdevhelp-3.0.pc share/GConf/gsettings/devhelp.convert share/appdata/devhelp.appdata.xml share/applications/devhelp.desktop -share/devhelp/assistant/assistant.css -share/devhelp/assistant/assistant.js -share/devhelp/dtd/devhelp-1.dtd +%%DATADIR%%/assistant/assistant.css +%%DATADIR%%/assistant/assistant.js +%%DATADIR%%/dtd/devhelp-1.dtd share/icons/hicolor/16x16/apps/devhelp.png share/icons/hicolor/22x22/apps/devhelp.png share/icons/hicolor/24x24/apps/devhelp.png share/icons/hicolor/256x256/apps/devhelp.png share/icons/hicolor/32x32/apps/devhelp.png share/icons/hicolor/48x48/apps/devhelp.png +share/icons/hicolor/symbolic/apps/devhelp-symbolic.svg share/locale/am/LC_MESSAGES/devhelp.mo share/locale/ar/LC_MESSAGES/devhelp.mo share/locale/as/LC_MESSAGES/devhelp.mo @@ -38,6 +39,7 @@ share/locale/be@latin/LC_MESSAGES/devhelp.mo share/locale/bg/LC_MESSAGES/devhelp.mo share/locale/bn/LC_MESSAGES/devhelp.mo share/locale/bn_IN/LC_MESSAGES/devhelp.mo +share/locale/bs/LC_MESSAGES/devhelp.mo share/locale/ca/LC_MESSAGES/devhelp.mo share/locale/ca@valencia/LC_MESSAGES/devhelp.mo share/locale/cs/LC_MESSAGES/devhelp.mo diff --git a/devel/glade/Makefile b/devel/glade/Makefile index f552261ded11..810d61300798 100644 --- a/devel/glade/Makefile +++ b/devel/glade/Makefile @@ -1,10 +1,9 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/devel/glade/Makefile 19813 2014-08-15 19:44:33Z gusi $ PORTNAME= glade PORTVERSION= 3.18.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -18,8 +17,10 @@ CONFLICTS= glade3-3.* USES= desktop-file-utils gettext gmake libtool \ pathfix pkgconfig tar:xz -USE_GNOME= gtk30 gnomeprefix gnomedocutils intlhack \ - introspection:build +USE_GNOME= gtk30 gnomedocutils intlhack +# introspection:build +# temp disable, introspection generation crashes with GNOME 3.15 +CONFIGURE_ARGS= --disable-introspection INSTALLS_ICONS= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/devel/glade/pkg-plist b/devel/glade/pkg-plist index 6e02cb615eb5..9f7525963bc4 100644 --- a/devel/glade/pkg-plist +++ b/devel/glade/pkg-plist @@ -35,7 +35,6 @@ 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 lib/libgladeui-2.so lib/libgladeui-2.so.6 @@ -45,49 +44,6 @@ man/man1/glade-previewer.1.gz man/man1/glade.1.gz share/appdata/glade.appdata.xml share/applications/glade.desktop -%%DOCSDIR%%/GladeApp.html -%%DOCSDIR%%/GladeBaseEditor.html -%%DOCSDIR%%/GladeClipboard.html -%%DOCSDIR%%/GladeDesignView.html -%%DOCSDIR%%/GladeEditorProperty.html -%%DOCSDIR%%/GladeInspector.html -%%DOCSDIR%%/GladePalette.html -%%DOCSDIR%%/GladePlaceholder.html -%%DOCSDIR%%/GladeProject.html -%%DOCSDIR%%/GladeProperty.html -%%DOCSDIR%%/GladeWidget.html -%%DOCSDIR%%/GladeWidgetAction.html -%%DOCSDIR%%/catalog.html -%%DOCSDIR%%/catalogintro.html -%%DOCSDIR%%/core.html -%%DOCSDIR%%/dockables.html -%%DOCSDIR%%/gladeui-Glade-Utils.html -%%DOCSDIR%%/gladeui-GladeClipboardView.html -%%DOCSDIR%%/gladeui-GladeFixed.html -%%DOCSDIR%%/gladeui-GladePropertyClass.html -%%DOCSDIR%%/gladeui-GladeSignalEditor.html -%%DOCSDIR%%/gladeui-Xml-Utils.html -%%DOCSDIR%%/gladeui-glade-command.html -%%DOCSDIR%%/gladeui-glade-editor.html -%%DOCSDIR%%/gladeui-glade-parameter.html -%%DOCSDIR%%/gladeui-glade-widget-adaptor.html -%%DOCSDIR%%/gladeui-2.devhelp2 -%%DOCSDIR%%/home.png -%%DOCSDIR%%/index.html -%%DOCSDIR%%/index.sgml -%%DOCSDIR%%/ix01.html -%%DOCSDIR%%/left-insensitive.png -%%DOCSDIR%%/left.png -%%DOCSDIR%%/misc.html -%%DOCSDIR%%/properties.html -%%DOCSDIR%%/pythonsupport.html -%%DOCSDIR%%/right-insensitive.png -%%DOCSDIR%%/right.png -%%DOCSDIR%%/style.css -%%DOCSDIR%%/up-insensitive.png -%%DOCSDIR%%/up.png -%%DOCSDIR%%/widgetclasses.html -share/gir-1.0/Gladeui-2.0.gir share/glade/catalogs/glade-catalog.dtd share/glade/catalogs/gtk+.xml share/glade/catalogs/gtkunixprint.xml @@ -377,72 +333,114 @@ 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/gtk-doc/html/gladeui-2/GladeApp.html +share/gtk-doc/html/gladeui-2/GladeBaseEditor.html +share/gtk-doc/html/gladeui-2/GladeClipboard.html +share/gtk-doc/html/gladeui-2/GladeDesignView.html +share/gtk-doc/html/gladeui-2/GladeEditorProperty.html +share/gtk-doc/html/gladeui-2/GladeInspector.html +share/gtk-doc/html/gladeui-2/GladePalette.html +share/gtk-doc/html/gladeui-2/GladePlaceholder.html +share/gtk-doc/html/gladeui-2/GladeProject.html +share/gtk-doc/html/gladeui-2/GladeProperty.html +share/gtk-doc/html/gladeui-2/GladeWidget.html +share/gtk-doc/html/gladeui-2/GladeWidgetAction.html +share/gtk-doc/html/gladeui-2/catalog.html +share/gtk-doc/html/gladeui-2/catalogintro.html +share/gtk-doc/html/gladeui-2/core.html +share/gtk-doc/html/gladeui-2/dockables.html +share/gtk-doc/html/gladeui-2/gladeui-2.devhelp2 +share/gtk-doc/html/gladeui-2/gladeui-Glade-Utils.html +share/gtk-doc/html/gladeui-2/gladeui-GladeClipboardView.html +share/gtk-doc/html/gladeui-2/gladeui-GladeFixed.html +share/gtk-doc/html/gladeui-2/gladeui-GladePropertyClass.html +share/gtk-doc/html/gladeui-2/gladeui-GladeSignalEditor.html +share/gtk-doc/html/gladeui-2/gladeui-Xml-Utils.html +share/gtk-doc/html/gladeui-2/gladeui-glade-command.html +share/gtk-doc/html/gladeui-2/gladeui-glade-editor.html +share/gtk-doc/html/gladeui-2/gladeui-glade-parameter.html +share/gtk-doc/html/gladeui-2/gladeui-glade-widget-adaptor.html +share/gtk-doc/html/gladeui-2/home.png +share/gtk-doc/html/gladeui-2/index.html +share/gtk-doc/html/gladeui-2/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 +share/gtk-doc/html/gladeui-2/misc.html +share/gtk-doc/html/gladeui-2/properties.html +share/gtk-doc/html/gladeui-2/pythonsupport.html +share/gtk-doc/html/gladeui-2/right-insensitive.png +share/gtk-doc/html/gladeui-2/right.png +share/gtk-doc/html/gladeui-2/style.css +share/gtk-doc/html/gladeui-2/up-insensitive.png +share/gtk-doc/html/gladeui-2/up.png +share/gtk-doc/html/gladeui-2/widgetclasses.html +share/help/C/glade/figures/main-window.png share/help/C/glade/index.docbook share/help/C/glade/legal.xml -share/help/C/glade/figures/main-window.png +share/help/bg/glade/figures/main-window.png share/help/bg/glade/index.docbook share/help/bg/glade/legal.xml -share/help/bg/glade/figures/main-window.png +share/help/ca/glade/figures/main-window.png share/help/ca/glade/index.docbook share/help/ca/glade/legal.xml -share/help/ca/glade/figures/main-window.png +share/help/cs/glade/figures/main-window.png share/help/cs/glade/index.docbook share/help/cs/glade/legal.xml -share/help/cs/glade/figures/main-window.png +share/help/de/glade/figures/main-window.png share/help/de/glade/index.docbook share/help/de/glade/legal.xml -share/help/de/glade/figures/main-window.png +share/help/el/glade/figures/main-window.png share/help/el/glade/index.docbook share/help/el/glade/legal.xml -share/help/el/glade/figures/main-window.png +share/help/en_GB/glade/figures/main-window.png share/help/en_GB/glade/index.docbook share/help/en_GB/glade/legal.xml -share/help/en_GB/glade/figures/main-window.png +share/help/es/glade/figures/main-window.png share/help/es/glade/index.docbook share/help/es/glade/legal.xml -share/help/es/glade/figures/main-window.png +share/help/eu/glade/figures/main-window.png share/help/eu/glade/index.docbook share/help/eu/glade/legal.xml -share/help/eu/glade/figures/main-window.png +share/help/fr/glade/figures/main-window.png share/help/fr/glade/index.docbook share/help/fr/glade/legal.xml -share/help/fr/glade/figures/main-window.png +share/help/gl/glade/figures/main-window.png share/help/gl/glade/index.docbook share/help/gl/glade/legal.xml -share/help/gl/glade/figures/main-window.png +share/help/hi/glade/figures/main-window.png share/help/hi/glade/index.docbook share/help/hi/glade/legal.xml -share/help/hi/glade/figures/main-window.png +share/help/hu/glade/figures/main-window.png share/help/hu/glade/index.docbook share/help/hu/glade/legal.xml -share/help/hu/glade/figures/main-window.png +share/help/it/glade/figures/main-window.png share/help/it/glade/index.docbook share/help/it/glade/legal.xml -share/help/it/glade/figures/main-window.png +share/help/ja/glade/figures/main-window.png share/help/ja/glade/index.docbook share/help/ja/glade/legal.xml -share/help/ja/glade/figures/main-window.png +share/help/oc/glade/figures/main-window.png share/help/oc/glade/index.docbook share/help/oc/glade/legal.xml -share/help/oc/glade/figures/main-window.png +share/help/pt_BR/glade/figures/main-window.png share/help/pt_BR/glade/index.docbook share/help/pt_BR/glade/legal.xml -share/help/pt_BR/glade/figures/main-window.png +share/help/ru/glade/figures/main-window.png share/help/ru/glade/index.docbook share/help/ru/glade/legal.xml -share/help/ru/glade/figures/main-window.png +share/help/sl/glade/figures/main-window.png share/help/sl/glade/index.docbook share/help/sl/glade/legal.xml -share/help/sl/glade/figures/main-window.png +share/help/sv/glade/figures/main-window.png share/help/sv/glade/index.docbook share/help/sv/glade/legal.xml -share/help/sv/glade/figures/main-window.png +share/help/uk/glade/figures/main-window.png share/help/uk/glade/index.docbook share/help/uk/glade/legal.xml -share/help/uk/glade/figures/main-window.png +share/help/zh_CN/glade/figures/main-window.png share/help/zh_CN/glade/index.docbook share/help/zh_CN/glade/legal.xml -share/help/zh_CN/glade/figures/main-window.png share/icons/hicolor/16x16/apps/glade.png share/icons/hicolor/22x22/apps/glade.png share/icons/hicolor/24x24/apps/glade.png diff --git a/devel/glib20-reference/pkg-plist b/devel/glib20-reference/pkg-plist index d3a5bce79d26..44db62e3d2b5 100644 --- a/devel/glib20-reference/pkg-plist +++ b/devel/glib20-reference/pkg-plist @@ -13,6 +13,7 @@ share/doc/gio/GAsyncInitable.html share/doc/gio/GAsyncResult.html share/doc/gio/GBufferedInputStream.html share/doc/gio/GBufferedOutputStream.html +share/doc/gio/GBytesIcon.html share/doc/gio/GCancellable.html share/doc/gio/GCharsetConverter.html share/doc/gio/GConverter.html @@ -54,9 +55,12 @@ share/doc/gio/GIOModule.html share/doc/gio/GIOStream.html share/doc/gio/GIcon.html share/doc/gio/GInetAddress.html +share/doc/gio/GInetAddressMask.html share/doc/gio/GInetSocketAddress.html share/doc/gio/GInitable.html share/doc/gio/GInputStream.html +share/doc/gio/GListModel.html +share/doc/gio/GListStore.html share/doc/gio/GLoadableIcon.html share/doc/gio/GMemoryInputStream.html share/doc/gio/GMemoryOutputStream.html @@ -67,21 +71,25 @@ share/doc/gio/GMountOperation.html share/doc/gio/GNetworkAddress.html share/doc/gio/GNetworkMonitor.html share/doc/gio/GNetworkService.html +share/doc/gio/GNotification.html share/doc/gio/GOutputStream.html share/doc/gio/GPermission.html share/doc/gio/GPollableInputStream.html share/doc/gio/GPollableOutputStream.html +share/doc/gio/GPropertyAction.html share/doc/gio/GProxy.html share/doc/gio/GProxyAddress.html share/doc/gio/GProxyResolver.html share/doc/gio/GRemoteActionGroup.html share/doc/gio/GResolver.html +share/doc/gio/GResource.html share/doc/gio/GSeekable.html share/doc/gio/GSettings.html share/doc/gio/GSettingsBackend.html share/doc/gio/GSimpleAction.html share/doc/gio/GSimpleActionGroup.html share/doc/gio/GSimpleAsyncResult.html +share/doc/gio/GSimpleIOStream.html share/doc/gio/GSimplePermission.html share/doc/gio/GSimpleProxyResolver.html share/doc/gio/GSocket.html @@ -94,6 +102,7 @@ share/doc/gio/GSocketListener.html share/doc/gio/GSocketService.html share/doc/gio/GSrvTarget.html share/doc/gio/GSubprocess.html +share/doc/gio/GSubprocessLauncher.html share/doc/gio/GTask.html share/doc/gio/GTcpConnection.html share/doc/gio/GTcpWrapperConnection.html @@ -135,6 +144,7 @@ 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-deprecated.html share/doc/gio/api-index-full.html share/doc/gio/application.html @@ -142,23 +152,24 @@ share/doc/gio/async.html share/doc/gio/ch01.html share/doc/gio/ch02.html share/doc/gio/ch03.html -share/doc/gio/ch30.html share/doc/gio/ch31.html -share/doc/gio/ch31s02.html -share/doc/gio/ch31s03.html share/doc/gio/ch32.html share/doc/gio/ch32s02.html share/doc/gio/ch32s03.html -share/doc/gio/ch32s04.html -share/doc/gio/ch32s05.html -share/doc/gio/ch32s06.html -share/doc/gio/ch32s07.html share/doc/gio/ch33.html share/doc/gio/ch33s02.html share/doc/gio/ch33s03.html share/doc/gio/ch33s04.html share/doc/gio/ch33s05.html +share/doc/gio/ch33s06.html +share/doc/gio/ch33s07.html +share/doc/gio/ch34.html +share/doc/gio/ch34s02.html +share/doc/gio/ch34s03.html +share/doc/gio/ch34s04.html +share/doc/gio/ch34s05.html share/doc/gio/conversion.html +share/doc/gio/data-models.html share/doc/gio/extending-gio.html share/doc/gio/extending.html share/doc/gio/failable_initialization.html @@ -177,7 +188,6 @@ share/doc/gio/gio-D-Bus-Utilities.html share/doc/gio/gio-Desktop-file-based-GAppInfo.html share/doc/gio/gio-Extension-Points.html share/doc/gio/gio-GActionGroup-exporter.html -share/doc/gio/gio-GBytesIcon.html share/doc/gio/gio-GContentType.html share/doc/gio/gio-GConverterInputstream.html share/doc/gio/gio-GConverterOutputstream.html @@ -185,13 +195,8 @@ share/doc/gio/gio-GDBusError.html share/doc/gio/gio-GFileAttribute.html share/doc/gio/gio-GIOError.html share/doc/gio/gio-GIOScheduler.html -share/doc/gio/gio-GInetAddressMask.html share/doc/gio/gio-GMenuModel-exporter.html -share/doc/gio/gio-GNotification.html -share/doc/gio/gio-GPropertyAction.html -share/doc/gio/gio-GResource.html share/doc/gio/gio-GSettingsSchema-GSettingsSchemaSource.html -share/doc/gio/gio-GSubprocessLauncher.html share/doc/gio/gio-GWin32InputStream.html share/doc/gio/gio-GWin32OutputStream.html share/doc/gio/gio-Owning-Bus-Names.html @@ -263,6 +268,7 @@ share/doc/glib/api-index-2-38.html share/doc/glib/api-index-2-4.html share/doc/glib/api-index-2-40.html share/doc/glib/api-index-2-42.html +share/doc/glib/api-index-2-44.html share/doc/glib/api-index-2-6.html share/doc/glib/api-index-2-8.html share/doc/glib/api-index-deprecated.html @@ -391,6 +397,7 @@ 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-6.html share/doc/gobject/api-index-2-8.html share/doc/gobject/api-index-deprecated.html diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index a8ad68cdf240..1458f0d93d76 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -1,9 +1,8 @@ # Created by: Vanilla I. Shu <vanilla@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/devel/glib20/Makefile 20052 2014-11-10 10:21:14Z gusi $ PORTNAME= glib -PORTVERSION= 2.42.2 +PORTVERSION= 2.44.1 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -40,7 +39,7 @@ INSTALL_TARGET= install-strip SHEBANG_FILES= */*.pl -LIBVERSION= 0.4200.2 +LIBVERSION= 0.4400.1 PLIST_SUB+= LIBVERSION=${LIBVERSION} glib_MAN= gtester.1 gtester-report.1 glib-gettextize.1 diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo index 85668fe0f75d..e7c06a6ae366 100644 --- a/devel/glib20/distinfo +++ b/devel/glib20/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome2/glib-2.42.2.tar.xz) = a3cc1ebd2bd310a9fdf42ae4293ee713cdf1764bd29f552febf3bf44cadae7db -SIZE (gnome2/glib-2.42.2.tar.xz) = 7002480 +SHA256 (gnome2/glib-2.44.1.tar.xz) = 8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07 +SIZE (gnome2/glib-2.44.1.tar.xz) = 7132940 diff --git a/devel/glib20/files/patch-gio_gunixmounts.c b/devel/glib20/files/patch-gio_gunixmounts.c deleted file mode 100644 index f73b3af2a941..000000000000 --- a/devel/glib20/files/patch-gio_gunixmounts.c +++ /dev/null @@ -1,24 +0,0 @@ ---- gio/gunixmounts.c.orig 2014-09-22 15:42:12.000000000 +0200 -+++ gio/gunixmounts.c 2014-09-28 10:03:52.141514611 +0200 -@@ -150,6 +150,7 @@ - GFileMonitor *fstab_monitor; - GFileMonitor *mtab_monitor; - -+ guint mount_poller_source; - GList *mount_poller_mounts; - - GSource *proc_mounts_watch_source; -@@ -1293,6 +1294,13 @@ - - g_list_free_full (monitor->mount_poller_mounts, (GDestroyNotify)g_unix_mount_free); - -+ if (monitor->mount_poller_source > 0) -+ { -+ g_source_remove (monitor->mount_poller_source); -+ g_list_foreach (monitor->mount_poller_mounts, (GFunc)g_unix_mount_free, NULL); -+ g_list_free (monitor->mount_poller_mounts); -+ } -+ - the_mount_monitor = NULL; - - G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize (object); diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist index cbfc71914d10..38d25910b0c6 100644 --- a/devel/glib20/pkg-plist +++ b/devel/glib20/pkg-plist @@ -89,6 +89,7 @@ include/glib-2.0/gio/ginetaddressmask.h include/glib-2.0/gio/ginetsocketaddress.h include/glib-2.0/gio/ginitable.h include/glib-2.0/gio/ginputstream.h +include/glib-2.0/gio/gio-autocleanups.h include/glib-2.0/gio/gio.h include/glib-2.0/gio/gioenums.h include/glib-2.0/gio/gioenumtypes.h @@ -97,6 +98,8 @@ include/glib-2.0/gio/giomodule.h include/glib-2.0/gio/gioscheduler.h include/glib-2.0/gio/giostream.h include/glib-2.0/gio/giotypes.h +include/glib-2.0/gio/glistmodel.h +include/glib-2.0/gio/gliststore.h include/glib-2.0/gio/gloadableicon.h include/glib-2.0/gio/gmemoryinputstream.h include/glib-2.0/gio/gmemoryoutputstream.h @@ -130,6 +133,7 @@ include/glib-2.0/gio/gsettingsbackend.h include/glib-2.0/gio/gsettingsschema.h include/glib-2.0/gio/gsimpleaction.h include/glib-2.0/gio/gsimpleactiongroup.h +include/glib-2.0/gio/gsimpleiostream.h include/glib-2.0/gio/gsimpleproxyresolver.h include/glib-2.0/gio/gsimpleasyncresult.h include/glib-2.0/gio/gsimplepermission.h @@ -202,6 +206,7 @@ include/glib-2.0/glib/gi18n-lib.h include/glib-2.0/glib/gi18n.h include/glib-2.0/glib/giochannel.h include/glib-2.0/glib/gkeyfile.h +include/glib-2.0/glib/glib-autocleanups.h include/glib-2.0/glib/glist.h include/glib-2.0/glib/gmacros.h include/glib-2.0/glib/gmain.h @@ -253,6 +258,7 @@ include/glib-2.0/gobject/gclosure.h include/glib-2.0/gobject/genums.h include/glib-2.0/gobject/glib-types.h include/glib-2.0/gobject/gmarshal.h +include/glib-2.0/gobject/gobject-autocleanups.h include/glib-2.0/gobject/gobject.h include/glib-2.0/gobject/gobjectnotifyqueue.c include/glib-2.0/gobject/gparam.h @@ -442,4 +448,5 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo @dir lib/gio/modules @dir share/GConf/gsettings @exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas 2>/dev/null || /usr/bin/true +@unexec /bin/unlink %D/share/glib-2.0/schemas/gschemas.compiled || /usr/bin/true @exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true diff --git a/devel/glibmm-reference/Makefile b/devel/glibmm-reference/Makefile index 0e74b6558bfe..8965b01d7acd 100644 --- a/devel/glibmm-reference/Makefile +++ b/devel/glibmm-reference/Makefile @@ -1,13 +1,14 @@ # Created by: Jean-Yves Lefort <jylefort@FreeBSD.org> # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/glibmm-2.4.pc:${PORTSDIR}/devel/glibmm \ gm4:${PORTSDIR}/devel/m4 GNU_CONFIGURE= yes USES= gmake pkgconfig +PORTSCOUT= ignore:1 DOCSDIR= ${PREFIX}/share/doc/glibmm-2.4 diff --git a/devel/glibmm-reference/pkg-plist b/devel/glibmm-reference/pkg-plist index fb9efe2a795f..8d898ea9dc2c 100644 --- a/devel/glibmm-reference/pkg-plist +++ b/devel/glibmm-reference/pkg-plist @@ -1 +1 @@ -share/devhelp/books/glibmm-%%API_VERSION%%/glibmm-%%API_VERSION%%.devhelp2 +share/devhelp/books/glibmm-%%VERSION%%/glibmm-%%VERSION%%.devhelp2 diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile index 8e1eaeebf167..4c4369d08592 100644 --- a/devel/glibmm/Makefile +++ b/devel/glibmm/Makefile @@ -1,9 +1,8 @@ # Created by: Adam Weinberger <adamw@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/devel/glibmm/Makefile 19944 2014-10-15 05:33:09Z gusi $ PORTNAME= glibmm -PORTVERSION= 2.42.0 +PORTVERSION= 2.44.0 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= GNOME @@ -13,8 +12,9 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= C++ interfaces for glib2 USES+= tar:xz +PORTSCOUT?= limitw:1,even -PLIST_SUB= VERSION="2.4" API_VERSION="2.4" +PLIST_SUB= VERSION="2.4" .if !defined(REFERENCE_PORT) diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo index 67c65b0ab5b7..de4ddd34d084 100644 --- a/devel/glibmm/distinfo +++ b/devel/glibmm/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome2/glibmm-2.42.0.tar.xz) = 985083d97378d234da27a7243587cc0d186897a4b2d3c1286f794089be1a3397 -SIZE (gnome2/glibmm-2.42.0.tar.xz) = 6031860 +SHA256 (gnome2/glibmm-2.44.0.tar.xz) = 1b0ac0425d24895507c0e0e8088a464c7ae2d289c47afa1c11f63278fc672ea8 +SIZE (gnome2/glibmm-2.44.0.tar.xz) = 6102664 diff --git a/devel/glibmm/pkg-plist b/devel/glibmm/pkg-plist index 720ca6ba65ca..cccd4916950c 100644 --- a/devel/glibmm/pkg-plist +++ b/devel/glibmm/pkg-plist @@ -1,364 +1,370 @@ -include/giomm-%%API_VERSION%%/giomm.h -include/giomm-%%API_VERSION%%/giomm/action.h -include/giomm-%%API_VERSION%%/giomm/actiongroup.h -include/giomm-%%API_VERSION%%/giomm/actionmap.h -include/giomm-%%API_VERSION%%/giomm/appinfo.h -include/giomm-%%API_VERSION%%/giomm/applaunchcontext.h -include/giomm-%%API_VERSION%%/giomm/application.h -include/giomm-%%API_VERSION%%/giomm/applicationcommandline.h -include/giomm-%%API_VERSION%%/giomm/asyncinitable.h -include/giomm-%%API_VERSION%%/giomm/asyncresult.h -include/giomm-%%API_VERSION%%/giomm/bufferedinputstream.h -include/giomm-%%API_VERSION%%/giomm/bufferedoutputstream.h -include/giomm-%%API_VERSION%%/giomm/cancellable.h -include/giomm-%%API_VERSION%%/giomm/charsetconverter.h -include/giomm-%%API_VERSION%%/giomm/contenttype.h -include/giomm-%%API_VERSION%%/giomm/converter.h -include/giomm-%%API_VERSION%%/giomm/converterinputstream.h -include/giomm-%%API_VERSION%%/giomm/converteroutputstream.h -include/giomm-%%API_VERSION%%/giomm/credentials.h -include/giomm-%%API_VERSION%%/giomm/datainputstream.h -include/giomm-%%API_VERSION%%/giomm/dataoutputstream.h -include/giomm-%%API_VERSION%%/giomm/dbusactiongroup.h -include/giomm-%%API_VERSION%%/giomm/dbusaddress.h -include/giomm-%%API_VERSION%%/giomm/dbusauthobserver.h -include/giomm-%%API_VERSION%%/giomm/dbusconnection.h -include/giomm-%%API_VERSION%%/giomm/dbuserror.h -include/giomm-%%API_VERSION%%/giomm/dbuserrorutils.h -include/giomm-%%API_VERSION%%/giomm/dbusinterface.h -include/giomm-%%API_VERSION%%/giomm/dbusinterfaceskeleton.h -include/giomm-%%API_VERSION%%/giomm/dbusinterfacevtable.h -include/giomm-%%API_VERSION%%/giomm/dbusintrospection.h -include/giomm-%%API_VERSION%%/giomm/dbusmenumodel.h -include/giomm-%%API_VERSION%%/giomm/dbusmessage.h -include/giomm-%%API_VERSION%%/giomm/dbusmethodinvocation.h -include/giomm-%%API_VERSION%%/giomm/dbusobject.h -include/giomm-%%API_VERSION%%/giomm/dbusownname.h -include/giomm-%%API_VERSION%%/giomm/dbusproxy.h -include/giomm-%%API_VERSION%%/giomm/dbusserver.h -include/giomm-%%API_VERSION%%/giomm/dbussubtreevtable.h -include/giomm-%%API_VERSION%%/giomm/dbusutils.h -include/giomm-%%API_VERSION%%/giomm/dbuswatchname.h -include/giomm-%%API_VERSION%%/giomm/desktopappinfo.h -include/giomm-%%API_VERSION%%/giomm/drive.h -include/giomm-%%API_VERSION%%/giomm/emblem.h -include/giomm-%%API_VERSION%%/giomm/emblemedicon.h -include/giomm-%%API_VERSION%%/giomm/enums.h -include/giomm-%%API_VERSION%%/giomm/error.h -include/giomm-%%API_VERSION%%/giomm/file.h -include/giomm-%%API_VERSION%%/giomm/fileattributeinfo.h -include/giomm-%%API_VERSION%%/giomm/fileattributeinfolist.h -include/giomm-%%API_VERSION%%/giomm/fileenumerator.h -include/giomm-%%API_VERSION%%/giomm/fileicon.h -include/giomm-%%API_VERSION%%/giomm/fileinfo.h -include/giomm-%%API_VERSION%%/giomm/fileinputstream.h -include/giomm-%%API_VERSION%%/giomm/fileiostream.h -include/giomm-%%API_VERSION%%/giomm/filemonitor.h -include/giomm-%%API_VERSION%%/giomm/filenamecompleter.h -include/giomm-%%API_VERSION%%/giomm/fileoutputstream.h -include/giomm-%%API_VERSION%%/giomm/filterinputstream.h -include/giomm-%%API_VERSION%%/giomm/filteroutputstream.h -include/giomm-%%API_VERSION%%/giomm/icon.h -include/giomm-%%API_VERSION%%/giomm/inetaddress.h -include/giomm-%%API_VERSION%%/giomm/inetsocketaddress.h -include/giomm-%%API_VERSION%%/giomm/init.h -include/giomm-%%API_VERSION%%/giomm/initable.h -include/giomm-%%API_VERSION%%/giomm/inputstream.h -include/giomm-%%API_VERSION%%/giomm/iostream.h -include/giomm-%%API_VERSION%%/giomm/loadableicon.h -include/giomm-%%API_VERSION%%/giomm/memoryinputstream.h -include/giomm-%%API_VERSION%%/giomm/memoryoutputstream.h -include/giomm-%%API_VERSION%%/giomm/menu.h -include/giomm-%%API_VERSION%%/giomm/menuattributeiter.h -include/giomm-%%API_VERSION%%/giomm/menuitem.h -include/giomm-%%API_VERSION%%/giomm/menulinkiter.h -include/giomm-%%API_VERSION%%/giomm/menumodel.h -include/giomm-%%API_VERSION%%/giomm/mount.h -include/giomm-%%API_VERSION%%/giomm/mountoperation.h -include/giomm-%%API_VERSION%%/giomm/networkaddress.h -include/giomm-%%API_VERSION%%/giomm/networkservice.h -include/giomm-%%API_VERSION%%/giomm/notification.h -include/giomm-%%API_VERSION%%/giomm/outputstream.h -include/giomm-%%API_VERSION%%/giomm/permission.h -include/giomm-%%API_VERSION%%/giomm/pollableinputstream.h -include/giomm-%%API_VERSION%%/giomm/pollableoutputstream.h -include/giomm-%%API_VERSION%%/giomm/private/action_p.h -include/giomm-%%API_VERSION%%/giomm/private/actiongroup_p.h -include/giomm-%%API_VERSION%%/giomm/private/actionmap_p.h -include/giomm-%%API_VERSION%%/giomm/private/appinfo_p.h -include/giomm-%%API_VERSION%%/giomm/private/applaunchcontext_p.h -include/giomm-%%API_VERSION%%/giomm/private/application_p.h -include/giomm-%%API_VERSION%%/giomm/private/applicationcommandline_p.h -include/giomm-%%API_VERSION%%/giomm/private/asyncinitable_p.h -include/giomm-%%API_VERSION%%/giomm/private/asyncresult_p.h -include/giomm-%%API_VERSION%%/giomm/private/bufferedinputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/bufferedoutputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/cancellable_p.h -include/giomm-%%API_VERSION%%/giomm/private/charsetconverter_p.h -include/giomm-%%API_VERSION%%/giomm/private/converter_p.h -include/giomm-%%API_VERSION%%/giomm/private/converterinputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/converteroutputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/credentials_p.h -include/giomm-%%API_VERSION%%/giomm/private/datainputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/dataoutputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/dbusactiongroup_p.h -include/giomm-%%API_VERSION%%/giomm/private/dbusaddress_p.h -include/giomm-%%API_VERSION%%/giomm/private/dbusauthobserver_p.h -include/giomm-%%API_VERSION%%/giomm/private/dbusconnection_p.h -include/giomm-%%API_VERSION%%/giomm/private/dbuserror_p.h -include/giomm-%%API_VERSION%%/giomm/private/dbuserrorutils_p.h -include/giomm-%%API_VERSION%%/giomm/private/dbusinterface_p.h -include/giomm-%%API_VERSION%%/giomm/private/dbusinterfaceskeleton_p.h -include/giomm-%%API_VERSION%%/giomm/private/dbusinterfacevtable_p.h -include/giomm-%%API_VERSION%%/giomm/private/dbusintrospection_p.h -include/giomm-%%API_VERSION%%/giomm/private/dbusmenumodel_p.h -include/giomm-%%API_VERSION%%/giomm/private/dbusmessage_p.h -include/giomm-%%API_VERSION%%/giomm/private/dbusmethodinvocation_p.h -include/giomm-%%API_VERSION%%/giomm/private/dbusobject_p.h -include/giomm-%%API_VERSION%%/giomm/private/dbusownname_p.h -include/giomm-%%API_VERSION%%/giomm/private/dbusproxy_p.h -include/giomm-%%API_VERSION%%/giomm/private/dbusserver_p.h -include/giomm-%%API_VERSION%%/giomm/private/dbussubtreevtable_p.h -include/giomm-%%API_VERSION%%/giomm/private/dbusutils_p.h -include/giomm-%%API_VERSION%%/giomm/private/dbuswatchname_p.h -include/giomm-%%API_VERSION%%/giomm/private/desktopappinfo_p.h -include/giomm-%%API_VERSION%%/giomm/private/drive_p.h -include/giomm-%%API_VERSION%%/giomm/private/emblem_p.h -include/giomm-%%API_VERSION%%/giomm/private/emblemedicon_p.h -include/giomm-%%API_VERSION%%/giomm/private/enums_p.h -include/giomm-%%API_VERSION%%/giomm/private/error_p.h -include/giomm-%%API_VERSION%%/giomm/private/file_p.h -include/giomm-%%API_VERSION%%/giomm/private/fileattributeinfo_p.h -include/giomm-%%API_VERSION%%/giomm/private/fileattributeinfolist_p.h -include/giomm-%%API_VERSION%%/giomm/private/fileenumerator_p.h -include/giomm-%%API_VERSION%%/giomm/private/fileicon_p.h -include/giomm-%%API_VERSION%%/giomm/private/fileinfo_p.h -include/giomm-%%API_VERSION%%/giomm/private/fileinputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/fileiostream_p.h -include/giomm-%%API_VERSION%%/giomm/private/filemonitor_p.h -include/giomm-%%API_VERSION%%/giomm/private/filenamecompleter_p.h -include/giomm-%%API_VERSION%%/giomm/private/fileoutputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/filterinputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/filteroutputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/icon_p.h -include/giomm-%%API_VERSION%%/giomm/private/inetaddress_p.h -include/giomm-%%API_VERSION%%/giomm/private/inetsocketaddress_p.h -include/giomm-%%API_VERSION%%/giomm/private/initable_p.h -include/giomm-%%API_VERSION%%/giomm/private/inputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/iostream_p.h -include/giomm-%%API_VERSION%%/giomm/private/loadableicon_p.h -include/giomm-%%API_VERSION%%/giomm/private/memoryinputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/memoryoutputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/menu_p.h -include/giomm-%%API_VERSION%%/giomm/private/menuattributeiter_p.h -include/giomm-%%API_VERSION%%/giomm/private/menuitem_p.h -include/giomm-%%API_VERSION%%/giomm/private/menulinkiter_p.h -include/giomm-%%API_VERSION%%/giomm/private/menumodel_p.h -include/giomm-%%API_VERSION%%/giomm/private/mount_p.h -include/giomm-%%API_VERSION%%/giomm/private/mountoperation_p.h -include/giomm-%%API_VERSION%%/giomm/private/networkaddress_p.h -include/giomm-%%API_VERSION%%/giomm/private/networkservice_p.h -include/giomm-%%API_VERSION%%/giomm/private/notification_p.h -include/giomm-%%API_VERSION%%/giomm/private/outputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/pollableinputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/pollableoutputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/permission_p.h -include/giomm-%%API_VERSION%%/giomm/private/simplepermission_p.h -include/giomm-%%API_VERSION%%/giomm/private/proxy_p.h -include/giomm-%%API_VERSION%%/giomm/private/proxyaddress_p.h -include/giomm-%%API_VERSION%%/giomm/private/proxyresolver_p.h -include/giomm-%%API_VERSION%%/giomm/private/remoteactiongroup_p.h -include/giomm-%%API_VERSION%%/giomm/private/resolver_p.h -include/giomm-%%API_VERSION%%/giomm/private/resource_p.h -include/giomm-%%API_VERSION%%/giomm/private/seekable_p.h -include/giomm-%%API_VERSION%%/giomm/private/settings_p.h -include/giomm-%%API_VERSION%%/giomm/private/simpleaction_p.h -include/giomm-%%API_VERSION%%/giomm/private/simpleactiongroup_p.h -include/giomm-%%API_VERSION%%/giomm/private/socket_p.h -include/giomm-%%API_VERSION%%/giomm/private/socketaddress_p.h -include/giomm-%%API_VERSION%%/giomm/private/socketaddressenumerator_p.h -include/giomm-%%API_VERSION%%/giomm/private/socketclient_p.h -include/giomm-%%API_VERSION%%/giomm/private/socketconnectable_p.h -include/giomm-%%API_VERSION%%/giomm/private/socketconnection_p.h -include/giomm-%%API_VERSION%%/giomm/private/socketcontrolmessage_p.h -include/giomm-%%API_VERSION%%/giomm/private/socketlistener_p.h -include/giomm-%%API_VERSION%%/giomm/private/socketservice_p.h -include/giomm-%%API_VERSION%%/giomm/private/srvtarget_p.h -include/giomm-%%API_VERSION%%/giomm/private/tcpconnection_p.h -include/giomm-%%API_VERSION%%/giomm/private/themedicon_p.h -include/giomm-%%API_VERSION%%/giomm/private/threadedsocketservice_p.h -include/giomm-%%API_VERSION%%/giomm/private/tlscertificate_p.h -include/giomm-%%API_VERSION%%/giomm/private/tlsclientconnection_p.h -include/giomm-%%API_VERSION%%/giomm/private/tlsconnection_p.h -include/giomm-%%API_VERSION%%/giomm/private/tlsdatabase_p.h -include/giomm-%%API_VERSION%%/giomm/private/tlsinteraction_p.h -include/giomm-%%API_VERSION%%/giomm/private/tlspassword_p.h -include/giomm-%%API_VERSION%%/giomm/private/tlsserverconnection_p.h -include/giomm-%%API_VERSION%%/giomm/private/unixconnection_p.h -include/giomm-%%API_VERSION%%/giomm/private/unixcredentialsmessage_p.h -include/giomm-%%API_VERSION%%/giomm/private/unixfdlist_p.h -include/giomm-%%API_VERSION%%/giomm/private/unixfdmessage_p.h -include/giomm-%%API_VERSION%%/giomm/private/unixinputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/unixoutputstream_p.h -include/giomm-%%API_VERSION%%/giomm/private/unixsocketaddress_p.h -include/giomm-%%API_VERSION%%/giomm/private/volume_p.h -include/giomm-%%API_VERSION%%/giomm/private/volumemonitor_p.h -include/giomm-%%API_VERSION%%/giomm/private/zlibcompressor_p.h -include/giomm-%%API_VERSION%%/giomm/private/zlibdecompressor_p.h -include/giomm-%%API_VERSION%%/giomm/proxy.h -include/giomm-%%API_VERSION%%/giomm/proxyaddress.h -include/giomm-%%API_VERSION%%/giomm/proxyresolver.h -include/giomm-%%API_VERSION%%/giomm/remoteactiongroup.h -include/giomm-%%API_VERSION%%/giomm/resolver.h -include/giomm-%%API_VERSION%%/giomm/resource.h -include/giomm-%%API_VERSION%%/giomm/seekable.h -include/giomm-%%API_VERSION%%/giomm/settings.h -include/giomm-%%API_VERSION%%/giomm/simpleaction.h -include/giomm-%%API_VERSION%%/giomm/simpleactiongroup.h -include/giomm-%%API_VERSION%%/giomm/simplepermission.h -include/giomm-%%API_VERSION%%/giomm/socket.h -include/giomm-%%API_VERSION%%/giomm/socketaddress.h -include/giomm-%%API_VERSION%%/giomm/socketaddressenumerator.h -include/giomm-%%API_VERSION%%/giomm/socketclient.h -include/giomm-%%API_VERSION%%/giomm/socketconnectable.h -include/giomm-%%API_VERSION%%/giomm/socketconnection.h -include/giomm-%%API_VERSION%%/giomm/socketcontrolmessage.h -include/giomm-%%API_VERSION%%/giomm/socketlistener.h -include/giomm-%%API_VERSION%%/giomm/socketservice.h -include/giomm-%%API_VERSION%%/giomm/socketsource.h -include/giomm-%%API_VERSION%%/giomm/srvtarget.h -include/giomm-%%API_VERSION%%/giomm/tcpconnection.h -include/giomm-%%API_VERSION%%/giomm/themedicon.h -include/giomm-%%API_VERSION%%/giomm/threadedsocketservice.h -include/giomm-%%API_VERSION%%/giomm/tlscertificate.h -include/giomm-%%API_VERSION%%/giomm/tlsclientconnection.h -include/giomm-%%API_VERSION%%/giomm/tlsconnection.h -include/giomm-%%API_VERSION%%/giomm/tlsdatabase.h -include/giomm-%%API_VERSION%%/giomm/tlsinteraction.h -include/giomm-%%API_VERSION%%/giomm/tlspassword.h -include/giomm-%%API_VERSION%%/giomm/tlsserverconnection.h -include/giomm-%%API_VERSION%%/giomm/unixconnection.h -include/giomm-%%API_VERSION%%/giomm/unixcredentialsmessage.h -include/giomm-%%API_VERSION%%/giomm/unixfdlist.h -include/giomm-%%API_VERSION%%/giomm/unixfdmessage.h -include/giomm-%%API_VERSION%%/giomm/unixinputstream.h -include/giomm-%%API_VERSION%%/giomm/unixoutputstream.h -include/giomm-%%API_VERSION%%/giomm/unixsocketaddress.h -include/giomm-%%API_VERSION%%/giomm/volume.h -include/giomm-%%API_VERSION%%/giomm/volumemonitor.h -include/giomm-%%API_VERSION%%/giomm/wrap_init.h -include/giomm-%%API_VERSION%%/giomm/zlibcompressor.h -include/giomm-%%API_VERSION%%/giomm/zlibdecompressor.h -include/glibmm-%%API_VERSION%%/glibmm.h -include/glibmm-%%API_VERSION%%/glibmm/arrayhandle.h -include/glibmm-%%API_VERSION%%/glibmm/balancedtree.h -include/glibmm-%%API_VERSION%%/glibmm/base64.h -include/glibmm-%%API_VERSION%%/glibmm/bytearray.h -include/glibmm-%%API_VERSION%%/glibmm/bytes.h -include/glibmm-%%API_VERSION%%/glibmm/checksum.h -include/glibmm-%%API_VERSION%%/glibmm/class.h -include/glibmm-%%API_VERSION%%/glibmm/containerhandle_shared.h -include/glibmm-%%API_VERSION%%/glibmm/containers.h -include/glibmm-%%API_VERSION%%/glibmm/convert.h -include/glibmm-%%API_VERSION%%/glibmm/date.h -include/glibmm-%%API_VERSION%%/glibmm/datetime.h -include/glibmm-%%API_VERSION%%/glibmm/debug.h -include/glibmm-%%API_VERSION%%/glibmm/dispatcher.h -include/glibmm-%%API_VERSION%%/glibmm/error.h -include/glibmm-%%API_VERSION%%/glibmm/exception.h -include/glibmm-%%API_VERSION%%/glibmm/exceptionhandler.h -include/glibmm-%%API_VERSION%%/glibmm/fileutils.h -include/glibmm-%%API_VERSION%%/glibmm/helperlist.h -include/glibmm-%%API_VERSION%%/glibmm/i18n-lib.h -include/glibmm-%%API_VERSION%%/glibmm/i18n.h -include/glibmm-%%API_VERSION%%/glibmm/init.h -include/glibmm-%%API_VERSION%%/glibmm/interface.h -include/glibmm-%%API_VERSION%%/glibmm/iochannel.h -include/glibmm-%%API_VERSION%%/glibmm/keyfile.h -include/glibmm-%%API_VERSION%%/glibmm/listhandle.h -include/glibmm-%%API_VERSION%%/glibmm/main.h -include/glibmm-%%API_VERSION%%/glibmm/markup.h -include/glibmm-%%API_VERSION%%/glibmm/miscutils.h -include/glibmm-%%API_VERSION%%/glibmm/module.h -include/glibmm-%%API_VERSION%%/glibmm/nodetree.h -include/glibmm-%%API_VERSION%%/glibmm/object.h -include/glibmm-%%API_VERSION%%/glibmm/objectbase.h -include/glibmm-%%API_VERSION%%/glibmm/optioncontext.h -include/glibmm-%%API_VERSION%%/glibmm/optionentry.h -include/glibmm-%%API_VERSION%%/glibmm/optiongroup.h -include/glibmm-%%API_VERSION%%/glibmm/pattern.h -include/glibmm-%%API_VERSION%%/glibmm/priorities.h -include/glibmm-%%API_VERSION%%/glibmm/private/balancedtree_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/bytearray_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/bytes_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/checksum_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/convert_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/date_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/datetime_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/fileutils_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/interface_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/iochannel_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/keyfile_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/markup_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/module_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/nodetree_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/object_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/optioncontext_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/optionentry_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/optiongroup_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/regex_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/shell_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/spawn_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/thread_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/threads_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/timezone_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/unicode_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/uriutils_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/valuearray_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/variant_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/variantdict_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/variantiter_p.h -include/glibmm-%%API_VERSION%%/glibmm/private/varianttype_p.h -include/glibmm-%%API_VERSION%%/glibmm/property.h -include/glibmm-%%API_VERSION%%/glibmm/propertyproxy.h -include/glibmm-%%API_VERSION%%/glibmm/propertyproxy_base.h -include/glibmm-%%API_VERSION%%/glibmm/quark.h -include/glibmm-%%API_VERSION%%/glibmm/random.h -include/glibmm-%%API_VERSION%%/glibmm/refptr.h -include/glibmm-%%API_VERSION%%/glibmm/regex.h -include/glibmm-%%API_VERSION%%/glibmm/sarray.h -include/glibmm-%%API_VERSION%%/glibmm/shell.h -include/glibmm-%%API_VERSION%%/glibmm/signalproxy.h -include/glibmm-%%API_VERSION%%/glibmm/signalproxy_connectionnode.h -include/glibmm-%%API_VERSION%%/glibmm/slisthandle.h -include/glibmm-%%API_VERSION%%/glibmm/spawn.h -include/glibmm-%%API_VERSION%%/glibmm/streamiochannel.h -include/glibmm-%%API_VERSION%%/glibmm/stringutils.h -include/glibmm-%%API_VERSION%%/glibmm/thread.h -include/glibmm-%%API_VERSION%%/glibmm/threadpool.h -include/glibmm-%%API_VERSION%%/glibmm/threads.h -include/glibmm-%%API_VERSION%%/glibmm/timer.h -include/glibmm-%%API_VERSION%%/glibmm/timeval.h -include/glibmm-%%API_VERSION%%/glibmm/timezone.h -include/glibmm-%%API_VERSION%%/glibmm/unicode.h -include/glibmm-%%API_VERSION%%/glibmm/uriutils.h -include/glibmm-%%API_VERSION%%/glibmm/ustring.h -include/glibmm-%%API_VERSION%%/glibmm/utility.h -include/glibmm-%%API_VERSION%%/glibmm/value.h -include/glibmm-%%API_VERSION%%/glibmm/value_basictypes.h -include/glibmm-%%API_VERSION%%/glibmm/value_custom.h -include/glibmm-%%API_VERSION%%/glibmm/valuearray.h -include/glibmm-%%API_VERSION%%/glibmm/variant.h -include/glibmm-%%API_VERSION%%/glibmm/variant_basictypes.h -include/glibmm-%%API_VERSION%%/glibmm/variantdict.h -include/glibmm-%%API_VERSION%%/glibmm/variantiter.h -include/glibmm-%%API_VERSION%%/glibmm/varianttype.h -include/glibmm-%%API_VERSION%%/glibmm/vectorutils.h -include/glibmm-%%API_VERSION%%/glibmm/wrap.h -include/glibmm-%%API_VERSION%%/glibmm/wrap_init.h -include/glibmm-%%API_VERSION%%/glibmm_generate_extra_defs/generate_extra_defs.h -lib/giomm-%%API_VERSION%%/include/giommconfig.h -lib/glibmm-%%API_VERSION%%/include/glibmmconfig.h +include/giomm-%%VERSION%%/giomm.h +include/giomm-%%VERSION%%/giomm/action.h +include/giomm-%%VERSION%%/giomm/actiongroup.h +include/giomm-%%VERSION%%/giomm/actionmap.h +include/giomm-%%VERSION%%/giomm/appinfo.h +include/giomm-%%VERSION%%/giomm/applaunchcontext.h +include/giomm-%%VERSION%%/giomm/application.h +include/giomm-%%VERSION%%/giomm/applicationcommandline.h +include/giomm-%%VERSION%%/giomm/asyncinitable.h +include/giomm-%%VERSION%%/giomm/asyncresult.h +include/giomm-%%VERSION%%/giomm/bufferedinputstream.h +include/giomm-%%VERSION%%/giomm/bufferedoutputstream.h +include/giomm-%%VERSION%%/giomm/cancellable.h +include/giomm-%%VERSION%%/giomm/charsetconverter.h +include/giomm-%%VERSION%%/giomm/contenttype.h +include/giomm-%%VERSION%%/giomm/converter.h +include/giomm-%%VERSION%%/giomm/converterinputstream.h +include/giomm-%%VERSION%%/giomm/converteroutputstream.h +include/giomm-%%VERSION%%/giomm/credentials.h +include/giomm-%%VERSION%%/giomm/datainputstream.h +include/giomm-%%VERSION%%/giomm/dataoutputstream.h +include/giomm-%%VERSION%%/giomm/dbusactiongroup.h +include/giomm-%%VERSION%%/giomm/dbusaddress.h +include/giomm-%%VERSION%%/giomm/dbusauthobserver.h +include/giomm-%%VERSION%%/giomm/dbusconnection.h +include/giomm-%%VERSION%%/giomm/dbuserror.h +include/giomm-%%VERSION%%/giomm/dbuserrorutils.h +include/giomm-%%VERSION%%/giomm/dbusinterface.h +include/giomm-%%VERSION%%/giomm/dbusinterfaceskeleton.h +include/giomm-%%VERSION%%/giomm/dbusinterfacevtable.h +include/giomm-%%VERSION%%/giomm/dbusintrospection.h +include/giomm-%%VERSION%%/giomm/dbusmenumodel.h +include/giomm-%%VERSION%%/giomm/dbusmessage.h +include/giomm-%%VERSION%%/giomm/dbusmethodinvocation.h +include/giomm-%%VERSION%%/giomm/dbusobject.h +include/giomm-%%VERSION%%/giomm/dbusownname.h +include/giomm-%%VERSION%%/giomm/dbusproxy.h +include/giomm-%%VERSION%%/giomm/dbusserver.h +include/giomm-%%VERSION%%/giomm/dbussubtreevtable.h +include/giomm-%%VERSION%%/giomm/dbusutils.h +include/giomm-%%VERSION%%/giomm/dbuswatchname.h +include/giomm-%%VERSION%%/giomm/desktopappinfo.h +include/giomm-%%VERSION%%/giomm/drive.h +include/giomm-%%VERSION%%/giomm/emblem.h +include/giomm-%%VERSION%%/giomm/emblemedicon.h +include/giomm-%%VERSION%%/giomm/enums.h +include/giomm-%%VERSION%%/giomm/error.h +include/giomm-%%VERSION%%/giomm/file.h +include/giomm-%%VERSION%%/giomm/fileattributeinfo.h +include/giomm-%%VERSION%%/giomm/fileattributeinfolist.h +include/giomm-%%VERSION%%/giomm/fileenumerator.h +include/giomm-%%VERSION%%/giomm/fileicon.h +include/giomm-%%VERSION%%/giomm/fileinfo.h +include/giomm-%%VERSION%%/giomm/fileinputstream.h +include/giomm-%%VERSION%%/giomm/fileiostream.h +include/giomm-%%VERSION%%/giomm/filemonitor.h +include/giomm-%%VERSION%%/giomm/filenamecompleter.h +include/giomm-%%VERSION%%/giomm/fileoutputstream.h +include/giomm-%%VERSION%%/giomm/filterinputstream.h +include/giomm-%%VERSION%%/giomm/filteroutputstream.h +include/giomm-%%VERSION%%/giomm/icon.h +include/giomm-%%VERSION%%/giomm/inetaddress.h +include/giomm-%%VERSION%%/giomm/inetsocketaddress.h +include/giomm-%%VERSION%%/giomm/init.h +include/giomm-%%VERSION%%/giomm/initable.h +include/giomm-%%VERSION%%/giomm/inputstream.h +include/giomm-%%VERSION%%/giomm/iostream.h +include/giomm-%%VERSION%%/giomm/loadableicon.h +include/giomm-%%VERSION%%/giomm/memoryinputstream.h +include/giomm-%%VERSION%%/giomm/memoryoutputstream.h +include/giomm-%%VERSION%%/giomm/menu.h +include/giomm-%%VERSION%%/giomm/menuattributeiter.h +include/giomm-%%VERSION%%/giomm/menuitem.h +include/giomm-%%VERSION%%/giomm/menulinkiter.h +include/giomm-%%VERSION%%/giomm/menumodel.h +include/giomm-%%VERSION%%/giomm/mount.h +include/giomm-%%VERSION%%/giomm/mountoperation.h +include/giomm-%%VERSION%%/giomm/networkaddress.h +include/giomm-%%VERSION%%/giomm/networkmonitor.h +include/giomm-%%VERSION%%/giomm/networkservice.h +include/giomm-%%VERSION%%/giomm/notification.h +include/giomm-%%VERSION%%/giomm/outputstream.h +include/giomm-%%VERSION%%/giomm/permission.h +include/giomm-%%VERSION%%/giomm/pollableinputstream.h +include/giomm-%%VERSION%%/giomm/pollableoutputstream.h +include/giomm-%%VERSION%%/giomm/private/action_p.h +include/giomm-%%VERSION%%/giomm/private/actiongroup_p.h +include/giomm-%%VERSION%%/giomm/private/actionmap_p.h +include/giomm-%%VERSION%%/giomm/private/appinfo_p.h +include/giomm-%%VERSION%%/giomm/private/applaunchcontext_p.h +include/giomm-%%VERSION%%/giomm/private/application_p.h +include/giomm-%%VERSION%%/giomm/private/applicationcommandline_p.h +include/giomm-%%VERSION%%/giomm/private/asyncinitable_p.h +include/giomm-%%VERSION%%/giomm/private/asyncresult_p.h +include/giomm-%%VERSION%%/giomm/private/bufferedinputstream_p.h +include/giomm-%%VERSION%%/giomm/private/bufferedoutputstream_p.h +include/giomm-%%VERSION%%/giomm/private/cancellable_p.h +include/giomm-%%VERSION%%/giomm/private/charsetconverter_p.h +include/giomm-%%VERSION%%/giomm/private/converter_p.h +include/giomm-%%VERSION%%/giomm/private/converterinputstream_p.h +include/giomm-%%VERSION%%/giomm/private/converteroutputstream_p.h +include/giomm-%%VERSION%%/giomm/private/credentials_p.h +include/giomm-%%VERSION%%/giomm/private/datainputstream_p.h +include/giomm-%%VERSION%%/giomm/private/dataoutputstream_p.h +include/giomm-%%VERSION%%/giomm/private/dbusactiongroup_p.h +include/giomm-%%VERSION%%/giomm/private/dbusaddress_p.h +include/giomm-%%VERSION%%/giomm/private/dbusauthobserver_p.h +include/giomm-%%VERSION%%/giomm/private/dbusconnection_p.h +include/giomm-%%VERSION%%/giomm/private/dbuserror_p.h +include/giomm-%%VERSION%%/giomm/private/dbuserrorutils_p.h +include/giomm-%%VERSION%%/giomm/private/dbusinterface_p.h +include/giomm-%%VERSION%%/giomm/private/dbusinterfaceskeleton_p.h +include/giomm-%%VERSION%%/giomm/private/dbusinterfacevtable_p.h +include/giomm-%%VERSION%%/giomm/private/dbusintrospection_p.h +include/giomm-%%VERSION%%/giomm/private/dbusmenumodel_p.h +include/giomm-%%VERSION%%/giomm/private/dbusmessage_p.h +include/giomm-%%VERSION%%/giomm/private/dbusmethodinvocation_p.h +include/giomm-%%VERSION%%/giomm/private/dbusobject_p.h +include/giomm-%%VERSION%%/giomm/private/dbusownname_p.h +include/giomm-%%VERSION%%/giomm/private/dbusproxy_p.h +include/giomm-%%VERSION%%/giomm/private/dbusserver_p.h +include/giomm-%%VERSION%%/giomm/private/dbussubtreevtable_p.h +include/giomm-%%VERSION%%/giomm/private/dbusutils_p.h +include/giomm-%%VERSION%%/giomm/private/dbuswatchname_p.h +include/giomm-%%VERSION%%/giomm/private/desktopappinfo_p.h +include/giomm-%%VERSION%%/giomm/private/drive_p.h +include/giomm-%%VERSION%%/giomm/private/emblem_p.h +include/giomm-%%VERSION%%/giomm/private/emblemedicon_p.h +include/giomm-%%VERSION%%/giomm/private/enums_p.h +include/giomm-%%VERSION%%/giomm/private/error_p.h +include/giomm-%%VERSION%%/giomm/private/file_p.h +include/giomm-%%VERSION%%/giomm/private/fileattributeinfo_p.h +include/giomm-%%VERSION%%/giomm/private/fileattributeinfolist_p.h +include/giomm-%%VERSION%%/giomm/private/fileenumerator_p.h +include/giomm-%%VERSION%%/giomm/private/fileicon_p.h +include/giomm-%%VERSION%%/giomm/private/fileinfo_p.h +include/giomm-%%VERSION%%/giomm/private/fileinputstream_p.h +include/giomm-%%VERSION%%/giomm/private/fileiostream_p.h +include/giomm-%%VERSION%%/giomm/private/filemonitor_p.h +include/giomm-%%VERSION%%/giomm/private/filenamecompleter_p.h +include/giomm-%%VERSION%%/giomm/private/fileoutputstream_p.h +include/giomm-%%VERSION%%/giomm/private/filterinputstream_p.h +include/giomm-%%VERSION%%/giomm/private/filteroutputstream_p.h +include/giomm-%%VERSION%%/giomm/private/icon_p.h +include/giomm-%%VERSION%%/giomm/private/inetaddress_p.h +include/giomm-%%VERSION%%/giomm/private/inetsocketaddress_p.h +include/giomm-%%VERSION%%/giomm/private/initable_p.h +include/giomm-%%VERSION%%/giomm/private/inputstream_p.h +include/giomm-%%VERSION%%/giomm/private/iostream_p.h +include/giomm-%%VERSION%%/giomm/private/loadableicon_p.h +include/giomm-%%VERSION%%/giomm/private/memoryinputstream_p.h +include/giomm-%%VERSION%%/giomm/private/memoryoutputstream_p.h +include/giomm-%%VERSION%%/giomm/private/menu_p.h +include/giomm-%%VERSION%%/giomm/private/menuattributeiter_p.h +include/giomm-%%VERSION%%/giomm/private/menuitem_p.h +include/giomm-%%VERSION%%/giomm/private/menulinkiter_p.h +include/giomm-%%VERSION%%/giomm/private/menumodel_p.h +include/giomm-%%VERSION%%/giomm/private/mount_p.h +include/giomm-%%VERSION%%/giomm/private/mountoperation_p.h +include/giomm-%%VERSION%%/giomm/private/networkaddress_p.h +include/giomm-%%VERSION%%/giomm/private/networkmonitor_p.h +include/giomm-%%VERSION%%/giomm/private/networkservice_p.h +include/giomm-%%VERSION%%/giomm/private/notification_p.h +include/giomm-%%VERSION%%/giomm/private/outputstream_p.h +include/giomm-%%VERSION%%/giomm/private/pollableinputstream_p.h +include/giomm-%%VERSION%%/giomm/private/pollableoutputstream_p.h +include/giomm-%%VERSION%%/giomm/private/permission_p.h +include/giomm-%%VERSION%%/giomm/private/simplepermission_p.h +include/giomm-%%VERSION%%/giomm/private/proxy_p.h +include/giomm-%%VERSION%%/giomm/private/proxyaddress_p.h +include/giomm-%%VERSION%%/giomm/private/proxyresolver_p.h +include/giomm-%%VERSION%%/giomm/private/remoteactiongroup_p.h +include/giomm-%%VERSION%%/giomm/private/resolver_p.h +include/giomm-%%VERSION%%/giomm/private/resource_p.h +include/giomm-%%VERSION%%/giomm/private/seekable_p.h +include/giomm-%%VERSION%%/giomm/private/settings_p.h +include/giomm-%%VERSION%%/giomm/private/simpleaction_p.h +include/giomm-%%VERSION%%/giomm/private/simpleactiongroup_p.h +include/giomm-%%VERSION%%/giomm/private/socket_p.h +include/giomm-%%VERSION%%/giomm/private/socketaddress_p.h +include/giomm-%%VERSION%%/giomm/private/socketaddressenumerator_p.h +include/giomm-%%VERSION%%/giomm/private/socketclient_p.h +include/giomm-%%VERSION%%/giomm/private/socketconnectable_p.h +include/giomm-%%VERSION%%/giomm/private/socketconnection_p.h +include/giomm-%%VERSION%%/giomm/private/socketcontrolmessage_p.h +include/giomm-%%VERSION%%/giomm/private/socketlistener_p.h +include/giomm-%%VERSION%%/giomm/private/socketservice_p.h +include/giomm-%%VERSION%%/giomm/private/srvtarget_p.h +include/giomm-%%VERSION%%/giomm/private/tcpconnection_p.h +include/giomm-%%VERSION%%/giomm/private/tcpwrapperconnection_p.h +include/giomm-%%VERSION%%/giomm/private/themedicon_p.h +include/giomm-%%VERSION%%/giomm/private/threadedsocketservice_p.h +include/giomm-%%VERSION%%/giomm/private/tlscertificate_p.h +include/giomm-%%VERSION%%/giomm/private/tlsclientconnection_p.h +include/giomm-%%VERSION%%/giomm/private/tlsconnection_p.h +include/giomm-%%VERSION%%/giomm/private/tlsdatabase_p.h +include/giomm-%%VERSION%%/giomm/private/tlsinteraction_p.h +include/giomm-%%VERSION%%/giomm/private/tlspassword_p.h +include/giomm-%%VERSION%%/giomm/private/tlsserverconnection_p.h +include/giomm-%%VERSION%%/giomm/private/unixconnection_p.h +include/giomm-%%VERSION%%/giomm/private/unixcredentialsmessage_p.h +include/giomm-%%VERSION%%/giomm/private/unixfdlist_p.h +include/giomm-%%VERSION%%/giomm/private/unixfdmessage_p.h +include/giomm-%%VERSION%%/giomm/private/unixinputstream_p.h +include/giomm-%%VERSION%%/giomm/private/unixoutputstream_p.h +include/giomm-%%VERSION%%/giomm/private/unixsocketaddress_p.h +include/giomm-%%VERSION%%/giomm/private/volume_p.h +include/giomm-%%VERSION%%/giomm/private/volumemonitor_p.h +include/giomm-%%VERSION%%/giomm/private/zlibcompressor_p.h +include/giomm-%%VERSION%%/giomm/private/zlibdecompressor_p.h +include/giomm-%%VERSION%%/giomm/proxy.h +include/giomm-%%VERSION%%/giomm/proxyaddress.h +include/giomm-%%VERSION%%/giomm/proxyresolver.h +include/giomm-%%VERSION%%/giomm/remoteactiongroup.h +include/giomm-%%VERSION%%/giomm/resolver.h +include/giomm-%%VERSION%%/giomm/resource.h +include/giomm-%%VERSION%%/giomm/seekable.h +include/giomm-%%VERSION%%/giomm/settings.h +include/giomm-%%VERSION%%/giomm/simpleaction.h +include/giomm-%%VERSION%%/giomm/simpleactiongroup.h +include/giomm-%%VERSION%%/giomm/simplepermission.h +include/giomm-%%VERSION%%/giomm/socket.h +include/giomm-%%VERSION%%/giomm/socketaddress.h +include/giomm-%%VERSION%%/giomm/socketaddressenumerator.h +include/giomm-%%VERSION%%/giomm/socketclient.h +include/giomm-%%VERSION%%/giomm/socketconnectable.h +include/giomm-%%VERSION%%/giomm/socketconnection.h +include/giomm-%%VERSION%%/giomm/socketcontrolmessage.h +include/giomm-%%VERSION%%/giomm/socketlistener.h +include/giomm-%%VERSION%%/giomm/socketservice.h +include/giomm-%%VERSION%%/giomm/socketsource.h +include/giomm-%%VERSION%%/giomm/srvtarget.h +include/giomm-%%VERSION%%/giomm/tcpconnection.h +include/giomm-%%VERSION%%/giomm/tcpwrapperconnection.h +include/giomm-%%VERSION%%/giomm/themedicon.h +include/giomm-%%VERSION%%/giomm/threadedsocketservice.h +include/giomm-%%VERSION%%/giomm/tlscertificate.h +include/giomm-%%VERSION%%/giomm/tlsclientconnection.h +include/giomm-%%VERSION%%/giomm/tlsconnection.h +include/giomm-%%VERSION%%/giomm/tlsdatabase.h +include/giomm-%%VERSION%%/giomm/tlsinteraction.h +include/giomm-%%VERSION%%/giomm/tlspassword.h +include/giomm-%%VERSION%%/giomm/tlsserverconnection.h +include/giomm-%%VERSION%%/giomm/unixconnection.h +include/giomm-%%VERSION%%/giomm/unixcredentialsmessage.h +include/giomm-%%VERSION%%/giomm/unixfdlist.h +include/giomm-%%VERSION%%/giomm/unixfdmessage.h +include/giomm-%%VERSION%%/giomm/unixinputstream.h +include/giomm-%%VERSION%%/giomm/unixoutputstream.h +include/giomm-%%VERSION%%/giomm/unixsocketaddress.h +include/giomm-%%VERSION%%/giomm/volume.h +include/giomm-%%VERSION%%/giomm/volumemonitor.h +include/giomm-%%VERSION%%/giomm/wrap_init.h +include/giomm-%%VERSION%%/giomm/zlibcompressor.h +include/giomm-%%VERSION%%/giomm/zlibdecompressor.h +include/glibmm-%%VERSION%%/glibmm.h +include/glibmm-%%VERSION%%/glibmm/arrayhandle.h +include/glibmm-%%VERSION%%/glibmm/balancedtree.h +include/glibmm-%%VERSION%%/glibmm/base64.h +include/glibmm-%%VERSION%%/glibmm/binding.h +include/glibmm-%%VERSION%%/glibmm/bytearray.h +include/glibmm-%%VERSION%%/glibmm/bytes.h +include/glibmm-%%VERSION%%/glibmm/checksum.h +include/glibmm-%%VERSION%%/glibmm/class.h +include/glibmm-%%VERSION%%/glibmm/containerhandle_shared.h +include/glibmm-%%VERSION%%/glibmm/containers.h +include/glibmm-%%VERSION%%/glibmm/convert.h +include/glibmm-%%VERSION%%/glibmm/date.h +include/glibmm-%%VERSION%%/glibmm/datetime.h +include/glibmm-%%VERSION%%/glibmm/debug.h +include/glibmm-%%VERSION%%/glibmm/dispatcher.h +include/glibmm-%%VERSION%%/glibmm/error.h +include/glibmm-%%VERSION%%/glibmm/exception.h +include/glibmm-%%VERSION%%/glibmm/exceptionhandler.h +include/glibmm-%%VERSION%%/glibmm/fileutils.h +include/glibmm-%%VERSION%%/glibmm/helperlist.h +include/glibmm-%%VERSION%%/glibmm/i18n-lib.h +include/glibmm-%%VERSION%%/glibmm/i18n.h +include/glibmm-%%VERSION%%/glibmm/init.h +include/glibmm-%%VERSION%%/glibmm/interface.h +include/glibmm-%%VERSION%%/glibmm/iochannel.h +include/glibmm-%%VERSION%%/glibmm/keyfile.h +include/glibmm-%%VERSION%%/glibmm/listhandle.h +include/glibmm-%%VERSION%%/glibmm/main.h +include/glibmm-%%VERSION%%/glibmm/markup.h +include/glibmm-%%VERSION%%/glibmm/miscutils.h +include/glibmm-%%VERSION%%/glibmm/module.h +include/glibmm-%%VERSION%%/glibmm/nodetree.h +include/glibmm-%%VERSION%%/glibmm/object.h +include/glibmm-%%VERSION%%/glibmm/objectbase.h +include/glibmm-%%VERSION%%/glibmm/optioncontext.h +include/glibmm-%%VERSION%%/glibmm/optionentry.h +include/glibmm-%%VERSION%%/glibmm/optiongroup.h +include/glibmm-%%VERSION%%/glibmm/pattern.h +include/glibmm-%%VERSION%%/glibmm/priorities.h +include/glibmm-%%VERSION%%/glibmm/private/balancedtree_p.h +include/glibmm-%%VERSION%%/glibmm/private/binding_p.h +include/glibmm-%%VERSION%%/glibmm/private/bytearray_p.h +include/glibmm-%%VERSION%%/glibmm/private/bytes_p.h +include/glibmm-%%VERSION%%/glibmm/private/checksum_p.h +include/glibmm-%%VERSION%%/glibmm/private/convert_p.h +include/glibmm-%%VERSION%%/glibmm/private/date_p.h +include/glibmm-%%VERSION%%/glibmm/private/datetime_p.h +include/glibmm-%%VERSION%%/glibmm/private/fileutils_p.h +include/glibmm-%%VERSION%%/glibmm/private/interface_p.h +include/glibmm-%%VERSION%%/glibmm/private/iochannel_p.h +include/glibmm-%%VERSION%%/glibmm/private/keyfile_p.h +include/glibmm-%%VERSION%%/glibmm/private/markup_p.h +include/glibmm-%%VERSION%%/glibmm/private/module_p.h +include/glibmm-%%VERSION%%/glibmm/private/nodetree_p.h +include/glibmm-%%VERSION%%/glibmm/private/object_p.h +include/glibmm-%%VERSION%%/glibmm/private/optioncontext_p.h +include/glibmm-%%VERSION%%/glibmm/private/optionentry_p.h +include/glibmm-%%VERSION%%/glibmm/private/optiongroup_p.h +include/glibmm-%%VERSION%%/glibmm/private/regex_p.h +include/glibmm-%%VERSION%%/glibmm/private/shell_p.h +include/glibmm-%%VERSION%%/glibmm/private/spawn_p.h +include/glibmm-%%VERSION%%/glibmm/private/thread_p.h +include/glibmm-%%VERSION%%/glibmm/private/threads_p.h +include/glibmm-%%VERSION%%/glibmm/private/timezone_p.h +include/glibmm-%%VERSION%%/glibmm/private/unicode_p.h +include/glibmm-%%VERSION%%/glibmm/private/uriutils_p.h +include/glibmm-%%VERSION%%/glibmm/private/valuearray_p.h +include/glibmm-%%VERSION%%/glibmm/private/variant_p.h +include/glibmm-%%VERSION%%/glibmm/private/variantdict_p.h +include/glibmm-%%VERSION%%/glibmm/private/variantiter_p.h +include/glibmm-%%VERSION%%/glibmm/private/varianttype_p.h +include/glibmm-%%VERSION%%/glibmm/property.h +include/glibmm-%%VERSION%%/glibmm/propertyproxy.h +include/glibmm-%%VERSION%%/glibmm/propertyproxy_base.h +include/glibmm-%%VERSION%%/glibmm/quark.h +include/glibmm-%%VERSION%%/glibmm/random.h +include/glibmm-%%VERSION%%/glibmm/refptr.h +include/glibmm-%%VERSION%%/glibmm/regex.h +include/glibmm-%%VERSION%%/glibmm/sarray.h +include/glibmm-%%VERSION%%/glibmm/shell.h +include/glibmm-%%VERSION%%/glibmm/signalproxy.h +include/glibmm-%%VERSION%%/glibmm/signalproxy_connectionnode.h +include/glibmm-%%VERSION%%/glibmm/slisthandle.h +include/glibmm-%%VERSION%%/glibmm/spawn.h +include/glibmm-%%VERSION%%/glibmm/streamiochannel.h +include/glibmm-%%VERSION%%/glibmm/stringutils.h +include/glibmm-%%VERSION%%/glibmm/thread.h +include/glibmm-%%VERSION%%/glibmm/threadpool.h +include/glibmm-%%VERSION%%/glibmm/threads.h +include/glibmm-%%VERSION%%/glibmm/timer.h +include/glibmm-%%VERSION%%/glibmm/timeval.h +include/glibmm-%%VERSION%%/glibmm/timezone.h +include/glibmm-%%VERSION%%/glibmm/unicode.h +include/glibmm-%%VERSION%%/glibmm/uriutils.h +include/glibmm-%%VERSION%%/glibmm/ustring.h +include/glibmm-%%VERSION%%/glibmm/utility.h +include/glibmm-%%VERSION%%/glibmm/value.h +include/glibmm-%%VERSION%%/glibmm/value_basictypes.h +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/variantdict.h +include/glibmm-%%VERSION%%/glibmm/variantiter.h +include/glibmm-%%VERSION%%/glibmm/varianttype.h +include/glibmm-%%VERSION%%/glibmm/vectorutils.h +include/glibmm-%%VERSION%%/glibmm/wrap.h +include/glibmm-%%VERSION%%/glibmm/wrap_init.h +include/glibmm-%%VERSION%%/glibmm_generate_extra_defs/generate_extra_defs.h +lib/giomm-%%VERSION%%/include/giommconfig.h +lib/glibmm-%%VERSION%%/include/glibmmconfig.h lib/glibmm-%%VERSION%%/proc/generate_wrap_init.pl lib/glibmm-%%VERSION%%/proc/gmmproc lib/glibmm-%%VERSION%%/proc/m4/base.m4 @@ -410,5 +416,5 @@ lib/libglibmm-%%VERSION%%.so.1.3.0 lib/libglibmm_generate_extra_defs-%%VERSION%%.so lib/libglibmm_generate_extra_defs-%%VERSION%%.so.1 lib/libglibmm_generate_extra_defs-%%VERSION%%.so.1.3.0 -libdata/pkgconfig/giomm-%%API_VERSION%%.pc -libdata/pkgconfig/glibmm-%%API_VERSION%%.pc +libdata/pkgconfig/giomm-%%VERSION%%.pc +libdata/pkgconfig/glibmm-%%VERSION%%.pc diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile index cc33b98ed121..eb6425f27937 100644 --- a/devel/gnome-common/Makefile +++ b/devel/gnome-common/Makefile @@ -3,6 +3,7 @@ PORTNAME= gnome-common PORTVERSION= 3.14.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -10,7 +11,14 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Common automake macros for GNOME 3 +BUILD_DEPENDS= autoconf-archive>=0:${PORTSDIR}/devel/autoconf-archive + USES= gmake pkgconfig tar:xz GNU_CONFIGURE= yes +# remove files provided by autoconf-archive +post-install: + @${RM} ${STAGEDIR}${PREFIX}/share/aclocal/ax_check_enable_debug.m4 + @${RM} ${STAGEDIR}${PREFIX}/share/aclocal/ax_code_coverage.m4 + .include <bsd.port.mk> diff --git a/devel/gnome-common/pkg-plist b/devel/gnome-common/pkg-plist index f3f77e1d0ff8..c6a577c3a2a4 100644 --- a/devel/gnome-common/pkg-plist +++ b/devel/gnome-common/pkg-plist @@ -1,7 +1,5 @@ bin/gnome-autogen.sh bin/gnome-doc-common -share/aclocal/ax_check_enable_debug.m4 -share/aclocal/ax_code_coverage.m4 share/aclocal/gnome-code-coverage.m4 share/aclocal/gnome-common.m4 share/aclocal/gnome-compiler-flags.m4 diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index 84c2cfe0fb2c..94da0f86e05b 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -1,6 +1,5 @@ # Created by: Ade Lovett <ade@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/devel/gnome-vfs/Makefile,v 1.191 2010/09/29 12:30:29 kwm Exp $ PORTNAME= gnome-vfs PORTVERSION= 2.24.4 @@ -19,8 +18,7 @@ USES= tar:bzip2 RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info USES+= gettext gmake libtool:keepla pathfix pkgconfig -USE_GNOME= gnomeprefix intlhack gnomemimedata gconf2 \ - referencehack +USE_GNOME= gconf2 gnomemimedata intlhack referencehack INSTALL_TARGET= install-strip USE_OPENSSL= yes USE_LDCONFIG= yes diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile index 0c93f265578f..20f2504f9f27 100644 --- a/devel/gobject-introspection/Makefile +++ b/devel/gobject-introspection/Makefile @@ -1,9 +1,8 @@ # Created by: Alexander Logvinov <avl@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/devel/gobject-introspection/Makefile 20031 2014-11-02 21:47:55Z kwm $ PORTNAME= gobject-introspection -PORTVERSION= 1.42.0 +PORTVERSION= 1.44.0 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -15,6 +14,8 @@ COMMENT= Generate interface introspection data for GObject libraries BUILD_DEPENDS= cairo-trace:${PORTSDIR}/graphics/cairo LIB_DEPENDS= libffi.so:${PORTSDIR}/devel/libffi +PORTSCOUT= limitw:1,even + USES= bison gettext gmake libtool pathfix pkgconfig \ python:2 tar:xz GNU_CONFIGURE= yes @@ -22,6 +23,7 @@ USE_GNOME= glib20 USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib +CONFIGURE_ARGS= --disable-doctool INSTALL_TARGET= install-strip # Force it to put the .cache in ${WRKSRC} instead of ~/.cache. ports/143260 diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo index d5ce5b50693c..95797833c864 100644 --- a/devel/gobject-introspection/distinfo +++ b/devel/gobject-introspection/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/gobject-introspection-1.42.0.tar.xz) = 3ba2edfad4f71d4f0de16960b5d5f2511335fa646b2c49bbb93ce5942b3f95f7 -SIZE (gnome3/gobject-introspection-1.42.0.tar.xz) = 1308056 +SHA256 (gnome3/gobject-introspection-1.44.0.tar.xz) = 6f0c2c28aeaa37b5037acbf21558098c4f95029b666db755d3a12c2f1e1627ad +SIZE (gnome3/gobject-introspection-1.44.0.tar.xz) = 1319168 diff --git a/devel/gsettings-desktop-schemas/Makefile b/devel/gsettings-desktop-schemas/Makefile index b72d01998dd0..46743499868c 100644 --- a/devel/gsettings-desktop-schemas/Makefile +++ b/devel/gsettings-desktop-schemas/Makefile @@ -1,9 +1,8 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/devel/gsettings-desktop-schemas/Makefile 20031 2014-11-02 21:47:55Z kwm $ PORTNAME= gsettings-desktop-schemas -PORTVERSION= 3.14.1 +PORTVERSION= 3.16.1 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -15,6 +14,8 @@ LICENSE= LGPL21 RUN_DEPENDS= ${LOCALBASE}/etc/fonts/conf.avail/31-cantarell.conf:${PORTSDIR}/x11-fonts/cantarell-fonts +PORTSCOUT= limitw:1,even + USES= gettext gmake pathfix perl5 pkgconfig tar:xz USE_PERL5= build USE_GNOME= intltool glib20 introspection:build @@ -35,15 +36,16 @@ GLIB_SCHEMAS= org.gnome.desktop.a11y.applications.gschema.xml \ org.gnome.desktop.input-sources.gschema.xml \ org.gnome.desktop.interface.gschema.xml \ org.gnome.desktop.lockdown.gschema.xml \ - org.gnome.desktop.notifications.gschema.xml \ org.gnome.desktop.media-handling.gschema.xml \ + org.gnome.desktop.notifications.gschema.xml \ + org.gnome.desktop.peripherals.gschema.xml \ org.gnome.desktop.privacy.gschema.xml \ - org.gnome.desktop.search-providers.gschema.xml \ org.gnome.desktop.screensaver.gschema.xml \ + org.gnome.desktop.search-providers.gschema.xml \ org.gnome.desktop.session.gschema.xml \ org.gnome.desktop.sound.gschema.xml \ - org.gnome.desktop.thumbnailers.gschema.xml \ org.gnome.desktop.thumbnail-cache.gschema.xml \ + org.gnome.desktop.thumbnailers.gschema.xml \ org.gnome.desktop.wm.keybindings.gschema.xml \ org.gnome.desktop.wm.preferences.gschema.xml \ org.gnome.system.locale.gschema.xml \ diff --git a/devel/gsettings-desktop-schemas/distinfo b/devel/gsettings-desktop-schemas/distinfo index dc23bd729bfc..70d0a03b53ad 100644 --- a/devel/gsettings-desktop-schemas/distinfo +++ b/devel/gsettings-desktop-schemas/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/gsettings-desktop-schemas-3.14.1.tar.xz) = 217eba09f0fb263dcb8ce6efa21c9afaf0504ac1d937732d1af1c6724c05f065 -SIZE (gnome3/gsettings-desktop-schemas-3.14.1.tar.xz) = 495956 +SHA256 (gnome3/gsettings-desktop-schemas-3.16.1.tar.xz) = 74fe9fdad510c8a6666febeceb7ebafc581ef990b3afcc8c1e8b5d90b24b3461 +SIZE (gnome3/gsettings-desktop-schemas-3.16.1.tar.xz) = 547752 diff --git a/devel/gsettings-desktop-schemas/pkg-plist b/devel/gsettings-desktop-schemas/pkg-plist index 5e8153166618..068317f04e9b 100644 --- a/devel/gsettings-desktop-schemas/pkg-plist +++ b/devel/gsettings-desktop-schemas/pkg-plist @@ -6,6 +6,7 @@ share/GConf/gsettings/wm-schemas.convert share/gir-1.0/GDesktopEnums-3.0.gir share/locale/as/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/bg/LC_MESSAGES/gsettings-desktop-schemas.mo +share/locale/bs/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/ca/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/ca@valencia/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/cs/LC_MESSAGES/gsettings-desktop-schemas.mo @@ -26,6 +27,7 @@ share/locale/hu/LC_MESSAGES/gsettings-desktop-schemas.mo share/locale/id/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 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 diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile index 91ea6bb569a8..33c1afc540d9 100644 --- a/devel/gtranslator/Makefile +++ b/devel/gtranslator/Makefile @@ -1,10 +1,8 @@ # Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/devel/gtranslator/Makefile 19822 2014-08-20 08:57:46Z gusi $ PORTNAME= gtranslator -PORTVERSION= 2.91.6 -PORTREVISION= 1 +PORTVERSION= 2.91.7 CATEGORIES= devel gnome MASTER_SITES= GNOME diff --git a/devel/gtranslator/distinfo b/devel/gtranslator/distinfo index d5529294f8c7..96bdd06084c1 100644 --- a/devel/gtranslator/distinfo +++ b/devel/gtranslator/distinfo @@ -1,2 +1,2 @@ -SHA256 (gtranslator-2.91.6.tar.xz) = a1fd4b17b1f32cc7223a31d34e34f95b20acc7b5a23768351a34ff0b7a4bcdf6 -SIZE (gtranslator-2.91.6.tar.xz) = 2235796 +SHA256 (gtranslator-2.91.7.tar.xz) = 2b25b45b33e4aa856953b4a5da1d98bd51a343ddb479aeae3934bfe0c3651f9d +SIZE (gtranslator-2.91.7.tar.xz) = 2835836 diff --git a/devel/gtranslator/files/patch-configure b/devel/gtranslator/files/patch-configure deleted file mode 100644 index bd473d7f666c..000000000000 --- a/devel/gtranslator/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig Sat Aug 7 01:53:34 2004 -+++ configure Sat Aug 7 01:53:40 2004 -@@ -5284,7 +5284,7 @@ - if test "x$enable_debug" = "xyes" ; then - CFLAGS="$CFLAGS -ggdb " - else -- CFLAGS="`echo $CFLAGS|sed -e s/-g.//g -e s/-ggdb//g`" -+# CFLAGS="`echo $CFLAGS|sed -e s/-g.//g -e s/-ggdb//g`" - fi - echo "$as_me:$LINENO: result: $enable_debug" >&5 - echo "${ECHO_T}$enable_debug" >&6 diff --git a/devel/gtranslator/pkg-plist b/devel/gtranslator/pkg-plist index 5778d1391ab5..82605493ff92 100644 --- a/devel/gtranslator/pkg-plist +++ b/devel/gtranslator/pkg-plist @@ -48,6 +48,7 @@ lib/gtranslator/plugins/libtranslation-memory.a lib/gtranslator/plugins/libtranslation-memory.so libdata/pkgconfig/gtranslator.pc man/man1/gtranslator.1.gz +share/appdata/gtranslator.appdata.xml share/applications/gtranslator.desktop %%DOCSDIR%%/ExtendedClassDiagram.png %%DOCSDIR%%/SingleClassDiagram.png @@ -74,9 +75,12 @@ share/applications/gtranslator.desktop %%DOCSDIR%%/home.png %%DOCSDIR%%/index.html %%DOCSDIR%%/index.sgml +%%DOCSDIR%%/left-insensitive.png %%DOCSDIR%%/left.png +%%DOCSDIR%%/right-insensitive.png %%DOCSDIR%%/right.png %%DOCSDIR%%/style.css +%%DOCSDIR%%/up-insensitive.png %%DOCSDIR%%/up.png %%DATADIR%%/dtd/umtf.dtd %%DATADIR%%/gir-1.0/Gtranslator-3.0.gir @@ -563,6 +567,57 @@ share/help/ja/gtranslator/gtr-use-delete-entry.page share/help/ja/gtranslator/gtr-wizzard.page share/help/ja/gtranslator/index.page share/help/ja/gtranslator/license.page +share/help/pt_BR/gtranslator/figures/Gtranslator_022.png +share/help/pt_BR/gtranslator/figures/Gtranslator_023.png +share/help/pt_BR/gtranslator/figures/Gtranslator_025.png +share/help/pt_BR/gtranslator/figures/Gtranslator_026.png +share/help/pt_BR/gtranslator/figures/Gtranslator_027.png +share/help/pt_BR/gtranslator/figures/add-profile.png +share/help/pt_BR/gtranslator/figures/comment-text.png +share/help/pt_BR/gtranslator/figures/edit-profile.png +share/help/pt_BR/gtranslator/figures/edit-text.png +share/help/pt_BR/gtranslator/figures/edit-toolbar.png +share/help/pt_BR/gtranslator/figures/edit_header.png +share/help/pt_BR/gtranslator/figures/edit_header2.png +share/help/pt_BR/gtranslator/figures/gtr-prefs-tm.png +share/help/pt_BR/gtranslator/figures/gtrans_go_to_string_menu.png +share/help/pt_BR/gtranslator/figures/gtranslator-plugins.png +share/help/pt_BR/gtranslator/figures/gtranslator.png +share/help/pt_BR/gtranslator/figures/gtranslator22.png +share/help/pt_BR/gtranslator/figures/gtranslator32.png +share/help/pt_BR/gtranslator/figures/gtranslator_interface.png +share/help/pt_BR/gtranslator/figures/gtranslator_tm_strings.png +share/help/pt_BR/gtranslator/figures/message-detail.png +share/help/pt_BR/gtranslator/figures/mover1.png +share/help/pt_BR/gtranslator/figures/mover2.png +share/help/pt_BR/gtranslator/figures/mover3.png +share/help/pt_BR/gtranslator/figures/mover4.png +share/help/pt_BR/gtranslator/figures/mover5.png +share/help/pt_BR/gtranslator/figures/profiles2.png +share/help/pt_BR/gtranslator/figures/tm-manager.png +share/help/pt_BR/gtranslator/figures/use-tm-entry.png +share/help/pt_BR/gtranslator/gtr-add-comment-po.page +share/help/pt_BR/gtranslator/gtr-concepts.page +share/help/pt_BR/gtranslator/gtr-create-tm.page +share/help/pt_BR/gtranslator/gtr-custom.page +share/help/pt_BR/gtranslator/gtr-edit-header.page +share/help/pt_BR/gtranslator/gtr-edit-po.page +share/help/pt_BR/gtranslator/gtr-faq.page +share/help/pt_BR/gtranslator/gtr-goto-string-po.page +share/help/pt_BR/gtranslator/gtr-join-users.page +share/help/pt_BR/gtranslator/gtr-main-window.page +share/help/pt_BR/gtranslator/gtr-open-po.page +share/help/pt_BR/gtranslator/gtr-plugins.page +share/help/pt_BR/gtranslator/gtr-profiles.page +share/help/pt_BR/gtranslator/gtr-quickstart.page +share/help/pt_BR/gtranslator/gtr-report-problem.page +share/help/pt_BR/gtranslator/gtr-save-po.page +share/help/pt_BR/gtranslator/gtr-shortcut-keys.page +share/help/pt_BR/gtranslator/gtr-translate.page +share/help/pt_BR/gtranslator/gtr-use-delete-entry.page +share/help/pt_BR/gtranslator/gtr-wizzard.page +share/help/pt_BR/gtranslator/index.page +share/help/pt_BR/gtranslator/license.page share/help/ru/gtranslator/figures/Gtranslator_022.png share/help/ru/gtranslator/figures/Gtranslator_023.png share/help/ru/gtranslator/figures/Gtranslator_025.png diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile index 7f4f0fb32676..86fea0384e3a 100644 --- a/devel/gvfs/Makefile +++ b/devel/gvfs/Makefile @@ -1,10 +1,9 @@ # Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/devel/gvfs/Makefile 19827 2014-08-24 08:15:41Z gusi $ PORTNAME= gvfs -PORTVERSION= 1.20.3 -PORTREVISION= 4 +PORTVERSION= 1.24.1 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -21,13 +20,12 @@ LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \ PORTSCOUT= limitw:1,even USES= gettext gmake libarchive libtool pathfix pkgconfig tar:xz -USE_GNOME= glib20 gnomeprefix intlhack intltool libxslt:build +USE_GNOME= glib20 intlhack libxslt:build GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-obexftp \ - --disable-bluray \ - --disable-afc + --disable-bluray CONFIGURE_ARGS+=\ --disable-gudev \ @@ -37,7 +35,6 @@ CONFIGURE_ARGS+=\ --disable-udev \ --disable-goa \ --disable-keyring \ - --disable-bluray \ --disable-libmtp \ --disable-gtk @@ -46,11 +43,12 @@ INSTALL_TARGET= install-strip GLIB_SCHEMAS= org.gnome.system.gvfs.enums.xml OPTIONS_SUB= yes -OPTIONS_DEFINE= AVAHI SAMBA GPHOTO2 CDDA HAL FUSE +OPTIONS_DEFINE= AVAHI SAMBA GPHOTO2 CDDA HAL FUSE AFC OPTIONS_DEFAULT=AVAHI SAMBA GPHOTO2 CDDA HAL FUSE CDDA_DESC= CDDA (enables HAL) GPHOTO2_DESC= Gphoto 2 camera support (enables HAL) SAMBA_DESC= Samba support +AFC_DESC= Apple device support FUSE_USES= fuse FUSE_CONFIGURE_ENABLE= fuse @@ -67,6 +65,10 @@ GPHOTO2_CONFIGURE_ENABLE= gphoto2 AVAHI_LIB_DEPENDS= libavahi-client.so:${PORTSDIR}/net/avahi-app AVAHI_CONFIGURE_ENABLE= avahi +AFC_LIB_DEPENDS= libimobiledevice.so:${PORTSDIR}/comms/libimobiledevice \ + libplist.so:${PORTSDIR}/devel/libplist +AFC_CONFIGURE_ENABLE= afc + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MSAMBA} @@ -92,6 +94,5 @@ post-patch: post-install: @${MKDIR} ${STAGEDIR}${DATADIR}/remote-volume-monitors - ${TOUCH} ${STAGEDIR}${DATADIR}/remote-volume-monitors/.keep .include <bsd.port.mk> diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo index 7297317d5eae..c77e1297275c 100644 --- a/devel/gvfs/distinfo +++ b/devel/gvfs/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/gvfs-1.20.3.tar.xz) = 646b1906b1c85876fa07299246855f16836080466dde1826003bbbd4b9415cba -SIZE (gnome3/gvfs-1.20.3.tar.xz) = 1558028 +SHA256 (gnome3/gvfs-1.24.1.tar.xz) = d38367ce189415c36fd19dca478bc9b80694b495c3458e74fb0f13d1ac9df1f9 +SIZE (gnome3/gvfs-1.24.1.tar.xz) = 1624212 diff --git a/devel/gvfs/files/common_Makefile.am b/devel/gvfs/files/common_Makefile.am new file mode 100644 index 000000000000..5cd673a4c1dc --- /dev/null +++ b/devel/gvfs/files/common_Makefile.am @@ -0,0 +1,18 @@ +--- common/Makefile.am.orig 2015-02-13 07:19:44 UTC ++++ common/Makefile.am +@@ -43,6 +43,15 @@ libgvfscommon_la_LIBADD = \ + $(GLIB_LIBS) \ + $(BLURAY_LIBS) + ++if USE_HAL ++libgvfscommon_la_SOURCES += \ ++ gvfsdbusutils.c gvfsdbusutils.h ++libgvfscommon_la_CFLAGS += \ ++ $(DBUS_CFLAGS) ++libgvfscommon_la_LIBADD = \ ++ $(DBUS_LIBS) ++endif ++ + libgvfscommon_monitor_la_SOURCES = \ + gvfsmountinfo.h gvfsmountinfo.c \ + $(NULL) diff --git a/devel/gvfs/files/monitor_hal_Makefile.am b/devel/gvfs/files/monitor_hal_Makefile.am new file mode 100644 index 000000000000..f6f626b4bc83 --- /dev/null +++ b/devel/gvfs/files/monitor_hal_Makefile.am @@ -0,0 +1,10 @@ +--- monitor/hal/Makefile.am.orig 2015-02-03 15:52:20 UTC ++++ monitor/hal/Makefile.am +@@ -23,7 +23,6 @@ gvfs_hal_volume_monitor_SOURCES = \ + ghalvolume.c ghalvolume.h \ + ghalmount.c ghalmount.h \ + ghalvolumemonitor.c ghalvolumemonitor.h \ +- gvfsdbusutils.c gvfsdbusutils.h \ + $(NULL) + + gvfs_hal_volume_monitor_CFLAGS = \ diff --git a/devel/gvfs/files/patch-common_Makefile.in b/devel/gvfs/files/patch-common_Makefile.in deleted file mode 100644 index d702fb4a03a4..000000000000 --- a/devel/gvfs/files/patch-common_Makefile.in +++ /dev/null @@ -1,201 +0,0 @@ -https://bugzilla.gnome.org/show_bug.cgi?id=722411 - ---- common/Makefile.in.orig 2014-05-25 17:42:50.000000000 +0200 -+++ common/Makefile.in 2014-05-25 17:43:35.000000000 +0200 -@@ -78,7 +78,13 @@ - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ --@HAVE_AVAHI_TRUE@am__append_1 = libgvfscommon-dnssd.la -+@USE_HAL_TRUE@am__append_1 = \ -+@USE_HAL_TRUE@ gvfsdbusutils.c gvfsdbusutils.h -+ -+@USE_HAL_TRUE@am__append_2 = \ -+@USE_HAL_TRUE@ $(DBUS_CFLAGS) -+ -+@HAVE_AVAHI_TRUE@am__append_3 = libgvfscommon-dnssd.la - subdir = common - DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp -@@ -156,15 +162,26 @@ - $(LDFLAGS) -o $@ - libgvfscommon_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) --am__objects_2 = gvfsdbus.lo --am_libgvfscommon_la_OBJECTS = gmountspec.lo gmountoperationdbus.lo \ -- gmountsource.lo gmounttracker.lo gvfsdaemonprotocol.lo \ -- gvfsicon.lo gvfsfileinfo.lo $(am__objects_2) $(am__objects_1) -+am__libgvfscommon_la_SOURCES_DIST = gmountspec.c gmountspec.h \ -+ gmountoperationdbus.c gmountoperationdbus.h gmountsource.c \ -+ gmountsource.h gmounttracker.c gmounttracker.h \ -+ gvfsdaemonprotocol.c gvfsdaemonprotocol.h gvfsicon.h \ -+ gvfsicon.c gvfsfileinfo.c gvfsfileinfo.h gvfsdbus.c gvfsdbus.h \ -+ gvfsdbusutils.c gvfsdbusutils.h -+am__objects_2 = libgvfscommon_la-gvfsdbus.lo -+@USE_HAL_TRUE@am__objects_3 = libgvfscommon_la-gvfsdbusutils.lo -+am_libgvfscommon_la_OBJECTS = libgvfscommon_la-gmountspec.lo \ -+ libgvfscommon_la-gmountoperationdbus.lo \ -+ libgvfscommon_la-gmountsource.lo \ -+ libgvfscommon_la-gmounttracker.lo \ -+ libgvfscommon_la-gvfsdaemonprotocol.lo \ -+ libgvfscommon_la-gvfsicon.lo libgvfscommon_la-gvfsfileinfo.lo \ -+ $(am__objects_2) $(am__objects_1) $(am__objects_3) - libgvfscommon_la_OBJECTS = $(am_libgvfscommon_la_OBJECTS) - libgvfscommon_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(AM_CFLAGS) $(CFLAGS) $(libgvfscommon_la_LDFLAGS) $(LDFLAGS) \ -- -o $@ -+ $(libgvfscommon_la_CFLAGS) $(CFLAGS) \ -+ $(libgvfscommon_la_LDFLAGS) $(LDFLAGS) -o $@ - AM_V_P = $(am__v_P_@AM_V@) - am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) - am__v_P_0 = false -@@ -204,7 +221,7 @@ - $(libgvfscommon_la_SOURCES) - DIST_SOURCES = $(am__libgvfscommon_dnssd_la_SOURCES_DIST) \ - $(libgvfscommon_monitor_la_SOURCES) \ -- $(libgvfscommon_la_SOURCES) -+ $(am__libgvfscommon_la_SOURCES_DIST) - am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ -@@ -456,7 +473,7 @@ - top_srcdir = @top_srcdir@ - NULL = - pkglib_LTLIBRARIES = libgvfscommon.la --noinst_LTLIBRARIES = libgvfscommon-monitor.la $(am__append_1) -+noinst_LTLIBRARIES = libgvfscommon-monitor.la $(am__append_3) - AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/gvfs \ - -I$(top_srcdir)/daemon \ - $(GLIB_CFLAGS) $(BLURAY_CFLAGS) \ -@@ -464,17 +481,12 @@ - - dbus_built_sources = gvfsdbus.c gvfsdbus.h - BUILT_SOURCES = $(dbus_built_sources) --libgvfscommon_la_SOURCES = \ -- gmountspec.c gmountspec.h \ -- gmountoperationdbus.c gmountoperationdbus.h \ -- gmountsource.c gmountsource.h \ -- gmounttracker.c gmounttracker.h \ -- gvfsdaemonprotocol.c gvfsdaemonprotocol.h \ -- gvfsicon.h gvfsicon.c \ -- gvfsfileinfo.c gvfsfileinfo.h \ -- $(dbus_built_sources) \ -- $(NULL) -- -+libgvfscommon_la_SOURCES = gmountspec.c gmountspec.h \ -+ gmountoperationdbus.c gmountoperationdbus.h gmountsource.c \ -+ gmountsource.h gmounttracker.c gmounttracker.h \ -+ gvfsdaemonprotocol.c gvfsdaemonprotocol.h gvfsicon.h \ -+ gvfsicon.c gvfsfileinfo.c gvfsfileinfo.h $(dbus_built_sources) \ -+ $(NULL) $(am__append_1) - - # needed by cygwin (see bug #564003) - libgvfscommon_la_LDFLAGS = -no-undefined -avoid-version -@@ -482,6 +494,10 @@ - $(GLIB_LIBS) \ - $(BLURAY_LIBS) - -+@USE_HAL_TRUE@libgvfscommon_la_LIBADD = \ -+@USE_HAL_TRUE@ $(DBUS_LIBS) -+ -+libgvfscommon_la_CFLAGS = $(am__append_2) - libgvfscommon_monitor_la_SOURCES = \ - gvfsmountinfo.h gvfsmountinfo.c \ - $(NULL) -@@ -607,16 +623,17 @@ - distclean-compile: - -rm -f *.tab.c - --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmountoperationdbus.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmountsource.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmountspec.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmounttracker.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfsdaemonprotocol.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfsdbus.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfsfileinfo.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfsicon.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgvfscommon_dnssd_la-gvfsdnssdresolver.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgvfscommon_dnssd_la-gvfsdnssdutils.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgvfscommon_la-gmountoperationdbus.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgvfscommon_la-gmountsource.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgvfscommon_la-gmountspec.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgvfscommon_la-gmounttracker.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgvfscommon_la-gvfsdaemonprotocol.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgvfscommon_la-gvfsdbus.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgvfscommon_la-gvfsdbusutils.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgvfscommon_la-gvfsfileinfo.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgvfscommon_la-gvfsicon.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgvfscommon_monitor_la-gvfsmountinfo.Plo@am__quote@ - - .c.o: -@@ -661,6 +678,69 @@ - @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) $(libgvfscommon_monitor_la_CFLAGS) $(CFLAGS) -c -o libgvfscommon_monitor_la-gvfsmountinfo.lo `test -f 'gvfsmountinfo.c' || echo '$(srcdir)/'`gvfsmountinfo.c - -+libgvfscommon_la-gmountspec.lo: gmountspec.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) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -MT libgvfscommon_la-gmountspec.lo -MD -MP -MF $(DEPDIR)/libgvfscommon_la-gmountspec.Tpo -c -o libgvfscommon_la-gmountspec.lo `test -f 'gmountspec.c' || echo '$(srcdir)/'`gmountspec.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgvfscommon_la-gmountspec.Tpo $(DEPDIR)/libgvfscommon_la-gmountspec.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gmountspec.c' object='libgvfscommon_la-gmountspec.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) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -c -o libgvfscommon_la-gmountspec.lo `test -f 'gmountspec.c' || echo '$(srcdir)/'`gmountspec.c -+ -+libgvfscommon_la-gmountoperationdbus.lo: gmountoperationdbus.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) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -MT libgvfscommon_la-gmountoperationdbus.lo -MD -MP -MF $(DEPDIR)/libgvfscommon_la-gmountoperationdbus.Tpo -c -o libgvfscommon_la-gmountoperationdbus.lo `test -f 'gmountoperationdbus.c' || echo '$(srcdir)/'`gmountoperationdbus.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgvfscommon_la-gmountoperationdbus.Tpo $(DEPDIR)/libgvfscommon_la-gmountoperationdbus.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gmountoperationdbus.c' object='libgvfscommon_la-gmountoperationdbus.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) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -c -o libgvfscommon_la-gmountoperationdbus.lo `test -f 'gmountoperationdbus.c' || echo '$(srcdir)/'`gmountoperationdbus.c -+ -+libgvfscommon_la-gmountsource.lo: gmountsource.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) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -MT libgvfscommon_la-gmountsource.lo -MD -MP -MF $(DEPDIR)/libgvfscommon_la-gmountsource.Tpo -c -o libgvfscommon_la-gmountsource.lo `test -f 'gmountsource.c' || echo '$(srcdir)/'`gmountsource.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgvfscommon_la-gmountsource.Tpo $(DEPDIR)/libgvfscommon_la-gmountsource.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gmountsource.c' object='libgvfscommon_la-gmountsource.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) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -c -o libgvfscommon_la-gmountsource.lo `test -f 'gmountsource.c' || echo '$(srcdir)/'`gmountsource.c -+ -+libgvfscommon_la-gmounttracker.lo: gmounttracker.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) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -MT libgvfscommon_la-gmounttracker.lo -MD -MP -MF $(DEPDIR)/libgvfscommon_la-gmounttracker.Tpo -c -o libgvfscommon_la-gmounttracker.lo `test -f 'gmounttracker.c' || echo '$(srcdir)/'`gmounttracker.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgvfscommon_la-gmounttracker.Tpo $(DEPDIR)/libgvfscommon_la-gmounttracker.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gmounttracker.c' object='libgvfscommon_la-gmounttracker.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) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -c -o libgvfscommon_la-gmounttracker.lo `test -f 'gmounttracker.c' || echo '$(srcdir)/'`gmounttracker.c -+ -+libgvfscommon_la-gvfsdaemonprotocol.lo: gvfsdaemonprotocol.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) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -MT libgvfscommon_la-gvfsdaemonprotocol.lo -MD -MP -MF $(DEPDIR)/libgvfscommon_la-gvfsdaemonprotocol.Tpo -c -o libgvfscommon_la-gvfsdaemonprotocol.lo `test -f 'gvfsdaemonprotocol.c' || echo '$(srcdir)/'`gvfsdaemonprotocol.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgvfscommon_la-gvfsdaemonprotocol.Tpo $(DEPDIR)/libgvfscommon_la-gvfsdaemonprotocol.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gvfsdaemonprotocol.c' object='libgvfscommon_la-gvfsdaemonprotocol.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) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -c -o libgvfscommon_la-gvfsdaemonprotocol.lo `test -f 'gvfsdaemonprotocol.c' || echo '$(srcdir)/'`gvfsdaemonprotocol.c -+ -+libgvfscommon_la-gvfsicon.lo: gvfsicon.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) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -MT libgvfscommon_la-gvfsicon.lo -MD -MP -MF $(DEPDIR)/libgvfscommon_la-gvfsicon.Tpo -c -o libgvfscommon_la-gvfsicon.lo `test -f 'gvfsicon.c' || echo '$(srcdir)/'`gvfsicon.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgvfscommon_la-gvfsicon.Tpo $(DEPDIR)/libgvfscommon_la-gvfsicon.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gvfsicon.c' object='libgvfscommon_la-gvfsicon.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) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -c -o libgvfscommon_la-gvfsicon.lo `test -f 'gvfsicon.c' || echo '$(srcdir)/'`gvfsicon.c -+ -+libgvfscommon_la-gvfsfileinfo.lo: gvfsfileinfo.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) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -MT libgvfscommon_la-gvfsfileinfo.lo -MD -MP -MF $(DEPDIR)/libgvfscommon_la-gvfsfileinfo.Tpo -c -o libgvfscommon_la-gvfsfileinfo.lo `test -f 'gvfsfileinfo.c' || echo '$(srcdir)/'`gvfsfileinfo.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgvfscommon_la-gvfsfileinfo.Tpo $(DEPDIR)/libgvfscommon_la-gvfsfileinfo.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gvfsfileinfo.c' object='libgvfscommon_la-gvfsfileinfo.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) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -c -o libgvfscommon_la-gvfsfileinfo.lo `test -f 'gvfsfileinfo.c' || echo '$(srcdir)/'`gvfsfileinfo.c -+ -+libgvfscommon_la-gvfsdbus.lo: gvfsdbus.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) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -MT libgvfscommon_la-gvfsdbus.lo -MD -MP -MF $(DEPDIR)/libgvfscommon_la-gvfsdbus.Tpo -c -o libgvfscommon_la-gvfsdbus.lo `test -f 'gvfsdbus.c' || echo '$(srcdir)/'`gvfsdbus.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgvfscommon_la-gvfsdbus.Tpo $(DEPDIR)/libgvfscommon_la-gvfsdbus.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gvfsdbus.c' object='libgvfscommon_la-gvfsdbus.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) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -c -o libgvfscommon_la-gvfsdbus.lo `test -f 'gvfsdbus.c' || echo '$(srcdir)/'`gvfsdbus.c -+ -+libgvfscommon_la-gvfsdbusutils.lo: gvfsdbusutils.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) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -MT libgvfscommon_la-gvfsdbusutils.lo -MD -MP -MF $(DEPDIR)/libgvfscommon_la-gvfsdbusutils.Tpo -c -o libgvfscommon_la-gvfsdbusutils.lo `test -f 'gvfsdbusutils.c' || echo '$(srcdir)/'`gvfsdbusutils.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgvfscommon_la-gvfsdbusutils.Tpo $(DEPDIR)/libgvfscommon_la-gvfsdbusutils.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gvfsdbusutils.c' object='libgvfscommon_la-gvfsdbusutils.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) $(libgvfscommon_la_CFLAGS) $(CFLAGS) -c -o libgvfscommon_la-gvfsdbusutils.lo `test -f 'gvfsdbusutils.c' || echo '$(srcdir)/'`gvfsdbusutils.c -+ - mostlyclean-libtool: - -rm -f *.lo - diff --git a/devel/gvfs/files/patch-common_gvfsdbusutils.c b/devel/gvfs/files/patch-common_gvfsdbusutils.c deleted file mode 100644 index a79308b0d210..000000000000 --- a/devel/gvfs/files/patch-common_gvfsdbusutils.c +++ /dev/null @@ -1,543 +0,0 @@ -https://bugzilla.gnome.org/show_bug.cgi?id=722411 - ---- common/gvfsdbusutils.c.orig 2014-05-25 17:43:08.000000000 +0200 -+++ common/gvfsdbusutils.c 2014-05-25 17:43:08.000000000 +0200 -@@ -0,0 +1,538 @@ -+/* GIO - GLib Input, Output and Streaming Library -+ * -+ * Copyright (C) 2006-2007 Red Hat, Inc. -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library 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. -+ * -+ * 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 Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ * Author: Alexander Larsson <alexl@redhat.com> -+ */ -+ -+#include <config.h> -+ -+#include <stdlib.h> -+#include <string.h> -+ -+#include <glib/gi18n-lib.h> -+#include <gvfsdbusutils.h> -+#include <gio/gio.h> -+ -+static void -+_g_dbus_oom (void) -+{ -+ g_error ("DBus failed with out of memory error"); -+} -+ -+/************************************************************************* -+ * Helper fd source * -+ ************************************************************************/ -+ -+typedef struct -+{ -+ GSource source; -+ GPollFD pollfd; -+ GCancellable *cancellable; -+ gulong cancelled_tag; -+} FDSource; -+ -+static gboolean -+fd_source_prepare (GSource *source, -+ gint *timeout) -+{ -+ FDSource *fd_source = (FDSource *)source; -+ *timeout = -1; -+ -+ return g_cancellable_is_cancelled (fd_source->cancellable); -+} -+ -+static gboolean -+fd_source_check (GSource *source) -+{ -+ FDSource *fd_source = (FDSource *)source; -+ -+ return -+ g_cancellable_is_cancelled (fd_source->cancellable) || -+ fd_source->pollfd.revents != 0; -+} -+ -+static gboolean -+fd_source_dispatch (GSource *source, -+ GSourceFunc callback, -+ gpointer user_data) -+ -+{ -+ GFDSourceFunc func = (GFDSourceFunc)callback; -+ FDSource *fd_source = (FDSource *)source; -+ -+ g_assert (func != NULL); -+ -+ return (*func) (user_data, fd_source->pollfd.revents, fd_source->pollfd.fd); -+} -+ -+static void -+fd_source_finalize (GSource *source) -+{ -+ FDSource *fd_source = (FDSource *)source; -+ -+ if (fd_source->cancelled_tag) -+ g_cancellable_disconnect (fd_source->cancellable, -+ fd_source->cancelled_tag); -+ -+ if (fd_source->cancellable) -+ g_object_unref (fd_source->cancellable); -+} -+ -+static GSourceFuncs fd_source_funcs = { -+ fd_source_prepare, -+ fd_source_check, -+ fd_source_dispatch, -+ fd_source_finalize -+}; -+ -+/* Might be called on another thread */ -+static void -+fd_source_cancelled_cb (GCancellable *cancellable, -+ gpointer data) -+{ -+ /* Wake up the mainloop in case we're waiting on async calls with FDSource */ -+ g_main_context_wakeup (NULL); -+} -+ -+/* Two __ to avoid conflict with gio version */ -+GSource * -+__g_fd_source_new (int fd, -+ gushort events, -+ GCancellable *cancellable) -+{ -+ GSource *source; -+ FDSource *fd_source; -+ -+ source = g_source_new (&fd_source_funcs, sizeof (FDSource)); -+ fd_source = (FDSource *)source; -+ -+ if (cancellable) -+ fd_source->cancellable = g_object_ref (cancellable); -+ -+ fd_source->pollfd.fd = fd; -+ fd_source->pollfd.events = events; -+ g_source_add_poll (source, &fd_source->pollfd); -+ -+ if (cancellable) -+ fd_source->cancelled_tag = -+ g_cancellable_connect (cancellable, -+ (GCallback)fd_source_cancelled_cb, -+ NULL, NULL); -+ -+ return source; -+} -+ -+/************************************************************************* -+ * * -+ * dbus mainloop integration for async ops * -+ * * -+ *************************************************************************/ -+ -+static gint32 main_integration_data_slot = -1; -+static GOnce once_init_main_integration = G_ONCE_INIT; -+ -+/** -+ * A GSource subclass for dispatching DBusConnection messages. -+ * We need this on top of the IO handlers, because sometimes -+ * there are messages to dispatch queued up but no IO pending. -+ * -+ * The source is owned by the connection (and the main context -+ * while that is alive) -+ */ -+typedef struct -+{ -+ GSource source; -+ -+ DBusConnection *connection; -+ GSList *ios; -+ GSList *timeouts; -+} DBusSource; -+ -+typedef struct -+{ -+ DBusSource *dbus_source; -+ GSource *source; -+ DBusWatch *watch; -+} IOHandler; -+ -+typedef struct -+{ -+ DBusSource *dbus_source; -+ GSource *source; -+ DBusTimeout *timeout; -+} TimeoutHandler; -+ -+static gpointer -+main_integration_init (gpointer arg) -+{ -+ if (!dbus_connection_allocate_data_slot (&main_integration_data_slot)) -+ g_error ("Unable to allocate data slot"); -+ -+ return NULL; -+} -+ -+static gboolean -+dbus_source_prepare (GSource *source, -+ gint *timeout) -+{ -+ DBusConnection *connection = ((DBusSource *)source)->connection; -+ -+ *timeout = -1; -+ -+ return (dbus_connection_get_dispatch_status (connection) == DBUS_DISPATCH_DATA_REMAINS); -+} -+ -+static gboolean -+dbus_source_check (GSource *source) -+{ -+ return FALSE; -+} -+ -+static gboolean -+dbus_source_dispatch (GSource *source, -+ GSourceFunc callback, -+ gpointer user_data) -+{ -+ DBusConnection *connection = ((DBusSource *)source)->connection; -+ -+ dbus_connection_ref (connection); -+ -+ /* Only dispatch once - we don't want to starve other GSource */ -+ dbus_connection_dispatch (connection); -+ -+ dbus_connection_unref (connection); -+ -+ return TRUE; -+} -+ -+static gboolean -+io_handler_dispatch (gpointer data, -+ GIOCondition condition, -+ int fd) -+{ -+ IOHandler *handler = data; -+ guint dbus_condition = 0; -+ DBusConnection *connection; -+ -+ connection = handler->dbus_source->connection; -+ -+ if (connection) -+ dbus_connection_ref (connection); -+ -+ if (condition & G_IO_IN) -+ dbus_condition |= DBUS_WATCH_READABLE; -+ if (condition & G_IO_OUT) -+ dbus_condition |= DBUS_WATCH_WRITABLE; -+ if (condition & G_IO_ERR) -+ dbus_condition |= DBUS_WATCH_ERROR; -+ if (condition & G_IO_HUP) -+ dbus_condition |= DBUS_WATCH_HANGUP; -+ -+ /* Note that we don't touch the handler after this, because -+ * dbus may have disabled the watch and thus killed the -+ * handler. -+ */ -+ dbus_watch_handle (handler->watch, dbus_condition); -+ handler = NULL; -+ -+ if (connection) -+ dbus_connection_unref (connection); -+ -+ return TRUE; -+} -+ -+static void -+io_handler_free (IOHandler *handler) -+{ -+ DBusSource *dbus_source; -+ -+ dbus_source = handler->dbus_source; -+ dbus_source->ios = g_slist_remove (dbus_source->ios, handler); -+ -+ g_source_destroy (handler->source); -+ g_source_unref (handler->source); -+ g_free (handler); -+} -+ -+static void -+dbus_source_add_watch (DBusSource *dbus_source, -+ DBusWatch *watch) -+{ -+ guint flags; -+ GIOCondition condition; -+ IOHandler *handler; -+ int fd; -+ -+ if (!dbus_watch_get_enabled (watch)) -+ return; -+ -+ g_assert (dbus_watch_get_data (watch) == NULL); -+ -+ flags = dbus_watch_get_flags (watch); -+ -+ condition = G_IO_ERR | G_IO_HUP; -+ if (flags & DBUS_WATCH_READABLE) -+ condition |= G_IO_IN; -+ if (flags & DBUS_WATCH_WRITABLE) -+ condition |= G_IO_OUT; -+ -+ handler = g_new0 (IOHandler, 1); -+ handler->dbus_source = dbus_source; -+ handler->watch = watch; -+ -+#if (DBUS_MAJOR_VERSION == 1 && DBUS_MINOR_VERSION == 1 && DBUS_MICRO_VERSION >= 1) || (DBUS_MAJOR_VERSION == 1 && DBUS_MINOR_VERSION > 1) || (DBUS_MAJOR_VERSION > 1) -+ fd = dbus_watch_get_unix_fd (watch); -+#else -+ fd = dbus_watch_get_fd (watch); -+#endif -+ -+ handler->source = __g_fd_source_new (fd, condition, NULL); -+ g_source_set_callback (handler->source, -+ (GSourceFunc) io_handler_dispatch, handler, -+ NULL); -+ g_source_attach (handler->source, NULL); -+ -+ dbus_source->ios = g_slist_prepend (dbus_source->ios, handler); -+ dbus_watch_set_data (watch, handler, -+ (DBusFreeFunction)io_handler_free); -+} -+ -+static void -+dbus_source_remove_watch (DBusSource *dbus_source, -+ DBusWatch *watch) -+{ -+ dbus_watch_set_data (watch, NULL, NULL); -+} -+ -+static void -+timeout_handler_free (TimeoutHandler *handler) -+{ -+ DBusSource *dbus_source; -+ -+ dbus_source = handler->dbus_source; -+ dbus_source->timeouts = g_slist_remove (dbus_source->timeouts, handler); -+ -+ g_source_destroy (handler->source); -+ g_source_unref (handler->source); -+ g_free (handler); -+} -+ -+static gboolean -+timeout_handler_dispatch (gpointer data) -+{ -+ TimeoutHandler *handler = data; -+ -+ dbus_timeout_handle (handler->timeout); -+ -+ return TRUE; -+} -+ -+static void -+dbus_source_add_timeout (DBusSource *dbus_source, -+ DBusTimeout *timeout) -+{ -+ TimeoutHandler *handler; -+ -+ if (!dbus_timeout_get_enabled (timeout)) -+ return; -+ -+ g_assert (dbus_timeout_get_data (timeout) == NULL); -+ -+ handler = g_new0 (TimeoutHandler, 1); -+ handler->dbus_source = dbus_source; -+ handler->timeout = timeout; -+ -+ handler->source = g_timeout_source_new (dbus_timeout_get_interval (timeout)); -+ g_source_set_callback (handler->source, -+ timeout_handler_dispatch, handler, -+ NULL); -+ g_source_attach (handler->source, NULL); -+ -+ /* handler->source is owned by the context here */ -+ dbus_source->timeouts = g_slist_prepend (dbus_source->timeouts, handler); -+ -+ dbus_timeout_set_data (timeout, handler, -+ (DBusFreeFunction)timeout_handler_free); -+} -+ -+static void -+dbus_source_remove_timeout (DBusSource *source, -+ DBusTimeout *timeout) -+{ -+ dbus_timeout_set_data (timeout, NULL, NULL); -+} -+ -+static dbus_bool_t -+add_watch (DBusWatch *watch, -+ gpointer data) -+{ -+ DBusSource *dbus_source = data; -+ -+ dbus_source_add_watch (dbus_source, watch); -+ -+ return TRUE; -+} -+ -+static void -+remove_watch (DBusWatch *watch, -+ gpointer data) -+{ -+ DBusSource *dbus_source = data; -+ -+ dbus_source_remove_watch (dbus_source, watch); -+} -+ -+static void -+watch_toggled (DBusWatch *watch, -+ void *data) -+{ -+ /* Because we just exit on OOM, enable/disable is -+ * no different from add/remove */ -+ if (dbus_watch_get_enabled (watch)) -+ add_watch (watch, data); -+ else -+ remove_watch (watch, data); -+} -+ -+static dbus_bool_t -+add_timeout (DBusTimeout *timeout, -+ void *data) -+{ -+ DBusSource *source = data; -+ -+ if (!dbus_timeout_get_enabled (timeout)) -+ return TRUE; -+ -+ dbus_source_add_timeout (source, timeout); -+ -+ return TRUE; -+} -+ -+static void -+remove_timeout (DBusTimeout *timeout, -+ void *data) -+{ -+ DBusSource *source = data; -+ -+ dbus_source_remove_timeout (source, timeout); -+} -+ -+static void -+timeout_toggled (DBusTimeout *timeout, -+ void *data) -+{ -+ /* Because we just exit on OOM, enable/disable is -+ * no different from add/remove -+ */ -+ if (dbus_timeout_get_enabled (timeout)) -+ add_timeout (timeout, data); -+ else -+ remove_timeout (timeout, data); -+} -+ -+static void -+wakeup_main (void *data) -+{ -+ g_main_context_wakeup (NULL); -+} -+ -+static const GSourceFuncs dbus_source_funcs = { -+ dbus_source_prepare, -+ dbus_source_check, -+ dbus_source_dispatch -+}; -+ -+/* Called when the connection dies or when we're unintegrating from mainloop */ -+static void -+dbus_source_free (DBusSource *dbus_source) -+{ -+ while (dbus_source->ios) -+ { -+ IOHandler *handler = dbus_source->ios->data; -+ -+ dbus_watch_set_data (handler->watch, NULL, NULL); -+ } -+ -+ while (dbus_source->timeouts) -+ { -+ TimeoutHandler *handler = dbus_source->timeouts->data; -+ -+ dbus_timeout_set_data (handler->timeout, NULL, NULL); -+ } -+ -+ /* Remove from mainloop */ -+ g_source_destroy ((GSource *)dbus_source); -+ -+ g_source_unref ((GSource *)dbus_source); -+} -+ -+void -+_g_dbus_connection_integrate_with_main (DBusConnection *connection) -+{ -+ DBusSource *dbus_source; -+ -+ g_once (&once_init_main_integration, main_integration_init, NULL); -+ -+ g_assert (connection != NULL); -+ -+ _g_dbus_connection_remove_from_main (connection); -+ -+ dbus_source = (DBusSource *) -+ g_source_new ((GSourceFuncs*)&dbus_source_funcs, -+ sizeof (DBusSource)); -+ -+ dbus_source->connection = connection; -+ -+ if (!dbus_connection_set_watch_functions (connection, -+ add_watch, -+ remove_watch, -+ watch_toggled, -+ dbus_source, NULL)) -+ _g_dbus_oom (); -+ -+ if (!dbus_connection_set_timeout_functions (connection, -+ add_timeout, -+ remove_timeout, -+ timeout_toggled, -+ dbus_source, NULL)) -+ _g_dbus_oom (); -+ -+ dbus_connection_set_wakeup_main_function (connection, -+ wakeup_main, -+ dbus_source, NULL); -+ -+ /* Owned by both connection and mainloop (until destroy) */ -+ g_source_attach ((GSource *)dbus_source, NULL); -+ -+ if (!dbus_connection_set_data (connection, -+ main_integration_data_slot, -+ dbus_source, (DBusFreeFunction)dbus_source_free)) -+ _g_dbus_oom (); -+} -+ -+void -+_g_dbus_connection_remove_from_main (DBusConnection *connection) -+{ -+ g_once (&once_init_main_integration, main_integration_init, NULL); -+ -+ if (!dbus_connection_set_data (connection, -+ main_integration_data_slot, -+ NULL, NULL)) -+ _g_dbus_oom (); -+} diff --git a/devel/gvfs/files/patch-common_gvfsdbusutils.h b/devel/gvfs/files/patch-common_gvfsdbusutils.h deleted file mode 100644 index 875002011374..000000000000 --- a/devel/gvfs/files/patch-common_gvfsdbusutils.h +++ /dev/null @@ -1,47 +0,0 @@ -https://bugzilla.gnome.org/show_bug.cgi?id=722411 - ---- common/gvfsdbusutils.h.orig 2014-05-25 17:43:08.000000000 +0200 -+++ common/gvfsdbusutils.h 2014-05-25 17:43:08.000000000 +0200 -@@ -0,0 +1,42 @@ -+/* GIO - GLib Input, Output and Streaming Library -+ * -+ * Copyright (C) 2006-2007 Red Hat, Inc. -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library 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. -+ * -+ * 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 Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+ * -+ * Author: Alexander Larsson <alexl@redhat.com> -+ */ -+ -+#ifndef __GVFS_DBUS_UTILS_H__ -+#define __GVFS_DBUS_UTILS_H__ -+ -+#include <glib.h> -+#include <dbus/dbus.h> -+#include <gio/gio.h> -+ -+G_BEGIN_DECLS -+ -+typedef gboolean (*GFDSourceFunc) (gpointer data, -+ GIOCondition condition, -+ int fd); -+ -+void _g_dbus_connection_integrate_with_main (DBusConnection *connection); -+void _g_dbus_connection_remove_from_main (DBusConnection *connection); -+ -+G_END_DECLS -+ -+ -+#endif /* __GVFS_DBUS_UTILS_H__ */ diff --git a/devel/gvfs/files/patch-monitor_hal_Makefile.in b/devel/gvfs/files/patch-monitor_hal_Makefile.in deleted file mode 100644 index 2d1d2dfb7de5..000000000000 --- a/devel/gvfs/files/patch-monitor_hal_Makefile.in +++ /dev/null @@ -1,49 +0,0 @@ -https://bugzilla.gnome.org/show_bug.cgi?id=722411 - ---- monitor/hal/Makefile.in.orig 2014-05-25 17:43:00.000000000 +0200 -+++ monitor/hal/Makefile.in 2014-05-25 17:43:37.000000000 +0200 -@@ -110,7 +110,6 @@ - gvfs_hal_volume_monitor-ghalvolume.$(OBJEXT) \ - gvfs_hal_volume_monitor-ghalmount.$(OBJEXT) \ - gvfs_hal_volume_monitor-ghalvolumemonitor.$(OBJEXT) \ -- gvfs_hal_volume_monitor-gvfsdbusutils.$(OBJEXT) \ - $(am__objects_1) - gvfs_hal_volume_monitor_OBJECTS = \ - $(am_gvfs_hal_volume_monitor_OBJECTS) -@@ -456,7 +455,6 @@ - ghalvolume.c ghalvolume.h \ - ghalmount.c ghalmount.h \ - ghalvolumemonitor.c ghalvolumemonitor.h \ -- gvfsdbusutils.c gvfsdbusutils.h \ - $(NULL) - - gvfs_hal_volume_monitor_CFLAGS = \ -@@ -587,7 +585,6 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfs_hal_volume_monitor-ghalmount.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfs_hal_volume_monitor-ghalvolume.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfs_hal_volume_monitor-ghalvolumemonitor.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfs_hal_volume_monitor-gvfsdbusutils.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfs_hal_volume_monitor-hal-device.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfs_hal_volume_monitor-hal-marshal.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvfs_hal_volume_monitor-hal-pool.Po@am__quote@ -@@ -741,20 +738,6 @@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gvfs_hal_volume_monitor_CFLAGS) $(CFLAGS) -c -o gvfs_hal_volume_monitor-ghalvolumemonitor.obj `if test -f 'ghalvolumemonitor.c'; then $(CYGPATH_W) 'ghalvolumemonitor.c'; else $(CYGPATH_W) '$(srcdir)/ghalvolumemonitor.c'; fi` - --gvfs_hal_volume_monitor-gvfsdbusutils.o: gvfsdbusutils.c --@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gvfs_hal_volume_monitor_CFLAGS) $(CFLAGS) -MT gvfs_hal_volume_monitor-gvfsdbusutils.o -MD -MP -MF $(DEPDIR)/gvfs_hal_volume_monitor-gvfsdbusutils.Tpo -c -o gvfs_hal_volume_monitor-gvfsdbusutils.o `test -f 'gvfsdbusutils.c' || echo '$(srcdir)/'`gvfsdbusutils.c --@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gvfs_hal_volume_monitor-gvfsdbusutils.Tpo $(DEPDIR)/gvfs_hal_volume_monitor-gvfsdbusutils.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gvfsdbusutils.c' object='gvfs_hal_volume_monitor-gvfsdbusutils.o' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gvfs_hal_volume_monitor_CFLAGS) $(CFLAGS) -c -o gvfs_hal_volume_monitor-gvfsdbusutils.o `test -f 'gvfsdbusutils.c' || echo '$(srcdir)/'`gvfsdbusutils.c -- --gvfs_hal_volume_monitor-gvfsdbusutils.obj: gvfsdbusutils.c --@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gvfs_hal_volume_monitor_CFLAGS) $(CFLAGS) -MT gvfs_hal_volume_monitor-gvfsdbusutils.obj -MD -MP -MF $(DEPDIR)/gvfs_hal_volume_monitor-gvfsdbusutils.Tpo -c -o gvfs_hal_volume_monitor-gvfsdbusutils.obj `if test -f 'gvfsdbusutils.c'; then $(CYGPATH_W) 'gvfsdbusutils.c'; else $(CYGPATH_W) '$(srcdir)/gvfsdbusutils.c'; fi` --@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gvfs_hal_volume_monitor-gvfsdbusutils.Tpo $(DEPDIR)/gvfs_hal_volume_monitor-gvfsdbusutils.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gvfsdbusutils.c' object='gvfs_hal_volume_monitor-gvfsdbusutils.obj' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gvfs_hal_volume_monitor_CFLAGS) $(CFLAGS) -c -o gvfs_hal_volume_monitor-gvfsdbusutils.obj `if test -f 'gvfsdbusutils.c'; then $(CYGPATH_W) 'gvfsdbusutils.c'; else $(CYGPATH_W) '$(srcdir)/gvfsdbusutils.c'; fi` -- - mostlyclean-libtool: - -rm -f *.lo - diff --git a/devel/gvfs/pkg-plist b/devel/gvfs/pkg-plist index 2f9a88784eea..3cce3d845303 100644 --- a/devel/gvfs/pkg-plist +++ b/devel/gvfs/pkg-plist @@ -22,10 +22,12 @@ lib/gio/modules/libgioremote-volume-monitor.so lib/gio/modules/libgvfsdbus.so lib/gvfs/libgvfscommon.so lib/gvfs/libgvfsdaemon.so -libexec/gvfsd-afp -libexec/gvfsd-afp-browse +%%AFC%%libexec/gvfs-afc-volume-monitor %%GPHOTO2%%libexec/gvfs-gphoto2-volume-monitor %%HAL%%libexec/gvfs-hal-volume-monitor +libexec/gvfsd-afp +libexec/gvfsd-afp-browse +%%AFC%%libexec/gvfsd-afc libexec/gvfsd libexec/gvfsd-archive libexec/gvfsd-burn @@ -47,6 +49,7 @@ libexec/gvfsd-trash man/man1/gvfs-cat.1.gz man/man1/gvfs-copy.1.gz man/man1/gvfs-info.1.gz +man/man1/gvfs-less.1.gz man/man1/gvfs-ls.1.gz man/man1/gvfs-mime.1.gz man/man1/gvfs-mkdir.1.gz @@ -67,11 +70,28 @@ man/man1/gvfsd.1.gz man/man7/gvfs.7.gz %%AVAHI%%share/GConf/gsettings/gvfs-dns-sd.convert %%SAMBA%%share/GConf/gsettings/gvfs-smb.convert -share/bash-completion/completions/gvfs +share/bash-completion/completions/gvfs-cat +share/bash-completion/completions/gvfs-copy +share/bash-completion/completions/gvfs-info +share/bash-completion/completions/gvfs-less +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-move +share/bash-completion/completions/gvfs-open +share/bash-completion/completions/gvfs-rename +share/bash-completion/completions/gvfs-rm +share/bash-completion/completions/gvfs-save +share/bash-completion/completions/gvfs-set-attribute +share/bash-completion/completions/gvfs-trash +share/bash-completion/completions/gvfs-tree share/dbus-1/services/gvfs-daemon.service share/dbus-1/services/gvfs-metadata.service +%%AFC%%share/dbus-1/services/org.gtk.Private.AfcVolumeMonitor.service %%GPHOTO2%%share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service %%HAL%%share/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service +%%AFC%%%%DATADIR%%/mounts/afc.mount share/gvfs/mounts/afp-browse.mount share/gvfs/mounts/afp.mount %%DATADIR%%/mounts/archive.mount @@ -90,7 +110,7 @@ share/gvfs/mounts/afp.mount %%SAMBA%%%%DATADIR%%/mounts/smb-browse.mount %%SAMBA%%%%DATADIR%%/mounts/smb.mount %%DATADIR%%/mounts/trash.mount -%%DATADIR%%/remote-volume-monitors/.keep +%%AFC%%%%DATADIR%%/remote-volume-monitors/afc.monitor %%GPHOTO2%%%%DATADIR%%/remote-volume-monitors/gphoto2.monitor %%HAL%%%%DATADIR%%/remote-volume-monitors/hal.monitor share/locale/af/LC_MESSAGES/gvfs.mo @@ -102,6 +122,7 @@ share/locale/be@latin/LC_MESSAGES/gvfs.mo share/locale/bg/LC_MESSAGES/gvfs.mo share/locale/bn/LC_MESSAGES/gvfs.mo share/locale/bn_IN/LC_MESSAGES/gvfs.mo +share/locale/bs/LC_MESSAGES/gvfs.mo share/locale/ca/LC_MESSAGES/gvfs.mo share/locale/ca@valencia/LC_MESSAGES/gvfs.mo share/locale/cs/LC_MESSAGES/gvfs.mo @@ -164,3 +185,5 @@ share/locale/vi/LC_MESSAGES/gvfs.mo share/locale/zh_CN/LC_MESSAGES/gvfs.mo share/locale/zh_HK/LC_MESSAGES/gvfs.mo share/locale/zh_TW/LC_MESSAGES/gvfs.mo +@dir %%DATADIR%%/remote-volume-monitors +@dir share/GConf/gsettings diff --git a/devel/libgee/Makefile b/devel/libgee/Makefile index a6fe8f0e00e5..522fb272dee5 100644 --- a/devel/libgee/Makefile +++ b/devel/libgee/Makefile @@ -1,9 +1,8 @@ # Created by: Frank Steinborn <steinex@nognu.de> # $FreeBSD$ -# $MCom: ports/trunk/devel/libgee/Makefile 20031 2014-11-02 21:47:55Z kwm $ PORTNAME= libgee -PORTVERSION= 0.16.1 +PORTVERSION= 0.18.0 CATEGORIES= devel MASTER_SITES= GNOME @@ -12,6 +11,8 @@ COMMENT= GObject collection library BUILD_DEPENDS= valac:${PORTSDIR}/lang/vala +PORTSCOUT= limitw:1,even + GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-introspection=yes USES= gmake libtool pathfix pkgconfig tar:xz diff --git a/devel/libgee/distinfo b/devel/libgee/distinfo index 20a876c38616..e9b9586cf21c 100644 --- a/devel/libgee/distinfo +++ b/devel/libgee/distinfo @@ -1,2 +1,2 @@ -SHA256 (libgee-0.16.1.tar.xz) = d95f8ea8e78f843c71b1958fa2fb445e4a325e4821ec23d0d5108d8170e564a5 -SIZE (libgee-0.16.1.tar.xz) = 667024 +SHA256 (libgee-0.18.0.tar.xz) = 4ad99ef937d071b4883c061df40bfe233f7649d50c354cf81235f180b4244399 +SIZE (libgee-0.18.0.tar.xz) = 662296 diff --git a/devel/libpeas/Makefile b/devel/libpeas/Makefile index 1754a64529ed..11f7e7a61aad 100644 --- a/devel/libpeas/Makefile +++ b/devel/libpeas/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= libpeas -PORTVERSION= 1.12.1 -PORTREVISION?= 3 +PORTVERSION= 1.14.0 +PORTREVISION?= 1 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -33,17 +33,6 @@ INSTALL_TARGET= install-strip CONFIGURE_ARGS+=--disable-glade-catalog PLIST= ${.CURDIR}/pkg-plist -.if ${LIBPEAS_SLAVE} == no -OPTIONS_SUB= yes -OPTIONS_DEFINE= SEED -OPTIONS_DEFAULT=SEED -SEED_DESC= JavaScript support based on webkit-gtk3 -SEED_LIB_DEPENDS= libseed-gtk3.so:${PORTSDIR}/devel/seed -SEED_CONFIGURE_ENABLE= seed -.else -CONFIGURE_ARGS+= --disable-seed -.endif - .if ${LIBPEAS_SLAVE} == python2 USES+= python:2 USE_GNOME+= pygobject3 diff --git a/devel/libpeas/distinfo b/devel/libpeas/distinfo index 47d77f45a40c..b745b7eb74e1 100644 --- a/devel/libpeas/distinfo +++ b/devel/libpeas/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/libpeas-1.12.1.tar.xz) = e610be31c9d382580fb5d8686f8311149f27413f55af6abf5c033178b99452d6 -SIZE (gnome3/libpeas-1.12.1.tar.xz) = 522616 +SHA256 (gnome3/libpeas-1.14.0.tar.xz) = 5e4b3a8968b71497ab26a7a528c414c4c640c5724328fa3507854f04788e2d76 +SIZE (gnome3/libpeas-1.14.0.tar.xz) = 546092 diff --git a/devel/libpeas/files/patch-Makefile.in b/devel/libpeas/files/patch-Makefile.in index 29aa5e77e881..413f214dc2c9 100644 --- a/devel/libpeas/files/patch-Makefile.in +++ b/devel/libpeas/files/patch-Makefile.in @@ -1,9 +1,9 @@ ---- Makefile.in.orig 2015-05-17 08:39:30.610386000 +0200 -+++ Makefile.in 2015-05-17 08:41:22.473716000 +0200 -@@ -406,7 +406,7 @@ - top_srcdir = @top_srcdir@ - ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-glade-catalog +--- Makefile.in.orig 2015-06-14 15:26:41.400785000 +0200 ++++ Makefile.in 2015-06-14 15:27:12.810055000 +0200 +@@ -415,7 +415,7 @@ + --enable-gtk-doc \ + --disable-doc-cross-references + -SUBDIRS = libpeas loaders $(am__append_1) tests data po docs +SUBDIRS = libpeas loaders $(am__append_1) data po docs GCOVDIRS = libpeas loaders $(am__append_2) diff --git a/devel/libpeas/pkg-plist b/devel/libpeas/pkg-plist index 02e73bc7f2a9..53ee1d7492e4 100644 --- a/devel/libpeas/pkg-plist +++ b/devel/libpeas/pkg-plist @@ -1,4 +1,8 @@ bin/peas-demo +include/libpeas-1.0/libpeas-gtk/peas-gtk-configurable.h +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-engine.h include/libpeas-1.0/libpeas/peas-extension-base.h @@ -7,25 +11,18 @@ include/libpeas-1.0/libpeas/peas-extension.h include/libpeas-1.0/libpeas/peas-object-module.h include/libpeas-1.0/libpeas/peas-plugin-info.h include/libpeas-1.0/libpeas/peas.h -include/libpeas-1.0/libpeas-gtk/peas-gtk-configurable.h -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 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.1201.0 -%%SEED%%lib/libpeas-1.0/loaders/libseedloader.so +lib/libpeas-1.0.so.0.1400.0 lib/libpeas-gtk-1.0.so lib/libpeas-gtk-1.0.so.0 -lib/libpeas-gtk-1.0.so.0.1201.0 +lib/libpeas-gtk-1.0.so.0.1400.0 lib/peas-demo/plugins/helloworld/helloworld.plugin lib/peas-demo/plugins/helloworld/libhelloworld.so lib/peas-demo/plugins/secondtime/libsecondtime.so lib/peas-demo/plugins/secondtime/secondtime.plugin -%%SEED%%lib/peas-demo/plugins/seedhello/seedhello.js -%%SEED%%lib/peas-demo/plugins/seedhello/seedhello.plugin libdata/pkgconfig/libpeas-1.0.pc libdata/pkgconfig/libpeas-gtk-1.0.pc share/gir-1.0/Peas-1.0.gir @@ -40,6 +37,11 @@ share/gtk-doc/html/libpeas/PeasGtkPluginManagerView.html share/gtk-doc/html/libpeas/PeasObjectModule.html share/gtk-doc/html/libpeas/PeasPluginInfo.html share/gtk-doc/html/libpeas/annotation-glossary.html +share/gtk-doc/html/libpeas/api-index-1-14.html +share/gtk-doc/html/libpeas/api-index-1-2.html +share/gtk-doc/html/libpeas/api-index-1-4.html +share/gtk-doc/html/libpeas/api-index-1-6.html +share/gtk-doc/html/libpeas/api-index-deprecated.html share/gtk-doc/html/libpeas/api-index-full.html share/gtk-doc/html/libpeas/ch01.html share/gtk-doc/html/libpeas/ch02.html @@ -69,6 +71,7 @@ share/locale/ast/LC_MESSAGES/libpeas.mo share/locale/be/LC_MESSAGES/libpeas.mo share/locale/bg/LC_MESSAGES/libpeas.mo share/locale/bn_IN/LC_MESSAGES/libpeas.mo +share/locale/bs/LC_MESSAGES/libpeas.mo share/locale/ca/LC_MESSAGES/libpeas.mo share/locale/ca@valencia/LC_MESSAGES/libpeas.mo share/locale/cs/LC_MESSAGES/libpeas.mo @@ -92,6 +95,7 @@ share/locale/hu/LC_MESSAGES/libpeas.mo share/locale/id/LC_MESSAGES/libpeas.mo share/locale/it/LC_MESSAGES/libpeas.mo share/locale/ja/LC_MESSAGES/libpeas.mo +share/locale/kk/LC_MESSAGES/libpeas.mo share/locale/kn/LC_MESSAGES/libpeas.mo share/locale/ko/LC_MESSAGES/libpeas.mo share/locale/lt/LC_MESSAGES/libpeas.mo @@ -100,6 +104,7 @@ share/locale/ml/LC_MESSAGES/libpeas.mo share/locale/mr/LC_MESSAGES/libpeas.mo share/locale/nb/LC_MESSAGES/libpeas.mo share/locale/nds/LC_MESSAGES/libpeas.mo +share/locale/ne/LC_MESSAGES/libpeas.mo share/locale/nl/LC_MESSAGES/libpeas.mo share/locale/or/LC_MESSAGES/libpeas.mo share/locale/pa/LC_MESSAGES/libpeas.mo diff --git a/devel/libsoup-gnome/Makefile b/devel/libsoup-gnome/Makefile index 58c0f6ac9e21..51c99515ea14 100644 --- a/devel/libsoup-gnome/Makefile +++ b/devel/libsoup-gnome/Makefile @@ -1,13 +1,12 @@ # Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/devel/libsoup-gnome/Makefile 19571 2014-04-25 18:12:46Z kwm $ PORTREVISION= 0 CATEGORIES= devel gnome PKGNAMESUFFIX= -gnome MAINTAINER= gnome@FreeBSD.org -COMMENT= A GNOME wrapper for libsoup +COMMENT= GNOME wrapper for libsoup MASTERDIR= ${.CURDIR}/../libsoup DESCR= ${.CURDIR}/pkg-descr diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile index 892267bb9362..da4d003edb47 100644 --- a/devel/libsoup/Makefile +++ b/devel/libsoup/Makefile @@ -1,10 +1,8 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/devel/libsoup/Makefile 20035 2014-11-03 08:16:10Z kwm $ PORTNAME= libsoup -PORTVERSION= 2.48.1 -PORTREVISION= 1 +PORTVERSION= 2.50.0 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -17,12 +15,13 @@ LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt RUN_DEPENDS= glib-networking>=2.29.18:${PORTSDIR}/net/glib-networking USES= tar:xz +PORTSCOUT= limitw:1,even .if !defined(REFERENCE_PORT) USES+= gettext gmake libtool pathfix pkgconfig \ python:3:build tar:xz -USE_GNOME= glib20 intltool introspection:build \ +USE_GNOME= glib20 intlhack introspection:build \ libxml2 referencehack USE_SQLITE= 3 USE_LDCONFIG= yes @@ -37,8 +36,7 @@ PLIST_SUB= VERSION="2.4" LIBVERSION=${LIBVERSION} .if defined(SOUP_SLAVE) USE_SQLITE= yes -LIB_DEPENDS+= libsoup-2.4.so:${PORTSDIR}/devel/libsoup \ - libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring +LIB_DEPENDS+= libsoup-2.4.so:${PORTSDIR}/devel/libsoup CONFIGURE_ARGS+=--with-gnome .else CONFIGURE_ARGS+=--without-gnome diff --git a/devel/libsoup/distinfo b/devel/libsoup/distinfo index 71ea292b218b..03627eb8f843 100644 --- a/devel/libsoup/distinfo +++ b/devel/libsoup/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome2/libsoup-2.48.1.tar.xz) = 9b0d14b36e36a3131a06c6e3aa7245716e6904e3e636df81c0b6c8bd3f646f9a -SIZE (gnome2/libsoup-2.48.1.tar.xz) = 1707612 +SHA256 (gnome2/libsoup-2.50.0.tar.xz) = 1e01365ac4af3817187ea847f9d3588c27eee01fc519a5a7cb212bb78b0f667b +SIZE (gnome2/libsoup-2.50.0.tar.xz) = 1755052 diff --git a/devel/libsoup/pkg-plist b/devel/libsoup/pkg-plist index 98222c955430..e246061bba27 100644 --- a/devel/libsoup/pkg-plist +++ b/devel/libsoup/pkg-plist @@ -22,12 +22,12 @@ include/libsoup-%%VERSION%%/libsoup/soup-message-headers.h include/libsoup-%%VERSION%%/libsoup/soup-message.h include/libsoup-%%VERSION%%/libsoup/soup-method.h include/libsoup-%%VERSION%%/libsoup/soup-misc.h -include/libsoup-%%VERSION%%/libsoup/soup-multipart.h include/libsoup-%%VERSION%%/libsoup/soup-multipart-input-stream.h +include/libsoup-%%VERSION%%/libsoup/soup-multipart.h include/libsoup-%%VERSION%%/libsoup/soup-password-manager.h include/libsoup-%%VERSION%%/libsoup/soup-portability.h -include/libsoup-%%VERSION%%/libsoup/soup-proxy-resolver.h include/libsoup-%%VERSION%%/libsoup/soup-proxy-resolver-default.h +include/libsoup-%%VERSION%%/libsoup/soup-proxy-resolver.h include/libsoup-%%VERSION%%/libsoup/soup-proxy-uri-resolver.h include/libsoup-%%VERSION%%/libsoup/soup-request-data.h include/libsoup-%%VERSION%%/libsoup/soup-request-file.h @@ -46,6 +46,8 @@ include/libsoup-%%VERSION%%/libsoup/soup-types.h include/libsoup-%%VERSION%%/libsoup/soup-uri.h include/libsoup-%%VERSION%%/libsoup/soup-value-utils.h include/libsoup-%%VERSION%%/libsoup/soup-version.h +include/libsoup-%%VERSION%%/libsoup/soup-websocket-connection.h +include/libsoup-%%VERSION%%/libsoup/soup-websocket.h include/libsoup-%%VERSION%%/libsoup/soup-xmlrpc.h include/libsoup-%%VERSION%%/libsoup/soup.h lib/girepository-1.0/Soup-%%VERSION%%.typelib @@ -104,14 +106,15 @@ share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-Soup-Miscellaneous-Ut share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-SoupServer-deprecated-API.html share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-Top-Level-Domain-utils.html share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-Version-Information.html +share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-WebSockets.html share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-XMLRPC-Support.html share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-soup-method.html share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-soup-status.html share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%.devhelp2 share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-build-howto.html share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-client-howto.html -share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-server-howto.html share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-request-howto.html +share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-server-howto.html share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-session-porting.html share/gtk-doc/html/libsoup-%%VERSION%%/right-insensitive.png share/gtk-doc/html/libsoup-%%VERSION%%/right.png @@ -123,6 +126,7 @@ share/locale/as/LC_MESSAGES/libsoup.mo share/locale/be/LC_MESSAGES/libsoup.mo share/locale/bg/LC_MESSAGES/libsoup.mo share/locale/bn_IN/LC_MESSAGES/libsoup.mo +share/locale/bs/LC_MESSAGES/libsoup.mo share/locale/ca/LC_MESSAGES/libsoup.mo share/locale/ca@valencia/LC_MESSAGES/libsoup.mo share/locale/cs/LC_MESSAGES/libsoup.mo diff --git a/devel/pygobject3-common/Makefile b/devel/pygobject3-common/Makefile index d84296f63dd7..cbdc8aaed024 100644 --- a/devel/pygobject3-common/Makefile +++ b/devel/pygobject3-common/Makefile @@ -1,9 +1,8 @@ # Created by: Gustau Perez i Querol <gustau.perez@gmail.com> # $FreeBSD$ -# $MCom: ports/trunk/devel/pygobject3-common/Makefile 19953 2014-10-15 08:51:31Z gusi $ PORTNAME= gobject -PORTVERSION= 3.14.0 +PORTVERSION= 3.16.2 PORTREVISION?= 0 CATEGORIES= devel python MASTER_SITES= GNOME/sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/devel/pygobject3-common/distinfo b/devel/pygobject3-common/distinfo index afd938c5fde1..20ce89ee2b02 100644 --- a/devel/pygobject3-common/distinfo +++ b/devel/pygobject3-common/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/pygobject-3.14.0.tar.xz) = 779effa93f4b59cdb72f4ab0128fb3fd82900bf686193b570fd3a8ce63392d54 -SIZE (gnome3/pygobject-3.14.0.tar.xz) = 720128 +SHA256 (gnome3/pygobject-3.16.2.tar.xz) = de620e00fe7ecb788aa2dc0d664e41f71b8e718e728168e8d982cf193a9e7e64 +SIZE (gnome3/pygobject-3.16.2.tar.xz) = 725544 diff --git a/devel/pygobject3-common/files/patch-gi_pygi-cache.h b/devel/pygobject3-common/files/patch-gi_pygi-cache.h deleted file mode 100644 index f11882f93912..000000000000 --- a/devel/pygobject3-common/files/patch-gi_pygi-cache.h +++ /dev/null @@ -1,40 +0,0 @@ -From 3b70f5bc8e59e49795fcaa7b285aeff0c4565a04 Mon Sep 17 00:00:00 2001 -From: Simon Feltman <sfeltman@src.gnome.org> -Date: Mon, 27 Oct 2014 20:19:23 -0700 -Subject: Remove redefinitions of function and vfunc cache typedefs - -https://bugzilla.gnome.org/show_bug.cgi?id=737874 - -diff --git a/gi/pygi-cache.h b/gi/pygi-cache.h -index 093dde2..0361f00 100644 ---- gi/pygi-cache.h -+++ gi/pygi-cache.h -@@ -197,7 +197,7 @@ struct _PyGICallableCache - GICallableInfo *callable_info); - }; - --typedef struct _PyGIFunctionCache { -+struct _PyGIFunctionCache { - PyGICallableCache callable_cache; - - /* An invoker with ffi_cif already setup */ -@@ -207,13 +207,13 @@ typedef struct _PyGIFunctionCache { - PyGIInvokeState *state, - PyObject *py_args, - PyObject *py_kwargs); --} PyGIFunctionCache; -+} ; - --typedef struct _PyGIVFuncCache { -+struct _PyGIVFuncCache { - PyGIFunctionWithInstanceCache fwi_cache; - - GIBaseInfo *info; --} PyGIVFuncCache; -+}; - - - gboolean --- -cgit v0.10.1 - diff --git a/devel/xfce4-vala/Makefile b/devel/xfce4-vala/Makefile index 81d1ff5b5248..6375b0fad746 100644 --- a/devel/xfce4-vala/Makefile +++ b/devel/xfce4-vala/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfce4-vala PORTVERSION= 4.10.3 -PORTREVISION= 1 +PORTREVISION= 2 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.26 +CONFIGURE_ARGS= --with-vala-api=0.28 .include <bsd.port.mk> |