Index: head/devel/libdbusmenu/Makefile =================================================================== --- head/devel/libdbusmenu/Makefile (revision 415638) +++ head/devel/libdbusmenu/Makefile (revision 415639) @@ -1,54 +1,42 @@ # Created by: Olivier Duchateau # $FreeBSD$ PORTNAME= libdbusmenu -PORTVERSION= 12.10.2 -PORTREVISION= 1 +PORTVERSION= 16.04.0 CATEGORIES= devel -MASTER_SITES= https://launchpadlibrarian.net/118249592/ \ +MASTER_SITES= https://launchpadlibrarian.net/243440794/ \ https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/ MAINTAINER= olivierd@FreeBSD.org COMMENT= GLib and Gtk Implementation of the DBusMenu protocol LICENSE= GPLv3 LGPL21 LGPL3 LICENSE_COMB= multi LICENSE_DISTFILES= ${WRKSRC}/COPYING-GPL3 ${WRKSRC}/COPYING.2.1 \ ${WRKSRC}/COPYING BUILD_DEPENDS= vapigen:lang/vala \ gtkdoc-check:textproc/gtk-doc LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib GNU_CONFIGURE= yes -USES= gmake pkgconfig pathfix libtool +USES= gmake libtool pathfix pkgconfig USE_GNOME= gnomedocutils:build glib20 intltool intlhack libxslt \ - introspection:build + introspection:build gtk30 USE_XORG= x11 USE_LDCONFIG= yes +INSTALL_TARGET= install-strip PLIST_SUB= VERSION="0.4" -OPTIONS_SUB= yes -OPTIONS_SINGLE= GTK -OPTIONS_SINGLE_GTK= GTK2 GTK3 -OPTIONS_DEFAULT= GTK3 - -CONFIGURE_ARGS= --disable-scrollkeeper \ +CONFIGURE_ARGS= --disable-static \ + --disable-static \ --disable-dumper \ --disable-tests \ --disable-massivedebugging \ --enable-introspection=yes \ --disable-nls \ --enable-vala \ - --without-omf-dir \ - --without-help-dir \ - --enable-gtk - -GTK2_USE= GNOME=gtk20 -GTK2_CONFIGURE_ON= --with-gtk=2 - -GTK3_USE= GNOME=gtk30 -GTK3_CONFIGURE_ON= --with-gtk=3 + --with-gtk=3 .include Index: head/devel/libdbusmenu/distinfo =================================================================== --- head/devel/libdbusmenu/distinfo (revision 415638) +++ head/devel/libdbusmenu/distinfo (revision 415639) @@ -1,2 +1,3 @@ -SHA256 (libdbusmenu-12.10.2.tar.gz) = 9d6ad4a0b918b342ad2ee9230cce8a095eb601cb0cee6ddc1122d0481f9d04c9 -SIZE (libdbusmenu-12.10.2.tar.gz) = 735730 +TIMESTAMP = 1463934664 +SHA256 (libdbusmenu-16.04.0.tar.gz) = b9cc4a2acd74509435892823607d966d424bd9ad5d0b00938f27240a1bfa878a +SIZE (libdbusmenu-16.04.0.tar.gz) = 760376 Index: head/devel/libdbusmenu/files/patch-libdbusmenu-glib__menuitem.c =================================================================== --- head/devel/libdbusmenu/files/patch-libdbusmenu-glib__menuitem.c (revision 415638) +++ head/devel/libdbusmenu/files/patch-libdbusmenu-glib__menuitem.c (nonexistent) @@ -1,20 +0,0 @@ ---- ./libdbusmenu-glib/menuitem.c.orig 2012-10-03 15:54:22.000000000 +0000 -+++ ./libdbusmenu-glib/menuitem.c 2014-07-03 11:27:19.000000000 +0000 -@@ -974,7 +974,7 @@ - } - return mi; - } -- find_id_t find_id = {mi: NULL, id: id}; -+ find_id_t find_id = {.mi = NULL, .id = id}; - find_id_helper(mi, &find_id); - return find_id.mi; - } -@@ -1712,7 +1712,7 @@ - - func(mi, data); - GList * children = dbusmenu_menuitem_get_children(mi); -- foreach_struct_t foreach_data = {func: func, data: data}; -+ foreach_struct_t foreach_data = {.func = func, .data = data}; - g_list_foreach(children, foreach_helper, &foreach_data); - return; - } Property changes on: head/devel/libdbusmenu/files/patch-libdbusmenu-glib__menuitem.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/libdbusmenu/files/patch-libdbusmenu-glib__server.c =================================================================== --- head/devel/libdbusmenu/files/patch-libdbusmenu-glib__server.c (revision 415638) +++ head/devel/libdbusmenu/files/patch-libdbusmenu-glib__server.c (nonexistent) @@ -1,15 +0,0 @@ ---- ./libdbusmenu-glib/server.c.orig 2012-10-03 15:54:22.000000000 +0000 -+++ ./libdbusmenu-glib/server.c 2014-07-03 11:29:01.000000000 +0000 -@@ -215,9 +215,9 @@ - static GDBusNodeInfo * dbusmenu_node_info = NULL; - static GDBusInterfaceInfo * dbusmenu_interface_info = NULL; - static const GDBusInterfaceVTable dbusmenu_interface_table = { -- method_call: bus_method_call, -- get_property: bus_get_prop, -- set_property: NULL /* No properties that can be set */ -+ .method_call = bus_method_call, -+ .get_property = bus_get_prop, -+ .set_property = NULL /* No properties that can be set */ - }; - static method_table_t dbusmenu_method_table[METHOD_COUNT]; - Property changes on: head/devel/libdbusmenu/files/patch-libdbusmenu-glib__server.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/libdbusmenu/files/patch-libdbusmenu-glib_Makefile.in =================================================================== --- head/devel/libdbusmenu/files/patch-libdbusmenu-glib_Makefile.in (nonexistent) +++ head/devel/libdbusmenu/files/patch-libdbusmenu-glib_Makefile.in (revision 415639) @@ -0,0 +1,11 @@ +--- libdbusmenu-glib/Makefile.in.orig 2016-02-27 19:00:13 UTC ++++ libdbusmenu-glib/Makefile.in +@@ -555,7 +555,7 @@ INTROSPECTION_COMPILER_ARGS = --included + @HAVE_INTROSPECTION_TRUE@Dbusmenu_0_4_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS) + @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0 + @HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS) +-@HAVE_INTROSPECTION_TRUE@typelibdir = $(INTROSPECTION_TYPELIBDIR) ++@HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepository-1.0 + @HAVE_INTROSPECTION_TRUE@typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) + + ######################### Property changes on: head/devel/libdbusmenu/files/patch-libdbusmenu-glib_Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/libdbusmenu/files/patch-libdbusmenu-gtk_Makefile.in =================================================================== --- head/devel/libdbusmenu/files/patch-libdbusmenu-gtk_Makefile.in (nonexistent) +++ head/devel/libdbusmenu/files/patch-libdbusmenu-gtk_Makefile.in (revision 415639) @@ -0,0 +1,11 @@ +--- libdbusmenu-gtk/Makefile.in.orig 2016-02-27 19:00:14 UTC ++++ libdbusmenu-gtk/Makefile.in +@@ -568,7 +568,7 @@ INTROSPECTION_COMPILER_ARGS = --included + @HAVE_INTROSPECTION_TRUE@DbusmenuGtk3_0_4_gir_EXPORT_PACKAGES = $(DbusmenuGtk_0_4_gir_EXPORT_PACKAGES) + @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0 + @HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS) +-@HAVE_INTROSPECTION_TRUE@typelibdir = $(INTROSPECTION_TYPELIBDIR) ++@HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepository-1.0 + @HAVE_INTROSPECTION_TRUE@typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) + + ######################### Property changes on: head/devel/libdbusmenu/files/patch-libdbusmenu-gtk_Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/libdbusmenu/pkg-plist =================================================================== --- head/devel/libdbusmenu/pkg-plist (revision 415638) +++ head/devel/libdbusmenu/pkg-plist (revision 415639) @@ -1,78 +1,69 @@ include/libdbusmenu-glib-%%VERSION%%/libdbusmenu-glib/client.h include/libdbusmenu-glib-%%VERSION%%/libdbusmenu-glib/dbusmenu-glib.h include/libdbusmenu-glib-%%VERSION%%/libdbusmenu-glib/enum-types.h include/libdbusmenu-glib-%%VERSION%%/libdbusmenu-glib/menuitem-proxy.h include/libdbusmenu-glib-%%VERSION%%/libdbusmenu-glib/menuitem.h include/libdbusmenu-glib-%%VERSION%%/libdbusmenu-glib/server.h include/libdbusmenu-glib-%%VERSION%%/libdbusmenu-glib/types.h -%%GTK2%%include/libdbusmenu-gtk-%%VERSION%%/libdbusmenu-gtk/client.h -%%GTK2%%include/libdbusmenu-gtk-%%VERSION%%/libdbusmenu-gtk/dbusmenu-gtk.h -%%GTK2%%include/libdbusmenu-gtk-%%VERSION%%/libdbusmenu-gtk/menu.h -%%GTK2%%include/libdbusmenu-gtk-%%VERSION%%/libdbusmenu-gtk/menuitem.h -%%GTK2%%include/libdbusmenu-gtk-%%VERSION%%/libdbusmenu-gtk/parser.h -%%GTK3%%include/libdbusmenu-gtk3-%%VERSION%%/libdbusmenu-gtk/client.h -%%GTK3%%include/libdbusmenu-gtk3-%%VERSION%%/libdbusmenu-gtk/dbusmenu-gtk.h -%%GTK3%%include/libdbusmenu-gtk3-%%VERSION%%/libdbusmenu-gtk/menu.h -%%GTK3%%include/libdbusmenu-gtk3-%%VERSION%%/libdbusmenu-gtk/menuitem.h -%%GTK3%%include/libdbusmenu-gtk3-%%VERSION%%/libdbusmenu-gtk/parser.h +include/libdbusmenu-gtk3-%%VERSION%%/libdbusmenu-gtk/client.h +include/libdbusmenu-gtk3-%%VERSION%%/libdbusmenu-gtk/dbusmenu-gtk.h +include/libdbusmenu-gtk3-%%VERSION%%/libdbusmenu-gtk/menu.h +include/libdbusmenu-gtk3-%%VERSION%%/libdbusmenu-gtk/menuitem.h +include/libdbusmenu-gtk3-%%VERSION%%/libdbusmenu-gtk/parser.h lib/girepository-1.0/Dbusmenu-%%VERSION%%.typelib -%%GTK2%%lib/girepository-1.0/DbusmenuGtk-%%VERSION%%.typelib -%%GTK3%%lib/girepository-1.0/DbusmenuGtk3-%%VERSION%%.typelib -lib/libdbusmenu-glib.a +lib/girepository-1.0/DbusmenuGtk3-%%VERSION%%.typelib lib/libdbusmenu-glib.so lib/libdbusmenu-glib.so.4 lib/libdbusmenu-glib.so.4.0.12 -%%GTK2%%lib/libdbusmenu-gtk.a -%%GTK2%%lib/libdbusmenu-gtk.so -%%GTK2%%lib/libdbusmenu-gtk.so.4 -%%GTK2%%lib/libdbusmenu-gtk.so.4.0.12 -%%GTK3%%lib/libdbusmenu-gtk3.a -%%GTK3%%lib/libdbusmenu-gtk3.so -%%GTK3%%lib/libdbusmenu-gtk3.so.4 -%%GTK3%%lib/libdbusmenu-gtk3.so.4.0.12 +lib/libdbusmenu-gtk3.so +lib/libdbusmenu-gtk3.so.4 +lib/libdbusmenu-gtk3.so.4.0.12 libdata/pkgconfig/dbusmenu-glib-%%VERSION%%.pc -%%GTK2%%libdata/pkgconfig/dbusmenu-gtk-%%VERSION%%.pc -%%GTK3%%libdata/pkgconfig/dbusmenu-gtk3-%%VERSION%%.pc +libdata/pkgconfig/dbusmenu-gtk3-%%VERSION%%.pc libexec/dbusmenu-bench %%DOCSDIR%%/README.dbusmenu-bench share/gir-1.0/Dbusmenu-%%VERSION%%.gir -%%GTK2%%share/gir-1.0/DbusmenuGtk-%%VERSION%%.gir -%%GTK3%%share/gir-1.0/DbusmenuGtk3-%%VERSION%%.gir +share/gir-1.0/DbusmenuGtk3-%%VERSION%%.gir share/gtk-doc/html/libdbusmenu-glib/annotation-glossary.html share/gtk-doc/html/libdbusmenu-glib/api-index-deprecated.html share/gtk-doc/html/libdbusmenu-glib/api-index-full.html share/gtk-doc/html/libdbusmenu-glib/ch01.html share/gtk-doc/html/libdbusmenu-glib/home.png share/gtk-doc/html/libdbusmenu-glib/index.html share/gtk-doc/html/libdbusmenu-glib/index.sgml +share/gtk-doc/html/libdbusmenu-glib/left-insensitive.png share/gtk-doc/html/libdbusmenu-glib/left.png share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitem.html share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuMenuitemProxy.html share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuServer.html share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-Types.html share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib.devhelp2 share/gtk-doc/html/libdbusmenu-glib/object-tree.html +share/gtk-doc/html/libdbusmenu-glib/right-insensitive.png share/gtk-doc/html/libdbusmenu-glib/right.png share/gtk-doc/html/libdbusmenu-glib/style.css +share/gtk-doc/html/libdbusmenu-glib/up-insensitive.png share/gtk-doc/html/libdbusmenu-glib/up.png share/gtk-doc/html/libdbusmenu-gtk/annotation-glossary.html share/gtk-doc/html/libdbusmenu-gtk/api-index-deprecated.html share/gtk-doc/html/libdbusmenu-gtk/api-index-full.html share/gtk-doc/html/libdbusmenu-gtk/ch01.html share/gtk-doc/html/libdbusmenu-gtk/home.png share/gtk-doc/html/libdbusmenu-gtk/index.html share/gtk-doc/html/libdbusmenu-gtk/index.sgml +share/gtk-doc/html/libdbusmenu-gtk/left-insensitive.png share/gtk-doc/html/libdbusmenu-gtk/left.png share/gtk-doc/html/libdbusmenu-gtk/libdbusmenu-gtk-DbusmenuGtkClient.html share/gtk-doc/html/libdbusmenu-gtk/libdbusmenu-gtk-DbusmenuGtkMenu.html share/gtk-doc/html/libdbusmenu-gtk/libdbusmenu-gtk-menuitem.html share/gtk-doc/html/libdbusmenu-gtk/libdbusmenu-gtk-parser.html share/gtk-doc/html/libdbusmenu-gtk/libdbusmenu-gtk.devhelp2 share/gtk-doc/html/libdbusmenu-gtk/object-tree.html +share/gtk-doc/html/libdbusmenu-gtk/right-insensitive.png share/gtk-doc/html/libdbusmenu-gtk/right.png share/gtk-doc/html/libdbusmenu-gtk/style.css +share/gtk-doc/html/libdbusmenu-gtk/up-insensitive.png share/gtk-doc/html/libdbusmenu-gtk/up.png share/vala/vapi/Dbusmenu-%%VERSION%%.vapi -%%GTK2%%share/vala/vapi/DbusmenuGtk-%%VERSION%%.vapi -%%GTK3%%share/vala/vapi/DbusmenuGtk3-%%VERSION%%.vapi +share/vala/vapi/DbusmenuGtk3-%%VERSION%%.vapi