gnome-settings-daemon: broken update to 3.16.4

[coypu <coypu%sdf.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	coypu <coypu%sdf.org@localhost>
Pushed By:	coypu
Date:		Mon Mar 7 21:23:15 2016 +0200
Changeset:	22bfffcab5dc9eba5b94511c3f11dd7b20cf4a7b

Modified Files:
	gnome-settings-daemon/Makefile
	gnome-settings-daemon/buildlink3.mk
Added Files:
	gnome-settings-daemon/TODO
	gnome-settings-daemon/patches/patch-data_Makefile.in

Log Message:
gnome-settings-daemon: broken update to 3.16.4

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=22bfffcab5dc9eba5b94511c3f11dd7b20cf4a7b

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gnome-settings-daemon/Makefile                       | 15 ++++++++++++++-
 gnome-settings-daemon/TODO                           | 10 ++++++++++
 gnome-settings-daemon/buildlink3.mk                  |  6 +++---
 gnome-settings-daemon/patches/patch-data_Makefile.in | 13 +++++++++++++
 4 files changed, 40 insertions(+), 4 deletions(-)

diffs:
diff --git a/gnome-settings-daemon/Makefile b/gnome-settings-daemon/Makefile
index 197b538..5057517 100644
--- a/gnome-settings-daemon/Makefile
+++ b/gnome-settings-daemon/Makefile
@@ -16,6 +16,10 @@ USE_TOOLS+=	pkg-config intltool gmake msgfmt
 
 CONFLICTS+=	gnome-control-center<2.22.0
 
+CONFIGURE_ARGS= 	--disable-gudev
+CONFIGURE_ARGS+=	--disable-rfkill
+CONFIGURE_ARGS+=	--disable-network-manager
+
 GCONF_SCHEMAS+=	gnome-settings-daemon.schemas
 GCONF_SCHEMAS+=	desktop_gnome_font_rendering.schemas
 GCONF_SCHEMAS+=	desktop_gnome_keybindings.schemas
@@ -31,6 +35,8 @@ PKG_SUPPORTED_OPTIONS=	pulseaudio
 .include "../../mk/bsd.options.mk"
 PLIST_VARS+=		pulseaudio
 
+#DEPENDS+=	gettext-[0-9]*:../../devel/gettext
+
 .include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../audio/libcanberra/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
@@ -50,6 +56,13 @@ BUILDLINK_API_DEPENDS.libxklavier+=	libxklavier>=5.0
 .include "../../x11/gnome-desktop3/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
-.include "../../sysutils/upower/buildlink3.mk"
+.include "../../wip/upower/buildlink3.mk"
+.include "../../wip/colord/buildlink3.mk"
+.include "../../wip/geoclue/buildlink3.mk"
+.include "../../wip/geocode-glib/buildlink3.mk"
+.include "../../wip/libgweather/buildlink3.mk"
+.include "../../wip/polkit/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
+.include "../../textproc/json-glib/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/gnome-settings-daemon/TODO b/gnome-settings-daemon/TODO
new file mode 100644
index 0000000..258bb43
--- /dev/null
+++ b/gnome-settings-daemon/TODO
@@ -0,0 +1,10 @@
+Build ends here:
+
+  CCLD     gsd-power-enums-update
+libtool: link: cannot find the library `/usr/pkgsrc/wip/gnome-settings-daemon/work/.buildlink/lib/libintl.la' or unhandled argument `/usr/pkgsrc/wip/gnome-settings-daemon/work/.buildlink/lib/libintl.la'
+Makefile:712: recipe for target 'gsd-power-enums-update' failed
+
+<.> /usr/pkg/bin/libtool --silent --tag=CC --mode=link clang -DG_LOG_DOMAIN=\"power-plugin\" -DPLUGIN_NAME=\"power\" -pthread -D_REENTRANT -pthread -I/usr/pkgsrc/wip/gnome-settings-daemon/work/.buildlink/include/libupower-glib -I/usr/pkgsrc/wip/gnome-settings-daemon/work/.buildlink/include/gnome-desktop-3.0 -I/usr/pkgsrc/wip/gnome-settings-daemon/work/.buildlink/include -I/usr/pkgsrc/wip/gnome-settings-daemon/work/.buildlink/include/gtk-3.0 -I/usr/pkgsrc/wip/gnome-settings-daemon/work/.buildlink/include/at-spi2-atk/2.0 -I/usr/pkgsrc/wip/gnome-settings-daemon/work/.buildlink/include/at-spi-2.0 -I/usr/pkgsrc/wip/gnome-settings-daemon/work/.buildlink/include/dbus-1.0 -I/usr/pkgsrc/wip/gnome-settings-daemon/work/.buildlink/lib/dbus-1.0/include -I/usr/pkgsrc/wip/gnome-settings-daemon/work/.buildlink/include/glib/gio-unix-2.0/ -I/usr/pkgsrc/wip/gnome-settings-daemon/work/.buildlink/include/cairo -I/usr/pkgsrc/wip/gnome-settings-daemon/work/.buildlink/include/pango-1.0 -I/usr/pkgsr
c/wip/gnome-settings-daemon/work/.buildlink/include/harfbuzz -I/usr/pkgsrc/wip/gnome-settings-daemon/work/.buildlink/include/atk-1.0 -I/usr/pkgsrc/wip/gnome-settings-daemon/work/.buildlink/include/pixman-1 -I/usr/pkgsrc/wip/gnome-settings-daemon/work/.buildlink/include/freetype2 -I/usr/pkgsrc/wip/gnome-settings-daemon/work/.buildlink/include/libpng16 -I/usr/pkgsrc/wip/gnome-settings-daemon/work/.buildlink/include/gdk-pixbuf-2.0 -I/usr/pkgsrc/wip/gnome-settings-daemon/work/.buildlink/include/glib/glib-2.0 -I/usr/pkgsrc/wip/gnome-settings-daemon/work/.buildlink/lib/glib-2.0/include -I/usr/pkgsrc/wip/gnome-settings-daemon/work/.buildlink/include/gsettings-desktop-schemas -pthread -O2 -I/usr/pkgsrc/wip/gnome-settings-daemon/work/.buildlink/include/libdrm -I/usr/include/krb5 -export_dynamic -module -avoid-version -no-undefined -L/usr/pkgsrc/wip/gnome-settings-daemon/work/.buildlink/lib/pulseaudio -Wl,-R/usr/pkg/lib/pulseaudio -L/usr/pkgsrc/wip/gnome-settings-daemon/work/.buildlink/lib -Wl
 ,-R/usr/pkg/lib -o libpower.la -rpath /usr/pkg/lib/gnome-settings-daemon-3.0 libpower_la-gpm-common.lo libpower_la-gsd-backlight-linux.lo libpower_la-gsd-power-manager.lo libpower_la-gsd-power-plugin.lo ../../plugins/common/libcommon.la ../../gnome-settings-daemon/libgsd.la -lupower-glib -lgnome-desktop-3 -lcanberra-gtk3 -lcanberra -lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -latk-1.0 -lcairo-gobject -lcairo -lnotify -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lintl -lX11 -lXext -lXtst -lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -latk-1.0 -lcairo-gobject -lcairo -lnotify -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lintl -lX11 
+
+libtool: link: `libpower_la-gpm-common.lo' is not a valid libtool object
+
diff --git a/gnome-settings-daemon/buildlink3.mk b/gnome-settings-daemon/buildlink3.mk
index fa299f4..879cff0 100644
--- a/gnome-settings-daemon/buildlink3.mk
+++ b/gnome-settings-daemon/buildlink3.mk
@@ -5,9 +5,9 @@ BUILDLINK_TREE+=	gnome-settings-daemon
 .if !defined(GNOME_SETTINGS_DAEMON_BUILDLINK3_MK)
 GNOME_SETTINGS_DAEMON_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnome-settings-daemon+=	gnome-settings-daemon>=2.22.0
-BUILDLINK_ABI_DEPENDS.gnome-settings-daemon+=	gnome-settings-daemon>=2.32.1nb13
-BUILDLINK_PKGSRCDIR.gnome-settings-daemon?=	../../sysutils/gnome-settings-daemon
+BUILDLINK_API_DEPENDS.gnome-settings-daemon+=	gnome-settings-daemon>=3.16.0
+BUILDLINK_ABI_DEPENDS.gnome-settings-daemon+=	gnome-settings-daemon>=3.16.1nb13
+BUILDLINK_PKGSRCDIR.gnome-settings-daemon?=	../../wip/gnome-settings-daemon
 
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .endif # GNOME_SETTINGS_DAEMON_BUILDLINK3_MK
diff --git a/gnome-settings-daemon/patches/patch-data_Makefile.in b/gnome-settings-daemon/patches/patch-data_Makefile.in
new file mode 100644
index 0000000..b3ffba4
--- /dev/null
+++ b/gnome-settings-daemon/patches/patch-data_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- data/Makefile.in.orig	2015-11-13 14:00:20.000000000 +0000
++++ data/Makefile.in
+@@ -418,7 +418,7 @@ gsettings_SCHEMAS = \
+ 
+ convertdir = $(datadir)/GConf/gsettings
+ convert_DATA = gnome-settings-daemon.convert
+-desktopdir = $(sysconfdir)/xdg/autostart
++desktopdir = $(datadir)/gnome/autostart
+ desktop_in_files = gnome-settings-daemon.desktop.in.in
+ desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
+ pkgconfigdir = $(libdir)/pkgconfig