diff options
| author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
| commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
| tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /mate-extra | |
| download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz | |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'mate-extra')
53 files changed, 3012 insertions, 0 deletions
diff --git a/mate-extra/caja-dropbox/Manifest b/mate-extra/caja-dropbox/Manifest new file mode 100644 index 0000000000..98df5d0d08 --- /dev/null +++ b/mate-extra/caja-dropbox/Manifest @@ -0,0 +1 @@ +DIST caja-dropbox-1.8.0.tar.xz 310592 SHA256 bb26151cad68e910979af6dd8b323434462a2457998ad67529660135c0caa513 SHA512 33c0804ba756ec50b531e4992b74577848f52fef60b8c69b96f307a2b8a57fd42ff951d6d3fdd55a6b1e260c4f46d0a26f90f730a88dc45a66e2d78888492fbc WHIRLPOOL 3b200e6a1b5e6f9926566962c48b9585fa0f9cc1ccc8ee89e45489d87c41cbf50a2b1bd62036140ba7492edf5a2812b918c4c4596b17c4674e0821a72d29550f diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.8.0.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.8.0.ebuild new file mode 100644 index 0000000000..50c54844b4 --- /dev/null +++ b/mate-extra/caja-dropbox/caja-dropbox-1.8.0.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +PYTHON_COMPAT=( python2_7 ) +GNOME2_LA_PUNT="yes" + +inherit autotools eutils gnome2 python-single-r1 linux-info user versionator + +MATE_BRANCH="1.8" + +SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz" +DESCRIPTION="Store, Sync and Share Files Online" +HOMEPAGE="http://www.dropbox.com/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="debug" + +RDEPEND=" + dev-libs/atk:0 + >=dev-libs/glib-2.14:2 + dev-python/pygtk:2[${PYTHON_USEDEP}] + >=mate-base/caja-1.8:0 + media-libs/fontconfig:1.0 + media-libs/freetype:2 + net-misc/dropbox:0 + x11-libs/cairo:0 + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 + x11-libs/libXinerama:0 + x11-libs/pango:0" + +DEPEND="${RDEPEND} + dev-python/docutils:0 + virtual/pkgconfig:*" + +G2CONF="${G2CONF} $(use_enable debug) --disable-static" + +CONFIG_CHECK="~INOTIFY_USER" + +pkg_setup () { + python-single-r1_pkg_setup + check_extra_config + enewgroup dropbox +} + +src_prepare() { + gnome2_src_prepare + + # Use system dropbox. + sed -e "s|~/[.]dropbox-dist|/opt/dropbox|" \ + -e 's|\(DROPBOXD_PATH = \).*|\1"/opt/dropbox/dropboxd"|' \ + -i caja-dropbox.in || die + + # Use system rst2man. + epatch "${FILESDIR}"/${P}-system-rst2man.patch + + AT_NOELIBTOOLIZE=yes eautoreconf +} + +DOCS="AUTHORS ChangeLog NEWS README" + +src_install () { + python_fix_shebang caja-dropbox.in + + gnome2_src_install + + local extensiondir="$(pkg-config --variable=extensiondir libcaja-extension)" + [ -z ${extensiondir} ] && die "pkg-config unable to get caja extensions dir" + + # Strip $EPREFIX from $extensiondir as fowners/fperms act on $ED not $D. + extensiondir="${extensiondir#${EPREFIX}}" + use prefix || fowners root:dropbox "${extensiondir}"/libcaja-dropbox.so + fperms o-rwx "${extensiondir}"/libcaja-dropbox.so +} + +pkg_postinst () { + gnome2_pkg_postinst + + elog + elog "Add any users who wish to have access to the dropbox caja" + elog "plugin to the group 'dropbox'. You need to setup a drobox account" + elog "before using this plugin. Visit ${HOMEPAGE} for more information." + elog +} diff --git a/mate-extra/caja-dropbox/files/caja-dropbox-0.7.0-system-rst2man.patch b/mate-extra/caja-dropbox/files/caja-dropbox-0.7.0-system-rst2man.patch new file mode 100644 index 0000000000..ea0053b4bb --- /dev/null +++ b/mate-extra/caja-dropbox/files/caja-dropbox-0.7.0-system-rst2man.patch @@ -0,0 +1,13 @@ +Index: nautilus-dropbox-0.7.0/configure.in +=================================================================== +--- nautilus-dropbox-0.7.0.orig/configure.in ++++ nautilus-dropbox-0.7.0/configure.in +@@ -31,7 +31,7 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLI + + AC_PATH_PROG([PYTHON], [python]) + +-AC_PATH_PROG([RST2MAN], [rst2man], [python rst2man.py]) ++AC_PATH_PROG([RST2MAN], [rst2man.py], [python rst2man.py]) + AC_SUBST(RST2MAN) + + # define module checking macro diff --git a/mate-extra/caja-dropbox/files/caja-dropbox-1.8.0-system-rst2man.patch b/mate-extra/caja-dropbox/files/caja-dropbox-1.8.0-system-rst2man.patch new file mode 100644 index 0000000000..740418249d --- /dev/null +++ b/mate-extra/caja-dropbox/files/caja-dropbox-1.8.0-system-rst2man.patch @@ -0,0 +1,13 @@ +Index: nautilus-dropbox-0.7.0/configure.ac +=================================================================== +--- nautilus-dropbox-0.7.0.orig/configure.ac ++++ nautilus-dropbox-0.7.0/configure.ac +@@ -31,7 +31,7 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLI + + AC_PATH_PROG([PYTHON], [python]) + +-AC_PATH_PROG([RST2MAN], [rst2man], [python rst2man.py]) ++AC_PATH_PROG([RST2MAN], [rst2man.py], [python rst2man.py]) + AC_SUBST(RST2MAN) + + # define module checking macro diff --git a/mate-extra/caja-dropbox/metadata.xml b/mate-extra/caja-dropbox/metadata.xml new file mode 100644 index 0000000000..8f12c89e5c --- /dev/null +++ b/mate-extra/caja-dropbox/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>mate</herd> + <upstream> + <remote-id type="github">mate-desktop/caja-dropbox</remote-id> + </upstream> +</pkgmetadata> diff --git a/mate-extra/caja-extensions/Manifest b/mate-extra/caja-extensions/Manifest new file mode 100644 index 0000000000..58750a53ba --- /dev/null +++ b/mate-extra/caja-extensions/Manifest @@ -0,0 +1 @@ +DIST caja-extensions-1.8.0.tar.xz 343784 SHA256 71b4353236b4f13e1984a8497ff80ed63d74141833ba47a32629a5d3505bbc91 SHA512 1a59bf3ed7300d790f47494d0bef677a760fa069aaf76c2f35eb4d17b67be0fcdfa904e3a05d45ca1ff9f3016961c689aa620d37f020ed199ca2ddb3d8dd3663 WHIRLPOOL f192f8e966de8272ca65d7e856ebf26bfdbca8cf559da7571c6e372b5c9ad3b21f1e08691014546ed4cd9b6b60a5840b8a02c53d9d7ed34a8876a873771dc2be diff --git a/mate-extra/caja-extensions/caja-extensions-1.8.0.ebuild b/mate-extra/caja-extensions/caja-extensions-1.8.0.ebuild new file mode 100644 index 0000000000..ba75d64c3c --- /dev/null +++ b/mate-extra/caja-extensions/caja-extensions-1.8.0.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GCONF_DEBUG="yes" +GNOME2_LA_PUNT="yes" + +inherit autotools eutils gnome2 + +MATE_BRANCH="$(get_version_component_range 1-2)" + +SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz" +DESCRIPTION="Several Caja extensions" +HOMEPAGE="http://www.mate-desktop.org" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" + +SENDTO="cdr gajim +mail pidgin upnp" +IUSE="image-converter +open-terminal share ${SENDTO}" + +RDEPEND=">=x11-libs/gtk+-2.18:2 + >=dev-libs/glib-2.26:2 + >=mate-base/caja-1.8:0 + virtual/libintl:0 + x11-libs/gdk-pixbuf:2 + open-terminal? ( >=mate-base/mate-desktop-1.8:0 ) + cdr? ( >=app-cdr/brasero-2.32.1:0= ) + gajim? ( + net-im/gajim:0 + >=dev-libs/dbus-glib-0.60:0 + >=sys-apps/dbus-1:0 + ) + pidgin? ( >=dev-libs/dbus-glib-0.60:0 ) + upnp? ( >=net-libs/gupnp-0.13:0= )" + +DEPEND="${RDEPEND} + >=dev-util/intltool-0.18:* + >=mate-base/mate-common-1.8:0 + sys-devel/gettext:* + virtual/pkgconfig:* + !!mate-extra/mate-file-manager-open-terminal + !!mate-extra/mate-file-manager-sendto + !!mate-extra/mate-file-manager-image-converter + !!mate-extra/mate-file-manager-share" + +src_prepare() { + epatch "${FILESDIR}/${PN}-1.8.0-sendto-options.patch" + + eautoreconf +} + +src_configure() { + MY_CONF="" + + if use cdr || use mail || use pidgin || use gajim || use upnp ; then + MY_CONF="${MY_CONF} --enable-sendto" + MY_CONF="${MY_CONF} --with-sendto-plugins=removable-devices" + use cdr && MY_CONF="${MY_CONF},caja-burn" + use mail && MY_CONF="${MY_CONF},emailclient" + use pidgin && MY_CONF="${MY_CONF},pidgin" + use gajim && MY_CONF="${MY_CONF},gajim" + use upnp && MY_CONF="${MY_CONF},upnp" + else + MYCONF="${MY_CONF} --disable-sendto" + fi + + gnome2_src_configure ${MY_CONF} \ + --disable-gksu \ + $(use_enable image-converter) \ + $(use_enable open-terminal) \ + $(use_enable share) +} + +DOCS="AUTHORS ChangeLog NEWS README" diff --git a/mate-extra/caja-extensions/files/caja-extensions-1.8.0-sendto-options.patch b/mate-extra/caja-extensions/files/caja-extensions-1.8.0-sendto-options.patch new file mode 100644 index 0000000000..5e0953a017 --- /dev/null +++ b/mate-extra/caja-extensions/files/caja-extensions-1.8.0-sendto-options.patch @@ -0,0 +1,316 @@ +diff --git a/configure.ac b/configure.ac +index fcf02d6..c38061f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -102,19 +102,173 @@ if test "x$enable_sendto" = "xyes"; then + GUPNP_REQUIRED=0.13 + PKG_CHECK_MODULES(SENDTO, + glib-2.0 >= $GLIB_REQUIRED +- gio-2.0 >= $GLIB_REQUIRED + gthread-2.0 >= $GTHREAD_REQUIRED + gmodule-2.0 >= $GLIB_REQUIRED + gobject-2.0 >= $GLIB_REQUIRED +- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED +- dbus-1 >= $DBUS_REQUIRED +- dbus-glib-1 >= $DBUS_GLIB_REQUIRED +- gupnp-1.0 >= $GUPNP_REQUIRED) ++ gtk+-$GTK_API_VERSION >= $GTK_REQUIRED) + AC_SUBST(SENDTO_CFLAGS) + AC_SUBST(SENDTO_LIBS) +- AC_DEFINE_UNQUOTED(GAJIM_SHARE_DIR, "$prefix/share/gajim", [path to gajim share dir]) +-fi + ++ # The full list of plugins ++ allowed_sendto_plugins="emailclient gajim caja-burn pidgin removable-devices upnp" ++ ++ sendto_plugin_error_or_ignore() ++ { ++ if test "${error_on_bad_sendto_plugin}" = "1" ; then ++ AC_MSG_ERROR([$1]) ++ else ++ AC_MSG_WARN([$1 (disabling sendto plugin)]) ++ fi ++ } ++ ++ AC_ARG_WITH([sendto-plugins], ++ [AS_HELP_STRING([--with-sendto-plugins],[Which caja-sendto plugins to compile (default: auto; "all", "autodetect" are valid)])], ++ [], [with_sendto_plugins=autodetect]) ++ ++ used_sendto_plugins="" ++ used_sendto_plugins2="" ++ ++ if test "x${with_sendto_plugins}" = "xautodetect" ; then ++ # Default to all plugins and just ignore them if they won't compile ++ with_sendto_plugins="all" ++ error_on_bad_sendto_plugin="0" ++ else ++ # Clean up the plugin list and error if a plugin won't compile ++ with_sendto_plugins=`echo ,"${with_sendto_plugins}", | sed -e 's/[[ ,]][[ ,]]*/ /g' -e 's/,$//'` ++ error_on_bad_sendto_plugin="1" ++ fi ++ ++ # Iterate through the wanted plugins and weed out bad ones (or error) ++ for wanted_sendto_plugin in ${with_sendto_plugins}; do ++ for allowed_sendto_plugin in ${allowed_sendto_plugins}; do ++ case ${wanted_sendto_plugin} in ++ all) ++ # List all plugins as being used ++ used_sendto_plugins=${allowed_sendto_plugins} ++ ;; ++ autodetect) ++ # List all plugins as being used ++ used_sendto_plugins=${allowed_sendto_plugins} ++ ;; ++ ${allowed_sendto_plugin}) used_sendto_plugins="${used_sendto_plugins} ${wanted_sendto_plugin}";; # List the plugin ++ *) ;; ++ esac ++ done ++ done ++ ++ # Check for plugin-specific requirements and error if necessary ++ for sendto_plugin in ${used_sendto_plugins}; do ++ add_sendto_plugin="1" ++ ++ case ${sendto_plugin} in ++ emailclient) ++ PKG_CHECK_MODULES(EMAILCLIENT, gio-2.0, ++ enable_emailclient=yes, enable_emailclient=no) ++ if test "${enable_emailclient}" != "yes" ; then ++ sendto_plugin_error_or_ignore "you need gio-2.0 to build the emailclient plugin" ++ add_sendto_plugin="0" ++ fi ++ ;; ++ gajim) ++ AC_ARG_WITH(sendto_gajim, ++ [AS_HELP_STRING(--with-sendto-gajim,[Path to Gajim install prefix])], ++ [GAJIM_PATH="$withval"],[GAJIM_PATH="$prefix"]) ++ ++ GAJIM_SHARE_DIR="$GAJIM_PATH"/share/gajim ++ ++ PKG_CHECK_MODULES(DBUS, dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED, ++ [AC_SUBST(DBUS_CFLAGS) ++ AC_SUBST(DBUS_LIBS) ++ enable_sendto_gajim=yes ++ AC_DEFINE_UNQUOTED(GAJIM_SHARE_DIR, "$GAJIM_SHARE_DIR", [path to gajim share dir])], ++ [enable_gajim=no]) ++ ++ if test "${enable_gajim}" != "yes" ; then ++ sendto_plugin_error_or_ignore "you need gajim and dbus-glib installed for the gajim plugin" ++ add_sendto_plugin="0" ++ fi ++ ;; ++ caja-burn) ++ PKG_CHECK_MODULES(GIO, gio-2.0, ++ enable_burn=yes, enable_burn=no) ++ if test "${enable_burn}" != "yes" ; then ++ sendto_plugin_error_or_ignore "you need gio installed for the caja-burn plugin" ++ add_sendto_plugin="0" ++ fi ++ ;; ++ pidgin) ++ PKG_CHECK_MODULES(PIDGIN, dbus-glib-1 >= $DBUS_GLIB_REQUIRED, ++ enable_pidgin=yes, enable_pidgin=no) ++ if test "${enable_pidgin}" != "yes" ; then ++ sendto_plugin_error_or_ignore "you need dbus-glib to build the pidgin plugin" ++ add_sendto_plugin="0" ++ fi ++ ;; ++ removable-devices) ++ PKG_CHECK_MODULES(GIO, gio-2.0, ++ enable_removable=yes, enable_removable=no) ++ if test "${enable_removable}" != "yes" ; then ++ sendto_plugin_error_or_ignore "you need gio-2.0 to build the removable-devices plugin" ++ add_sendto_plugin="0" ++ fi ++ ;; ++ upnp) ++ PKG_CHECK_MODULES(UPNP, gupnp-1.0 >= $GUPNP_REQUIRED, ++ enable_upnp=yes, enable_upnp=no) ++ if test "${enable_upnp}" != "yes" ; then ++ sendto_plugin_error_or_ignore "you need gupnp installed for the upnp plugin" ++ add_sendto_plugin="0" ++ fi ++ ;; ++ esac ++ ++ # Add the specified plugin ++ if test "${add_sendto_plugin}" = "1" ; then ++ used_sendto_plugins2="${used_sendto_plugins2} ${sendto_plugin}" ++ fi ++ done ++ ++ ALL_SENDTO_PLUGINS=$allowed_sendto_plugins ++ SENDTO_PLUGINS=$used_sendto_plugins2 ++ ++ dnl Error out if no plugins will be built ++ if test -z "${SENDTO_PLUGINS}" ; then ++ AC_MSG_ERROR([No sendto plugins will be built, and caja-sendto requires at least one]) ++ fi ++ ++ AC_MSG_CHECKING([which sendto plugins to compile]) ++ AC_MSG_RESULT([$SENDTO_PLUGINS]) ++ ++ AC_SUBST([ALL_SENDTO_PLUGINS]) ++ AC_SUBST([SENDTO_PLUGINS]) ++ ++ dnl For the pidgin sendto plugin ++ AM_CONDITIONAL(HAVE_SENDTO_PIDGIN, test "x$enable_pidgin" = "xyes") ++ ++ dnl For the GIO based plugins ++ enable_nst_common=no ++ if test "x$enable_burn" = "xyes" -o "x$enable_removable" = "xyes"; then ++ enable_nst_common=yes ++ fi ++ AM_CONDITIONAL(HAVE_GIO, test "x$enable_nst_common" = "xyes") ++ ++ if test "x${SENDTO_PLUGINS}" != "x" ; then ++ for allowed_sendto_plugin in ${ALL_SENDTO_PLUGINS}; do ++ for sendto_plugin in ${SENDTO_PLUGINS}; do ++ case ${allowed_sendto_plugin} in ++ ${sendto_plugin}) ++ AC_MSG_NOTICE([** ${allowed_sendto_plugin} sendto plugin enabled]) ++ continue 2 ++ ;; ++ *);; ++ esac ++ done ++ AC_MSG_NOTICE([ ${allowed_sendto_plugin} sendto plugin disabled]) ++ done ++ else ++ AC_MSG_NOTICE([ No caja-sendto plugins enabled]) ++ fi ++fi + AM_CONDITIONAL(ENABLE_SENDTO, test x"$enable_sendto" = "xyes") + + # share extension +diff --git a/sendto/plugins/Makefile.am b/sendto/plugins/Makefile.am +index 10097e8..6d17c98 100644 +--- a/sendto/plugins/Makefile.am ++++ b/sendto/plugins/Makefile.am +@@ -1,16 +1,13 @@ +-SUBDIRS = . \ +- caja-burn \ +- emailclient \ +- gajim \ +- pidgin \ +- removable-devices \ +- upnp ++SUBDIRS = . $(SENDTO_PLUGINS) ++DIST_SUBDIRS = $(ALL_SENDTO_PLUGINS) + + NST_COMMON_SOURCES = nst-common.c nst-common.h + ++if HAVE_GIO + noinst_LTLIBRARIES = libnstcommon.la + libnstcommon_la_SOURCES = $(NST_COMMON_SOURCES) + libnstcommon_la_CFLAGS = $(SENDTO_CFLAGS) + libnstcommon_la_LIBADD = $(SENDTO_LIBS) ++endif + + EXTRA_DIST = $(NST_COMMON_SOURCES) +diff --git a/sendto/plugins/caja-burn/Makefile.am b/sendto/plugins/caja-burn/Makefile.am +index 50c309b..00f95c2 100644 +--- a/sendto/plugins/caja-burn/Makefile.am ++++ b/sendto/plugins/caja-burn/Makefile.am +@@ -9,11 +9,12 @@ AM_CPPFLAGS = \ + -I$(srcdir)/../ \ + $(SENDTO_CFLAGS) \ + $(WARN_CFLAGS) \ +- $(DISABLE_DEPRECATED) ++ $(DISABLE_DEPRECATED) \ ++ $(GIO_CFLAGS) + + plugin_LTLIBRARIES = libnstburn.la + + libnstburn_la_SOURCES = caja-burn.c + libnstburn_la_LDFLAGS = -module -avoid-version +-libnstburn_la_LIBADD = $(SENDTO_LIBS) $(builddir)/../libnstcommon.la ++libnstburn_la_LIBADD = $(GIO_LIBS) $(SENDTO_LIBS) $(builddir)/../libnstcommon.la + +diff --git a/sendto/plugins/emailclient/Makefile.am b/sendto/plugins/emailclient/Makefile.am +index 31ba40e..c4af752 100644 +--- a/sendto/plugins/emailclient/Makefile.am ++++ b/sendto/plugins/emailclient/Makefile.am +@@ -7,6 +7,7 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/sendto \ + -I$(top_builddir) \ + $(SENDTO_CFLAGS) \ ++ $(EMAILCLIENT_CFLAGS) \ + $(DISABLE_DEPRECATED) \ + $(WARN_CFLAGS) + +@@ -14,4 +15,4 @@ plugin_LTLIBRARIES = libnstemailclient.la + + libnstemailclient_la_SOURCES = emailclient.c + libnstemailclient_la_LDFLAGS = -module -avoid-version +-libnstemailclient_la_LIBADD = $(SENDTO_LIBS) ++libnstemailclient_la_LIBADD = $(SENDTO_LIBS) $(EMAILCLIENT_LIBS) +diff --git a/sendto/plugins/gajim/Makefile.am b/sendto/plugins/gajim/Makefile.am +index 5acd5b0..c39a3c0 100644 +--- a/sendto/plugins/gajim/Makefile.am ++++ b/sendto/plugins/gajim/Makefile.am +@@ -7,6 +7,7 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/sendto \ + -I$(top_builddir) \ + $(SENDTO_CFLAGS) \ ++ $(DBUS_CFLAGS) \ + $(DISABLE_DEPRECATED) \ + $(WARN_CFLAGS) + +@@ -14,5 +15,5 @@ plugin_LTLIBRARIES = libnstgajim.la + + libnstgajim_la_SOURCES = gajim.c + libnstgajim_la_LDFLAGS = -module -avoid-version +-libnstgajim_la_LIBADD = $(SENDTO_LIBS) ++libnstgajim_la_LIBADD = $(DBUS_LIBS) $(SENDTO_LIBS) + +diff --git a/sendto/plugins/pidgin/Makefile.am b/sendto/plugins/pidgin/Makefile.am +index b7f650a..bcfe1d3 100644 +--- a/sendto/plugins/pidgin/Makefile.am ++++ b/sendto/plugins/pidgin/Makefile.am +@@ -7,6 +7,8 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/sendto \ + -I$(top_builddir) \ + $(SENDTO_CFLAGS) \ ++ $(NST_EBOOK_CFLAGS) \ ++ $(PIDGIN_CFLAGS) \ + $(DISABLE_DEPRECATED) \ + $(WARN_CFLAGS) + +@@ -14,5 +16,5 @@ plugin_LTLIBRARIES = libnstpidgin.la + + libnstpidgin_la_SOURCES = pidgin.c + libnstpidgin_la_LDFLAGS = -module -avoid-version +-libnstpidgin_la_LIBADD = $(SENDTO_LIBS) ++libnstpidgin_la_LIBADD = $(PIDGIN_LIBS) $(SENDTO_LIBS) + +diff --git a/sendto/plugins/removable-devices/Makefile.am b/sendto/plugins/removable-devices/Makefile.am +index 294ca90..797353b 100644 +--- a/sendto/plugins/removable-devices/Makefile.am ++++ b/sendto/plugins/removable-devices/Makefile.am +@@ -15,5 +15,5 @@ plugin_LTLIBRARIES = libnstremovable_devices.la + + libnstremovable_devices_la_SOURCES = removable-devices.c + libnstremovable_devices_la_LDFLAGS = -module -avoid-version +-libnstremovable_devices_la_LIBADD = $(SENDTO_LIBS) $(builddir)/../libnstcommon.la ++libnstremovable_devices_la_LIBADD = $(GIO_LIBS) $(SENDTO_LIBS) $(builddir)/../libnstcommon.la + +diff --git a/sendto/plugins/upnp/Makefile.am b/sendto/plugins/upnp/Makefile.am +index 4127abd..31a8bd6 100644 +--- a/sendto/plugins/upnp/Makefile.am ++++ b/sendto/plugins/upnp/Makefile.am +@@ -7,6 +7,7 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/sendto \ + -I$(top_builddir) \ + $(SENDTO_CFLAGS) \ ++ $(UPNP_CFLAGS) \ + $(DISABLE_DEPRECATED) \ + $(WARN_CFLAGS) + +@@ -14,5 +15,5 @@ plugin_LTLIBRARIES = libnstupnp.la + + libnstupnp_la_SOURCES = upnp.c + libnstupnp_la_LDFLAGS = -module -avoid-version +-libnstupnp_la_LIBADD = $(SENDTO_LIBS) ++libnstupnp_la_LIBADD = $(UPNP_LIBS) $(SENDTO_LIBS) + diff --git a/mate-extra/caja-extensions/metadata.xml b/mate-extra/caja-extensions/metadata.xml new file mode 100644 index 0000000000..d719a85807 --- /dev/null +++ b/mate-extra/caja-extensions/metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>mate</herd> + <use> + <flag name="gajim">Add an extension to support <pkg>net-im/gajim</pkg>.</flag> + <flag name="image-converter">Add image conversion support.</flag> + <flag name="mail">Add an extension to support e-mail functionality.</flag> + <flag name="open-terminal">Add an extension to support an open terminal.</flag> + <flag name="pidgin">Add an extension to support <pkg>net-im/pidgin</pkg></flag> + <flag name="share">Add an extension to support sharing files.</flag> + </use> + <upstream> + <remote-id type="github">mate-desktop/caja-extensions</remote-id> + </upstream> +</pkgmetadata> diff --git a/mate-extra/mate-calc/Manifest b/mate-extra/mate-calc/Manifest new file mode 100644 index 0000000000..272b3b8803 --- /dev/null +++ b/mate-extra/mate-calc/Manifest @@ -0,0 +1 @@ +DIST mate-calc-1.8.0.tar.xz 753972 SHA256 13d56287430cbb7d60a74666ba752a1a8ea9692125c6a02f97d0cc98d451d99a SHA512 92cd2e5ee8f6943b70ba1402909698f0ca922864bf3553d04ba3212673824b3f1f2042786f77814bf004e93408f46b7be438ddbe1046884f834abc90606bdf11 WHIRLPOOL 7743c0d132d3ca4b71072bd61e152dd44f9688e5f55efc2fb358c5ff238594488f03d4501d0efd6aa687df3925dbe3a265aa2d910a9670446e39c113436f3520 diff --git a/mate-extra/mate-calc/mate-calc-1.8.0.ebuild b/mate-extra/mate-calc/mate-calc-1.8.0.ebuild new file mode 100644 index 0000000000..dff3b3f371 --- /dev/null +++ b/mate-extra/mate-calc/mate-calc-1.8.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GCONF_DEBUG="no" + +inherit gnome2 versionator + +MATE_BRANCH="$(get_version_component_range 1-2)" + +SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz" +DESCRIPTION="A calculator application for MATE" +HOMEPAGE="http://mate-desktop.org" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" + +RDEPEND="app-text/rarian:0 + >=dev-libs/glib-2.30:2 + dev-libs/atk:0 + dev-libs/libxml2:2 + >=x11-libs/gtk+-2.18:2 + x11-libs/pango:0 + virtual/libintl:0" + +DEPEND="${RDEPEND} + >=app-text/scrollkeeper-dtd-1:1.0 + app-text/yelp-tools:0 + >=dev-util/intltool-0.35:* + sys-devel/gettext:* + virtual/pkgconfig:*" + +DOCS="AUTHORS ChangeLog NEWS README" diff --git a/mate-extra/mate-calc/metadata.xml b/mate-extra/mate-calc/metadata.xml new file mode 100644 index 0000000000..815ce85792 --- /dev/null +++ b/mate-extra/mate-calc/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>mate</herd> + <upstream> + <remote-id type="github">mate-desktop/mate-calc</remote-id> + </upstream> +</pkgmetadata> diff --git a/mate-extra/mate-dialogs/Manifest b/mate-extra/mate-dialogs/Manifest new file mode 100644 index 0000000000..ef4102765b --- /dev/null +++ b/mate-extra/mate-dialogs/Manifest @@ -0,0 +1 @@ +DIST mate-dialogs-1.8.0.tar.xz 2786956 SHA256 1db39f743846377c1b5e065c1199285cd70509a26ae2fbdec0884b06f00bcbda SHA512 82b54e034e9ec4d8b1819c5ca9817b9f12fd2273345a26aa9d75b5d1ee307a8d2254f5ba3e4a7a3e8e482344a4be71d95bed8a9f6af9e691babcdeea1f2c0fa3 WHIRLPOOL 12aacb04567b23c089fb2879817d2b2583896dbb5b6290ba4284487c9816ce0629a067990c0fd13698cfbcc502c70ad9f0faf3c9e06de10ed3c07637ec4e7827 diff --git a/mate-extra/mate-dialogs/mate-dialogs-1.8.0.ebuild b/mate-extra/mate-dialogs/mate-dialogs-1.8.0.ebuild new file mode 100644 index 0000000000..1b4a6c539f --- /dev/null +++ b/mate-extra/mate-dialogs/mate-dialogs-1.8.0.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GCONF_DEBUG="yes" + +inherit gnome2 versionator + +MATE_BRANCH="$(get_version_component_range 1-2)" + +SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz" +DESCRIPTION="Display MATE dialogs from the commandline and shell scripts" +HOMEPAGE="http://mate-desktop.org" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="amd64 x86" + +IUSE="libnotify" + +RDEPEND="app-text/rarian:0 + >=dev-libs/glib-2.8:2 + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-2.18:2 + x11-libs/libX11:0 + virtual/libintl:0 + libnotify? ( >=x11-libs/libnotify-0.7.0:0 )" + +DEPEND="${RDEPEND} + app-text/docbook-xml-dtd:4.1.2 + >=app-text/scrollkeeper-dtd-1:1.0 + app-text/yelp-tools:0 + >=dev-util/intltool-0.40:* + >=mate-base/mate-common-1.8:0 + >=sys-devel/gettext-0.14:* + virtual/pkgconfig:*" + +src_configure() { + gnome2_src_configure \ + --with-gtk=2.0 \ + $(use_enable libnotify) +} + +DOCS="AUTHORS ChangeLog HACKING NEWS README THANKS TODO" diff --git a/mate-extra/mate-dialogs/metadata.xml b/mate-extra/mate-dialogs/metadata.xml new file mode 100644 index 0000000000..e05b855fdc --- /dev/null +++ b/mate-extra/mate-dialogs/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>mate</herd> + <upstream> + <remote-id type="github">mate-desktop/mate-dialogs</remote-id> + </upstream> +</pkgmetadata> diff --git a/mate-extra/mate-media/Manifest b/mate-extra/mate-media/Manifest new file mode 100644 index 0000000000..2e6f7ed578 --- /dev/null +++ b/mate-extra/mate-media/Manifest @@ -0,0 +1 @@ +DIST mate-media-1.8.0.tar.xz 939728 SHA256 a264f9afcae7dff50aefb813616857db10ed62ac30c4071e690485ee9c6e5f61 SHA512 c41f35e3827246f16eea8887f9e3226c32dad260af478b8923d9d80ea4b9eb0e6ab87f975e2ad4838bf567494d5c5c1039f325033d5244dd677f73ef00ef865a WHIRLPOOL 771705bebee18c901c0def8bcc3b0a843cace5ce7c88558d8f008c520c46aa695ca6dd1071edbdf9bc7246aa72eb41e5e8c427805806bad7866bfcfc0969bca9 diff --git a/mate-extra/mate-media/mate-media-1.8.0.ebuild b/mate-extra/mate-media/mate-media-1.8.0.ebuild new file mode 100644 index 0000000000..8795cbe561 --- /dev/null +++ b/mate-extra/mate-media/mate-media-1.8.0.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GCONF_DEBUG="yes" + +inherit gnome2 versionator + +MATE_BRANCH="$(get_version_component_range 1-2)" + +SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz" +DESCRIPTION="Multimedia related programs for the MATE desktop" +HOMEPAGE="http://mate-desktop.org" + +LICENSE="LGPL-2 GPL-2 FDL-1.1" +SLOT="0" +KEYWORDS="amd64 x86" + +IUSE="aac flac mp3 pulseaudio speex twolame vorbis" + +# FIXME: automagic dev-util/glade:3 support +COMMON_DEPEND="app-text/rarian:0 + dev-libs/libxml2:2 + >=dev-libs/glib-2.18.2:2 + >=x11-libs/gtk+-2.24:2 + >=mate-base/mate-panel-1.8:0 + >=mate-base/mate-desktop-1.8:0 + >=media-libs/gstreamer-0.10.23:0.10 + >=media-libs/gst-plugins-base-0.10.23:0.10 + >=media-libs/gst-plugins-good-0.10:0.10 + >=media-libs/libcanberra-0.13:0[gtk] + >=media-plugins/gst-plugins-meta-0.10-r2:0.10 + >=media-plugins/gst-plugins-gconf-0.10.1:0.10 + >=dev-libs/libunique-1:1 + x11-libs/cairo:0 + x11-libs/pango:0 + virtual/libintl:0 + pulseaudio? ( >=media-sound/pulseaudio-0.9.16:0[glib] )" + +# Specific gst plugins are used by the default audio encoding profiles +RDEPEND="${COMMON_DEPEND} + >=media-plugins/gst-plugins-meta-0.10:0.10[flac?,vorbis?] + aac? ( + >=media-plugins/gst-plugins-faac-0.10.23:0.10 + >=media-plugins/gst-plugins-ffmpeg-0.10:0.10 + ) + mp3? ( + >=media-libs/gst-plugins-ugly-0.10:0.10 + >=media-plugins/gst-plugins-taglib-0.10.23:0.10 + >=media-plugins/gst-plugins-lame-0.10:0.10 + ) + speex? ( + >=media-plugins/gst-plugins-ogg-0.10.23:0.10 + >=media-plugins/gst-plugins-speex-0.10.23:0.10 + ) + twolame? ( + >=media-plugins/gst-plugins-taglib-0.10.23:0.10 + >=media-plugins/gst-plugins-twolame-0.10:0.10 + )" + +DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.1.2 + app-text/yelp-tools:0 + >=app-text/scrollkeeper-dtd-1:1.0 + >=dev-util/intltool-0.35.0:* + sys-devel/gettext:* + virtual/pkgconfig:* + !!<mate-base/mate-applets-1.8:*" + +src_configure() { + gnome2_src_configure \ + $(use_enable pulseaudio) \ + $(use_enable !pulseaudio gstmix) \ + $(use_enable !pulseaudio gst-mixer-applet) +} + +DOCS="AUTHORS ChangeLog* NEWS README" + +pkg_postinst() { + gnome2_pkg_postinst + + ewarn + ewarn "If you cannot play some music format, please check your" + ewarn "USE flags on media-plugins/gst-plugins-meta" + ewarn + + if use pulseaudio ; then + ewarn "You have enabled pulseaudio support, gstmixer will not be built" + ewarn "If you do not use pulseaudio, you do not want this" + fi +} diff --git a/mate-extra/mate-media/metadata.xml b/mate-extra/mate-media/metadata.xml new file mode 100644 index 0000000000..032165d8cc --- /dev/null +++ b/mate-extra/mate-media/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>mate</herd> + <use> + <flag name="twolame">Bring in twolame gstreamer support</flag> + </use> + <upstream> + <remote-id type="github">mate-desktop/mate-media</remote-id> + </upstream> +</pkgmetadata> diff --git a/mate-extra/mate-polkit/Manifest b/mate-extra/mate-polkit/Manifest new file mode 100644 index 0000000000..602a1f4720 --- /dev/null +++ b/mate-extra/mate-polkit/Manifest @@ -0,0 +1 @@ +DIST mate-polkit-1.8.0.tar.xz 324960 SHA256 bc01640c63f6248497ca78c3d8df8ff608d8bf1fbfce7c11416b014a109aeccd SHA512 6e7324c539f86a906cd192f8e6a17c417717ae80c0b9d8d46907f1e911f364f73933365520469bbed3201287ae897d8055a7fa14b103ade8e6c7cee9e30912cf WHIRLPOOL b3243bd5814e2d156fd85a376294f1c102dd8661e8716e2007291a9513429202b11ff15bbb53a5b33ea5a9cabac559836374778b99627767973f935a05617d6f diff --git a/mate-extra/mate-polkit/mate-polkit-1.8.0.ebuild b/mate-extra/mate-polkit/mate-polkit-1.8.0.ebuild new file mode 100644 index 0000000000..349d33913c --- /dev/null +++ b/mate-extra/mate-polkit/mate-polkit-1.8.0.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GCONF_DEBUG="no" + +inherit gnome2 versionator + +MATE_BRANCH="$(get_version_component_range 1-2)" + +SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz" +DESCRIPTION="A MATE specific DBUS session bus service that is used to bring up authentication dialogs" +HOMEPAGE="https://github.com/mate-desktop/mate-polkit" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="amd64 x86" + +IUSE="+introspection" + +RDEPEND=">=dev-libs/glib-2.28:2 + >=sys-auth/polkit-0.102:0[introspection?] + >=x11-libs/gtk+-2.24:2[introspection?] + x11-libs/gdk-pixbuf:2[introspection?] + virtual/libintl:0 + introspection? ( >=dev-libs/gobject-introspection-0.6.2:0 )" + +# We call gtkdocize so we need to depend on gtk-doc. +DEPEND="${RDEPEND} + >=dev-util/gtk-doc-1.3:0 + >=dev-util/intltool-0.35:* + >=mate-base/mate-common-1.8:0 + sys-devel/gettext:* + virtual/pkgconfig:* + !<gnome-extra/polkit-gnome-0.102:0" + +# Entropy PMS specific. This way we can install the pkg into the build chroots. +ENTROPY_RDEPEND="!lxde-base/lxpolkit" + +src_configure() { + gnome2_src_configure \ + --disable-static \ + $(use_enable introspection) +} + +DOCS="AUTHORS HACKING NEWS README" diff --git a/mate-extra/mate-polkit/metadata.xml b/mate-extra/mate-polkit/metadata.xml new file mode 100644 index 0000000000..98365c2ab3 --- /dev/null +++ b/mate-extra/mate-polkit/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>mate</herd> + <upstream> + <remote-id type="github">mate-desktop/mate-polkit</remote-id> + </upstream> +</pkgmetadata> diff --git a/mate-extra/mate-power-manager/Manifest b/mate-extra/mate-power-manager/Manifest new file mode 100644 index 0000000000..035a970126 --- /dev/null +++ b/mate-extra/mate-power-manager/Manifest @@ -0,0 +1,2 @@ +DIST mate-power-manager-1.8.0.tar.xz 3339588 SHA256 3d83b7736b0b6256242db3b9efaa18530b4ba6d80b146eafaf511230ae926d9f SHA512 f91b195e384138ce0881f53f4d3e8924d422445ac258de2138da16ab29999cd367b2e37c226e5d56e698bc54b82c8996b3263a638702f45b2f96ffabbceca479 WHIRLPOOL 31a423d25abd488bceb13354cabc3f80844f791060339ea38d4fa12f8ac80d1d4a4c94c8e07af7ba489fd5da98f7bbdfbf4edebe339926e91e0d39747ddb3a34 +DIST mate-power-manager-1.8.1.tar.xz 3341892 SHA256 6fa72d4e6a018a44144d06b68c8f67e067e3847ad83b4b8a8aaa0e2a8c9b6147 SHA512 1715d4f5515245d1fb4543dcce60b1f391ddf78bca50b28fd9097330ea42080873b0bf956a7510adc153679da239092035c62969e2f2afc4a635335ffcb714b7 WHIRLPOOL a6ef0581e13d0414b52f4efd3d9e60ca97a885639d3288ff00d1382d5b1bb6d9b04590ad92912a0123ea248f7d6f138dc680bc9d83087f99d4361d2ede10ec20 diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.6-libsecret.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.6-libsecret.patch new file mode 100644 index 0000000000..b36ce4e61b --- /dev/null +++ b/mate-extra/mate-power-manager/files/mate-power-manager-1.6-libsecret.patch @@ -0,0 +1,144 @@ +diff --git a/README b/README +index 77e1213..3f6a122 100644 +--- a/README ++++ b/README +@@ -15,7 +15,7 @@ To build, MATE Power Manager requires + + - Glib (2.13.0 or later) + - Gtk2+ (2.11.0 or later) +- - MATE Keyring (1.1.0 or later) ++ - GNOME Keyring (3.0.0 or later) + - DBus (0.70 or later) + - libnotify (0.7.0 or later) + - Cairo (1.0.0 or later) +diff --git a/configure.ac b/configure.ac +index 89309ff..912c362 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -102,7 +102,7 @@ GLIB_REQUIRED=2.13.0 + GIO_REQUIRED=2.25.0 + GTK_REQUIRED=2.17.7 + GDK_REQUIRED=2.11.0 +-MATE_KEYRING_REQUIRED=1.1.0 ++GNOME_KEYRING_REQUIRED=3.0.0 + DBUS_REQUIRED=1.0 + DBUS_GLIB_REQUIRED=0.70 + LIBNOTIFY_REQUIRED=0.7.0 +@@ -249,18 +249,18 @@ fi + AM_CONDITIONAL([HAVE_TESTS], [test $have_tests = yes]) + + dnl --------------------------------------------------------------------------- +-dnl - Build mate-keyring support ++dnl - Build gnome-keyring support + dnl --------------------------------------------------------------------------- + AC_ARG_WITH(keyring, + [AS_HELP_STRING([--without-keyring], +- [Disable the use of mate-keyring])], ++ [Disable the use of gnome-keyring])], + [], + [with_keyring=yes]) + + AM_CONDITIONAL([WITH_KEYRING],[test "$with_keyring" = "yes"]) + + if test "$with_keyring" = "yes"; then +- PKG_CHECK_MODULES(KEYRING, mate-keyring-1 >= $MATE_KEYRING_REQUIRED) ++ PKG_CHECK_MODULES(KEYRING, gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED) + AC_DEFINE([WITH_KEYRING],[1],[Define if KEYRING support is enabled]) + fi + +@@ -393,7 +393,7 @@ echo " + datadir: ${datadir} + compiler: ${CC} + cflags: ${CFLAGS} +- mate-keyring support: ${with_keyring} ++ gnome-keyring support: ${with_keyring} + Building extra applets: ${enable_applets} + Self test support: ${have_tests} + Use libunique: ${enable_libunique} +diff --git a/data/org.mate.power-manager.gschema.xml.in b/data/org.mate.power-manager.gschema.xml.in +index dcd2cd4..adecce0 100644 +--- a/data/org.mate.power-manager.gschema.xml.in ++++ b/data/org.mate.power-manager.gschema.xml.in +@@ -183,13 +183,13 @@ + </key> + <key name="lock-keyring-suspend" type="b"> + <default>false</default> +- <_summary>Lock MATE keyring on sleep</_summary> +- <_description>Whether the MATE keyring is locked before the computer enters suspend. This means the keyring will have to be unlocked on resume.</_description> ++ <_summary>Lock GNOME keyring on sleep</_summary> ++ <_description>Whether the GNOME keyring is locked before the computer enters suspend. This means the keyring will have to be unlocked on resume.</_description> + </key> + <key name="lock-keyring-hibernate" type="b"> + <default>true</default> +- <_summary>Lock MATE keyring on sleep</_summary> +- <_description>Whether the MATE keyring is locked before the computer enters hibernate. This means the keyring will have to be unlocked on resume.</_description> ++ <_summary>Lock GNOME keyring on sleep</_summary> ++ <_description>Whether the GNOME keyring is locked before the computer enters hibernate. This means the keyring will have to be unlocked on resume.</_description> + </key> + <key name="spindown-enable-ac" type="b"> + <default>false</default> +diff --git a/src/gpm-control.c b/src/gpm-control.c +index cb84814..8253336 100644 +--- a/src/gpm-control.c ++++ b/src/gpm-control.c +@@ -42,7 +42,7 @@ + #include <libupower-glib/upower.h> + + #ifdef WITH_KEYRING +-#include <mate-keyring.h> ++#include <gnome-keyring.h> + #endif /* WITH_KEYRING */ + + #include "egg-debug.h" +@@ -212,8 +212,8 @@ enum { + GpmScreensaver *screensaver; + guint32 throttle_cookie = 0; + #ifdef WITH_KEYRING +- gboolean lock_mate_keyring; +- MateKeyringResult keyres; ++ gboolean lock_gnome_keyring; ++ GnomeKeyringResult keyres; + #endif /* WITH_KEYRING */ + + GError *dbus_error = NULL; +@@ -234,10 +234,10 @@ enum { + + #ifdef WITH_KEYRING + /* we should perhaps lock keyrings when sleeping #375681 */ +- lock_mate_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_SUSPEND); +- if (lock_mate_keyring) { +- keyres = mate_keyring_lock_all_sync (); +- if (keyres != MATE_KEYRING_RESULT_OK) ++ lock_gnome_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_SUSPEND); ++ if (lock_gnome_keyring) { ++ keyres = gnome_keyring_lock_all_sync (); ++ if (keyres != GNOME_KEYRING_RESULT_OK) + egg_warning ("could not lock keyring"); + } + #endif /* WITH_KEYRING */ +@@ -323,8 +323,8 @@ enum { + GpmScreensaver *screensaver; + guint32 throttle_cookie = 0; + #ifdef WITH_KEYRING +- gboolean lock_mate_keyring; +- MateKeyringResult keyres; ++ gboolean lock_gnome_keyring; ++ GnomeKeyringResult keyres; + #endif /* WITH_KEYRING */ + + GError *dbus_error = NULL; +@@ -345,10 +345,10 @@ enum { + + #ifdef WITH_KEYRING + /* we should perhaps lock keyrings when sleeping #375681 */ +- lock_mate_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_HIBERNATE); +- if (lock_mate_keyring) { +- keyres = mate_keyring_lock_all_sync (); +- if (keyres != MATE_KEYRING_RESULT_OK) { ++ lock_gnome_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_HIBERNATE); ++ if (lock_gnome_keyring) { ++ keyres = gnome_keyring_lock_all_sync (); ++ if (keyres != GNOME_KEYRING_RESULT_OK) { + egg_warning ("could not lock keyring"); + } + } diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-avoid-levels-is-0-warning.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-avoid-levels-is-0-warning.patch new file mode 100644 index 0000000000..9bccb5c953 --- /dev/null +++ b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-avoid-levels-is-0-warning.patch @@ -0,0 +1,15 @@ +diff --git a/src/gpm-kbd-backlight.c b/src/gpm-kbd-backlight.c +index 0ac6801..a439e94 100644 +--- a/src/gpm-kbd-backlight.c ++++ b/src/gpm-kbd-backlight.c +@@ -113,6 +113,9 @@ gpm_kbd_backlight_set (GpmKbdBacklight *backlight, + guint goal; + + g_return_val_if_fail (GPM_IS_KBD_BACKLIGHT (backlight), FALSE); ++ /* avoid warnings if no keyboard brightness is available */ ++ if (backlight->priv->max_brightness < 1) ++ return FALSE; + /* if we're setting the same we are, don't bother */ + //g_return_val_if_fail (backlight->priv->brightness_percent != percentage, FALSE); + + diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-dbus_interface_keyboard_backlight_controls.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-dbus_interface_keyboard_backlight_controls.patch new file mode 100644 index 0000000000..689192ff9e --- /dev/null +++ b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-dbus_interface_keyboard_backlight_controls.patch @@ -0,0 +1,160 @@ +diff -uprN mate-power-manager-orig/src/gpm-common.h mate-power-manager/src/gpm-common.h +--- mate-power-manager-orig/src/gpm-common.h 2013-10-03 13:56:55.000000000 +0200 ++++ mate-power-manager/src/gpm-common.h 2013-10-13 19:54:10.649901214 +0200 +@@ -33,6 +33,7 @@ G_BEGIN_DECLS + #define GPM_DBUS_SERVICE "org.mate.PowerManager" + #define GPM_DBUS_INTERFACE "org.mate.PowerManager" + #define GPM_DBUS_INTERFACE_BACKLIGHT "org.mate.PowerManager.Backlight" ++#define GPM_DBUS_INTERFACE_KBD_BACKLIGHT "org.mate.PowerManager.KbdBacklight" + #define GPM_DBUS_PATH "/org/mate/PowerManager" + #define GPM_DBUS_PATH_BACKLIGHT "/org/mate/PowerManager/Backlight" + #define GPM_DBUS_PATH_KBD_BACKLIGHT "/org/mate/PowerManager/KbdBacklight" +diff -uprN mate-power-manager-orig/src/gpm-kbd-backlight.c mate-power-manager/src/gpm-kbd-backlight.c +--- mate-power-manager-orig/src/gpm-kbd-backlight.c 2013-10-03 13:56:55.000000000 +0200 ++++ mate-power-manager/src/gpm-kbd-backlight.c 2013-10-13 19:58:07.154258855 +0200 +@@ -31,21 +31,6 @@ + #include "gpm-kbd-backlight.h" + #include "gsd-media-keys-window.h" + +-static const gchar *kbd_backlight_introspection = "" +-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>""<node name=\"/\">" +- "<interface name=\"org.mate.PowerManager.Backlight\">" +- "<method name=\"GetBrightness\">" +- "<arg type=\"u\" name=\"percentage_brightness\" direction=\"out\"/>" +- "</method>" +- "<method name=\"SetBrightness\">" +- "<arg type=\"u\" name=\"percentage_brightness\" direction=\"in\"/>" +- "</method>" +- "<signal name=\"BrightnessChanged\">" +- "<arg type=\"u\" name=\"percentage_brightness\" direction=\"out\"/>" +- "</signal>" +- "</interface>" +-"</node>"; +- + #define GPM_KBD_BACKLIGHT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPM_TYPE_KBD_BACKLIGHT, GpmKbdBacklightPrivate)) + + struct GpmKbdBacklightPrivate +@@ -430,40 +415,6 @@ gpm_kbd_backlight_dbus_property_set (GDB + return FALSE; + } + +-/** +- * gpm_kbd_backlight_register_dbus: +- * @backlight: +- * @connection: +- * @error: +- **/ +-void +-gpm_kbd_backlight_register_dbus (GpmKbdBacklight *backlight, +- GDBusConnection *connection, +- GError **error) +-{ +- GDBusNodeInfo *node_info; +- GDBusInterfaceInfo *interface_info; +- GDBusInterfaceVTable interface_vtable = { +- gpm_kbd_backlight_dbus_method_call, +- gpm_kbd_backlight_dbus_property_get, +- gpm_kbd_backlight_dbus_property_set +- }; +- +- node_info = g_dbus_node_info_new_for_xml (kbd_backlight_introspection, NULL); +- interface_info = g_dbus_node_info_lookup_interface (node_info, GPM_DBUS_INTERFACE_BACKLIGHT); +- +- backlight->priv->bus_connection = g_object_ref (connection); +- backlight->priv->bus_object_id = +- g_dbus_connection_register_object (connection, +- GPM_DBUS_PATH_KBD_BACKLIGHT, +- interface_info, +- &interface_vtable, +- backlight, +- NULL, +- error); +- g_dbus_node_info_unref (node_info); +-} +- + static gboolean + gpm_kbd_backlight_evaluate_power_source_and_set (GpmKbdBacklight *backlight) + { +diff -uprN mate-power-manager-orig/src/gpm-manager.c mate-power-manager/src/gpm-manager.c +--- mate-power-manager-orig/src/gpm-manager.c 2013-10-03 13:56:55.000000000 +0200 ++++ mate-power-manager/src/gpm-manager.c 2013-10-13 20:05:11.449488592 +0200 +@@ -63,6 +63,7 @@ + #include "gpm-disks.h" + + #include "org.mate.PowerManager.Backlight.h" ++#include "org.mate.PowerManager.KbdBacklight.h" + + static void gpm_manager_finalize (GObject *object); + +@@ -1986,12 +1987,13 @@ gpm_manager_init (GpmManager *manager) + G_OBJECT (manager->priv->backlight)); + } + +- manager->priv->kbd_backlight = gpm_kbd_backlight_new (); +- if (manager->priv->kbd_backlight != NULL) { +- gpm_kbd_backlight_register_dbus (manager->priv->kbd_backlight, +- g_connection, +- NULL); +- } ++ manager->priv->kbd_backlight = gpm_kbd_backlight_new (); ++ if (manager->priv->kbd_backlight != NULL) { ++ dbus_g_object_type_install_info (GPM_TYPE_KBD_BACKLIGHT, ++ &dbus_glib_gpm_kbd_backlight_object_info); ++ dbus_g_connection_register_g_object (connection, GPM_DBUS_PATH_KBD_BACKLIGHT, ++ G_OBJECT (manager->priv->kbd_backlight)); ++ } + + manager->priv->idle = gpm_idle_new (); + g_signal_connect (manager->priv->idle, "idle-changed", +diff -uprN mate-power-manager-orig/src/Makefile.am mate-power-manager/src/Makefile.am +--- mate-power-manager-orig/src/Makefile.am 2013-10-03 13:56:55.000000000 +0200 ++++ mate-power-manager/src/Makefile.am 2013-10-13 20:10:17.374533688 +0200 +@@ -6,6 +6,7 @@ NULL = + EXTRA_DIST = \ + org.mate.PowerManager.xml \ + org.mate.PowerManager.Backlight.xml \ ++ org.mate.PowerManager.KbdBacklight.xml \ + gpm-marshal.list \ + $(NULL) + +@@ -270,6 +271,7 @@ endif + BUILT_SOURCES = \ + org.mate.PowerManager.h \ + org.mate.PowerManager.Backlight.h \ ++ org.mate.PowerManager.KbdBacklight.h \ + gpm-marshal.c \ + gpm-marshal.h \ + $(NULL) +@@ -295,6 +297,13 @@ org.mate.PowerManager.Backlight.h: org.m + --output=org.mate.PowerManager.Backlight.h \ + $(srcdir)/org.mate.PowerManager.Backlight.xml + ++org.mate.PowerManager.KbdBacklight.h: org.mate.PowerManager.KbdBacklight.xml ++ libtool --mode=execute dbus-binding-tool \ ++ --prefix=gpm_kbd_backlight \ ++ --mode=glib-server \ ++ --output=org.mate.PowerManager.KbdBacklight.h \ ++ $(srcdir)/org.mate.PowerManager.KbdBacklight.xml ++ + clean-local: + rm -f *~ + rm -f gpm-marshal.c gpm-marshal.h +diff -uprN mate-power-manager-orig/src/org.mate.PowerManager.KbdBacklight.xml mate-power-manager/src/org.mate.PowerManager.KbdBacklight.xml +--- mate-power-manager-orig/src/org.mate.PowerManager.KbdBacklight.xml 2013-10-13 20:12:11.556667787 +0200 ++++ mate-power-manager/src/org.mate.PowerManager.KbdBacklight.xml 2013-10-13 20:11:45.972413654 +0200 +@@ -0,0 +1,15 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<node name="/"> ++ <interface name="org.mate.PowerManager.KbdBacklight"> ++ <method name="GetBrightness"> ++ <arg type="u" name="percentage_brightness" direction="out"/> ++ </method> ++ <method name="SetBrightness"> ++ <arg type="u" name="percentage_brightness" direction="in"/> ++ </method> ++ <signal name="BrightnessChanged"> ++ <arg type="u" name="percentage_brightness" direction="out"/> ++ </signal> ++ </interface> ++</node> ++ diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-improve-UPower1-support.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-improve-UPower1-support.patch new file mode 100644 index 0000000000..d3e9d855ef --- /dev/null +++ b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-improve-UPower1-support.patch @@ -0,0 +1,102 @@ +diff --git a/src/gpm-engine.c b/src/gpm-engine.c +index e6c6bf2..fe458e3 100644 +--- a/src/gpm-engine.c ++++ b/src/gpm-engine.c +@@ -82,6 +82,9 @@ G_DEFINE_TYPE (GpmEngine, gpm_engine, G_TYPE_OBJECT) + + static UpDevice *gpm_engine_get_composite_device (GpmEngine *engine, UpDevice *original_device); + static UpDevice *gpm_engine_update_composite_device (GpmEngine *engine, UpDevice *original_device); ++#if UP_CHECK_VERSION (0, 99, 0) ++static void gpm_engine_device_changed_cb (UpDevice *device, GParamSpec *pspec, GpmEngine *engine); ++#endif + + typedef enum { + GPM_ENGINE_WARNING_NONE = 0, +@@ -757,6 +760,13 @@ gpm_engine_device_add (GpmEngine *engine, UpDevice *device) + g_object_get (composite, "state", &state, NULL); + g_object_set_data (G_OBJECT(composite), "engine-state-old", GUINT_TO_POINTER(state)); + } ++ ++#if UP_CHECK_VERSION (0, 99, 0) ++ if (kind == UP_DEVICE_KIND_BATTERY || kind == UP_DEVICE_KIND_UPS || kind == UP_DEVICE_KIND_LINE_POWER) ++ return; ++ g_signal_connect (device, "notify", G_CALLBACK (gpm_engine_device_changed_cb), engine); ++#endif ++ + } + + /** +@@ -851,19 +861,20 @@ gpm_engine_device_removed_cb (UpClient *client, UpDevice *device, GpmEngine *eng + **/ + static void + #if UP_CHECK_VERSION(0, 99, 0) +-gpm_engine_device_changed_cb (UpClient *client, GParamSpec *pspec, GpmEngine *engine) +-{ +- gpm_engine_recalculate_state (engine); +-} ++gpm_engine_device_changed_cb (UpDevice *device, GParamSpec *pspec, GpmEngine *engine) + #else + gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *engine) ++#endif + { ++#if !UP_CHECK_VERSION(0, 99, 0) + UpDeviceKind kind; ++#endif + UpDeviceState state; + UpDeviceState state_old; + GpmEngineWarning warning_old; + GpmEngineWarning warning; + ++#if !UP_CHECK_VERSION(0, 99, 0) + /* get device properties */ + g_object_get (device, + "kind", &kind, +@@ -874,6 +885,7 @@ gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *eng + egg_debug ("updating because %s changed", up_device_get_object_path (device)); + device = gpm_engine_update_composite_device (engine, device); + } ++#endif + + /* get device properties (may be composite) */ + g_object_get (device, +@@ -917,7 +929,6 @@ gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *eng + + gpm_engine_recalculate_state (engine); + } +-#endif + + /** + * gpm_engine_get_devices: +@@ -1042,10 +1053,7 @@ gpm_engine_init (GpmEngine *engine) + G_CALLBACK (gpm_engine_device_added_cb), engine); + g_signal_connect (engine->priv->client, "device-removed", + G_CALLBACK (gpm_engine_device_removed_cb), engine); +-#if UP_CHECK_VERSION(0, 99, 0) +- g_signal_connect (engine->priv->client, "notify", +- G_CALLBACK (gpm_engine_device_changed_cb), engine); +-#else ++#if !UP_CHECK_VERSION(0, 99, 0) + g_signal_connect (engine->priv->client, "device-changed", + G_CALLBACK (gpm_engine_device_changed_cb), engine); + #endif +@@ -1075,6 +1083,11 @@ gpm_engine_init (GpmEngine *engine) + #endif + + /* create a fake virtual composite battery */ ++#if UP_CHECK_VERSION(0, 99, 0) ++ engine->priv->battery_composite = up_client_get_display_device (engine->priv->client); ++ g_signal_connect (engine->priv->client, "notify", ++ G_CALLBACK (gpm_engine_device_changed_cb), engine); ++#else + engine->priv->battery_composite = up_device_new (); + g_object_set (engine->priv->battery_composite, + "kind", UP_DEVICE_KIND_BATTERY, +@@ -1083,6 +1096,7 @@ gpm_engine_init (GpmEngine *engine) + "power-supply", TRUE, + "is-present", TRUE, + NULL); ++#endif + + engine->priv->previous_icon = NULL; + engine->priv->previous_summary = NULL; + diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-other-round-of-fixes-for-UPower-0.99-API-changes.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-other-round-of-fixes-for-UPower-0.99-API-changes.patch new file mode 100644 index 0000000000..83447294b6 --- /dev/null +++ b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-other-round-of-fixes-for-UPower-0.99-API-changes.patch @@ -0,0 +1,217 @@ +diff --git a/src/gpm-engine.c b/src/gpm-engine.c +index fe458e3..56d19e2 100644 +--- a/src/gpm-engine.c ++++ b/src/gpm-engine.c +@@ -84,7 +84,29 @@ static UpDevice *gpm_engine_get_composite_device (GpmEngine *engine, UpDevice *o + static UpDevice *gpm_engine_update_composite_device (GpmEngine *engine, UpDevice *original_device); + #if UP_CHECK_VERSION (0, 99, 0) + static void gpm_engine_device_changed_cb (UpDevice *device, GParamSpec *pspec, GpmEngine *engine); +-#endif ++ ++#define GPM_ENGINE_WARNING_NONE UP_DEVICE_LEVEL_NONE ++#define GPM_ENGINE_WARNING_DISCHARGING UP_DEVICE_LEVEL_DISCHARGING ++#define GPM_ENGINE_WARNING_LOW UP_DEVICE_LEVEL_LOW ++#define GPM_ENGINE_WARNING_CRITICAL UP_DEVICE_LEVEL_CRITICAL ++#define GPM_ENGINE_WARNING_ACTION UP_DEVICE_LEVEL_ACTION ++ ++/** ++ * gpm_engine_get_warning: ++ * ++ * This gets the possible engine state for the device according to the ++ * policy, which could be per-percent, or per-time. ++ * ++ * Return value: A GpmEngine state, e.g. GPM_ENGINE_WARNING_DISCHARGING ++ **/ ++static UpDeviceLevel ++gpm_engine_get_warning (GpmEngine *engine, UpDevice *device) ++{ ++ UpDeviceLevel warning; ++ g_object_get (device, "warning-level", &warning, NULL); ++ return warning; ++} ++#else + + typedef enum { + GPM_ENGINE_WARNING_NONE = 0, +@@ -226,6 +248,7 @@ gpm_engine_get_warning (GpmEngine *engine, UpDevice *device) + out: + return warning_type; + } ++#endif + + /** + * gpm_engine_get_summary: +@@ -282,12 +305,20 @@ gpm_engine_get_summary (GpmEngine *engine) + * Returns the icon + **/ + static gchar * ++#if UP_CHECK_VERSION (0, 99, 0) ++gpm_engine_get_icon_priv (GpmEngine *engine, UpDeviceKind device_kind, UpDeviceLevel warning, gboolean use_state) ++#else + gpm_engine_get_icon_priv (GpmEngine *engine, UpDeviceKind device_kind, GpmEngineWarning warning, gboolean use_state) ++#endif + { + guint i; + GPtrArray *array; + UpDevice *device; ++#if UP_CHECK_VERSION (0, 99, 0) ++ UpDeviceLevel warning_temp; ++#else + GpmEngineWarning warning_temp; ++#endif + UpDeviceKind kind; + UpDeviceState state; + gboolean is_present; +@@ -572,6 +603,9 @@ gpm_engine_device_check_capacity (GpmEngine *engine, UpDevice *device) + static UpDevice * + gpm_engine_get_composite_device (GpmEngine *engine, UpDevice *original_device) + { ++#if UP_CHECK_VERSION (0, 99, 0) ++ return engine->priv->battery_composite; ++#else + guint battery_devices = 0; + GPtrArray *array; + UpDevice *device; +@@ -601,6 +635,7 @@ gpm_engine_get_composite_device (GpmEngine *engine, UpDevice *original_device) + out: + /* return composite device or original device */ + return device; ++#endif + } + + /** +@@ -609,6 +644,18 @@ gpm_engine_get_composite_device (GpmEngine *engine, UpDevice *original_device) + static UpDevice * + gpm_engine_update_composite_device (GpmEngine *engine, UpDevice *original_device) + { ++#if UP_CHECK_VERSION (0, 99, 0) ++ gchar *text; ++ ++ text = up_device_to_text (engine->priv->battery_composite); ++ egg_debug ("composite:\n%s", text); ++ g_free (text); ++ ++ /* force update of icon */ ++ gpm_engine_recalculate_state_icon (engine); ++ ++ return engine->priv->battery_composite; ++#else + guint i; + gdouble percentage = 0.0; + gdouble energy = 0.0; +@@ -720,6 +767,7 @@ gpm_engine_update_composite_device (GpmEngine *engine, UpDevice *original_device + out: + /* return composite device or original device */ + return device; ++#endif + } + + /** +@@ -728,7 +776,11 @@ gpm_engine_update_composite_device (GpmEngine *engine, UpDevice *original_device + static void + gpm_engine_device_add (GpmEngine *engine, UpDevice *device) + { ++#if UP_CHECK_VERSION (0, 99, 0) ++ UpDeviceLevel warning; ++#else + GpmEngineWarning warning; ++#endif + UpDeviceState state; + UpDeviceKind kind; + UpDevice *composite; +@@ -762,9 +814,9 @@ gpm_engine_device_add (GpmEngine *engine, UpDevice *device) + } + + #if UP_CHECK_VERSION (0, 99, 0) +- if (kind == UP_DEVICE_KIND_BATTERY || kind == UP_DEVICE_KIND_UPS || kind == UP_DEVICE_KIND_LINE_POWER) +- return; + g_signal_connect (device, "notify", G_CALLBACK (gpm_engine_device_changed_cb), engine); ++ g_ptr_array_add (engine->priv->array, g_object_ref (device)); ++ gpm_engine_recalculate_state (engine); + #endif + + } +@@ -820,10 +872,14 @@ gpm_engine_coldplug_idle_cb (GpmEngine *engine) + static void + gpm_engine_device_added_cb (UpClient *client, UpDevice *device, GpmEngine *engine) + { ++#if UP_CHECK_VERSION (0, 99, 0) ++ gpm_engine_device_add (engine, device); ++#else + /* add to list */ + g_ptr_array_add (engine->priv->array, g_object_ref (device)); + + gpm_engine_recalculate_state (engine); ++#endif + } + + /** +@@ -866,15 +922,17 @@ gpm_engine_device_changed_cb (UpDevice *device, GParamSpec *pspec, GpmEngine *en + gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *engine) + #endif + { +-#if !UP_CHECK_VERSION(0, 99, 0) + UpDeviceKind kind; +-#endif + UpDeviceState state; + UpDeviceState state_old; ++#if UP_CHECK_VERSION(0, 99, 0) ++ UpDeviceLevel warning_old; ++ UpDeviceLevel warning; ++#else + GpmEngineWarning warning_old; + GpmEngineWarning warning; ++#endif + +-#if !UP_CHECK_VERSION(0, 99, 0) + /* get device properties */ + g_object_get (device, + "kind", &kind, +@@ -885,7 +943,6 @@ gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *eng + egg_debug ("updating because %s changed", up_device_get_object_path (device)); + device = gpm_engine_update_composite_device (engine, device); + } +-#endif + + /* get device properties (may be composite) */ + g_object_get (device, +@@ -1070,22 +1127,10 @@ gpm_engine_init (GpmEngine *engine) + g_signal_connect (engine->priv->phone, "device-refresh", + G_CALLBACK (phone_device_refresh_cb), engine); + +-#if UP_CHECK_VERSION(0, 99, 0) +- /* coldplug */ +- array = up_client_get_devices(engine->priv->client); +- if (array) { +- for (i = 0; i < array->len; i++) { +- UpDevice *device = g_ptr_array_index (array, i); +- gpm_engine_device_added_cb(engine->priv->client, device, engine); +- } +- g_ptr_array_free (array, TRUE); +- } +-#endif +- + /* create a fake virtual composite battery */ + #if UP_CHECK_VERSION(0, 99, 0) + engine->priv->battery_composite = up_client_get_display_device (engine->priv->client); +- g_signal_connect (engine->priv->client, "notify", ++ g_signal_connect (engine->priv->battery_composite, "notify", + G_CALLBACK (gpm_engine_device_changed_cb), engine); + #else + engine->priv->battery_composite = up_device_new (); +diff --git a/src/gpm-manager.c b/src/gpm-manager.c +index df84cac..09bd0c0 100644 +--- a/src/gpm-manager.c ++++ b/src/gpm-manager.c +@@ -1858,7 +1858,9 @@ gpm_manager_init (GpmManager *manager) + G_CALLBACK (gpm_manager_settings_changed_cb), manager); + manager->priv->client = up_client_new (); + #if UP_CHECK_VERSION(0, 99, 0) +- g_signal_connect (manager->priv->client, "notify", ++ g_signal_connect (manager->priv->client, "notify::lid-is-closed", ++ G_CALLBACK (gpm_manager_client_changed_cb), manager); ++ g_signal_connect (manager->priv->client, "notify::on-battery", + G_CALLBACK (gpm_manager_client_changed_cb), manager); + #else + g_signal_connect (manager->priv->client, "changed", + diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-port-to-upower-0.99-API.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-port-to-upower-0.99-API.patch new file mode 100644 index 0000000000..7202575835 --- /dev/null +++ b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-port-to-upower-0.99-API.patch @@ -0,0 +1,390 @@ +diff --git a/src/gpm-backlight.c b/src/gpm-backlight.c +index 1f1d834..d2938a4 100644 +--- a/src/gpm-backlight.c ++++ b/src/gpm-backlight.c +@@ -410,7 +410,11 @@ gpm_settings_key_changed_cb (GSettings *settings, const gchar *key, GpmBacklight + * Does the actions when the ac power source is inserted/removed. + **/ + static void ++#if UP_CHECK_VERSION(0, 99, 0) ++gpm_backlight_client_changed_cb (UpClient *client, GParamSpec *pspec, GpmBacklight *backlight) ++#else + gpm_backlight_client_changed_cb (UpClient *client, GpmBacklight *backlight) ++#endif + { + gpm_backlight_brightness_evaluate_and_set (backlight, FALSE, TRUE); + } +@@ -727,8 +731,13 @@ gpm_backlight_init (GpmBacklight *backlight) + + /* we use up_client for the ac-adapter-changed signal */ + backlight->priv->client = up_client_new (); ++#if UP_CHECK_VERSION(0, 99, 0) ++ g_signal_connect (backlight->priv->client, "notify", ++ G_CALLBACK (gpm_backlight_client_changed_cb), backlight); ++#else + g_signal_connect (backlight->priv->client, "changed", + G_CALLBACK (gpm_backlight_client_changed_cb), backlight); ++#endif + + /* gets caps */ + backlight->priv->can_dim = gpm_brightness_has_hw (backlight->priv->brightness); +diff --git a/src/gpm-button.c b/src/gpm-button.c +index 1e38173..b331cf6 100644 +--- a/src/gpm-button.c ++++ b/src/gpm-button.c +@@ -324,7 +324,11 @@ gpm_button_reset_time (GpmButton *button) + * gpm_button_client_changed_cb + **/ + static void ++#if UP_CHECK_VERSION(0, 99, 0) ++gpm_button_client_changed_cb (UpClient *client, GParamSpec *pspec, GpmButton *button) ++#else + gpm_button_client_changed_cb (UpClient *client, GpmButton *button) ++#endif + { + gboolean lid_is_closed; + +@@ -363,9 +367,13 @@ gpm_button_init (GpmButton *button) + + button->priv->client = up_client_new (); + button->priv->lid_is_closed = up_client_get_lid_is_closed (button->priv->client); ++#if UP_CHECK_VERSION(0, 99, 0) ++ g_signal_connect (button->priv->client, "notify", ++ G_CALLBACK (gpm_button_client_changed_cb), button); ++#else + g_signal_connect (button->priv->client, "changed", + G_CALLBACK (gpm_button_client_changed_cb), button); +- ++#endif + /* register the brightness keys */ + gpm_button_xevent_key (button, XF86XK_PowerOff, GPM_BUTTON_POWER); + #ifdef HAVE_XF86XK_SUSPEND +diff --git a/src/gpm-control.c b/src/gpm-control.c +index ec50136..0562d38 100644 +--- a/src/gpm-control.c ++++ b/src/gpm-control.c +@@ -289,10 +289,11 @@ gpm_control_suspend (GpmControl *control, GError **error) + } + g_object_unref(proxy); + } ++#if !UP_CHECK_VERSION(0, 99, 0) + else { + ret = up_client_suspend_sync (control->priv->client, NULL, error); + } +- ++#endif + egg_debug ("emitting resume"); + g_signal_emit (control, signals [RESUME], 0, GPM_CONTROL_ACTION_SUSPEND); + +@@ -399,10 +400,11 @@ gpm_control_hibernate (GpmControl *control, GError **error) + ret = TRUE; + } + } ++#if !UP_CHECK_VERSION(0, 99, 0) + else { + ret = up_client_hibernate_sync (control->priv->client, NULL, error); + } +- ++#endif + egg_debug ("emitting resume"); + g_signal_emit (control, signals [RESUME], 0, GPM_CONTROL_ACTION_HIBERNATE); + +diff --git a/src/gpm-engine.c b/src/gpm-engine.c +index 96a043e..e6c6bf2 100644 +--- a/src/gpm-engine.c ++++ b/src/gpm-engine.c +@@ -768,12 +768,14 @@ gpm_engine_coldplug_idle_cb (GpmEngine *engine) + guint i; + GPtrArray *array = NULL; + UpDevice *device; ++#if !UP_CHECK_VERSION(0, 99, 0) + gboolean ret; + GError *error = NULL; ++#endif + + g_return_val_if_fail (engine != NULL, FALSE); + g_return_val_if_fail (GPM_IS_ENGINE (engine), FALSE); +- ++#if !UP_CHECK_VERSION(0, 99, 0) + /* get devices from UPower */ + ret = up_client_enumerate_devices_sync (engine->priv->client, NULL, &error); + if (!ret) { +@@ -781,7 +783,7 @@ gpm_engine_coldplug_idle_cb (GpmEngine *engine) + g_error_free (error); + goto out; + } +- ++#endif + /* connected mobile phones */ + gpm_phone_coldplug (engine->priv->phone); + +@@ -793,7 +795,9 @@ gpm_engine_coldplug_idle_cb (GpmEngine *engine) + device = g_ptr_array_index (array, i); + gpm_engine_device_add (engine, device); + } ++#if !UP_CHECK_VERSION(0, 99, 0) + out: ++#endif + if (array != NULL) + g_ptr_array_unref (array); + /* never repeat */ +@@ -816,6 +820,22 @@ gpm_engine_device_added_cb (UpClient *client, UpDevice *device, GpmEngine *engin + * gpm_engine_device_removed_cb: + **/ + static void ++#if UP_CHECK_VERSION(0, 99, 0) ++gpm_engine_device_removed_cb (UpClient *client, const char *object_path, GpmEngine *engine) ++{ ++ guint i; ++ ++ for (i = 0; i < engine->priv->array->len; i++) { ++ UpDevice *device = g_ptr_array_index (engine->priv->array, i); ++ ++ if (g_strcmp0 (object_path, up_device_get_object_path (device)) == 0) { ++ g_ptr_array_remove_index (engine->priv->array, i); ++ break; ++ } ++ } ++ gpm_engine_recalculate_state (engine); ++} ++#else + gpm_engine_device_removed_cb (UpClient *client, UpDevice *device, GpmEngine *engine) + { + gboolean ret; +@@ -824,12 +844,18 @@ gpm_engine_device_removed_cb (UpClient *client, UpDevice *device, GpmEngine *eng + return; + gpm_engine_recalculate_state (engine); + } +- ++#endif + + /** + * gpm_engine_device_changed_cb: + **/ + static void ++#if UP_CHECK_VERSION(0, 99, 0) ++gpm_engine_device_changed_cb (UpClient *client, GParamSpec *pspec, GpmEngine *engine) ++{ ++ gpm_engine_recalculate_state (engine); ++} ++#else + gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *engine) + { + UpDeviceKind kind; +@@ -891,6 +917,7 @@ gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *eng + + gpm_engine_recalculate_state (engine); + } ++#endif + + /** + * gpm_engine_get_devices: +@@ -1003,7 +1030,10 @@ phone_device_refresh_cb (GpmPhone *phone, guint idx, GpmEngine *engine) + static void + gpm_engine_init (GpmEngine *engine) + { +- ++#if UP_CHECK_VERSION(0, 99, 0) ++ GPtrArray *array = NULL; ++ guint i; ++#endif + engine->priv = GPM_ENGINE_GET_PRIVATE (engine); + + engine->priv->array = g_ptr_array_new_with_free_func (g_object_unref); +@@ -1012,8 +1042,13 @@ gpm_engine_init (GpmEngine *engine) + G_CALLBACK (gpm_engine_device_added_cb), engine); + g_signal_connect (engine->priv->client, "device-removed", + G_CALLBACK (gpm_engine_device_removed_cb), engine); ++#if UP_CHECK_VERSION(0, 99, 0) ++ g_signal_connect (engine->priv->client, "notify", ++ G_CALLBACK (gpm_engine_device_changed_cb), engine); ++#else + g_signal_connect (engine->priv->client, "device-changed", + G_CALLBACK (gpm_engine_device_changed_cb), engine); ++#endif + + engine->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA); + g_signal_connect (engine->priv->settings, "changed", +@@ -1027,6 +1062,18 @@ gpm_engine_init (GpmEngine *engine) + g_signal_connect (engine->priv->phone, "device-refresh", + G_CALLBACK (phone_device_refresh_cb), engine); + ++#if UP_CHECK_VERSION(0, 99, 0) ++ /* coldplug */ ++ array = up_client_get_devices(engine->priv->client); ++ if (array) { ++ for (i = 0; i < array->len; i++) { ++ UpDevice *device = g_ptr_array_index (array, i); ++ gpm_engine_device_added_cb(engine->priv->client, device, engine); ++ } ++ g_ptr_array_free (array, TRUE); ++ } ++#endif ++ + /* create a fake virtual composite battery */ + engine->priv->battery_composite = up_device_new (); + g_object_set (engine->priv->battery_composite, +diff --git a/src/gpm-kbd-backlight.c b/src/gpm-kbd-backlight.c +index a439e94..3a0f6e6 100644 +--- a/src/gpm-kbd-backlight.c ++++ b/src/gpm-kbd-backlight.c +@@ -486,6 +486,9 @@ gpm_kbd_backlight_control_resume_cb (GpmControl *control, + **/ + static void + gpm_kbd_backlight_client_changed_cb (UpClient *client, ++#if UP_CHECK_VERSION(0, 99, 0) ++ GParamSpec *pspec, ++#endif + GpmKbdBacklight *backlight) + { + gpm_kbd_backlight_evaluate_power_source_and_set (backlight); +@@ -755,8 +758,13 @@ gpm_kbd_backlight_init (GpmKbdBacklight *backlight) + + /* Use upower for ac changed signal */ + backlight->priv->client = up_client_new (); ++#if UP_CHECK_VERSION(0, 99, 0) ++ g_signal_connect (backlight->priv->client, "notify", ++ G_CALLBACK (gpm_kbd_backlight_client_changed_cb), backlight); ++#else + g_signal_connect (backlight->priv->client, "changed", + G_CALLBACK (gpm_kbd_backlight_client_changed_cb), backlight); ++#endif + + backlight->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA); + //g_signal_connect (backlight->priv->settings, "changed", G_CALLBACK (gpm_settings_key_changed_cb), backlight); +diff --git a/src/gpm-manager.c b/src/gpm-manager.c +index c4d0530..df84cac 100644 +--- a/src/gpm-manager.c ++++ b/src/gpm-manager.c +@@ -971,7 +971,11 @@ gpm_manager_get_spindown_timeout (GpmManager *manager) + * gpm_manager_client_changed_cb: + **/ + static void ++#if UP_CHECK_VERSION(0, 99, 0) ++gpm_manager_client_changed_cb (UpClient *client, GParamSpec *pspec, GpmManager *manager) ++#else + gpm_manager_client_changed_cb (UpClient *client, GpmManager *manager) ++#endif + { + gboolean event_when_closed; + gint timeout; +@@ -1853,8 +1857,13 @@ gpm_manager_init (GpmManager *manager) + g_signal_connect (manager->priv->settings, "changed", + G_CALLBACK (gpm_manager_settings_changed_cb), manager); + manager->priv->client = up_client_new (); ++#if UP_CHECK_VERSION(0, 99, 0) ++ g_signal_connect (manager->priv->client, "notify", ++ G_CALLBACK (gpm_manager_client_changed_cb), manager); ++#else + g_signal_connect (manager->priv->client, "changed", + G_CALLBACK (gpm_manager_client_changed_cb), manager); ++#endif + + /* use libmatenotify */ + notify_init (GPM_NAME); +diff --git a/src/gpm-prefs-core.c b/src/gpm-prefs-core.c +index 7a2662d..6abb792 100644 +--- a/src/gpm-prefs-core.c ++++ b/src/gpm-prefs-core.c +@@ -811,7 +811,9 @@ gpm_prefs_init (GpmPrefs *prefs) + UpDevice *device; + UpDeviceKind kind; + GpmBrightness *brightness; ++#if !UP_CHECK_VERSION(0, 99, 0) + gboolean ret; ++#endif + guint i; + + GDBusProxy *proxy; +@@ -897,9 +899,11 @@ gpm_prefs_init (GpmPrefs *prefs) + else { + /* are we allowed to shutdown? */ + egg_console_kit_can_stop (prefs->priv->console, &prefs->priv->can_shutdown, NULL); ++#if !UP_CHECK_VERSION(0, 99, 0) + /* get values from UpClient */ + prefs->priv->can_suspend = up_client_get_can_suspend (prefs->priv->client); + prefs->priv->can_hibernate = up_client_get_can_hibernate (prefs->priv->client); ++#endif + } + + if (LOGIND_RUNNING()) { +@@ -953,14 +957,14 @@ gpm_prefs_init (GpmPrefs *prefs) + brightness = gpm_brightness_new (); + prefs->priv->has_lcd = gpm_brightness_has_hw (brightness); + g_object_unref (brightness); +- ++#if !UP_CHECK_VERSION(0, 99, 0) + /* get device list */ + ret = up_client_enumerate_devices_sync (prefs->priv->client, NULL, &error); + if (!ret) { + egg_warning ("failed to get device list: %s", error->message); + g_error_free (error); + } +- ++#endif + devices = up_client_get_devices (prefs->priv->client); + for (i=0; i<devices->len; i++) { + device = g_ptr_array_index (devices, i); +diff --git a/src/gpm-statistics.c b/src/gpm-statistics.c +index 98b5632..13489dc 100644 +--- a/src/gpm-statistics.c ++++ b/src/gpm-statistics.c +@@ -1236,6 +1236,12 @@ gpm_stats_device_added_cb (UpClient *client, UpDevice *device, gpointer user_dat + * gpm_stats_device_changed_cb: + **/ + static void ++#if UP_CHECK_VERSION(0, 99, 0) ++gpm_stats_device_changed_cb (UpClient *client, GParamSpec *pspec, gpointer user_data) ++{ ++ gpm_stats_button_update_ui(); ++} ++#else + gpm_stats_device_changed_cb (UpClient *client, UpDevice *device, gpointer user_data) + { + const gchar *object_path; +@@ -1246,6 +1252,7 @@ gpm_stats_device_changed_cb (UpClient *client, UpDevice *device, gpointer user_d + if (g_strcmp0 (current_device, object_path) == 0) + gpm_stats_update_info_data (device); + } ++#endif + + /** + * gpm_stats_device_removed_cb: +@@ -1794,11 +1801,12 @@ main (int argc, char *argv[]) + + wakeups = up_wakeups_new (); + g_signal_connect (wakeups, "data-changed", G_CALLBACK (gpm_stats_data_changed_cb), NULL); +- ++#if !UP_CHECK_VERSION(0, 99, 0) + /* coldplug */ + ret = up_client_enumerate_devices_sync (client, NULL, NULL); + if (!ret) + goto out; ++#endif + devices = up_client_get_devices (client); + + /* add devices in visually pleasing order */ +@@ -1814,7 +1822,11 @@ main (int argc, char *argv[]) + /* connect now the coldplug is done */ + g_signal_connect (client, "device-added", G_CALLBACK (gpm_stats_device_added_cb), NULL); + g_signal_connect (client, "device-removed", G_CALLBACK (gpm_stats_device_removed_cb), NULL); ++#if UP_CHECK_VERSION(0, 99, 0) ++ g_signal_connect (client, "notify", G_CALLBACK (gpm_stats_device_changed_cb), NULL); ++#else + g_signal_connect (client, "device-changed", G_CALLBACK (gpm_stats_device_changed_cb), NULL); ++#endif + + /* set current device */ + if (devices->len > 0) { +@@ -1854,8 +1866,9 @@ main (int argc, char *argv[]) + gtk_widget_show (widget); + + gtk_main (); +- ++#if !UP_CHECK_VERSION(0, 99, 0) + out: ++#endif + g_object_unref (settings); + g_object_unref (client); + g_object_unref (wakeups); + diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-remove-battery-recall-logic.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-remove-battery-recall-logic.patch new file mode 100644 index 0000000000..6d462b937c --- /dev/null +++ b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-remove-battery-recall-logic.patch @@ -0,0 +1,263 @@ +diff --git a/data/org.mate.power-manager.gschema.xml.in b/data/org.mate.power-manager.gschema.xml.in +index adecce0..ca009b5 100644 +--- a/data/org.mate.power-manager.gschema.xml.in ++++ b/data/org.mate.power-manager.gschema.xml.in +@@ -211,11 +211,6 @@ + <_summary>Seconds of inactivity to spin down when on battery</_summary> + <_description>The number of seconds of inactivity to spin down the disks when on battery power.</_description> + </key> +- <key name="notify-perhaps-recall" type="b"> +- <default>true</default> +- <_summary>If we should show the recalled battery warning for a broken battery</_summary> +- <_description>If we should show the recalled battery warning for a broken battery. Set this to false only if you know your battery is okay.</_description> +- </key> + <key name="notify-low-capacity" type="b"> + <default>true</default> + <_summary>If we should show the low capacity warning for a broken battery</_summary> +diff --git a/src/gpm-common.h b/src/gpm-common.h +index ef20f88..303bdd1 100644 +--- a/src/gpm-common.h ++++ b/src/gpm-common.h +@@ -98,7 +98,6 @@ G_BEGIN_DECLS + #define GPM_SETTINGS_SPINDOWN_TIMEOUT_BATT "spindown-timeout-battery" + + /* notify */ +-#define GPM_SETTINGS_NOTIFY_PERHAPS_RECALL "notify-perhaps-recall" + #define GPM_SETTINGS_NOTIFY_LOW_CAPACITY "notify-low-capacity" + #define GPM_SETTINGS_NOTIFY_DISCHARGING "notify-discharging" + #define GPM_SETTINGS_NOTIFY_FULLY_CHARGED "notify-fully-charged" +diff --git a/src/gpm-engine.c b/src/gpm-engine.c +index 0f9d0c1..96a043e 100644 +--- a/src/gpm-engine.c ++++ b/src/gpm-engine.c +@@ -72,7 +72,6 @@ enum { + CHARGE_ACTION, + DISCHARGING, + LOW_CAPACITY, +- PERHAPS_RECALL, + LAST_SIGNAL + }; + +@@ -761,42 +760,6 @@ gpm_engine_device_add (GpmEngine *engine, UpDevice *device) + } + + /** +- * gpm_engine_check_recall: +- **/ +-static gboolean +-gpm_engine_check_recall (GpmEngine *engine, UpDevice *device) +-{ +- UpDeviceKind kind; +- gboolean recall_notice = FALSE; +- gchar *recall_vendor = NULL; +- gchar *recall_url = NULL; +- +- /* get device properties */ +- g_object_get (device, +- "kind", &kind, +- "recall-notice", &recall_notice, +- "recall-vendor", &recall_vendor, +- "recall-url", &recall_url, +- NULL); +- +- /* not battery */ +- if (kind != UP_DEVICE_KIND_BATTERY) +- goto out; +- +- /* no recall data */ +- if (!recall_notice) +- goto out; +- +- /* emit signal for manager */ +- egg_debug ("** EMIT: perhaps-recall"); +- g_signal_emit (engine, signals [PERHAPS_RECALL], 0, device, recall_vendor, recall_url); +-out: +- g_free (recall_vendor); +- g_free (recall_url); +- return recall_notice; +-} +- +-/** + * gpm_engine_coldplug_idle_cb: + **/ + static gboolean +@@ -829,7 +792,6 @@ gpm_engine_coldplug_idle_cb (GpmEngine *engine) + for (i=0;i<array->len;i++) { + device = g_ptr_array_index (array, i); + gpm_engine_device_add (engine, device); +- gpm_engine_check_recall (engine, device); + } + out: + if (array != NULL) +@@ -846,7 +808,6 @@ gpm_engine_device_added_cb (UpClient *client, UpDevice *device, GpmEngine *engin + { + /* add to list */ + g_ptr_array_add (engine->priv->array, g_object_ref (device)); +- gpm_engine_check_recall (engine, device); + + gpm_engine_recalculate_state (engine); + } +@@ -1134,14 +1095,6 @@ gpm_engine_class_init (GpmEngineClass *klass) + G_STRUCT_OFFSET (GpmEngineClass, low_capacity), + NULL, NULL, g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, G_TYPE_POINTER); +- signals [PERHAPS_RECALL] = +- g_signal_new ("perhaps-recall", +- G_TYPE_FROM_CLASS (object_class), +- G_SIGNAL_RUN_LAST, +- G_STRUCT_OFFSET (GpmEngineClass, perhaps_recall), +- NULL, NULL, gpm_marshal_VOID__POINTER_STRING_STRING, +- G_TYPE_NONE, +- 3, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_STRING); + signals [FULLY_CHARGED] = + g_signal_new ("fully-charged", + G_TYPE_FROM_CLASS (object_class), +diff --git a/src/gpm-engine.h b/src/gpm-engine.h +index be1ccd6..43f8956 100644 +--- a/src/gpm-engine.h ++++ b/src/gpm-engine.h +@@ -49,10 +49,6 @@ typedef struct + gchar *icon); + void (* summary_changed) (GpmEngine *engine, + gchar *status); +- void (* perhaps_recall) (GpmEngine *engine, +- UpDevice *device, +- const gchar *oem_vendor, +- const gchar *website); + void (* low_capacity) (GpmEngine *engine, + UpDevice *device); + void (* charge_low) (GpmEngine *engine, +diff --git a/src/gpm-manager.c b/src/gpm-manager.c +index 6ca9dea..c4d0530 100644 +--- a/src/gpm-manager.c ++++ b/src/gpm-manager.c +@@ -68,7 +68,6 @@ + static void gpm_manager_finalize (GObject *object); + + #define GPM_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPM_TYPE_MANAGER, GpmManagerPrivate)) +-#define GPM_MANAGER_RECALL_DELAY 30 /* seconds */ + #define GPM_MANAGER_NOTIFY_TIMEOUT_NEVER 0 /* ms */ + #define GPM_MANAGER_NOTIFY_TIMEOUT_SHORT 10 * 1000 /* ms */ + #define GPM_MANAGER_NOTIFY_TIMEOUT_LONG 30 * 1000 /* ms */ +@@ -1092,111 +1091,6 @@ gpm_manager_settings_changed_cb (GSettings *settings, const gchar *key, GpmManag + } + + /** +- * gpm_manager_perhaps_recall_response_cb: +- */ +-static void +-gpm_manager_perhaps_recall_response_cb (GtkDialog *dialog, gint response_id, GpmManager *manager) +-{ +- GdkScreen *screen; +- GtkWidget *dialog_error; +- GError *error = NULL; +- gboolean ret; +- const gchar *website; +- +- /* don't show this again */ +- if (response_id == GTK_RESPONSE_CANCEL) { +- g_settings_set_boolean (manager->priv->settings, GPM_SETTINGS_NOTIFY_PERHAPS_RECALL, FALSE); +- goto out; +- } +- +- /* visit recall website */ +- if (response_id == GTK_RESPONSE_OK) { +- screen = gdk_screen_get_default(); +- website = (const gchar *) g_object_get_data (G_OBJECT (manager), "recall-oem-website"); +- ret = gtk_show_uri (screen, website, gtk_get_current_event_time (), &error); +- if (!ret) { +- dialog_error = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, +- "Failed to show url %s", error->message); +- gtk_dialog_run (GTK_DIALOG (dialog_error)); +- g_error_free (error); +- } +- goto out; +- } +-out: +- gtk_widget_destroy (GTK_WIDGET (dialog)); +- return; +-} +- +-/** +- * gpm_manager_perhaps_recall_delay_cb: +- */ +-static gboolean +-gpm_manager_perhaps_recall_delay_cb (GpmManager *manager) +-{ +- const gchar *oem_vendor; +- gchar *title = NULL; +- gchar *message = NULL; +- GtkWidget *dialog; +- +- oem_vendor = (const gchar *) g_object_get_data (G_OBJECT (manager), "recall-oem-vendor"); +- +- /* TRANSLATORS: the battery may be recalled by it's vendor */ +- title = g_strdup_printf ("%s: %s", GPM_NAME, _("Battery may be recalled")); +- message = g_strdup_printf (_("A battery in your computer may have been " +- "recalled by %s and you may be at risk.\n\n" +- "For more information visit the battery recall website."), oem_vendor); +- dialog = gtk_message_dialog_new_with_markup (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, +- GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, +- "<span size='larger'><b>%s</b></span>", title); +- +- gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), "%s", message); +- +- /* TRANSLATORS: button text, visit the manufacturers recall website */ +- gtk_dialog_add_button (GTK_DIALOG (dialog), _("Visit recall website"), GTK_RESPONSE_OK); +- +- /* TRANSLATORS: button text, do not show this bubble again */ +- gtk_dialog_add_button (GTK_DIALOG (dialog), _("Do not show me this again"), GTK_RESPONSE_CANCEL); +- +- /* wait async for response */ +- gtk_widget_show (dialog); +- g_signal_connect (dialog, "response", G_CALLBACK (gpm_manager_perhaps_recall_response_cb), manager); +- +- g_free (title); +- g_free (message); +- +- /* never repeat */ +- return FALSE; +-} +- +-/** +- * gpm_manager_engine_perhaps_recall_cb: +- */ +-static void +-gpm_manager_engine_perhaps_recall_cb (GpmEngine *engine, UpDevice *device, gchar *oem_vendor, gchar *website, GpmManager *manager) +-{ +- gboolean ret; +- +- /* don't show when running under GDM */ +- if (g_getenv ("RUNNING_UNDER_GDM") != NULL) { +- egg_debug ("running under gdm, so no notification"); +- return; +- } +- +- /* already shown, and dismissed */ +- ret = g_settings_get_boolean (manager->priv->settings, GPM_SETTINGS_NOTIFY_PERHAPS_RECALL); +- if (!ret) { +- egg_debug ("Gsettings prevents notification: %s", GPM_SETTINGS_NOTIFY_PERHAPS_RECALL); +- return; +- } +- +- g_object_set_data_full (G_OBJECT (manager), "recall-oem-vendor", (gpointer) g_strdup (oem_vendor), (GDestroyNotify) g_free); +- g_object_set_data_full (G_OBJECT (manager), "recall-oem-website", (gpointer) g_strdup (website), (GDestroyNotify) g_free); +- +- /* delay by a few seconds so the panel can load */ +- g_timeout_add_seconds (GPM_MANAGER_RECALL_DELAY, (GSourceFunc) gpm_manager_perhaps_recall_delay_cb, manager); +-} +- +-/** + * gpm_manager_engine_icon_changed_cb: + */ + static void +@@ -2023,8 +1917,6 @@ gpm_manager_init (GpmManager *manager) + gpm_manager_sync_policy_sleep (manager); + + manager->priv->engine = gpm_engine_new (); +- g_signal_connect (manager->priv->engine, "perhaps-recall", +- G_CALLBACK (gpm_manager_engine_perhaps_recall_cb), manager); + g_signal_connect (manager->priv->engine, "low-capacity", + G_CALLBACK (gpm_manager_engine_low_capacity_cb), manager); + g_signal_connect (manager->priv->engine, "icon-changed", + diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.8.0-r1.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.8.0-r1.ebuild new file mode 100644 index 0000000000..4a73885436 --- /dev/null +++ b/mate-extra/mate-power-manager/mate-power-manager-1.8.0-r1.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GCONF_DEBUG="no" + +inherit autotools gnome2 versionator + +MATE_BRANCH="$(get_version_component_range 1-2)" + +SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz" +DESCRIPTION="A session daemon for MATE that makes it easy to manage your laptop or desktop system" +HOMEPAGE="http://mate-desktop.org" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" + +IUSE="+applet gnome-keyring man policykit test unique" + +# Interactive testsuite. +RESTRICT="test" + +COMMON_DEPEND="app-text/rarian:0 + >=dev-libs/dbus-glib-0.70:0 + >=dev-libs/glib-2.13:2 + >=media-libs/libcanberra-0.10:0[gtk] + >=sys-apps/dbus-1:0 + || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) + >=x11-apps/xrandr-1.2:0 + >=x11-libs/cairo-1:0 + >=x11-libs/gdk-pixbuf-2.11:2 + >=x11-libs/gtk+-2.17.7:2 + x11-libs/libX11:0 + x11-libs/libXext:0 + x11-libs/libXrandr:0 + >=x11-libs/libnotify-0.7:0 + x11-libs/pango:0 + applet? ( >=mate-base/mate-panel-1.8:0 ) + gnome-keyring? ( >=gnome-base/gnome-keyring-3:0 ) + unique? ( >=dev-libs/libunique-0.9.4:1 )" + +RDEPEND="${COMMON_DEPEND} + policykit? ( >=mate-extra/mate-polkit-1.8:0 )" + +DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.3 + >=app-text/scrollkeeper-dtd-1:1.0 + app-text/yelp-tools:0 + >=dev-util/intltool-0.35:* + x11-proto/randrproto:0 + >=x11-proto/xproto-7.0.15:0 + sys-devel/gettext:* + virtual/pkgconfig:* + man? ( app-text/docbook-sgml-utils:0 + >=app-text/docbook-sgml-dtd-4.3 )" + +src_prepare() { + # Upstreamed patches + epatch "${FILESDIR}"/${PF}-dbus_interface_keyboard_backlight_controls.patch + epatch "${FILESDIR}"/${PF}-avoid-levels-is-0-warning.patch + + # Upower 1.0 fixes + # https://github.com/mate-desktop/mate-power-manager/commit/220a4e0 + epatch "${FILESDIR}"/${PF}-remove-battery-recall-logic.patch + # https://github.com/mate-desktop/mate-power-manager/commit/d59f4b8 + epatch "${FILESDIR}"/${PF}-port-to-upower-0.99-API.patch + # https://github.com/mate-desktop/mate-power-manager/commit/1fb2870 + epatch "${FILESDIR}"/${PF}-improve-UPower1-support.patch + # https://github.com/mate-desktop/mate-power-manager/commit/8f734c6 + epatch "${FILESDIR}"/${PF}-other-round-of-fixes-for-UPower-0.99-API-changes.patch + + eautoreconf + gnome2_src_prepare + + # This needs to be after eautoreconf to prevent problems like bug #356277 + # Remove the docbook2man rules here since it's not handled by a proper + # parameter in configure.in. + if ! use man; then + sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in \ + || die "docbook sed failed" + fi +} + +src_configure() { + gnome2_src_configure \ + $(use_enable applet applets) \ + $(use_enable test tests) \ + $(use_enable unique) \ + $(use_with gnome-keyring keyring) \ + --enable-compile-warnings=minimum \ + --enable-unique \ + --with-gtk=2.0 +} + +DOCS="AUTHORS HACKING NEWS README TODO" + +src_test() { + unset DBUS_SESSION_BUS_ADDRESS + + dbus-launch Xemake check || die "Test phase failed" +} diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.8.1.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.8.1.ebuild new file mode 100644 index 0000000000..defdb8a5b8 --- /dev/null +++ b/mate-extra/mate-power-manager/mate-power-manager-1.8.1.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GCONF_DEBUG="no" + +inherit autotools gnome2 versionator + +MATE_BRANCH="$(get_version_component_range 1-2)" + +SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz" +DESCRIPTION="A session daemon for MATE that makes it easy to manage your laptop or desktop system" +HOMEPAGE="http://mate-desktop.org" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="+applet gnome-keyring man policykit test unique" + +# Interactive testsuite. +RESTRICT="test" + +COMMON_DEPEND="app-text/rarian:0 + >=dev-libs/dbus-glib-0.70:0 + >=dev-libs/glib-2.13:2 + >=media-libs/libcanberra-0.10:0[gtk] + >=sys-apps/dbus-1:0 + || ( >=sys-power/upower-0.9.23:= >=sys-power/upower-pm-utils-0.9.23 ) + >=x11-apps/xrandr-1.2:0 + >=x11-libs/cairo-1:0 + >=x11-libs/gdk-pixbuf-2.11:2 + >=x11-libs/gtk+-2.17.7:2 + x11-libs/libX11:0 + x11-libs/libXext:0 + x11-libs/libXrandr:0 + >=x11-libs/libnotify-0.7:0 + x11-libs/pango:0 + applet? ( >=mate-base/mate-panel-1.8:0 ) + gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 ) + unique? ( >=dev-libs/libunique-0.9.4:1 )" + +RDEPEND="${COMMON_DEPEND} + policykit? ( >=mate-extra/mate-polkit-1.8:0 )" + +DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.3 + >=app-text/scrollkeeper-dtd-1:1.0 + app-text/yelp-tools:0 + >=dev-util/intltool-0.35:* + x11-proto/randrproto:0 + >=x11-proto/xproto-7.0.15:0 + sys-devel/gettext:* + virtual/pkgconfig:* + man? ( app-text/docbook-sgml-utils:0 + >=app-text/docbook-sgml-dtd-4.3 )" + +src_prepare() { + # Upstreamed patches + epatch "${FILESDIR}"/${PN}-1.8.0-r1-dbus_interface_keyboard_backlight_controls.patch + + eautoreconf + gnome2_src_prepare + + # This needs to be after eautoreconf to prevent problems like bug #356277 + # Remove the docbook2man rules here since it's not handled by a proper + # parameter in configure.in. + if ! use man; then + sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in \ + || die "docbook sed failed" + fi +} + +src_configure() { + gnome2_src_configure \ + $(use_enable applet applets) \ + $(use_enable test tests) \ + $(use_enable unique) \ + $(use_with gnome-keyring keyring) \ + --enable-compile-warnings=minimum \ + --with-gtk=2.0 +} + +DOCS="AUTHORS HACKING NEWS README TODO" + +src_test() { + unset DBUS_SESSION_BUS_ADDRESS + + dbus-launch Xemake check || die "Test phase failed" +} diff --git a/mate-extra/mate-power-manager/metadata.xml b/mate-extra/mate-power-manager/metadata.xml new file mode 100644 index 0000000000..bfcc294009 --- /dev/null +++ b/mate-extra/mate-power-manager/metadata.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>mate</herd> + <use> + <flag name="applet">Enable building of the MATE applet.</flag> + <flag name="man">Build power manager's man page.</flag> + <flag name="unique">Enable single instance support using + <pkg>dev-libs/libunique</pkg>.</flag> + </use> + <upstream> + <remote-id type="github">mate-desktop/mate-power-manager</remote-id> + </upstream> +</pkgmetadata> diff --git a/mate-extra/mate-screensaver/Manifest b/mate-extra/mate-screensaver/Manifest new file mode 100644 index 0000000000..665e8a7d5b --- /dev/null +++ b/mate-extra/mate-screensaver/Manifest @@ -0,0 +1,2 @@ +DIST mate-screensaver-1.8.0.tar.xz 4869084 SHA256 93979d0a6203fa0b59eb5477bdd5b78788a1b1adc861c3d0085339b859ec3106 SHA512 66375f38896bb95f1556f6574f5a91c58d4bf61fc976dee4e457691d3e6c2afbf1616c998fdd8b7e44a0a4781b5654e11b11820543672f4adcb0b29f62b45ecd WHIRLPOOL f2b166fd74fad5807b4c8fa5967d8b66e1d511e635a81215888ec961cc4dd1590cf8155cb22d3b28acf2307ffa47f146d32effedd272c7c4eff4bf356fe4b0ba +DIST mate-screensaver-1.8.1.tar.xz 4874424 SHA256 a3dd1fe9e8d05b7815544fa186c43a35271dd8b512d6b0377038df02c28c9d62 SHA512 e2bb5b4efbd5818834d0e9f9bf13e9f362f1251bdfc975fc93c69ab90163db859ebfc089e056fa73801053cd396d661954bb6e906e02881452b01a0394d7d2ff WHIRLPOOL a46bc84824205bc6a257325dda507b38a83751c30275052e921c3cbceb53a9243caed8704f0e63888f5fa927ff2a0b04b693e5c7fe0514e709fc356a7756af57 diff --git a/mate-extra/mate-screensaver/files/mate-screensaver-1.2.0-fix-popsquares-includes.patch b/mate-extra/mate-screensaver/files/mate-screensaver-1.2.0-fix-popsquares-includes.patch new file mode 100644 index 0000000000..5d13f69486 --- /dev/null +++ b/mate-extra/mate-screensaver/files/mate-screensaver-1.2.0-fix-popsquares-includes.patch @@ -0,0 +1,11 @@ +diff -burN a/savers/popsquares.c b/savers/popsquares.c +--- a/savers/popsquares.c 2012-03-07 22:28:11.000000000 +0100 ++++ b/savers/popsquares.c 2012-07-17 19:54:44.062628969 +0200 +@@ -21,6 +21,7 @@ + + #include "config.h" + ++#include <stdlib.h> + #include <string.h> + #include <gdk/gdk.h> + #include <gdk/gdkx.h> diff --git a/mate-extra/mate-screensaver/files/mate-screensaver-1.2.0-fix-with-libgl.patch b/mate-extra/mate-screensaver/files/mate-screensaver-1.2.0-fix-with-libgl.patch new file mode 100644 index 0000000000..45638c0ea1 --- /dev/null +++ b/mate-extra/mate-screensaver/files/mate-screensaver-1.2.0-fix-with-libgl.patch @@ -0,0 +1,11 @@ +--- a/configure.ac 2012-08-08 19:23:14.026623125 +0200 ++++ b/configure.ac 2012-08-08 19:23:20.766623326 +0200 +@@ -545,7 +545,7 @@ + dnl - Check for GL + dnl --------------------------------------------------------------------------- + +-AC_ARG_WITH(gl, [ --with-libgl build with GL support]) ++AC_ARG_WITH(libgl, [ --with-libgl build with GL support]) + have_libgl=no + GL_LIBS="" + diff --git a/mate-extra/mate-screensaver/files/xss-conversion.txt b/mate-extra/mate-screensaver/files/xss-conversion.txt new file mode 100644 index 0000000000..d69e506195 --- /dev/null +++ b/mate-extra/mate-screensaver/files/xss-conversion.txt @@ -0,0 +1,22 @@ +There is a conversion script which you can use to convert XScreenSaver +screensavers to the gnome-screensaver format. The conversion script is located +in the documentation directory (/usr/share/doc/${PF}/). + +The migrate-xscreensaver-config.sh and xscreensaver-config.xsl files will be +needed to convert the screensaver. Make sure to enable the executable bit on +the script (chmod +x migrate-xscreensaver-config.sh). + +The script takes the module to convert and creates a .desktop file corresponding +to the module. + +migrate-xscreensaver-config.sh /usr/share/xscreensaver/config/*.xml + +The above command should convert all xscreensaver modules. + +You must copy the desktop files into /usr/share/applications/gnome-screensavers (cp +*.desktop /usr/share/applications/screensavers), and the executables from +/usr/lib/misc/xscreensaver into /usr/libexec/gnome-screensaver +(cp /usr/lib/misc/xscreensaver/* /usr/libexec/gnome-screensaver) + +Going to the gnome-screensaver-preferences dialog should now show the new +modules in the list. diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.8.0.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.8.0.ebuild new file mode 100644 index 0000000000..4ef07c42f1 --- /dev/null +++ b/mate-extra/mate-screensaver/mate-screensaver-1.8.0.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GCONF_DEBUG="yes" + +inherit gnome2 multilib versionator + +MATE_BRANCH="$(get_version_component_range 1-2)" + +SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz" +DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop" +HOMEPAGE="http://mate-desktop.org" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" + +IUSE="X consolekit kernel_linux libnotify opengl pam systemd" + +RDEPEND=" + >=dev-libs/dbus-glib-0.71:0 + >=dev-libs/glib-2.26:2 + gnome-base/dconf:0 + >=mate-base/libmatekbd-1.8:0 + >=mate-base/mate-desktop-1.8:0 + >=mate-base/mate-menus-1.8:0 + >=sys-apps/dbus-0.30:0 + >=x11-libs/gdk-pixbuf-2.14:2 + >=x11-libs/gtk+-2.14:2 + >=x11-libs/libX11-1:0 + x11-libs/cairo:0 + x11-libs/libXext:0 + x11-libs/libXrandr:0 + x11-libs/libXScrnSaver:0 + x11-libs/libXxf86misc:0 + x11-libs/libXxf86vm:0 + x11-libs/libxklavier:0 + x11-libs/pango:0 + virtual/libintl:0 + libnotify? ( >=x11-libs/libnotify-0.7:0 ) + opengl? ( virtual/opengl:0 ) + pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 ) + !pam? ( kernel_linux? ( sys-apps/shadow:0 ) ) + !!<gnome-extra/gnome-screensaver-3:0" + +# FIXME: Why is systemd and consolekit only a DEPEND? ConsoleKit can't be used build-time only. +DEPEND="${RDEPEND} + >=dev-util/intltool-0.35:* + >=mate-base/mate-common-1.8:0 + sys-devel/gettext:* + x11-proto/randrproto:0 + x11-proto/scrnsaverproto:0 + x11-proto/xextproto:0 + x11-proto/xf86miscproto:0 + virtual/pkgconfig:* + consolekit? ( sys-auth/consolekit:0 ) + systemd? ( sys-apps/systemd:0= )" + +src_configure() { + gnome2_src_configure \ + $(use_with consolekit console-kit) \ + $(use_enable debug) \ + $(use_with libnotify) \ + $(use_with opengl libgl) \ + $(use_enable pam) \ + $(use_with systemd) \ + $(use_with X x) \ + --enable-locking \ + --with-kbd-layout-indicator \ + --with-xf86gamma-ext \ + --with-xscreensaverdir=/usr/share/xscreensaver/config \ + --with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver +} + +DOCS="AUTHORS ChangeLog NEWS README" + +src_install() { + gnome2_src_install + + # Install the conversion script in the documentation. + dodoc "${S}"/data/migrate-xscreensaver-config.sh + dodoc "${S}"/data/xscreensaver-config.xsl + dodoc "${FILESDIR}"/xss-conversion.txt + + # Non PAM users will need this suid to read the password hashes. + # OpenPAM users will probably need this too when + # http://bugzilla.gnome.org/show_bug.cgi?id=370847 + # is fixed. + if ! use pam ; then + fperms u+s /usr/libexec/mate-screensaver-dialog + fi +} + +pkg_postinst() { + gnome2_pkg_postinst + + if has_version "<x11-base/xorg-server-1.5.3-r4" ; then + ewarn "You have a too old xorg-server installation. This will cause" + ewarn "mate-screensaver to eat up your CPU. Please consider upgrading." + echo + fi + + if has_version "<x11-misc/xscreensaver-4.22-r2" ; then + ewarn "You have xscreensaver installed, you probably want to disable it." + ewarn "To prevent a duplicate screensaver entry in the menu, you need to" + ewarn "build xscreensaver with -gnome in the USE flags." + ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use" + echo + fi + + elog "Information for converting screensavers is located in " + elog "/usr/share/doc/${PF}/xss-conversion.txt.${PORTAGE_COMPRESS}" +} diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.8.1.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.8.1.ebuild new file mode 100644 index 0000000000..fc112741aa --- /dev/null +++ b/mate-extra/mate-screensaver/mate-screensaver-1.8.1.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GCONF_DEBUG="yes" + +inherit gnome2 multilib readme.gentoo versionator + +MATE_BRANCH="$(get_version_component_range 1-2)" + +SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz" +DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop" +HOMEPAGE="http://mate-desktop.org" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="X consolekit kernel_linux libnotify opengl pam systemd" + +DOC_CONTENTS=" + Information for converting screensavers is located in + /usr/share/doc/${PF}/xss-conversion.txt* +" + +RDEPEND=" + >=dev-libs/dbus-glib-0.71:0 + >=dev-libs/glib-2.26:2 + gnome-base/dconf:0 + >=mate-base/libmatekbd-1.8:0 + >=mate-base/mate-desktop-1.8:0 + >=mate-base/mate-menus-1.8:0 + >=sys-apps/dbus-0.30:0 + >=x11-libs/gdk-pixbuf-2.14:2 + >=x11-libs/gtk+-2.14:2 + >=x11-libs/libX11-1:0 + x11-libs/cairo:0 + x11-libs/libXext:0 + x11-libs/libXrandr:0 + x11-libs/libXScrnSaver:0 + x11-libs/libXxf86misc:0 + x11-libs/libXxf86vm:0 + x11-libs/libxklavier:0 + x11-libs/pango:0 + virtual/libintl:0 + libnotify? ( >=x11-libs/libnotify-0.7:0 ) + opengl? ( virtual/opengl:0 ) + pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 ) + !pam? ( kernel_linux? ( sys-apps/shadow:0 ) ) + !!<gnome-extra/gnome-screensaver-3:0" + +# FIXME: Why is systemd and consolekit only a DEPEND? ConsoleKit can't be used build-time only. +DEPEND="${RDEPEND} + >=dev-util/intltool-0.35:* + >=mate-base/mate-common-1.8:0 + sys-devel/gettext:* + x11-proto/randrproto:0 + x11-proto/scrnsaverproto:0 + x11-proto/xextproto:0 + x11-proto/xf86miscproto:0 + virtual/pkgconfig:* + consolekit? ( sys-auth/consolekit:0 ) + systemd? ( sys-apps/systemd:0= )" + +src_configure() { + gnome2_src_configure \ + $(use_with consolekit console-kit) \ + $(use_enable debug) \ + $(use_with libnotify) \ + $(use_with opengl libgl) \ + $(use_enable pam) \ + $(use_with systemd) \ + $(use_with X x) \ + --enable-locking \ + --with-kbd-layout-indicator \ + --with-xf86gamma-ext \ + --with-xscreensaverdir=/usr/share/xscreensaver/config \ + --with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver +} + +src_install() { + gnome2_src_install + + # Install the conversion script in the documentation. + dodoc "${S}"/data/migrate-xscreensaver-config.sh + dodoc "${S}"/data/xscreensaver-config.xsl + dodoc "${FILESDIR}"/xss-conversion.txt + + # Non PAM users will need this suid to read the password hashes. + # OpenPAM users will probably need this too when + # http://bugzilla.gnome.org/show_bug.cgi?id=370847 + # is fixed. + if ! use pam ; then + fperms u+s /usr/libexec/mate-screensaver-dialog + fi + + readme.gentoo_create_doc +} + +pkg_postinst() { + gnome2_pkg_postinst + + if has_version "<x11-base/xorg-server-1.5.3-r4" ; then + ewarn "You have a too old xorg-server installation. This will cause" + ewarn "mate-screensaver to eat up your CPU. Please consider upgrading." + echo + fi + + if has_version "<x11-misc/xscreensaver-4.22-r2" ; then + ewarn "You have xscreensaver installed, you probably want to disable it." + ewarn "To prevent a duplicate screensaver entry in the menu, you need to" + ewarn "build xscreensaver with -gnome in the USE flags." + ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use" + echo + fi + + readme.gentoo_print_elog +} diff --git a/mate-extra/mate-screensaver/metadata.xml b/mate-extra/mate-screensaver/metadata.xml new file mode 100644 index 0000000000..96aee56156 --- /dev/null +++ b/mate-extra/mate-screensaver/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>mate</herd> + <use> + <flag name="consolekit">Enable support for + <pkg>sys-auth/consolkekit</pkg></flag> + </use> + <upstream> + <remote-id type="github">mate-desktop/mate-screensaver</remote-id> + </upstream> +</pkgmetadata> diff --git a/mate-extra/mate-sensors-applet/Manifest b/mate-extra/mate-sensors-applet/Manifest new file mode 100644 index 0000000000..4089b032aa --- /dev/null +++ b/mate-extra/mate-sensors-applet/Manifest @@ -0,0 +1 @@ +DIST mate-sensors-applet-1.8.0.tar.xz 352128 SHA256 9bc6f42eae4b866f83d0fa9566e0111fd379dc6cf9dcc020b1fcca1c8a49d410 SHA512 8074900157c0d62b060f273fa975efcfa3808afb9c81c44089c1f255ce95ed34744070f98893d7b6bbb16d076ae7b7ddec391ef46459e06646d2586797df85fc WHIRLPOOL d245ed9cce0a9bd9eed1e3996529227e3fa909ba9dba37975599409783bd7f34ead6ca0d477dbac6d41462c85ba599ecb14f18a80e6ab604a29bfce413289bfe diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.8.0.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.8.0.ebuild new file mode 100644 index 0000000000..01d61b1fc2 --- /dev/null +++ b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.8.0.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" + +inherit gnome2 eutils versionator + +MATE_BRANCH="$(get_version_component_range 1-2)" + +SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz" +DESCRIPTION="MATE panel applet to display readings from hardware sensors" +HOMEPAGE="http://mate-desktop.org" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" + +IUSE="+dbus hddtemp libnotify lm_sensors video_cards_fglrx video_cards_nvidia" + +RDEPEND="app-text/rarian:0 + >=dev-libs/glib-2.26:2 + >=mate-base/mate-panel-1.8:0 + >=x11-libs/cairo-1.0.4:0 + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-2.14:2 + virtual/libintl:0 + hddtemp? ( + dbus? ( + >=dev-libs/dbus-glib-0.80:0 + >=dev-libs/libatasmart-0.16:0 ) + !dbus? ( >=app-admin/hddtemp-0.3_beta13:0 ) ) + libnotify? ( >=x11-libs/libnotify-0.7:0 ) + lm_sensors? ( sys-apps/lm_sensors:0 ) + video_cards_fglrx? ( x11-drivers/ati-drivers:* ) + video_cards_nvidia? ( || ( + >=x11-drivers/nvidia-drivers-100.14.09:0 + media-video/nvidia-settings:0 + ) )" + +DEPEND="${RDEPEND} + >=app-text/scrollkeeper-dtd-1:1.0 + app-text/yelp-tools:0 + dev-util/intltool:* + sys-devel/gettext:* + virtual/pkgconfig:*" + +# Requires libxslt only for use by gnome-doc-utils. +PDEPEND="hddtemp? ( dbus? ( sys-fs/udisks:0 ) )" + +src_configure() { + local myconf + + if use hddtemp && use dbus; then + myconf="${myconf} $(use_enable dbus udisks)" + else + myconf="${myconf} --disable-udisks" + fi + + gnome2_src_configure \ + --disable-static \ + $(use_enable libnotify) \ + $(use_with lm_sensors libsensors) \ + $(use_with video_cards_fglrx aticonfig) \ + $(use_with video_cards_nvidia nvidia) \ + ${myconf} +} + +DOCS="AUTHORS ChangeLog NEWS README TODO" diff --git a/mate-extra/mate-sensors-applet/metadata.xml b/mate-extra/mate-sensors-applet/metadata.xml new file mode 100644 index 0000000000..5c977d7ea1 --- /dev/null +++ b/mate-extra/mate-sensors-applet/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>mate</herd> + <upstream> + <remote-id type="github">mate-desktop/mate-sensors-applet</remote-id> + </upstream> +</pkgmetadata> diff --git a/mate-extra/mate-system-monitor/Manifest b/mate-extra/mate-system-monitor/Manifest new file mode 100644 index 0000000000..f4f0acc803 --- /dev/null +++ b/mate-extra/mate-system-monitor/Manifest @@ -0,0 +1 @@ +DIST mate-system-monitor-1.8.0.tar.xz 2099600 SHA256 00ef3c595d4837e44f70c40e683a292836c9c8a84d1f9ab66f5b97a206f47712 SHA512 175c46b05544de70fca37c444fd2ad4f578f62e50da1e0d30136fc2c6f79d49ff68c1d6fe6675d2aafd5d726c0b96d82971df3dc964b7430b2f4db179db91856 WHIRLPOOL 3a30f5c441ee1f60c7e735e7ea6c57d8e03cb22e7b3edb83bf2739548a939fc1ed64dd561bb3bd7e3f33de5643c25d14b940f8d9bb209403af1e30297728c266 diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.8.0.ebuild b/mate-extra/mate-system-monitor/mate-system-monitor-1.8.0.ebuild new file mode 100644 index 0000000000..dfda81c478 --- /dev/null +++ b/mate-extra/mate-system-monitor/mate-system-monitor-1.8.0.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GCONF_DEBUG="no" + +inherit gnome2 versionator + +MATE_BRANCH="$(get_version_component_range 1-2)" + +SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz" +DESCRIPTION="The MATE System Monitor" +HOMEPAGE="http://mate-desktop.org" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" + +RDEPEND="app-text/rarian:0 + >=dev-cpp/glibmm-2.16:2 + >=dev-cpp/gtkmm-2.22:2.4 + >=dev-libs/dbus-glib-0.70:0 + >=dev-libs/glib-2.28:2 + dev-libs/libsigc++:2 + >=dev-libs/libxml2-2:2 + >=gnome-base/libgtop-2.23.1:2= + >=gnome-base/librsvg-2.12:2 + >=sys-apps/dbus-0.7:0 + x11-libs/cairo:0 + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-2.20:2 + >=x11-libs/libwnck-2.5:1 + >=x11-themes/mate-icon-theme-1.8:0 + virtual/libintl:0" + +DEPEND="${RDEPEND} + >=app-text/scrollkeeper-dtd-1:1.0 + app-text/yelp-tools:0 + >=dev-util/intltool-0.35:* + sys-devel/gettext:* + virtual/pkgconfig:*" + +DOCS="AUTHORS ChangeLog NEWS README" diff --git a/mate-extra/mate-system-monitor/metadata.xml b/mate-extra/mate-system-monitor/metadata.xml new file mode 100644 index 0000000000..8a0098558d --- /dev/null +++ b/mate-extra/mate-system-monitor/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>mate</herd> + <upstream> + <remote-id type="github">mate-desktop/mate-system-monitor</remote-id> + </upstream> +</pkgmetadata> diff --git a/mate-extra/mate-user-share/Manifest b/mate-extra/mate-user-share/Manifest new file mode 100644 index 0000000000..8a12016915 --- /dev/null +++ b/mate-extra/mate-user-share/Manifest @@ -0,0 +1 @@ +DIST mate-user-share-1.8.0.tar.xz 928348 SHA256 8cfe07fcf728384b073557aa17bc10c9e221c6d714a1009ace582c3c74cc8b5a SHA512 0d0231abfc65fc8d0a16ec871bc534d788d9699f5a3a8b2f967c6532b06266591c11199eb9630121c595513fb7255175bdd8eeae0a265e68c7d0f5059daf4947 WHIRLPOOL ecb66912c6015f97f24156f8b83824873136177acc525bbed72606af35cd21d95e1cd2ea556ac9b7c403e6a756e9e9577189ee4cd19301e721113c51780f6d01 diff --git a/mate-extra/mate-user-share/mate-user-share-1.8.0.ebuild b/mate-extra/mate-user-share/mate-user-share-1.8.0.ebuild new file mode 100644 index 0000000000..d08825d8f4 --- /dev/null +++ b/mate-extra/mate-user-share/mate-user-share-1.8.0.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" + +inherit gnome2 multilib versionator + +MATE_BRANCH="$(get_version_component_range 1-2)" + +SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz" +DESCRIPTION="Personal file sharing for the MATE desktop" +HOMEPAGE="http://www.mate-desktop.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" + +IUSE="X bluetooth" + +RDEPEND=">=app-mobilephone/obex-data-server-0.4:0 + >=dev-libs/dbus-glib-0.70:0 + >=dev-libs/glib-2.15.2:2 + >=dev-libs/libunique-1:1 + >=mate-base/caja-1.8:0 + media-libs/libcanberra:0[gtk] + >=sys-apps/dbus-1.1.1:0 + >=x11-libs/gdk-pixbuf-2:2 + >=x11-libs/gtk+-2.14:2 + x11-libs/libX11:0 + x11-libs/pango:0 + >=x11-libs/libnotify-0.7:0 + >=www-apache/mod_dnssd-0.6:0 + >=www-servers/apache-2.2:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile] + virtual/libintl:0 + bluetooth? ( >=net-wireless/bluez-4.18:0= )" + +DEPEND="${RDEPEND} + app-text/docbook-xml-dtd:4.1.2 + app-text/yelp-tools:0 + >=dev-util/intltool-0.35:* + sys-devel/gettext:* + virtual/pkgconfig:*" + +src_configure() { + gnome2_src_configure \ + --with-httpd=apache2 \ + --with-modules-path=/usr/$(get_libdir)/apache2/modules/ \ + $(use_enable bluetooth) \ + $(use_with X x) +} + +DOCS="AUTHORS ChangeLog NEWS README" diff --git a/mate-extra/mate-user-share/metadata.xml b/mate-extra/mate-user-share/metadata.xml new file mode 100644 index 0000000000..3b08cd8639 --- /dev/null +++ b/mate-extra/mate-user-share/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>mate</herd> + <upstream> + <remote-id type="github">mate-desktop/mate-user-share</remote-id> + </upstream> +</pkgmetadata> diff --git a/mate-extra/mate-utils/Manifest b/mate-extra/mate-utils/Manifest new file mode 100644 index 0000000000..2e3f0c0099 --- /dev/null +++ b/mate-extra/mate-utils/Manifest @@ -0,0 +1,2 @@ +DIST mate-utils-1.8.0.tar.xz 2681836 SHA256 490d187d67c4f542cf3b8e63337acc1a9b7090c519adb844600b9d00da0b5cf0 SHA512 766fce72f7b486c3aa67e9a40b10207fbca36e7933cb7238bf0d6ac5a5e5165d5900ceb697c9af96f1135110b9b3985e349e9bc071a5174fe3fe0776ba0c4cd5 WHIRLPOOL 77fff5f47c83fa6884403f30194b606346659651f077912364907d8e3b6ad95e9eae974012aa8c54db31381231190077d362e402afe4f87279695871ab78144b +DIST mate-utils-1.8.1.tar.xz 2648184 SHA256 0ad9c40c656214caaa6cbd2107ebb13e3cea0b64b4e31c7105568726313522a5 SHA512 71a6a57365a067012447222b2ef4b768234b2e58bf88b5b45c6e4b7f746c81136ea1dfee45257406b19f2c4f4c51adc3279b09f7c9c41bfe7be9c66321ad0eef WHIRLPOOL fc35c564fb378ebfc147b9344790aae5a3934e86f6cf642dedb2ab98ae093bb259e298f4fa6de98157f3c4775445862888a56464de8852d829e6040f9a42fc95 diff --git a/mate-extra/mate-utils/mate-utils-1.8.0.ebuild b/mate-extra/mate-utils/mate-utils-1.8.0.ebuild new file mode 100644 index 0000000000..3a1ddf82a7 --- /dev/null +++ b/mate-extra/mate-utils/mate-utils-1.8.0.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GCONF_DEBUG="yes" +GNOME2_LA_PUNT="yes" + +inherit gnome2 versionator + +MATE_BRANCH="$(get_version_component_range 1-2)" + +SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz" +DESCRIPTION="Utilities for the MATE desktop" +HOMEPAGE="http://mate-desktop.org" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" + +IUSE="X applet ipv6 test" + +RDEPEND="app-text/rarian:0 + dev-libs/atk:0 + >=dev-libs/glib-2.20:2 + >=gnome-base/libgtop-2.12:2= + >=media-libs/libcanberra-0.4:0[gtk] + sys-libs/zlib:0 + >=x11-libs/gtk+-2.24:2 + x11-libs/cairo:0 + x11-libs/gdk-pixbuf:2 + x11-libs/libICE:0 + x11-libs/libSM:0 + x11-libs/libX11:0 + x11-libs/libXext:0 + x11-libs/pango:0 + applet? ( >=mate-base/mate-panel-1.8:0 )" + +DEPEND="${RDEPEND} + >=app-text/scrollkeeper-dtd-1:1.0 + app-text/yelp-tools:0 + >=dev-util/intltool-0.40:* + >=mate-base/mate-common-1.8:0 + x11-proto/xextproto:0 + sys-devel/gettext:* + virtual/pkgconfig:*" + +src_prepare() { + gnome2_src_prepare + + # Remove -D.*DISABLE_DEPRECATED cflagss + # This method is kinda prone to breakage. Recheck carefully with next bump. + # bug 339074 + LC_ALL=C find . -iname 'Makefile.am' -exec \ + sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die + + # Do Makefile.in after Makefile.am to avoid automake maintainer-mode + LC_ALL=C find . -iname 'Makefile.in' -exec \ + sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die + + if ! use test; then + sed -e 's/ tests//' -i logview/Makefile.{am,in} || die + fi + + # Fix up desktop files. + LC_ALL=C find . -iname '*.desktop.in*' -exec \ + sed -e 's/Categories\(.*\)MATE/Categories\1X-MATE/' -i {} + || die +} + +src_configure() { + local myconf + if ! use debug; then + myconf="${myconf} --enable-debug=minimum" + fi + + gnome2_src_configure \ + $(use_enable applet gdict-applet) \ + $(use_enable ipv6) \ + $(use_with X x) \ + --disable-maintainer-flags \ + --enable-zlib \ + ${myconf} +} + +DOCS="AUTHORS ChangeLog NEWS README THANKS" diff --git a/mate-extra/mate-utils/mate-utils-1.8.1.ebuild b/mate-extra/mate-utils/mate-utils-1.8.1.ebuild new file mode 100644 index 0000000000..f0ddb22130 --- /dev/null +++ b/mate-extra/mate-utils/mate-utils-1.8.1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +GCONF_DEBUG="yes" +GNOME2_LA_PUNT="yes" + +inherit gnome2 versionator + +MATE_BRANCH="$(get_version_component_range 1-2)" + +SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz" +DESCRIPTION="Utilities for the MATE desktop" +HOMEPAGE="http://mate-desktop.org" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="X applet ipv6 test" + +RDEPEND="app-text/rarian:0 + dev-libs/atk:0 + >=dev-libs/glib-2.20:2 + >=gnome-base/libgtop-2.12:2= + >=media-libs/libcanberra-0.4:0[gtk] + sys-libs/zlib:0 + >=x11-libs/gtk+-2.24:2 + x11-libs/cairo:0 + x11-libs/gdk-pixbuf:2 + x11-libs/libICE:0 + x11-libs/libSM:0 + x11-libs/libX11:0 + x11-libs/libXext:0 + x11-libs/pango:0 + applet? ( >=mate-base/mate-panel-1.8:0 )" + +DEPEND="${RDEPEND} + >=app-text/scrollkeeper-dtd-1:1.0 + app-text/yelp-tools:0 + >=dev-util/intltool-0.40:* + >=mate-base/mate-common-1.8:0 + x11-proto/xextproto:0 + sys-devel/gettext:* + virtual/pkgconfig:*" + +src_prepare() { + gnome2_src_prepare + + # Remove -D.*DISABLE_DEPRECATED cflagss + # This method is kinda prone to breakage. Recheck carefully with next bump. + # bug 339074 + LC_ALL=C find . -iname 'Makefile.am' -exec \ + sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die + + # Do Makefile.in after Makefile.am to avoid automake maintainer-mode + LC_ALL=C find . -iname 'Makefile.in' -exec \ + sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die + + if ! use test; then + sed -e 's/ tests//' -i logview/Makefile.{am,in} || die + fi + + # Fix up desktop files. + LC_ALL=C find . -iname '*.desktop.in*' -exec \ + sed -e 's/Categories\(.*\)MATE/Categories\1X-MATE/' -i {} + || die +} + +src_configure() { + local myconf + if ! use debug; then + myconf="${myconf} --enable-debug=minimum" + fi + + gnome2_src_configure \ + $(use_enable applet gdict-applet) \ + $(use_enable ipv6) \ + $(use_with X x) \ + --disable-maintainer-flags \ + --enable-zlib \ + ${myconf} +} + +DOCS="AUTHORS ChangeLog NEWS README THANKS" diff --git a/mate-extra/mate-utils/metadata.xml b/mate-extra/mate-utils/metadata.xml new file mode 100644 index 0000000000..dca77826b8 --- /dev/null +++ b/mate-extra/mate-utils/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>mate</herd> + <use> + <flag name="applet">Enable the mate dictionary applet</flag> + </use> + <upstream> + <remote-id type="github">mate-desktop/mate-utils</remote-id> + </upstream> +</pkgmetadata> diff --git a/mate-extra/metadata.xml b/mate-extra/metadata.xml new file mode 100644 index 0000000000..211105c47d --- /dev/null +++ b/mate-extra/metadata.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<catmetadata> + <longdescription lang="en"> + The mate-extra category contains additional non-core MATE packages. + </longdescription> + <longdescription lang="de"> + Die Kategorie mate-extra enthält zusätzliche MATE-Pakete die nicht + Teil des Basissystems sind. + </longdescription> + <longdescription lang="es"> + La categoría mate-extra contiene paquetes adicionales de MATE. + </longdescription> + <longdescription lang="ja"> + mate-extraカテゴリーにはMATEのコアなし拡張パッケージが含まれています。 + </longdescription> + <longdescription lang="nl"> + De mate-extra categorie bevat optionele extra's voor de MATE desktopomgeving. + </longdescription> + <longdescription lang="vi"> + Nhóm mate-extra chứa các gói MATE bổ sung, không thuộc về các gói cốt lõi. + </longdescription> + <longdescription lang="it"> + La categoria mate-extra contiene pacchetti vari per MATE. + </longdescription> + <longdescription lang="pt"> + A categoria mate-extra contém pacotes adicionais de MATE. + </longdescription> + <longdescription lang="pl"> + Kategoria mate-extra zawiera dodatkowe pakiety dla środowiska MATE. + </longdescription> +</catmetadata> + |