pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
gnome-settings-daemon: still broken
Module Name: pkgsrc-wip
Committed By: coypu <coypu%sdf.org@localhost>
Pushed By: coypu
Date: Mon Mar 7 07:19:04 2016 +0200
Changeset: bfa3e68675a1b2e00eba05506cbda2a16e7f7582
Modified Files:
gnome-keyring/Makefile
gnome-settings-daemon/Makefile
gnome-settings-daemon/distinfo
Removed Files:
gnome-settings-daemon/patches/patch-ac
gnome-settings-daemon/patches/patch-plugins_a11y-keyboard_gsd-a11y-keyboard-manager.c
gnome-settings-daemon/patches/patch-plugins_xrandr_gsd-xrandr-manager.c
Log Message:
gnome-settings-daemon: still broken
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bfa3e68675a1b2e00eba05506cbda2a16e7f7582
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
gnome-keyring/Makefile | 1 +
gnome-settings-daemon/Makefile | 20 +++++++--------
gnome-settings-daemon/distinfo | 12 ++++-----
gnome-settings-daemon/patches/patch-ac | 13 ----------
...ugins_a11y-keyboard_gsd-a11y-keyboard-manager.c | 29 ----------------------
.../patch-plugins_xrandr_gsd-xrandr-manager.c | 27 --------------------
6 files changed, 16 insertions(+), 86 deletions(-)
diffs:
diff --git a/gnome-keyring/Makefile b/gnome-keyring/Makefile
index 5a12f1e..3446338 100644
--- a/gnome-keyring/Makefile
+++ b/gnome-keyring/Makefile
@@ -43,5 +43,6 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.26.0
.include "../../security/libtasn1/buildlink3.mk"
.include "../../sysutils/dbus/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
.include "../../mk/pam.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/gnome-settings-daemon/Makefile b/gnome-settings-daemon/Makefile
index dc30516..197b538 100644
--- a/gnome-settings-daemon/Makefile
+++ b/gnome-settings-daemon/Makefile
@@ -1,11 +1,10 @@
# $NetBSD: Makefile,v 1.54 2015/04/25 14:24:52 tnn Exp $
#
-DISTNAME= gnome-settings-daemon-2.32.1
-PKGREVISION= 31
+DISTNAME= gnome-settings-daemon-3.16.4
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/2.32/}
-EXTRACT_SUFX= .tar.bz2
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/3.16/}
+EXTRACT_SUFX= .tar.xz
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.gnome.org/
@@ -32,12 +31,8 @@ PKG_SUPPORTED_OPTIONS= pulseaudio
.include "../../mk/bsd.options.mk"
PLIST_VARS+= pulseaudio
-.if !empty(PKG_OPTIONS:Mpulseaudio)
-PLIST.pulseaudio= yes
-BUILDLINK_API_DEPENDS.pulseaudio+= pulseaudio>=0.9.15
.include "../../audio/pulseaudio/buildlink3.mk"
.include "../../audio/libcanberra/buildlink3.mk"
-.endif
.include "../../devel/GConf/schemas.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
BUILDLINK_API_DEPENDS.dbus-glib+= dbus-glib>=0.74
@@ -45,11 +40,16 @@ BUILDLINK_API_DEPENDS.dbus-glib+= dbus-glib>=0.74
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../sysutils/libnotify/buildlink3.mk"
.include "../../x11/gnome-desktop/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.21.2
-.include "../../x11/gtk2/buildlink3.mk"
+#BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.21.2
+.include "../../x11/gtk3/buildlink3.mk"
BUILDLINK_API_DEPENDS.libgnomekbd+= libgnomekbd>=2.31.2
.include "../../x11/libgnomekbd/buildlink3.mk"
BUILDLINK_API_DEPENDS.libxklavier+= libxklavier>=5.0
.include "../../x11/libxklavier/buildlink3.mk"
+.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
+.include "../../x11/gnome-desktop3/buildlink3.mk"
+.include "../../graphics/lcms2/buildlink3.mk"
+.include "../../x11/libXtst/buildlink3.mk"
+.include "../../sysutils/upower/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/gnome-settings-daemon/distinfo b/gnome-settings-daemon/distinfo
index ed5472d..b822719 100644
--- a/gnome-settings-daemon/distinfo
+++ b/gnome-settings-daemon/distinfo
@@ -1,9 +1,7 @@
$NetBSD: distinfo,v 1.14 2015/11/04 01:32:15 agc Exp $
-SHA1 (gnome-settings-daemon-2.32.1.tar.bz2) = f2550acb4a9fd8f96ead1263ba5739915c303f6e
-RMD160 (gnome-settings-daemon-2.32.1.tar.bz2) = 71aef9419eeca5f9fa59bb55990327c307f9ca31
-SHA512 (gnome-settings-daemon-2.32.1.tar.bz2) = 69bceb01e1dd15a75dc3db1e78aebee8c7c4004f217856391a64bc527c6b46146f893e90292441d3c7650df8a1b3aee2078d7cbef33c76e47a8f1904dd8e447a
-Size (gnome-settings-daemon-2.32.1.tar.bz2) = 1331850 bytes
-SHA1 (patch-ac) = 6e77934d2ad8a75a0b476cf26a3ec72ea8160b23
-SHA1 (patch-plugins_a11y-keyboard_gsd-a11y-keyboard-manager.c) = 367d8983fbdd3b26cee56b363954d43e01051d5a
-SHA1 (patch-plugins_xrandr_gsd-xrandr-manager.c) = 8d923fff84961b6ad4a7cecd58985cea66e8825c
+SHA1 (gnome-settings-daemon-3.16.4.tar.xz) = 69fd3c2c5834da5face3c80025bbdea04a3a1428
+RMD160 (gnome-settings-daemon-3.16.4.tar.xz) = ef1af70a45345ee172422c10f59a1c0ae612ffdb
+SHA512 (gnome-settings-daemon-3.16.4.tar.xz) = 2833065ec2dd931fe287d7f7098f97cca8049303677609903318be207f6cc492a6bf78390a4c8e298dc006774fe0cd2aa4869ff4a1ac7e95ff495d1296620a82
+Size (gnome-settings-daemon-3.16.4.tar.xz) = 1605708 bytes
+SHA1 (patch-data_Makefile.in) = 3d5558ba2930ee238b7ff46618e70e9f5b3058b6
diff --git a/gnome-settings-daemon/patches/patch-ac b/gnome-settings-daemon/patches/patch-ac
deleted file mode 100644
index 56b508f..0000000
--- a/gnome-settings-daemon/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2008/11/14 01:01:51 wiz Exp $
-
---- data/Makefile.in.orig 2008-09-23 09:43:06.000000000 +0000
-+++ data/Makefile.in
-@@ -270,7 +270,7 @@ schemas_in_files = \
- $(NULL)
-
- schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
--desktopdir = $(sysconfdir)/xdg/autostart
-+desktopdir = $(datadir)/gnome/autostart
- desktop_in_files = gnome-settings-daemon.desktop.in
- desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- servicedir = $(datadir)/dbus-1/services
diff --git a/gnome-settings-daemon/patches/patch-plugins_a11y-keyboard_gsd-a11y-keyboard-manager.c b/gnome-settings-daemon/patches/patch-plugins_a11y-keyboard_gsd-a11y-keyboard-manager.c
deleted file mode 100644
index 3b9d82c..0000000
--- a/gnome-settings-daemon/patches/patch-plugins_a11y-keyboard_gsd-a11y-keyboard-manager.c
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-plugins_a11y-keyboard_gsd-a11y-keyboard-manager.c,v 1.1 2013/08/12 09:10:09 obache Exp $
-
-* Require libnotify 0.6.0
- https://git.gnome.org/browse/gnome-settings-daemon/commit/?id=e1ab570b0dce479ba235e5542ea07d1b5bafc4c9
-
---- plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c.orig 2010-11-15 13:10:51.000000000 +0000
-+++ plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
-@@ -608,9 +608,7 @@ ax_slowkeys_warning_post_bubble (GsdA11y
- gsd_a11y_keyboard_manager_ensure_status_icon (manager);
- manager->priv->notification = notify_notification_new (title,
- message,
-- "preferences-desktop-accessibility",
-- NULL);
-- notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon);
-+ "preferences-desktop-accessibility");
- notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
-
- notify_notification_add_action (manager->priv->notification,
-@@ -747,9 +745,7 @@ ax_stickykeys_warning_post_bubble (GsdA1
- gsd_a11y_keyboard_manager_ensure_status_icon (manager);
- manager->priv->notification = notify_notification_new (title,
- message,
-- "preferences-desktop-accessibility",
-- NULL);
-- notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon);
-+ "preferences-desktop-accessibility");
- notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
-
- notify_notification_add_action (manager->priv->notification,
diff --git a/gnome-settings-daemon/patches/patch-plugins_xrandr_gsd-xrandr-manager.c b/gnome-settings-daemon/patches/patch-plugins_xrandr_gsd-xrandr-manager.c
deleted file mode 100644
index 0c458e6..0000000
--- a/gnome-settings-daemon/patches/patch-plugins_xrandr_gsd-xrandr-manager.c
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-plugins_xrandr_gsd-xrandr-manager.c,v 1.1 2013/08/12 09:10:09 obache Exp $
-
-* Require libnotify 0.6.0
- https://git.gnome.org/browse/gnome-settings-daemon/commit/?id=e1ab570b0dce479ba235e5542ea07d1b5bafc4c9
-
---- plugins/xrandr/gsd-xrandr-manager.c.orig 2010-11-15 13:11:00.000000000 +0000
-+++ plugins/xrandr/gsd-xrandr-manager.c
-@@ -1086,16 +1086,9 @@ error_message (GsdXrandrManager *mgr, co
-
- g_assert (error_to_display == NULL || secondary_text == NULL);
-
-- if (priv->status_icon)
-- notification = notify_notification_new_with_status_icon (primary_text,
-- error_to_display ? error_to_display->message : secondary_text,
-- GSD_XRANDR_ICON_NAME,
-- priv->status_icon);
-- else
-- notification = notify_notification_new (primary_text,
-- error_to_display ? error_to_display->message : secondary_text,
-- GSD_XRANDR_ICON_NAME,
-- NULL);
-+ notification = notify_notification_new (primary_text,
-+ error_to_display ? error_to_display->message : secondary_text,
-+ GSD_XRANDR_ICON_NAME);
-
- notify_notification_show (notification, NULL); /* NULL-GError */
- #else
Home |
Main Index |
Thread Index |
Old Index