diff options
| author | Liguros - Gitlab CI/CD [master] <gitlab@liguros.net> | 2021-03-01 00:37:58 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [master] <gitlab@liguros.net> | 2021-03-01 00:37:58 +0000 |
| commit | 8ddb1a3d1229412a438971f82d37d518a0223726 (patch) | |
| tree | 83438b5ddb9d23a390f1a3fc505303d3d2223bf2 /mate-base | |
| parent | 9acab46e1a820daece7b2e631485c157ce2210ad (diff) | |
| download | baldeagleos-repo-21.1.5.tar.gz baldeagleos-repo-21.1.5.tar.xz baldeagleos-repo-21.1.5.zip | |
Adding metadatav21.1.5
Diffstat (limited to 'mate-base')
34 files changed, 309 insertions, 2053 deletions
diff --git a/mate-base/caja/metadata.xml b/mate-base/caja/metadata.xml index 6a32358770ac..21ab68ff20b4 100644 --- a/mate-base/caja/metadata.xml +++ b/mate-base/caja/metadata.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>mate@gentoo.org</email> - <name>Gentoo MATE Desktop</name> - </maintainer> - <use> - <flag name="mate">Install <pkg>x11-themes/mate-icon-theme</pkg> which + <maintainer type="project"> + <email>mate@gentoo.org</email> + <name>Gentoo MATE Desktop</name> + </maintainer> + <upstream> + <remote-id type="github">mate-desktop/caja</remote-id> + </upstream> + <use> + <flag name="mate">Install <pkg>x11-themes/mate-icon-theme</pkg> which is needed when this package is used in the MATE desktop environment.</flag> - <flag name="packagekit">Enable support for installing via <pkg>app-admin/packagekit</pkg> + <flag name="packagekit">Enable support for installing via <pkg>app-admin/packagekit</pkg> based on mimetype</flag> - </use> - <upstream> - <remote-id type="github">mate-desktop/caja</remote-id> - </upstream> -</pkgmetadata> + </use> + <origin>mate-overlay</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/mate-base/libmatekbd/Manifest b/mate-base/libmatekbd/Manifest index a9ce596988e1..8b74521dd892 100644 --- a/mate-base/libmatekbd/Manifest +++ b/mate-base/libmatekbd/Manifest @@ -1,4 +1,2 @@ -DIST libmatekbd-1.20.2.tar.xz 372452 BLAKE2B be79862aad4ca04e76c2496f06c166bf06674f47dd1b686432a667f765fd1e71fa1717224a989f2db19d0a006264b989db55d3f8daf5f06a22c2861570db16b1 SHA512 14d332ea4c90fe66f602a3484ea2c140c8ec280874dc7fa9e9e0a344e8e94e9713afa0e45f901ecf6e033b8072055e2c29a4d68164c868c63a052307acd54250 -DIST libmatekbd-1.22.0.tar.xz 374604 BLAKE2B 318c26cd6630773b0b1e89769e8b540545500d5bcc359e568d8cea0ffccebd17a1dd248cc8f61ba584058cb170171608f6c729256eb7936e8b23738657d5a9a5 SHA512 79f19455bb6c0df5a50e445907ac12d6bd92a54cd086e0303890bc67350de3d94b2fd665efdaec85f84a42d76af430ad0a1b9639da078179ac25d27c4a325281 DIST libmatekbd-1.23.0.tar.xz 363904 BLAKE2B 1b1ec3f7756127c1e41b4ff69069fcbf74505f3c844d1e3df1350d40f246ab96d017f4ec1326d3b72eba0b25eecbeaec9bc46b60d9f07e186e51c435015e56f7 SHA512 b20d0291b278aeb81e9d3e63d0740361960945e03936139e862cb44d0d3a32aecfee704569eecf7654a8d4e848ba29fe1b689ceefbe86a04e637c6bfc4f3ed3b DIST libmatekbd-1.24.0.tar.xz 425720 BLAKE2B 6f5f808f55c57c3d651d5c871a5f95269397a6d1c2e3cd37d2b16a5519300a81e994e0ac10bf474b9860ec7c0f3c862332199e10c506f38107c7f7d791899b4d SHA512 6a04f4f38ac1d1ef372fdbaddfe4c935d79039cce1a3d68a6876fa5550556f1d568de1d53857531c6f0bd5994e815f2c9e5be0436218e97718f87e17973ea655 diff --git a/mate-base/libmatekbd/libmatekbd-1.20.2.ebuild b/mate-base/libmatekbd/libmatekbd-1.20.2.ebuild deleted file mode 100644 index 09d432a949a8..000000000000 --- a/mate-base/libmatekbd/libmatekbd-1.20.2.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MATE_LA_PUNT="yes" - -inherit mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -DESCRIPTION="MATE keyboard configuration library" -LICENSE="LGPL-2" -SLOT="0" - -IUSE="X +introspection test" - -COMMON_DEPEND=">=dev-libs/glib-2.36:2 - x11-libs/cairo:0 - >=x11-libs/gdk-pixbuf-2.24:2 - x11-libs/libX11:0 - >=x11-libs/libxklavier-5.2:0[introspection?] - x11-libs/pango:0 - virtual/libintl:0 - >=x11-libs/gtk+-3.0:3[introspection?] - introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )" - -RDEPEND="${COMMON_DEPEND}" - -DEPEND="${COMMON_DEPEND} - sys-devel/gettext:* - >=dev-util/intltool-0.50.1:* - virtual/pkgconfig:*" - -src_configure() { - mate_src_configure \ - $(use_with X x) \ - $(use_enable introspection) \ - $(use_enable test tests) -} diff --git a/mate-base/libmatekbd/libmatekbd-1.22.0.ebuild b/mate-base/libmatekbd/libmatekbd-1.22.0.ebuild deleted file mode 100644 index b1f2113381e3..000000000000 --- a/mate-base/libmatekbd/libmatekbd-1.22.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MATE_LA_PUNT="yes" - -inherit mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="amd64 ~arm ~arm64 x86" -fi - -DESCRIPTION="MATE keyboard configuration library" -LICENSE="LGPL-2" -SLOT="0" - -IUSE="X +introspection test" - -RDEPEND=">=dev-libs/glib-2.50:2 - x11-libs/cairo - >=x11-libs/gdk-pixbuf-2.24:2 - x11-libs/libX11 - >=x11-libs/libxklavier-5.2:0[introspection?] - x11-libs/pango - virtual/libintl - >=x11-libs/gtk+-3.22:3[introspection?] - introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )" - -DEPEND="${RDEPEND} - dev-util/glib-utils - >=dev-util/intltool-0.50.1 - sys-devel/gettext - virtual/pkgconfig" - -src_configure() { - mate_src_configure \ - $(use_with X x) \ - $(use_enable introspection) \ - $(use_enable test tests) -} diff --git a/mate-base/libmatekbd/metadata.xml b/mate-base/libmatekbd/metadata.xml index 4262d8743d92..914fe125cc50 100644 --- a/mate-base/libmatekbd/metadata.xml +++ b/mate-base/libmatekbd/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>mate@gentoo.org</email> - <name>Gentoo MATE Desktop</name> - </maintainer> - <upstream> - <remote-id type="github">mate-desktop/libmatekbd</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="project"> + <email>mate@gentoo.org</email> + <name>Gentoo MATE Desktop</name> + </maintainer> + <upstream> + <remote-id type="github">mate-desktop/libmatekbd</remote-id> + </upstream> + <origin>mate-overlay</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/mate-base/mate-applets-meta/metadata.xml b/mate-base/mate-applets-meta/metadata.xml index 1d4f0490d71b..cb322750264f 100644 --- a/mate-base/mate-applets-meta/metadata.xml +++ b/mate-base/mate-applets-meta/metadata.xml @@ -1,14 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>mate@gentoo.org</email> - <name>Gentoo MATE Desktop</name> - </maintainer> - <use> - <flag name="appindicator">Pull in <pkg>mate-extra/mate-indicator-applet</pkg> + <maintainer type="project"> + <email>mate@gentoo.org</email> + <name>Gentoo MATE Desktop</name> + </maintainer> + + <use> + <flag name="appindicator">Pull in <pkg>mate-extra/mate-indicator-applet</pkg> for AppIndicator applet</flag> - <flag name="sensors">Pull in <pkg>mate-extra/mate-sensors-applet</pkg> + <flag name="sensors">Pull in <pkg>mate-extra/mate-sensors-applet</pkg> for hw sensors applet</flag> - </use> -</pkgmetadata> + </use> + <origin>mate-overlay</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/mate-base/mate-applets/Manifest b/mate-base/mate-applets/Manifest index 7b030c53a4e6..eafd87668896 100644 --- a/mate-base/mate-applets/Manifest +++ b/mate-base/mate-applets/Manifest @@ -1,6 +1 @@ -DIST mate-applets-1.20.3.tar.xz 7719028 BLAKE2B 5ae59bdf35ece314f23cf6369ba32cedcae760e1e3713c94319c5334f39c76f3e2ba5030ce0763e48ee1df56bb9aabf31214abf1cf2e4338f7007a517afcf381 SHA512 cc3e05617efab15cc30f5e8cbefc9995da43c76017c1a28e867e3632682842bf0338f0c3a553ad678ad48195cbc4cdfcb5056d1c704cfd058ba3f7fb5769edc5 -DIST mate-applets-1.22.1.tar.xz 7602112 BLAKE2B 22dc076d188cddf9c5160d7ecaddb14ecc41a575abac91b72959054f3fe1c961c80b1aa9171150e7c4ce61ccee0783572726386319312dc97f64d4f9266c1a6d SHA512 d132c8b5e433a557785745032235a5792d04edd7c249269d9a4066fb345b76955bdca71164f7b321f41f566803694d85d9cd7690fbd699daa54788572f0eb986 -DIST mate-applets-1.22.2.tar.xz 7648744 BLAKE2B 85235f12c1436c3caaa6429aabd16822ae34c5c4bd7a575aa9be2c2e9080734b39180e34b22fdf265a64b5ebffb24071d8768b99f55736631403da02882e45fe SHA512 a57ed37d6ddef303e40cbd8f811d1c6be473eeee78a5b56c5eb280d7dba10668678bf9203425f735fb3b356f4ec33eb2369867aa3ab4b446748fe36b80194e8f -DIST mate-applets-1.23.0.tar.xz 7614500 BLAKE2B d73e9fbbc4554b1a53d9dc3b169700782911f4c770f765cf5d1530f34420e2715546d83e4b34c4d1eb131b29cd702f7f0bc90d27af48160bf447b0be429691ae SHA512 3c784aff03884d91382e1ba6473eb6a052a57bbe5474b2b442914778f2916b629d1faff2195b3693c2b1ff5d500eb95269942416ccf8b93786a718b664e8f89d -DIST mate-applets-1.23.1.tar.xz 8140024 BLAKE2B e3f30fa4ba4403506c01b06d37281763af3a75bb7ce6869cfbff60482c02ac07bce1de8383b3059c21687e6ddeccc95dffff8dd6ac8ba55539bb97d6e91cfb3d SHA512 42cea89aa95211e3686f0115f9e7e3fa7f53262ef1a95fb1d73886633566254628ca4116aa6200b954b991842b4895e14ec32d6ee94be58ea66eae3aeacd4a0d DIST mate-applets-1.24.0.tar.xz 8142812 BLAKE2B cbb76d6d64bb6e9b9f93197dbe79e2751877b0604c5a84ff4b6b00608f2930925bdbc2824dc96848c84496fa5f16ab38458775727b22cb07f4db9ca854f93c42 SHA512 345a80b123c705997d44ac5a4bea5249045d75181c3802cf49b2eb08decc14a12f75f2e06e6ebfae267b937ff10edf7638cd64332e2e2e731695e6260df5222e diff --git a/mate-base/mate-applets/mate-applets-1.23.0.ebuild b/mate-base/mate-applets/mate-applets-1.23.0.ebuild deleted file mode 100644 index 13922d62f093..000000000000 --- a/mate-base/mate-applets/mate-applets-1.23.0.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -DESCRIPTION="Applets for the MATE Desktop and Panel" -LICENSE="GPL-2 FDL-1.1 LGPL-2" -SLOT="0" - -IUSE="X ipv6 policykit +upower" - -COMMON_DEPEND="dev-libs/atk - >=dev-libs/dbus-glib-0.74 - >=dev-libs/glib-2.50:2 - >=dev-libs/libmateweather-1.17.0 - >=dev-libs/libxml2-2.5:2 - >=gnome-base/libgtop-2.12.0:2= - >=gnome-extra/gucharmap-3.0:2.90 - >=mate-base/mate-panel-1.17.0 - >=net-wireless/wireless-tools-28_pre9:0 - >=sys-apps/dbus-1.1.2 - sys-power/cpupower - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.22:3 - x11-libs/gtksourceview:3.0 - >=x11-libs/libnotify-0.7 - x11-libs/libX11 - >=x11-libs/libwnck-3.0:3 - x11-libs/pango - virtual/libintl - policykit? ( >=sys-auth/polkit-0.97:0 ) - upower? ( >=sys-power/upower-0.9.23 ) - !!net-analyzer/mate-netspeed" - -RDEPEND="${COMMON_DEPEND} - >=mate-base/mate-settings-daemon-1.6" - -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.3 - app-text/rarian - >=app-text/scrollkeeper-dtd-1:1.0 - app-text/yelp-tools - >=dev-util/intltool-0.50.1 - dev-libs/libxslt - sys-devel/gettext:* - virtual/pkgconfig:*" - -# seems this issue is fixed in ee13eb9b2c5296fd3b2930a1408382dcced446a3 upstream -# PATCHES=( "${FILESDIR}"/${PN}-1.22.0-cpupower.patch ) - -src_configure() { - mate_src_configure \ - --libexecdir=/usr/libexec/mate-applets \ - --with-cpufreq-lib=cpupower \ - $(use_with X x) \ - $(use_with upower) \ - $(use_enable ipv6) \ - $(use_enable policykit polkit) -} - -src_test() { - unset DBUS_SESSION_BUS_ADDRESS - emake check -} - -src_install() { - mate_src_install - - local APPLETS="accessx-status battstat charpick command cpufreq drivemount - geyes mateweather multiload netspeed stickynotes - timerapplet trashapplet" - - for applet in ${APPLETS}; do - docinto ${applet} - - for d in AUTHORS ChangeLog NEWS README README.themes TODO; do - [ -s ${applet}/${d} ] && dodoc ${applet}/${d} - done - done -} diff --git a/mate-base/mate-applets/mate-applets-1.23.1.ebuild b/mate-base/mate-applets/mate-applets-1.23.1.ebuild deleted file mode 100644 index c5e7cc28f0c8..000000000000 --- a/mate-base/mate-applets/mate-applets-1.23.1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -DESCRIPTION="Applets for the MATE Desktop and Panel" -LICENSE="GPL-2 FDL-1.1 LGPL-2" -SLOT="0" - -IUSE="X ipv6 policykit +upower" - -COMMON_DEPEND="dev-libs/atk - >=dev-libs/dbus-glib-0.74 - >=dev-libs/glib-2.50:2 - >=dev-libs/libmateweather-1.17.0 - >=dev-libs/libxml2-2.5:2 - >=gnome-base/libgtop-2.12.0:2= - >=gnome-extra/gucharmap-3.0:2.90 - >=mate-base/mate-panel-1.17.0 - >=net-wireless/wireless-tools-28_pre9:0 - >=sys-apps/dbus-1.1.2 - sys-power/cpupower - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.22:3 - x11-libs/gtksourceview:3.0 - >=x11-libs/libnotify-0.7 - x11-libs/libX11 - >=x11-libs/libwnck-3.0:3 - x11-libs/pango - virtual/libintl - policykit? ( >=sys-auth/polkit-0.97:0 ) - upower? ( >=sys-power/upower-0.9.23 ) - !!net-analyzer/mate-netspeed" - -RDEPEND="${COMMON_DEPEND} - >=mate-base/mate-settings-daemon-1.6" - -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.3 - app-text/rarian - >=app-text/scrollkeeper-dtd-1:1.0 - app-text/yelp-tools - >=dev-util/intltool-0.50.1 - dev-libs/libxslt - sys-devel/gettext:* - virtual/pkgconfig:*" - -# seems this issue is fixed in ee13eb9b2c5296fd3b2930a1408382dcced446a3 upstream -# PATCHES=( "${FILESDIR}"/${PN}-1.22.0-cpupower.patch ) - -src_configure() { - mate_src_configure \ - --libexecdir=/usr/libexec/mate-applets \ - --with-cpufreq-lib=cpupower \ - $(use_with X x) \ - $(use_with upower) \ - $(use_enable ipv6) \ - $(use_enable policykit polkit) -} - -src_test() { - unset DBUS_SESSION_BUS_ADDRESS - emake check -} - -src_install() { - mate_src_install - - local APPLETS="accessx-status battstat charpick command cpufreq drivemount - geyes mateweather multiload netspeed stickynotes - timerapplet trashapplet" - - for applet in ${APPLETS}; do - docinto ${applet} - - for d in AUTHORS ChangeLog NEWS README README.themes TODO; do - [ -s ${applet}/${d} ] && dodoc ${applet}/${d} - done - done -} diff --git a/mate-base/mate-applets/mate-applets-9999.ebuild b/mate-base/mate-applets/mate-applets-9999.ebuild deleted file mode 100644 index 930eb83c1955..000000000000 --- a/mate-base/mate-applets/mate-applets-9999.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} ) - -inherit mate python-single-r1 - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -DESCRIPTION="Applets for the MATE Desktop and Panel" -LICENSE="GPL-2 FDL-1.1 LGPL-2" -SLOT="0" - -IUSE="X ipv6 policykit +upower" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPEND="${PYTHON_DEPS} - dev-libs/atk:0 - >=dev-libs/dbus-glib-0.74:0 - >=dev-libs/glib-2.36:2 - >=dev-libs/libmateweather-1.17.0 - >=dev-libs/libxml2-2.5:2 - dev-python/pygobject:3 - >=gnome-base/libgtop-2.12.0:2= - >=gnome-extra/gucharmap-3.0:2.90 - >=mate-base/mate-panel-1.17.0 - >=net-wireless/wireless-tools-28_pre9:0 - >=sys-apps/dbus-1.1.2:0 - sys-power/cpupower - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.14:3 - x11-libs/gtksourceview:3.0 - >=x11-libs/libnotify-0.7:0 - x11-libs/libX11:0 - >=x11-libs/libwnck-3.0:3 - x11-libs/pango:0 - virtual/libintl:0 - policykit? ( >=sys-auth/polkit-0.97:0 ) - upower? ( >=sys-power/upower-0.9.23 ) - !!net-analyzer/mate-netspeed" - -RDEPEND="${COMMON_DEPEND} - >=mate-base/mate-settings-daemon-1.6" - -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.3 - app-text/rarian:0 - >=app-text/scrollkeeper-dtd-1:1.0 - app-text/yelp-tools:0 - >=dev-util/intltool-0.50.1:* - dev-libs/libxslt:0 - sys-devel/gettext:* - virtual/pkgconfig:*" - -PATCHES=( "${FILESDIR}/${PN}-1.16.0-cpupower-4.7.patch" ) - -src_configure() { - mate_src_configure \ - --libexecdir=/usr/libexec/mate-applets \ - --with-cpufreq-lib=cpupower \ - $(use_with X x) \ - $(use_with upower) \ - $(use_enable ipv6) \ - $(use_enable policykit polkit) -} - -src_test() { - unset DBUS_SESSION_BUS_ADDRESS - emake check -} - -src_install() { - mate_src_install - - local APPLETS="accessx-status battstat charpick command cpufreq drivemount - geyes mateweather multiload netspeed stickynotes - timerapplet trashapplet" - - for applet in ${APPLETS}; do - docinto ${applet} - - for d in AUTHORS ChangeLog NEWS README README.themes TODO; do - [ -s ${applet}/${d} ] && dodoc ${applet}/${d} - done - done -} diff --git a/mate-base/mate-applets/metadata.xml b/mate-base/mate-applets/metadata.xml index dbdbdf91b958..611dfc65dffb 100644 --- a/mate-base/mate-applets/metadata.xml +++ b/mate-base/mate-applets/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>mate@gentoo.org</email> - <name>Gentoo MATE Desktop</name> - </maintainer> - <upstream> - <remote-id type="github">mate-desktop/mate-applets</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="project"> + <email>mate@gentoo.org</email> + <name>Gentoo MATE Desktop</name> + </maintainer> + <upstream> + <remote-id type="github">mate-desktop/mate-applets</remote-id> + </upstream> + <origin>mate-overlay</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/mate-base/mate-common/metadata.xml b/mate-base/mate-common/metadata.xml index 53ffdf572f4e..fdd6c809d449 100644 --- a/mate-base/mate-common/metadata.xml +++ b/mate-base/mate-common/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>mate@gentoo.org</email> - <name>Gentoo MATE Desktop</name> - </maintainer> - <upstream> - <remote-id type="github">mate-desktop/mate-common</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="project"> + <email>mate@gentoo.org</email> + <name>Gentoo MATE Desktop</name> + </maintainer> + <upstream> + <remote-id type="github">mate-desktop/mate-common</remote-id> + </upstream> + <origin>mate-overlay</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/mate-base/mate-control-center/Manifest b/mate-base/mate-control-center/Manifest index 1f8a7a785c42..9a96d36a3c04 100644 --- a/mate-base/mate-control-center/Manifest +++ b/mate-base/mate-control-center/Manifest @@ -1,6 +1 @@ -DIST mate-control-center-1.20.4.tar.xz 1534080 BLAKE2B 7b90912fd87e887fc3a9611d6c4419f13485b071e0d296731668cb4baec1bf1ed94bb0f21c8203a06db1b654f4cd4c0f1451edf57b8f77f38bffb7a23c1ec31e SHA512 a180d00970cc9ad7f6966de16beb1507ca71bd71478e64c84d8ad15058d479dd0dc5eeb6e99c9e20c61dddb44cfc2ef89b72b977b860da82acd80a98db85a9a6 -DIST mate-control-center-1.22.1.tar.xz 1445012 BLAKE2B 2dc129280510432c25d158d6acdb50e58dfffd2e027fade545459669a6e6dbeafc4efe2cc81e19483427ec563daee903e2422e61ee398c88fec566cd80842639 SHA512 92390bf5eea459effbd94f0488cdaf3d7b6ff4f548f1aafead928d75e064e85ec1ac7796289f96af2ca8f6cbf3ef57bd2ae37058192af0ec976f4770ec8abeca -DIST mate-control-center-1.22.2.tar.xz 1614216 BLAKE2B cb6dfe509740b2bedc036e849c85f9b752a56310fffe1bb31a19edfd428b3e2e35bf3a5bff9d83e3b72fc05f7bbd97bccd003340bfcb8cb43e9b6964a63957e8 SHA512 994563b8970ebf51ba44afe49122e82ff67fdb6c78ab2e8175acc6f619d40a82284cbafc1d61b89b25ac9e8488b00f63433eda94118d40a4fbff0d644ae1ddd5 -DIST mate-control-center-1.23.2.tar.xz 2496608 BLAKE2B 899b6b118a301618adb30b077b99d48d8022154cee16bb80d03eb3163d3cb7c72526b9b915297c500667bddf9e5fa9086d1c29a555234e32cc551e72324ff319 SHA512 0f660bd8da6548be140f9d9bb7c6fef42fdfb294b762579b2a43bd78963203f4931aab1753b1bcdb830da0386860ef1f1442a78b5f16bd385a205051dad25d87 -DIST mate-control-center-1.23.3.tar.xz 3488100 BLAKE2B a53e34bf1493e9dc0e8737723bf7da0b597b15c7793a90fd615f922208a065ce8db58685ab11951b50cf61152f2dfe3eae2c60c6be210f9ae4a8d72812353686 SHA512 ddb6cb64db5f2bfea611fe2f740c64cb378ce4959f98810bc4afcba0ba3e0f226c8be42caa7b9ea81d37ec186d2b6dac3d319e9c72b5ef1b6a9e7b7ca209231a DIST mate-control-center-1.24.0.tar.xz 3488572 BLAKE2B 683b3326deeacf3f47a8ca3201de66a492cac022ae341dfc54cdc97c9a5260e223a082a3dd899b31680e4a8e5b3237d0338c7fd8125468f75e1b00b4e6a130c7 SHA512 78e70bc94a34f8e6083d1951b12fcb9f7e8b7c55c5fac612ee27c8175e91b3872f6ecf15162e747444586612a94f857a02fb91a6fad142b5d0a16e749792c2ce diff --git a/mate-base/mate-control-center/mate-control-center-1.23.2.ebuild b/mate-base/mate-control-center/mate-control-center-1.23.2.ebuild deleted file mode 100644 index 929e6da66f5e..000000000000 --- a/mate-base/mate-control-center/mate-control-center-1.23.2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MATE_LA_PUNT="yes" - -inherit mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="amd64 ~arm ~arm64 x86" -fi - -DESCRIPTION="The MATE Desktop configuration tool" -LICENSE="GPL-2" -SLOT="0" - -IUSE="accountsservice appindicator debug" - -RDEPEND=" - dev-libs/atk - >=dev-libs/dbus-glib-0.73 - >=dev-libs/glib-2.50:2 - dev-libs/libxml2:2 - >=gnome-base/dconf-0.13.4 - >=gnome-base/librsvg-2.0:2 - >=mate-base/libmatekbd-1.17.0 - >=mate-base/mate-desktop-1.21.2 - >=mate-base/caja-1.20.0 - >=mate-base/mate-menus-1.21.0 - >=mate-base/mate-settings-daemon-1.23.1 - >=media-libs/fontconfig-1:1.0 - media-libs/freetype:2 - media-libs/libcanberra:0[gtk3] - >=sys-apps/dbus-1 - x11-apps/xmodmap - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.22:3 - x11-libs/libX11 - x11-libs/libXScrnSaver - x11-libs/libXcursor - x11-libs/libXext - >=x11-libs/libXi-1.5 - x11-libs/libXrandr - x11-libs/libXrender - >=x11-libs/libxklavier-4 - x11-libs/pango - >=x11-wm/marco-1.17.0 - virtual/libintl - accountsservice? ( sys-apps/accountsservice ) - appindicator? ( dev-libs/libappindicator:3 )" - -DEPEND="${RDEPEND} - app-text/rarian - >=app-text/scrollkeeper-dtd-1:1.0 - app-text/yelp-tools - dev-util/desktop-file-utils - dev-util/glib-utils - >=dev-util/intltool-0.50.1 - sys-devel/gettext - x11-base/xorg-proto - virtual/pkgconfig" - -src_configure() { - mate_src_configure \ - --disable-update-mimedb \ - $(use_enable appindicator) \ - $(use_enable debug) -} diff --git a/mate-base/mate-control-center/mate-control-center-1.23.3.ebuild b/mate-base/mate-control-center/mate-control-center-1.23.3.ebuild deleted file mode 100644 index 0939d6c436a9..000000000000 --- a/mate-base/mate-control-center/mate-control-center-1.23.3.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MATE_LA_PUNT="yes" - -inherit mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -DESCRIPTION="The MATE Desktop configuration tool" -LICENSE="GPL-2" -SLOT="0" - -IUSE="accountsservice appindicator debug" - -RDEPEND=" - dev-libs/atk - >=dev-libs/dbus-glib-0.73 - >=dev-libs/glib-2.50:2 - dev-libs/libxml2:2 - >=gnome-base/dconf-0.13.4 - >=gnome-base/librsvg-2.0:2 - >=mate-base/libmatekbd-1.17.0 - >=mate-base/mate-desktop-1.21.2 - >=mate-base/caja-1.20.0 - >=mate-base/mate-menus-1.21.0 - >=mate-base/mate-settings-daemon-1.21.2 - >=media-libs/fontconfig-1:1.0 - media-libs/freetype:2 - media-libs/libcanberra:0[gtk3] - >=sys-apps/dbus-1 - x11-apps/xmodmap - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.22:3 - x11-libs/libX11 - x11-libs/libXScrnSaver - x11-libs/libXcursor - x11-libs/libXext - >=x11-libs/libXi-1.5 - x11-libs/libXrandr - x11-libs/libXrender - >=x11-libs/libxklavier-4 - x11-libs/pango - >=x11-wm/marco-1.17.0 - accountsservice? ( sys-apps/accountsservice ) - appindicator? ( dev-libs/libappindicator:3 )" - -DEPEND="${RDEPEND} - app-text/rarian - >=app-text/scrollkeeper-dtd-1:1.0 - app-text/yelp-tools - dev-util/desktop-file-utils - dev-util/glib-utils - sys-devel/gettext - x11-base/xorg-proto - virtual/pkgconfig" - -src_configure() { - mate_src_configure \ - --disable-update-mimedb \ - $(use_enable appindicator) \ - $(use_enable debug) -} diff --git a/mate-base/mate-control-center/metadata.xml b/mate-base/mate-control-center/metadata.xml index ddbd22a4c058..7acdcfe7606d 100644 --- a/mate-base/mate-control-center/metadata.xml +++ b/mate-base/mate-control-center/metadata.xml @@ -1,15 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>mate@gentoo.org</email> - <name>Gentoo MATE Desktop</name> - </maintainer> - <use> - <flag name="accountsservice">Add support for AccountsService</flag> - <flag name="appindicator">Add support for AppIndicator</flag> - </use> - <upstream> - <remote-id type="github">mate-desktop/mate-control-center</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="project"> + <email>mate@gentoo.org</email> + <name>Gentoo MATE Desktop</name> + </maintainer> + <upstream> + <remote-id type="github">mate-desktop/mate-control-center</remote-id> + </upstream> + <use> + <flag name="accountsservice">Add support for AccountsService</flag> + <flag name="appindicator">Add support for AppIndicator</flag> + </use> + <origin>mate-overlay</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/mate-base/mate-desktop/mate-desktop-1.20.3-r1.ebuild b/mate-base/mate-desktop/mate-desktop-1.20.3-r1.ebuild new file mode 100644 index 000000000000..9e7cab7690de --- /dev/null +++ b/mate-base/mate-desktop/mate-desktop-1.20.3-r1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +MATE_LA_PUNT="yes" + +inherit mate + +if [[ ${PV} != 9999 ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +DESCRIPTION="Libraries for the MATE desktop that are not part of the UI" +LICENSE="GPL-2 FDL-1.1 LGPL-2" +SLOT="0" + +IUSE="X debug +introspection startup-notification" + +COMMON_DEPEND=" + >=dev-libs/glib-2.36:2 + >=gnome-base/dconf-0.13.4:0 + x11-libs/cairo:0 + x11-libs/libX11:0 + >=x11-libs/libXrandr-1.3:0 + virtual/libintl:0 + >=x11-libs/gtk+-3.0:3[introspection?] + introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) + startup-notification? ( >=x11-libs/startup-notification-0.5:0 )" + +RDEPEND="${COMMON_DEPEND}" + +DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.1.2 + dev-util/gtk-doc + dev-util/gtk-doc-am + >=dev-util/intltool-0.40:* + sys-devel/gettext:* + x11-base/xorg-proto:0 + virtual/pkgconfig:*" + +src_configure() { + mate_src_configure \ + --enable-mate-about \ + $(use_with X x) \ + $(use_enable debug) \ + $(use_enable introspection) \ + $(use_enable startup-notification) +} diff --git a/mate-base/mate-desktop/mate-desktop-1.22.0.ebuild b/mate-base/mate-desktop/mate-desktop-1.22.0.ebuild new file mode 100644 index 000000000000..5bb00164ee03 --- /dev/null +++ b/mate-base/mate-desktop/mate-desktop-1.22.0.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +MATE_LA_PUNT="yes" + +inherit mate + +if [[ ${PV} != 9999 ]]; then + KEYWORDS="amd64 ~arm ~arm64 x86" +fi + +DESCRIPTION="Libraries for the MATE desktop that are not part of the UI" +LICENSE="GPL-2 FDL-1.1 LGPL-2" +SLOT="0" + +IUSE="X debug +introspection startup-notification" + +COMMON_DEPEND=" + >=dev-libs/glib-2.50:2 + >=gnome-base/dconf-0.13.4 + x11-libs/cairo + x11-libs/libX11 + >=x11-libs/libXrandr-1.3 + virtual/libintl + >=x11-libs/gtk+-3.22:3[introspection?] + introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) + startup-notification? ( >=x11-libs/startup-notification-0.5:0 )" + +RDEPEND="${COMMON_DEPEND}" + +DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.1.2 + app-text/iso-codes + dev-util/gtk-doc + dev-util/gtk-doc-am + >=dev-util/intltool-0.40:* + sys-devel/gettext:* + x11-base/xorg-proto + virtual/pkgconfig:*" + +src_configure() { + mate_src_configure \ + --enable-mate-about \ + $(use_with X x) \ + $(use_enable debug) \ + $(use_enable introspection) \ + $(use_enable startup-notification) +} diff --git a/mate-base/mate-desktop/mate-desktop-1.22.2.ebuild b/mate-base/mate-desktop/mate-desktop-1.22.2.ebuild new file mode 100644 index 000000000000..5bb00164ee03 --- /dev/null +++ b/mate-base/mate-desktop/mate-desktop-1.22.2.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +MATE_LA_PUNT="yes" + +inherit mate + +if [[ ${PV} != 9999 ]]; then + KEYWORDS="amd64 ~arm ~arm64 x86" +fi + +DESCRIPTION="Libraries for the MATE desktop that are not part of the UI" +LICENSE="GPL-2 FDL-1.1 LGPL-2" +SLOT="0" + +IUSE="X debug +introspection startup-notification" + +COMMON_DEPEND=" + >=dev-libs/glib-2.50:2 + >=gnome-base/dconf-0.13.4 + x11-libs/cairo + x11-libs/libX11 + >=x11-libs/libXrandr-1.3 + virtual/libintl + >=x11-libs/gtk+-3.22:3[introspection?] + introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) + startup-notification? ( >=x11-libs/startup-notification-0.5:0 )" + +RDEPEND="${COMMON_DEPEND}" + +DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.1.2 + app-text/iso-codes + dev-util/gtk-doc + dev-util/gtk-doc-am + >=dev-util/intltool-0.40:* + sys-devel/gettext:* + x11-base/xorg-proto + virtual/pkgconfig:*" + +src_configure() { + mate_src_configure \ + --enable-mate-about \ + $(use_with X x) \ + $(use_enable debug) \ + $(use_enable introspection) \ + $(use_enable startup-notification) +} diff --git a/mate-base/mate-desktop/metadata.xml b/mate-base/mate-desktop/metadata.xml index 07d2ede1a16b..db4a0e73caf5 100644 --- a/mate-base/mate-desktop/metadata.xml +++ b/mate-base/mate-desktop/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>mate@gentoo.org</email> - <name>Gentoo MATE Desktop</name> - </maintainer> - <upstream> - <remote-id type="github">mate-desktop/mate-desktop</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="project"> + <email>mate@gentoo.org</email> + <name>Gentoo MATE Desktop</name> + </maintainer> + <upstream> + <remote-id type="github">mate-desktop/mate-desktop</remote-id> + </upstream> + <origin>mate-overlay</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/mate-base/mate-menus/Manifest b/mate-base/mate-menus/Manifest index cc2935b29b36..defb74c71f1d 100644 --- a/mate-base/mate-menus/Manifest +++ b/mate-base/mate-menus/Manifest @@ -1,6 +1 @@ -DIST mate-menus-1.20.1.tar.xz 359056 BLAKE2B aebf8b0f65df12283a9c95556011f4c326769d20153c7ed9a3d353eb56443730d047500b8a7385b96c3677d252a3617d4ccc61447fd81f32ae10eccbd1525c29 SHA512 a7c4a6da5c1dfd9741dde48f5b24185ce5049d0d350bddaba6da2e340adf3d1057fa253358cbba1d9a4ce5bce77046813b5cc50e6eff65e7ec88b186b3942314 -DIST mate-menus-1.20.2.tar.xz 361872 BLAKE2B ed195454f01346b0e22c28d6822e5aac40961a0758bc52b84f48d4cd8046575987aa14ae687c973235c46dbb49bff0066c2e169dd45cf656f910c6c416da79fe SHA512 f2936d76d529b26a1f8499ac06146c1184a679bcbf78d13ff9e728f4bc5541b536cd480aa112b01b1cb96041a317de9bdfb9b37e49bda14774bc67d96ab17e1d -DIST mate-menus-1.22.0.tar.xz 355948 BLAKE2B f65bd45c4c7c04f11f9228499991d7c2dfa60a3e74e4cbfcffc3a02f09e8e6cad6b4b4adb6d9227a4e893bad9dc032afc6cce8098ea62fd133ef836cbe9abdf2 SHA512 7ca02c1bb89c83b6b331fc2e8878862fa8f02f5cd52b297aa44b36dd5c2d1ee1ffeb1641d63a10bd4deb99f63ded9c3b890a05ab7f7faf32d7f895b0a2f68d70 -DIST mate-menus-1.22.1.tar.xz 351080 BLAKE2B 3ec947d6befefc838580547970ad7753c914077faa8cde2f37b9f3c48cd5d1223f382b67992826017e8ab16353c7fd2b4749a0fbd615668c0a4c6ad638c26014 SHA512 2766cafa35c11da6f6d5d6129a5e39c09e73ca97f72382df757091198260a342d278c53f88cddf75e174231443c1015198dfa1800b3601d5b770553ec7047a00 -DIST mate-menus-1.23.0.tar.xz 350212 BLAKE2B 1127f0ea3e43ed074b62c31de88cf8c2e1e7cd7c4b3a626f4360f2aba844fd542be956fc955c767e408c06ca5b39ed9c8a64305c69aebc178f732ff032466144 SHA512 c4d9706655b2461f806a85661566e14aff4284a29936b54c554a108fb279a82596904bfe3a5e8cc7953bac6ac6da9685373607d1548c1f37a41882383bbb3974 DIST mate-menus-1.24.0.tar.xz 404028 BLAKE2B 18bea0a6c21444b0b568564d0c15ba0e231643dfcb9c74d6ab9a08cd57cab2289436dada030397737667f5a51c4ab39ab06fff3f585347ebb5f7afc40957acc0 SHA512 27f8ba0666b08fbcfc3f02a42e4b9f3d3431e3d171be0fe9569f412b2f9ead370fff15833feb920b64d2a067e81354970df2ee1c465f10faa3dbd9c97af20406 diff --git a/mate-base/mate-menus/mate-menus-1.23.0.ebuild b/mate-base/mate-menus/mate-menus-1.23.0.ebuild deleted file mode 100644 index 5fa032f4de2e..000000000000 --- a/mate-base/mate-menus/mate-menus-1.23.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -GNOME2_LA_PUNT="yes" - -inherit mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -DESCRIPTION="MATE menu system, implementing the F.D.O cross-desktop spec" -LICENSE="GPL-2 LGPL-2" -SLOT="0" - -IUSE="debug +introspection" - -COMMON_DEPEND=">=dev-libs/glib-2.50:2 - virtual/libintl - introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )" - -RDEPEND="${COMMON_DEPEND}" - -DEPEND="${COMMON_DEPEND} - >=dev-util/intltool-0.40 - sys-devel/gettext:* - virtual/pkgconfig:*" - -src_configure() { - # Do NOT compile with --disable-debug/--enable-debug=no as it disables API - # usage checks. - mate_src_configure \ - --enable-debug=$(usex debug yes minimum) \ - $(use_enable introspection) -} - -src_install() { - mate_src_install - - exeinto /etc/X11/xinit/xinitrc.d/ - doexe "${FILESDIR}/10-xdg-menu-mate" -} diff --git a/mate-base/mate-menus/mate-menus-9999.ebuild b/mate-base/mate-menus/mate-menus-9999.ebuild deleted file mode 100644 index 2ecf08e1e1d9..000000000000 --- a/mate-base/mate-menus/mate-menus-9999.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} ) - -inherit python-r1 mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~x86" -fi - -DESCRIPTION="MATE menu system, implementing the F.D.O cross-desktop spec" -LICENSE="GPL-2 LGPL-2" -SLOT="0" - -IUSE="debug +introspection python" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -COMMON_DEPEND=">=dev-libs/glib-2.36.0:2 - virtual/libintl:0 - introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) - python? ( - dev-python/pygtk:2[${PYTHON_USEDEP}] - ${PYTHON_DEPS} - )" - -RDEPEND="${COMMON_DEPEND}" - -DEPEND="${COMMON_DEPEND} - >=dev-util/intltool-0.40:* - sys-devel/gettext:* - virtual/pkgconfig:*" - -src_prepare() { - mate_src_prepare - use python && python_copy_sources -} - -src_configure() { - # Do NOT compile with --disable-debug/--enable-debug=no as it disables API - # usage checks. - mate_py_cond_func_wrap mate_src_configure \ - --enable-debug=$(usex debug yes minimum) \ - $(use_enable python) \ - $(use_enable introspection) -} - -src_compile() { - mate_py_cond_func_wrap default -} - -src_test() { - mate_py_cond_func_wrap emake check -} - -src_install() { - mate_py_cond_func_wrap mate_src_install - - exeinto /etc/X11/xinit/xinitrc.d/ - doexe "${FILESDIR}/10-xdg-menu-mate" -} - -pkg_postinst() { - mate_pkg_postinst - einfo "Due to upstream bug" - einfo "https://github.com/mate-desktop/mate-menus/issues/2," - einfo "it is highly recommended to run the following command" - einfo "once you have logged in to your desktop for the first time:" - einfo "cd ~/.config/menus && ln -s {,mate-}applications-merged" -} diff --git a/mate-base/mate-menus/metadata.xml b/mate-base/mate-menus/metadata.xml index cbbfa6b717ae..408fd27083e4 100644 --- a/mate-base/mate-menus/metadata.xml +++ b/mate-base/mate-menus/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>mate@gentoo.org</email> - <name>Gentoo MATE Desktop</name> - </maintainer> - <upstream> - <remote-id type="github">mate-desktop/mate-menus</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="project"> + <email>mate@gentoo.org</email> + <name>Gentoo MATE Desktop</name> + </maintainer> + <upstream> + <remote-id type="github">mate-desktop/mate-menus</remote-id> + </upstream> + <origin>mate-overlay</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/mate-base/mate-panel/metadata.xml b/mate-base/mate-panel/metadata.xml index 0c4ac783b497..9ada32075ac0 100644 --- a/mate-base/mate-panel/metadata.xml +++ b/mate-base/mate-panel/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>mate@gentoo.org</email> - <name>Gentoo MATE Desktop</name> - </maintainer> - <upstream> - <remote-id type="github">mate-desktop/mate-panel</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="project"> + <email>mate@gentoo.org</email> + <name>Gentoo MATE Desktop</name> + </maintainer> + <upstream> + <remote-id type="github">mate-desktop/mate-panel</remote-id> + </upstream> + <origin>mate-overlay</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/mate-base/mate-session-manager/Manifest b/mate-base/mate-session-manager/Manifest index b530b719bf72..62abace8d055 100644 --- a/mate-base/mate-session-manager/Manifest +++ b/mate-base/mate-session-manager/Manifest @@ -1,5 +1 @@ -DIST mate-session-manager-1.20.2.tar.xz 592632 BLAKE2B 7cf2b32d8da00a3a9e030578d32591e101181f8a4e21e671becac1776670474cf7e3157efe1a8a0434dfce939b14b915f0b2c99e288f416ba44f6a496d62aff0 SHA512 8487a0d3e1c5c5e98eb442d15b4f25bd8d0115c19bb38647ecf5c495a0eda61a7e589410666c9be195066e0086629d80163b91dc9091d8985a36b3e791688157 -DIST mate-session-manager-1.22.1.tar.xz 580992 BLAKE2B 313f353597b072e0bc118f5e52258c73e4f5c9c51f0e27ed5c7763591b27df77a37439487b05142de99bbae19e595f01501189449331ca5dcf59ba0c5143a95c SHA512 1c47134813d24abef7b2f5df098120a2cd138f822ea3d687a1a2566224bbde21482bf40ac47ba08a39ed0899ff35eeac3c3690c83c006774c47f22189688990b -DIST mate-session-manager-1.22.2.tar.xz 581648 BLAKE2B 1e6921335004b9cfb968c9795a84703002149410a4d7321281cc91adea9b64c3bf6b42eb27a0c9b93a59ab0aa84d9947a2a7acfdf5886ccbdc5850ac9773b905 SHA512 afa712f8c708c79efd7a9d829fe961bb5a29612907df5fa90811fba1d417cddaca5ccc3c40042ecae6b544f0e0199c444f078d88bc9a264cb7ad930469dd5dd1 -DIST mate-session-manager-1.23.0.tar.xz 707396 BLAKE2B 3ad1fcadfab9d2c981002ff2aeca651ada13c299b988bee026964aacc9c9b52de518252a4cd544c0c94cdc748f85e73d27aa947ebcb7806dcb9b01e4886e1d3a SHA512 636a0b169bc489418a0206b3d3d3eb980146320a70573a5df05c719c389bfb29c4957c2d081c1351ebc1457341464dd75a4bd3a39ade0a7e829a7c22dec649a6 -DIST mate-session-manager-1.24.0.tar.xz 709712 BLAKE2B 6455872dfc89cdd3ced563a877e30ef59d2c6d94bd8f3b930eb778ea6b22a52ee860d785ba13d348e37e0d74526de4aef229d5c7b022e7f974ac949f553d7704 SHA512 ee519c8ded1f2df26e62a1384439e8929942d19560c258c91010f8d34bcc7518975406fbc0a5b76d4e73e954cdc2ea106d71476e446573d4a77d2704f6cc9e37 +DIST mate-session-manager-1.24.1.tar.xz 711188 BLAKE2B a2d48b53fbff6f2bf56cdf24efb709a17458341c75a37ab7494fcf344064b64f50e9527f11d74b681d2156508e24fefdb7a5c7637b72deddf1f3a82e4096031b SHA512 ca561e13080ef334a69f18b3aec0993532381ea5c178a0acf969bf2ed9cb5d484626404ab43d809727d8eef9b5eda29adc224168290f78a63da2621ac7ef79f5 diff --git a/mate-base/mate-session-manager/files/mate-session-manager-1.10.3-upower-0.99-series.patch b/mate-base/mate-session-manager/files/mate-session-manager-1.10.3-upower-0.99-series.patch deleted file mode 100644 index bf97fdfa34fa..000000000000 --- a/mate-base/mate-session-manager/files/mate-session-manager-1.10.3-upower-0.99-series.patch +++ /dev/null @@ -1,119 +0,0 @@ -From f9a2293e611930bab7a799efe2569313a4414348 Mon Sep 17 00:00:00 2001 -From: Olaf Leidinger <oleid@mescharet.de> -Date: Sat, 14 Nov 2015 16:46:28 +0100 -Subject: [PATCH] compile fix for upower 0.99 series - -upower 0.99 has lost support for hibernate and suspend. This leads to undefined -references to up_client_get_can_suspend and up_client_get_can_hibernate on my -system. This patch removes any call to those functions for upower >= 0.99. ---- - configure.ac | 7 ++++++- - mate-session/gsm-logout-dialog.c | 8 ++++---- - mate-session/gsm-manager.c | 12 ++++++------ - 3 files changed, 16 insertions(+), 11 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 74d86ac..9fe1f29 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -146,13 +146,18 @@ AC_ARG_ENABLE(upower, - enable_upower=$enableval, - enable_upower=no) - if test "x$enable_upower" = "xyes"; then -- PKG_CHECK_MODULES(UPOWER, upower-glib >= $UPOWER_REQUIRED, has_upower=yes, has_upower=no) -+ PKG_CHECK_MODULES([UPOWER], [upower-glib >= $UPOWER_REQUIRED], has_upower=yes, has_upower=no) - - if test "x$has_upower" = "xyes"; then - AC_DEFINE(HAVE_UPOWER, 1, [upower support]) - AC_SUBST(UPOWER_CFLAGS) - AC_SUBST(UPOWER_LIBS) - fi -+ PKG_CHECK_MODULES([UPOWER_HIBERNATE], [upower-glib < 0.99], has_upower_hibernate_suspend=yes, has_upower_hibernate_suspend=no) -+ if test "x$has_upower_hibernate_suspend" = "xyes"; then -+ AC_DEFINE(HAVE_UPOWER_HIBERNATE_SUSPEND, 1, [upower based support for hibernate and suspend (<0.99) ]) -+ fi -+ - fi - AM_CONDITIONAL(HAVE_UPOWER, test "x$has_upower" = "xyes") - AC_SUBST(HAVE_UPOWER) -diff --git a/mate-session/gsm-logout-dialog.c b/mate-session/gsm-logout-dialog.c -index 464101b..f53c197 100644 ---- a/mate-session/gsm-logout-dialog.c -+++ b/mate-session/gsm-logout-dialog.c -@@ -215,10 +215,10 @@ gsm_logout_supports_system_suspend (GsmLogoutDialog *logout_dialog) - if (LOGIND_RUNNING()) - ret = gsm_systemd_can_suspend (logout_dialog->priv->systemd); - #endif --#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) -+#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER_HIBERNATE_SUSPEND) - else - #endif --#ifdef HAVE_UPOWER -+#ifdef HAVE_UPOWER_HIBERNATE_SUSPEND - ret = up_client_get_can_suspend (logout_dialog->priv->up_client); - #endif - return ret; -@@ -233,10 +233,10 @@ gsm_logout_supports_system_hibernate (GsmLogoutDialog *logout_dialog) - if (LOGIND_RUNNING()) - ret = gsm_systemd_can_hibernate (logout_dialog->priv->systemd); - #endif --#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) -+#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER_HIBERNATE_SUSPEND) - else - #endif --#ifdef HAVE_UPOWER -+#ifdef HAVE_UPOWER_HIBERNATE_SUSPEND - ret = up_client_get_can_hibernate (logout_dialog->priv->up_client); - #endif - return ret; -diff --git a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c -index db392b8..7930993 100644 ---- a/mate-session/gsm-manager.c -+++ b/mate-session/gsm-manager.c -@@ -1184,10 +1184,10 @@ manager_attempt_hibernate (GsmManager *manager) - gsm_systemd_attempt_hibernate (systemd); - } - #endif --#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) -+#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER_HIBERNATE_SUSPEND) - else { - #endif --#ifdef HAVE_UPOWER -+#ifdef HAVE_UPOWER_HIBERNATE_SUSPEND - can_hibernate = up_client_get_can_hibernate (manager->priv->up_client); - if (can_hibernate) { - -@@ -1203,7 +1203,7 @@ manager_attempt_hibernate (GsmManager *manager) - } - } - #endif --#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) -+#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER_HIBERNATE_SUSPEND) - } - #endif - } -@@ -1229,10 +1229,10 @@ manager_attempt_suspend (GsmManager *manager) - gsm_systemd_attempt_suspend (systemd); - } - #endif --#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) -+#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER_HIBERNATE_SUSPEND) - else { - #endif --#ifdef HAVE_UPOWER -+#ifdef HAVE_UPOWER_HIBERNATE_SUSPEND - can_suspend = up_client_get_can_suspend (manager->priv->up_client); - if (can_suspend) { - -@@ -1248,7 +1248,7 @@ manager_attempt_suspend (GsmManager *manager) - } - } - #endif --#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER) -+#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER_HIBERNATE_SUSPEND) - } - #endif - } --- -2.6.3 - diff --git a/mate-base/mate-session-manager/files/mate-session-manager-1.12.2-save-session-ui.patch b/mate-base/mate-session-manager/files/mate-session-manager-1.12.2-save-session-ui.patch deleted file mode 100644 index e7040f47f45a..000000000000 --- a/mate-base/mate-session-manager/files/mate-session-manager-1.12.2-save-session-ui.patch +++ /dev/null @@ -1,535 +0,0 @@ -diff -burN a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c ---- a/capplet/gsm-properties-dialog.c 2012-02-29 22:03:08.000000000 +0100 -+++ b/capplet/gsm-properties-dialog.c 2012-08-08 12:16:37.527332034 +0200 -@@ -26,6 +26,8 @@ - #include <glib.h> - #include <glib/gi18n.h> - #include <gtk/gtk.h> -+#include <dbus/dbus-glib.h> -+#include <dbus/dbus-glib-lowlevel.h> - - #include <mateconf/mateconf-client.h> - -@@ -36,6 +38,11 @@ - #include "gsp-app.h" - #include "gsp-app-manager.h" - -+ -+#define GSM_SERVICE_DBUS "org.gnome.SessionManager" -+#define GSM_PATH_DBUS "/org.gnome.SessionManager" -+#define GSM_INTERFACE_DBUS "org.gnome.SessionManager" -+ - #define GSM_PROPERTIES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialogPrivate)) - - #define IS_STRING_EMPTY(x) ((x)==NULL||(x)[0]=='\0') -@@ -50,6 +57,7 @@ - #define CAPPLET_DELETE_WIDGET_NAME "session_properties_delete_button" - #define CAPPLET_EDIT_WIDGET_NAME "session_properties_edit_button" - #define CAPPLET_SAVE_WIDGET_NAME "session_properties_save_button" -+#define CAPPLET_SESSION_SAVED_WIDGET_NAME "session_properties_session_saved_label" - #define CAPPLET_REMEMBER_WIDGET_NAME "session_properties_remember_toggle" - - #define STARTUP_APP_ICON "system-run" -@@ -493,10 +501,66 @@ - } - - static void -+session_saved_message (GsmPropertiesDialog *dialog, -+ const char *msg, -+ gboolean is_error) -+{ -+ GtkLabel *label; -+ gchar *markup; -+ -+ label = GTK_LABEL (gtk_builder_get_object (dialog->priv->xml, CAPPLET_SESSION_SAVED_WIDGET_NAME)); -+ if (is_error) -+ markup = g_markup_printf_escaped ("<span foreground=\"red\">%s</span>", msg); -+ else -+ markup = g_markup_escape_text (msg, -1); -+ -+ gtk_label_set_markup (label, markup); -+ g_free (markup); -+} -+ -+static void -+session_saved_cb (DBusGProxy *proxy, -+ DBusGProxyCall *call_id, -+ void *user_data) -+{ -+ gboolean res; -+ GsmPropertiesDialog *dialog = user_data; -+ -+ res = dbus_g_proxy_end_call (proxy, call_id, NULL, G_TYPE_INVALID); -+ if (res) -+ session_saved_message (dialog, _("Your session has been saved."), FALSE); -+ else -+ session_saved_message (dialog, _("Failed to save session"), TRUE); -+ -+ g_object_unref (proxy); -+} -+ -+static void - on_save_session_clicked (GtkWidget *widget, - GsmPropertiesDialog *dialog) - { -- g_debug ("Session saving is not implemented yet!"); -+ DBusGConnection *conn; -+ DBusGProxy *proxy; -+ DBusGProxyCall *call; -+ -+ conn = dbus_g_bus_get (DBUS_BUS_SESSION, NULL); -+ if (conn == NULL) { -+ session_saved_message (dialog, _("Could not connect to the session bus"), TRUE); -+ return; -+ } -+ -+ proxy = dbus_g_proxy_new_for_name (conn, GSM_SERVICE_DBUS, GSM_PATH_DBUS, GSM_INTERFACE_DBUS); -+ if (proxy == NULL) { -+ session_saved_message (dialog, _("Could not connect to the session manager"), TRUE); -+ return; -+ } -+ -+ call = dbus_g_proxy_begin_call (proxy, "SaveSession", session_saved_cb, dialog, NULL, G_TYPE_INVALID); -+ if (call == NULL) { -+ session_saved_message (dialog, _("Failed to save session"), TRUE); -+ g_object_unref (proxy); -+ return; -+ } - } - - static void -diff -burN a/configure.ac b/configure.ac ---- a/configure.ac 2012-02-29 22:03:09.000000000 +0100 -+++ b/configure.ac 2012-08-08 12:18:58.740336360 +0200 -@@ -75,6 +75,7 @@ - PKG_CHECK_MODULES(SESSION_PROPERTIES, - glib-2.0 >= $GLIB_REQUIRED - gtk+-$GTK_API_VERSION >= $GTK_REQUIRED -+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED - ) - - PKG_CHECK_MODULES(SM, sm) -diff -burN a/data/session-properties.ui b/data/session-properties.ui ---- a/data/session-properties.ui 2012-02-29 22:03:08.000000000 +0100 -+++ b/data/session-properties.ui 2012-08-08 12:22:36.619343035 +0200 -@@ -148,6 +148,7 @@ - <property name="visible">True</property> - <child> - <object class="GtkButton" id="session_properties_save_button"> -+ <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <child> -@@ -191,6 +192,17 @@ - <property name="position">1</property> - </packing> - </child> -+ <child> -+ <object class="GtkLabel" id="session_properties_session_saved_label"> -+ <property name="visible">True</property> -+ <property name="wrap">True</property> -+ </object> -+ <packing> -+ <property name="expand">False</property> -+ <property name="fill">False</property> -+ <property name="position">2</property> -+ </packing> -+ </child> - </object> - <packing> - <property name="position">1</property> -diff -burN a/mate-session/gsm-client.c b/mate-session/gsm-client.c ---- a/mate-session/gsm-client.c 2012-02-29 22:03:08.000000000 +0100 -+++ b/mate-session/gsm-client.c 2012-08-08 12:24:20.120346205 +0200 -@@ -510,6 +510,17 @@ - g_signal_emit (client, signals[DISCONNECTED], 0); - } - -+gboolean -+gsm_client_request_save (GsmClient *client, -+ guint flags, -+ GError **error) -+{ -+ g_return_val_if_fail (GSM_IS_CLIENT (client), FALSE); -+ -+ return GSM_CLIENT_GET_CLASS (client)->impl_request_save (client, flags, error); -+} -+ -+ - GKeyFile * - gsm_client_save (GsmClient *client, - GError **error) -diff -burN a/mate-session/gsm-client.h b/mate-session/gsm-client.h ---- a/mate-session/gsm-client.h 2012-02-29 22:03:09.000000000 +0100 -+++ b/mate-session/gsm-client.h 2012-08-08 12:26:38.848350455 +0200 -@@ -94,6 +94,9 @@ - GError **error); - gboolean (*impl_stop) (GsmClient *client, - GError **error); -+ gboolean (*impl_request_save) (GsmClient *client, -+ guint flags, -+ GError **error); - GKeyFile * (*impl_save) (GsmClient *client, - GError **error); - }; -@@ -139,6 +142,10 @@ - - void gsm_client_disconnected (GsmClient *client); - -+gboolean gsm_client_request_save (GsmClient *client, -+ guint flags, -+ GError **error); -+ - GKeyFile *gsm_client_save (GsmClient *client, - GError **error); - /* exported to bus */ -diff -burN a/mate-session/gsm-dbus-client.c b/mate-session/gsm-dbus-client.c ---- a/mate-session/gsm-dbus-client.c 2012-02-29 22:03:08.000000000 +0100 -+++ b/mate-session/gsm-dbus-client.c 2012-08-08 12:38:15.393371794 +0200 -@@ -413,6 +413,19 @@ - G_OBJECT_CLASS (gsm_dbus_client_parent_class)->finalize (object); - } - -+static gboolean -+dbus_client_request_save (GsmClient *client, -+ guint flags, -+ GError **error) -+{ -+ g_debug ("GsmDBusClient: sending save request to client with id %s", -+ gsm_client_peek_id (client)); -+ -+ /* FIXME: The protocol does not support this */ -+ -+ return FALSE; -+} -+ - static GKeyFile * - dbus_client_save (GsmClient *client, - GError **error) -@@ -665,6 +678,7 @@ - object_class->set_property = gsm_dbus_client_set_property; - object_class->dispose = gsm_dbus_client_dispose; - -+ client_class->impl_request_save = dbus_client_request_save; - client_class->impl_save = dbus_client_save; - client_class->impl_stop = dbus_client_stop; - client_class->impl_query_end_session = dbus_client_query_end_session; -diff -burN a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c ---- a/mate-session/gsm-manager.c 2012-02-29 22:03:09.000000000 +0100 -+++ b/mate-session/gsm-manager.c 2012-08-08 12:47:24.627388620 +0200 -@@ -68,6 +68,7 @@ - #define GSM_MANAGER_DBUS_NAME "org.gnome.SessionManager" - - #define GSM_MANAGER_PHASE_TIMEOUT 30 /* seconds */ -+#define GSM_MANAGER_SAVE_SESSION_TIMEOUT 2 - - #define MDM_FLEXISERVER_COMMAND "mdmflexiserver" - #define MDM_FLEXISERVER_ARGS "--startnew Standard" -@@ -1176,6 +1177,69 @@ - - } - -+static gboolean -+_client_request_save (GsmClient *client, -+ ClientEndSessionData *data) -+{ -+ gboolean ret; -+ GError *error; -+ -+ error = NULL; -+ ret = gsm_client_request_save (client, data->flags, &error); -+ if (ret) { -+ g_debug ("GsmManager: adding client to query clients: %s", gsm_client_peek_id (client)); -+ data->manager->priv->query_clients = g_slist_prepend (data->manager->priv->query_clients, -+ client); -+ } else if (error) { -+ g_debug ("GsmManager: unable to query client: %s", error->message); -+ g_error_free (error); -+ } -+ -+ return FALSE; -+} -+ -+static gboolean -+_client_request_save_helper (const char *id, -+ GsmClient *client, -+ ClientEndSessionData *data) -+{ -+ return _client_request_save (client, data); -+} -+ -+static void -+query_save_session_complete (GsmManager *manager) -+{ -+ GError *error = NULL; -+ -+ if (g_slist_length (manager->priv->next_query_clients) > 0) { -+ ClientEndSessionData data; -+ -+ data.manager = manager; -+ data.flags = GSM_CLIENT_END_SESSION_FLAG_LAST; -+ -+ g_slist_foreach (manager->priv->next_query_clients, -+ (GFunc)_client_request_save, -+ &data); -+ -+ g_slist_free (manager->priv->next_query_clients); -+ manager->priv->next_query_clients = NULL; -+ -+ return; -+ } -+ -+ if (manager->priv->query_timeout_id > 0) { -+ g_source_remove (manager->priv->query_timeout_id); -+ manager->priv->query_timeout_id = 0; -+ } -+ -+ gsm_session_save (manager->priv->clients, &error); -+ -+ if (error) { -+ g_warning ("Error saving session: %s", error->message); -+ g_error_free (error); -+ } -+} -+ - static guint32 - generate_cookie (void) - { -@@ -1250,6 +1314,21 @@ - return FALSE; - } - -+static gboolean -+_on_query_save_session_timeout (GsmManager *manager) -+{ -+ manager->priv->query_timeout_id = 0; -+ -+ g_debug ("GsmManager: query to save session timed out"); -+ -+ g_slist_free (manager->priv->query_clients); -+ manager->priv->query_clients = NULL; -+ -+ query_save_session_complete (manager); -+ -+ return FALSE; -+} -+ - static void - do_phase_query_end_session (GsmManager *manager) - { -@@ -1886,13 +1965,32 @@ - const char *reason, - GsmManager *manager) - { -- /* just ignore if received outside of shutdown */ -- if (manager->priv->phase < GSM_MANAGER_PHASE_QUERY_END_SESSION) { -+ /* just ignore if we are not yet running */ -+ if (manager->priv->phase < GSM_MANAGER_PHASE_RUNNING) { - return; - } - - g_debug ("GsmManager: Response from end session request: is-ok=%d do-last=%d cancel=%d reason=%s", is_ok, do_last, cancel, reason ? reason :""); - -+ if (manager->priv->phase == GSM_MANAGER_PHASE_RUNNING) { -+ /* Ignore responses when no requests were sent */ -+ if (manager->priv->query_clients == NULL) { -+ return; -+ } -+ -+ manager->priv->query_clients = g_slist_remove (manager->priv->query_clients, client); -+ -+ if (do_last) { -+ manager->priv->next_query_clients = g_slist_prepend (manager->priv->next_query_clients, -+ client); -+ } -+ -+ if (manager->priv->query_clients == NULL) { -+ query_save_session_complete (manager); -+ } -+ return; -+ } -+ - if (cancel) { - cancel_end_session (manager); - return; -@@ -1991,6 +2089,15 @@ - } - - static void -+on_xsmp_client_save_request (GsmXSMPClient *client, -+ gboolean show_dialog, -+ GsmManager *manager) -+{ -+ g_debug ("GsmManager: save_request"); -+ gsm_manager_save_session (manager, NULL); -+} -+ -+static void - on_store_client_added (GsmStore *store, - const char *id, - GsmManager *manager) -@@ -2011,6 +2118,10 @@ - "logout-request", - G_CALLBACK (on_xsmp_client_logout_request), - manager); -+ g_signal_connect (client, -+ "save-request", -+ G_CALLBACK (on_xsmp_client_save_request), -+ manager); - } - - g_signal_connect (client, -@@ -2968,6 +3079,41 @@ - } - - gboolean -+gsm_manager_save_session (GsmManager *manager, -+ GError **error) -+{ -+ ClientEndSessionData data; -+ -+ g_debug ("GsmManager: SaveSession called"); -+ -+ g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE); -+ -+ if (manager->priv->phase != GSM_MANAGER_PHASE_RUNNING) { -+ g_set_error (error, -+ GSM_MANAGER_ERROR, -+ GSM_MANAGER_ERROR_NOT_IN_RUNNING, -+ "SaveSession interface is only available during the Running phase"); -+ return FALSE; -+ } -+ -+ data.manager = manager; -+ data.flags = 0; -+ gsm_store_foreach (manager->priv->clients, -+ (GsmStoreFunc)_client_request_save_helper, -+ &data); -+ -+ if (manager->priv->query_clients) { -+ manager->priv->query_timeout_id = g_timeout_add_seconds (GSM_MANAGER_SAVE_SESSION_TIMEOUT, -+ (GSourceFunc)_on_query_save_session_timeout, -+ manager); -+ return TRUE; -+ } else { -+ g_debug ("GsmManager: Nothing to save"); -+ return FALSE; -+ } -+} -+ -+gboolean - gsm_manager_can_shutdown (GsmManager *manager, - gboolean *shutdown_available, - GError **error) -diff -burN a/mate-session/gsm-manager.h b/mate-session/gsm-manager.h ---- a/mate-session/gsm-manager.h 2012-02-29 22:03:09.000000000 +0100 -+++ b/mate-session/gsm-manager.h 2012-08-08 12:49:14.262391979 +0200 -@@ -154,6 +154,9 @@ - gboolean gsm_manager_shutdown (GsmManager *manager, - GError **error); - -+gboolean gsm_manager_save_session (GsmManager *manager, -+ GError **error); -+ - gboolean gsm_manager_can_shutdown (GsmManager *manager, - gboolean *shutdown_available, - GError **error); -diff -burN a/mate-session/gsm-xsmp-client.c b/mate-session/gsm-xsmp-client.c ---- a/mate-session/gsm-xsmp-client.c 2012-02-29 22:03:08.000000000 +0100 -+++ b/mate-session/gsm-xsmp-client.c 2012-08-08 12:52:27.719397905 +0200 -@@ -69,6 +69,7 @@ - enum { - REGISTER_REQUEST, - LOGOUT_REQUEST, -+ SAVE_REQUEST, - LAST_SIGNAL - }; - -@@ -502,6 +503,31 @@ - return TRUE; - } - -+static gboolean -+xsmp_request_save (GsmClient *client, -+ guint flags, -+ GError **error) -+{ -+ GsmXSMPClient *xsmp = (GsmXSMPClient *) client; -+ -+ g_debug ("GsmXSMPClient: xsmp_request_save ('%s')", xsmp->priv->description); -+ -+ if (xsmp->priv->conn == NULL) { -+ g_set_error (error, -+ GSM_CLIENT_ERROR, -+ GSM_CLIENT_ERROR_NOT_REGISTERED, -+ "Client is not registered"); -+ return FALSE; -+ } -+ -+ if (flags & GSM_CLIENT_END_SESSION_FLAG_LAST) -+ xsmp_save_yourself_phase2 (client); -+ else -+ do_save_yourself (xsmp, SmSaveLocal, FALSE); -+ -+ return TRUE; -+} -+ - static char * - get_desktop_file_path (GsmXSMPClient *client) - { -@@ -976,6 +1002,8 @@ - object_class->get_property = gsm_xsmp_client_get_property; - object_class->set_property = gsm_xsmp_client_set_property; - -+ -+ client_class->impl_request_save = xsmp_request_save; - client_class->impl_save = xsmp_save; - client_class->impl_stop = xsmp_stop; - client_class->impl_query_end_session = xsmp_query_end_session; -@@ -1003,6 +1031,16 @@ - NULL, - NULL, - g_cclosure_marshal_VOID__BOOLEAN, -+ G_TYPE_NONE, -+ 1, G_TYPE_BOOLEAN); -+ signals[SAVE_REQUEST] = -+ g_signal_new ("save-request", -+ G_OBJECT_CLASS_TYPE (object_class), -+ G_SIGNAL_RUN_LAST, -+ G_STRUCT_OFFSET (GsmXSMPClientClass, save_request), -+ NULL, -+ NULL, -+ g_cclosure_marshal_VOID__BOOLEAN, - G_TYPE_NONE, - 1, G_TYPE_BOOLEAN); - -diff -burN a/mate-session/gsm-xsmp-client.h b/mate-session/gsm-xsmp-client.h ---- a/mate-session/gsm-xsmp-client.h 2012-02-29 22:03:09.000000000 +0100 -+++ b/mate-session/gsm-xsmp-client.h 2012-08-08 12:53:39.629400108 +0200 -@@ -57,6 +57,8 @@ - gboolean (*logout_request) (GsmXSMPClient *client, - gboolean prompt); - -+ gboolean (*save_request) (GsmXSMPClient *client, -+ gboolean prompt); - - void (*saved_state) (GsmXSMPClient *client); - -diff -burN a/mate-session/org.gnome.SessionManager.xml b/mate-session/org.gnome.SessionManager.xml ---- a/mate-session/org.gnome.SessionManager.xml 2012-02-29 22:03:09.000000000 +0100 -+++ b/mate-session/org.gnome.SessionManager.xml 2012-08-08 12:57:41.216407509 +0200 -@@ -256,6 +256,14 @@ - </doc:doc> - </method> - -+ <method name="SaveSession"> -+ <doc:doc> -+ <doc:description> -+ <doc:para>Request to save session</doc:para> -+ </doc:description> -+ </doc:doc> -+ </method> -+ - <method name="CanShutdown"> - <arg name="is_available" direction="out" type="b"> - <doc:doc> diff --git a/mate-base/mate-session-manager/files/mate-session-manager-1.5.2-save-session-ui.patch b/mate-base/mate-session-manager/files/mate-session-manager-1.5.2-save-session-ui.patch deleted file mode 100644 index 8a57d44a9180..000000000000 --- a/mate-base/mate-session-manager/files/mate-session-manager-1.5.2-save-session-ui.patch +++ /dev/null @@ -1,535 +0,0 @@ -diff -burN a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c ---- a/capplet/gsm-properties-dialog.c 2012-02-29 22:03:08.000000000 +0100 -+++ b/capplet/gsm-properties-dialog.c 2012-08-08 12:16:37.527332034 +0200 -@@ -26,6 +26,8 @@ - #include <glib.h> - #include <glib/gi18n.h> - #include <gtk/gtk.h> -+#include <dbus/dbus-glib.h> -+#include <dbus/dbus-glib-lowlevel.h> - - #include <mateconf/mateconf-client.h> - -@@ -36,6 +38,11 @@ - #include "gsp-app.h" - #include "gsp-app-manager.h" - -+ -+#define GSM_SERVICE_DBUS "org.mate.SessionManager" -+#define GSM_PATH_DBUS "/org/mate/SessionManager" -+#define GSM_INTERFACE_DBUS "org.mate.SessionManager" -+ - #define GSM_PROPERTIES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialogPrivate)) - - #define IS_STRING_EMPTY(x) ((x)==NULL||(x)[0]=='\0') -@@ -50,6 +57,7 @@ - #define CAPPLET_DELETE_WIDGET_NAME "session_properties_delete_button" - #define CAPPLET_EDIT_WIDGET_NAME "session_properties_edit_button" - #define CAPPLET_SAVE_WIDGET_NAME "session_properties_save_button" -+#define CAPPLET_SESSION_SAVED_WIDGET_NAME "session_properties_session_saved_label" - #define CAPPLET_REMEMBER_WIDGET_NAME "session_properties_remember_toggle" - - #define STARTUP_APP_ICON "system-run" -@@ -493,10 +501,66 @@ - } - - static void -+session_saved_message (GsmPropertiesDialog *dialog, -+ const char *msg, -+ gboolean is_error) -+{ -+ GtkLabel *label; -+ gchar *markup; -+ -+ label = GTK_LABEL (gtk_builder_get_object (dialog->priv->xml, CAPPLET_SESSION_SAVED_WIDGET_NAME)); -+ if (is_error) -+ markup = g_markup_printf_escaped ("<span foreground=\"red\">%s</span>", msg); -+ else -+ markup = g_markup_escape_text (msg, -1); -+ -+ gtk_label_set_markup (label, markup); -+ g_free (markup); -+} -+ -+static void -+session_saved_cb (DBusGProxy *proxy, -+ DBusGProxyCall *call_id, -+ void *user_data) -+{ -+ gboolean res; -+ GsmPropertiesDialog *dialog = user_data; -+ -+ res = dbus_g_proxy_end_call (proxy, call_id, NULL, G_TYPE_INVALID); -+ if (res) -+ session_saved_message (dialog, _("Your session has been saved."), FALSE); -+ else -+ session_saved_message (dialog, _("Failed to save session"), TRUE); -+ -+ g_object_unref (proxy); -+} -+ -+static void - on_save_session_clicked (GtkWidget *widget, - GsmPropertiesDialog *dialog) - { -- g_debug ("Session saving is not implemented yet!"); -+ DBusGConnection *conn; -+ DBusGProxy *proxy; -+ DBusGProxyCall *call; -+ -+ conn = dbus_g_bus_get (DBUS_BUS_SESSION, NULL); -+ if (conn == NULL) { -+ session_saved_message (dialog, _("Could not connect to the session bus"), TRUE); -+ return; -+ } -+ -+ proxy = dbus_g_proxy_new_for_name (conn, GSM_SERVICE_DBUS, GSM_PATH_DBUS, GSM_INTERFACE_DBUS); -+ if (proxy == NULL) { -+ session_saved_message (dialog, _("Could not connect to the session manager"), TRUE); -+ return; -+ } -+ -+ call = dbus_g_proxy_begin_call (proxy, "SaveSession", session_saved_cb, dialog, NULL, G_TYPE_INVALID); -+ if (call == NULL) { -+ session_saved_message (dialog, _("Failed to save session"), TRUE); -+ g_object_unref (proxy); -+ return; -+ } - } - - static void -diff -burN a/configure.ac b/configure.ac ---- a/configure.ac 2012-02-29 22:03:09.000000000 +0100 -+++ b/configure.ac 2012-08-08 12:18:58.740336360 +0200 -@@ -75,6 +75,7 @@ - PKG_CHECK_MODULES(SESSION_PROPERTIES, - glib-2.0 >= $GLIB_REQUIRED - gtk+-$GTK_API_VERSION >= $GTK_REQUIRED -+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED - ) - - PKG_CHECK_MODULES(SM, sm) -diff -burN a/data/session-properties.ui b/data/session-properties.ui ---- a/data/session-properties.ui 2012-02-29 22:03:08.000000000 +0100 -+++ b/data/session-properties.ui 2012-08-08 12:22:36.619343035 +0200 -@@ -148,6 +148,7 @@ - <property name="visible">True</property> - <child> - <object class="GtkButton" id="session_properties_save_button"> -+ <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <child> -@@ -191,6 +192,17 @@ - <property name="position">1</property> - </packing> - </child> -+ <child> -+ <object class="GtkLabel" id="session_properties_session_saved_label"> -+ <property name="visible">True</property> -+ <property name="wrap">True</property> -+ </object> -+ <packing> -+ <property name="expand">False</property> -+ <property name="fill">False</property> -+ <property name="position">2</property> -+ </packing> -+ </child> - </object> - <packing> - <property name="position">1</property> -diff -burN a/mate-session/gsm-client.c b/mate-session/gsm-client.c ---- a/mate-session/gsm-client.c 2012-02-29 22:03:08.000000000 +0100 -+++ b/mate-session/gsm-client.c 2012-08-08 12:24:20.120346205 +0200 -@@ -510,6 +510,17 @@ - g_signal_emit (client, signals[DISCONNECTED], 0); - } - -+gboolean -+gsm_client_request_save (GsmClient *client, -+ guint flags, -+ GError **error) -+{ -+ g_return_val_if_fail (GSM_IS_CLIENT (client), FALSE); -+ -+ return GSM_CLIENT_GET_CLASS (client)->impl_request_save (client, flags, error); -+} -+ -+ - GKeyFile * - gsm_client_save (GsmClient *client, - GError **error) -diff -burN a/mate-session/gsm-client.h b/mate-session/gsm-client.h ---- a/mate-session/gsm-client.h 2012-02-29 22:03:09.000000000 +0100 -+++ b/mate-session/gsm-client.h 2012-08-08 12:26:38.848350455 +0200 -@@ -94,6 +94,9 @@ - GError **error); - gboolean (*impl_stop) (GsmClient *client, - GError **error); -+ gboolean (*impl_request_save) (GsmClient *client, -+ guint flags, -+ GError **error); - GKeyFile * (*impl_save) (GsmClient *client, - GError **error); - }; -@@ -139,6 +142,10 @@ - - void gsm_client_disconnected (GsmClient *client); - -+gboolean gsm_client_request_save (GsmClient *client, -+ guint flags, -+ GError **error); -+ - GKeyFile *gsm_client_save (GsmClient *client, - GError **error); - /* exported to bus */ -diff -burN a/mate-session/gsm-dbus-client.c b/mate-session/gsm-dbus-client.c ---- a/mate-session/gsm-dbus-client.c 2012-02-29 22:03:08.000000000 +0100 -+++ b/mate-session/gsm-dbus-client.c 2012-08-08 12:38:15.393371794 +0200 -@@ -413,6 +413,19 @@ - G_OBJECT_CLASS (gsm_dbus_client_parent_class)->finalize (object); - } - -+static gboolean -+dbus_client_request_save (GsmClient *client, -+ guint flags, -+ GError **error) -+{ -+ g_debug ("GsmDBusClient: sending save request to client with id %s", -+ gsm_client_peek_id (client)); -+ -+ /* FIXME: The protocol does not support this */ -+ -+ return FALSE; -+} -+ - static GKeyFile * - dbus_client_save (GsmClient *client, - GError **error) -@@ -665,6 +678,7 @@ - object_class->set_property = gsm_dbus_client_set_property; - object_class->dispose = gsm_dbus_client_dispose; - -+ client_class->impl_request_save = dbus_client_request_save; - client_class->impl_save = dbus_client_save; - client_class->impl_stop = dbus_client_stop; - client_class->impl_query_end_session = dbus_client_query_end_session; -diff -burN a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c ---- a/mate-session/gsm-manager.c 2012-02-29 22:03:09.000000000 +0100 -+++ b/mate-session/gsm-manager.c 2012-08-08 12:47:24.627388620 +0200 -@@ -68,6 +68,7 @@ - #define GSM_MANAGER_DBUS_NAME "org.mate.SessionManager" - - #define GSM_MANAGER_PHASE_TIMEOUT 30 /* seconds */ -+#define GSM_MANAGER_SAVE_SESSION_TIMEOUT 2 - - #define MDM_FLEXISERVER_COMMAND "mdmflexiserver" - #define MDM_FLEXISERVER_ARGS "--startnew Standard" -@@ -1176,6 +1177,69 @@ - - } - -+static gboolean -+_client_request_save (GsmClient *client, -+ ClientEndSessionData *data) -+{ -+ gboolean ret; -+ GError *error; -+ -+ error = NULL; -+ ret = gsm_client_request_save (client, data->flags, &error); -+ if (ret) { -+ g_debug ("GsmManager: adding client to query clients: %s", gsm_client_peek_id (client)); -+ data->manager->priv->query_clients = g_slist_prepend (data->manager->priv->query_clients, -+ client); -+ } else if (error) { -+ g_debug ("GsmManager: unable to query client: %s", error->message); -+ g_error_free (error); -+ } -+ -+ return FALSE; -+} -+ -+static gboolean -+_client_request_save_helper (const char *id, -+ GsmClient *client, -+ ClientEndSessionData *data) -+{ -+ return _client_request_save (client, data); -+} -+ -+static void -+query_save_session_complete (GsmManager *manager) -+{ -+ GError *error = NULL; -+ -+ if (g_slist_length (manager->priv->next_query_clients) > 0) { -+ ClientEndSessionData data; -+ -+ data.manager = manager; -+ data.flags = GSM_CLIENT_END_SESSION_FLAG_LAST; -+ -+ g_slist_foreach (manager->priv->next_query_clients, -+ (GFunc)_client_request_save, -+ &data); -+ -+ g_slist_free (manager->priv->next_query_clients); -+ manager->priv->next_query_clients = NULL; -+ -+ return; -+ } -+ -+ if (manager->priv->query_timeout_id > 0) { -+ g_source_remove (manager->priv->query_timeout_id); -+ manager->priv->query_timeout_id = 0; -+ } -+ -+ gsm_session_save (manager->priv->clients, &error); -+ -+ if (error) { -+ g_warning ("Error saving session: %s", error->message); -+ g_error_free (error); -+ } -+} -+ - static guint32 - generate_cookie (void) - { -@@ -1250,6 +1314,21 @@ - return FALSE; - } - -+static gboolean -+_on_query_save_session_timeout (GsmManager *manager) -+{ -+ manager->priv->query_timeout_id = 0; -+ -+ g_debug ("GsmManager: query to save session timed out"); -+ -+ g_slist_free (manager->priv->query_clients); -+ manager->priv->query_clients = NULL; -+ -+ query_save_session_complete (manager); -+ -+ return FALSE; -+} -+ - static void - do_phase_query_end_session (GsmManager *manager) - { -@@ -1886,13 +1965,32 @@ - const char *reason, - GsmManager *manager) - { -- /* just ignore if received outside of shutdown */ -- if (manager->priv->phase < GSM_MANAGER_PHASE_QUERY_END_SESSION) { -+ /* just ignore if we are not yet running */ -+ if (manager->priv->phase < GSM_MANAGER_PHASE_RUNNING) { - return; - } - - g_debug ("GsmManager: Response from end session request: is-ok=%d do-last=%d cancel=%d reason=%s", is_ok, do_last, cancel, reason ? reason :""); - -+ if (manager->priv->phase == GSM_MANAGER_PHASE_RUNNING) { -+ /* Ignore responses when no requests were sent */ -+ if (manager->priv->query_clients == NULL) { -+ return; -+ } -+ -+ manager->priv->query_clients = g_slist_remove (manager->priv->query_clients, client); -+ -+ if (do_last) { -+ manager->priv->next_query_clients = g_slist_prepend (manager->priv->next_query_clients, -+ client); -+ } -+ -+ if (manager->priv->query_clients == NULL) { -+ query_save_session_complete (manager); -+ } -+ return; -+ } -+ - if (cancel) { - cancel_end_session (manager); - return; -@@ -1991,6 +2089,15 @@ - } - - static void -+on_xsmp_client_save_request (GsmXSMPClient *client, -+ gboolean show_dialog, -+ GsmManager *manager) -+{ -+ g_debug ("GsmManager: save_request"); -+ gsm_manager_save_session (manager, NULL); -+} -+ -+static void - on_store_client_added (GsmStore *store, - const char *id, - GsmManager *manager) -@@ -2011,6 +2118,10 @@ - "logout-request", - G_CALLBACK (on_xsmp_client_logout_request), - manager); -+ g_signal_connect (client, -+ "save-request", -+ G_CALLBACK (on_xsmp_client_save_request), -+ manager); - } - - g_signal_connect (client, -@@ -2968,6 +3079,41 @@ - } - - gboolean -+gsm_manager_save_session (GsmManager *manager, -+ GError **error) -+{ -+ ClientEndSessionData data; -+ -+ g_debug ("GsmManager: SaveSession called"); -+ -+ g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE); -+ -+ if (manager->priv->phase != GSM_MANAGER_PHASE_RUNNING) { -+ g_set_error (error, -+ GSM_MANAGER_ERROR, -+ GSM_MANAGER_ERROR_NOT_IN_RUNNING, -+ "SaveSession interface is only available during the Running phase"); -+ return FALSE; -+ } -+ -+ data.manager = manager; -+ data.flags = 0; -+ gsm_store_foreach (manager->priv->clients, -+ (GsmStoreFunc)_client_request_save_helper, -+ &data); -+ -+ if (manager->priv->query_clients) { -+ manager->priv->query_timeout_id = g_timeout_add_seconds (GSM_MANAGER_SAVE_SESSION_TIMEOUT, -+ (GSourceFunc)_on_query_save_session_timeout, -+ manager); -+ return TRUE; -+ } else { -+ g_debug ("GsmManager: Nothing to save"); -+ return FALSE; -+ } -+} -+ -+gboolean - gsm_manager_can_shutdown (GsmManager *manager, - gboolean *shutdown_available, - GError **error) -diff -burN a/mate-session/gsm-manager.h b/mate-session/gsm-manager.h ---- a/mate-session/gsm-manager.h 2012-02-29 22:03:09.000000000 +0100 -+++ b/mate-session/gsm-manager.h 2012-08-08 12:49:14.262391979 +0200 -@@ -154,6 +154,9 @@ - gboolean gsm_manager_shutdown (GsmManager *manager, - GError **error); - -+gboolean gsm_manager_save_session (GsmManager *manager, -+ GError **error); -+ - gboolean gsm_manager_can_shutdown (GsmManager *manager, - gboolean *shutdown_available, - GError **error); -diff -burN a/mate-session/gsm-xsmp-client.c b/mate-session/gsm-xsmp-client.c ---- a/mate-session/gsm-xsmp-client.c 2012-02-29 22:03:08.000000000 +0100 -+++ b/mate-session/gsm-xsmp-client.c 2012-08-08 12:52:27.719397905 +0200 -@@ -69,6 +69,7 @@ - enum { - REGISTER_REQUEST, - LOGOUT_REQUEST, -+ SAVE_REQUEST, - LAST_SIGNAL - }; - -@@ -502,6 +503,31 @@ - return TRUE; - } - -+static gboolean -+xsmp_request_save (GsmClient *client, -+ guint flags, -+ GError **error) -+{ -+ GsmXSMPClient *xsmp = (GsmXSMPClient *) client; -+ -+ g_debug ("GsmXSMPClient: xsmp_request_save ('%s')", xsmp->priv->description); -+ -+ if (xsmp->priv->conn == NULL) { -+ g_set_error (error, -+ GSM_CLIENT_ERROR, -+ GSM_CLIENT_ERROR_NOT_REGISTERED, -+ "Client is not registered"); -+ return FALSE; -+ } -+ -+ if (flags & GSM_CLIENT_END_SESSION_FLAG_LAST) -+ xsmp_save_yourself_phase2 (client); -+ else -+ do_save_yourself (xsmp, SmSaveLocal, FALSE); -+ -+ return TRUE; -+} -+ - static char * - get_desktop_file_path (GsmXSMPClient *client) - { -@@ -976,6 +1002,8 @@ - object_class->get_property = gsm_xsmp_client_get_property; - object_class->set_property = gsm_xsmp_client_set_property; - -+ -+ client_class->impl_request_save = xsmp_request_save; - client_class->impl_save = xsmp_save; - client_class->impl_stop = xsmp_stop; - client_class->impl_query_end_session = xsmp_query_end_session; -@@ -1003,6 +1031,16 @@ - NULL, - NULL, - g_cclosure_marshal_VOID__BOOLEAN, -+ G_TYPE_NONE, -+ 1, G_TYPE_BOOLEAN); -+ signals[SAVE_REQUEST] = -+ g_signal_new ("save-request", -+ G_OBJECT_CLASS_TYPE (object_class), -+ G_SIGNAL_RUN_LAST, -+ G_STRUCT_OFFSET (GsmXSMPClientClass, save_request), -+ NULL, -+ NULL, -+ g_cclosure_marshal_VOID__BOOLEAN, - G_TYPE_NONE, - 1, G_TYPE_BOOLEAN); - -diff -burN a/mate-session/gsm-xsmp-client.h b/mate-session/gsm-xsmp-client.h ---- a/mate-session/gsm-xsmp-client.h 2012-02-29 22:03:09.000000000 +0100 -+++ b/mate-session/gsm-xsmp-client.h 2012-08-08 12:53:39.629400108 +0200 -@@ -57,6 +57,8 @@ - gboolean (*logout_request) (GsmXSMPClient *client, - gboolean prompt); - -+ gboolean (*save_request) (GsmXSMPClient *client, -+ gboolean prompt); - - void (*saved_state) (GsmXSMPClient *client); - -diff -burN a/mate-session/org.mate.SessionManager.xml b/mate-session/org.mate.SessionManager.xml ---- a/mate-session/org.mate.SessionManager.xml 2012-02-29 22:03:09.000000000 +0100 -+++ b/mate-session/org.mate.SessionManager.xml 2012-08-08 12:57:41.216407509 +0200 -@@ -256,6 +256,14 @@ - </doc:doc> - </method> - -+ <method name="SaveSession"> -+ <doc:doc> -+ <doc:description> -+ <doc:para>Request to save session</doc:para> -+ </doc:description> -+ </doc:doc> -+ </method> -+ - <method name="CanShutdown"> - <arg name="is_available" direction="out" type="b"> - <doc:doc> diff --git a/mate-base/mate-session-manager/mate-session-manager-1.24.0.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.24.0.ebuild deleted file mode 100644 index aa972fbefe15..000000000000 --- a/mate-base/mate-session-manager/mate-session-manager-1.24.0.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -DESCRIPTION="MATE session manager" -HOMEPAGE="https://mate-desktop.org/" - -LICENSE="GPL-2 LGPL-2 FDL-1.1" -SLOT="0" -IUSE="debug elibc_FreeBSD elogind gnome-keyring ipv6 systemd +xtrans" - -REQUIRED_USE="?? ( elogind systemd )" - -# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and -# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_* -# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below). - -COMMON_DEPEND=" - >=dev-libs/dbus-glib-0.76 - >=dev-libs/glib-2.50:2 - dev-libs/libxslt - sys-apps/dbus - sys-devel/autoconf-archive - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.22:3 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXext - x11-libs/libXrender - x11-libs/libXtst - x11-libs/pango - virtual/libintl - elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) - systemd? ( sys-apps/systemd ) - !systemd? ( - elogind? ( sys-auth/elogind ) - !elogind? ( >=sys-auth/consolekit-0.9.2 ) - ) - xtrans? ( x11-libs/xtrans )" - -RDEPEND="${COMMON_DEPEND} - x11-apps/xdpyinfo - x11-misc/xdg-user-dirs - x11-misc/xdg-user-dirs-gtk - gnome-keyring? ( gnome-base/gnome-keyring ) - !<gnome-base/gdm-2.20.4" - -DEPEND="${COMMON_DEPEND} - >=dev-lang/perl-5 - dev-util/glib-utils - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.10.40 - virtual/pkgconfig" - -MATE_FORCE_AUTORECONF=true - -src_configure() { - mate_src_configure \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - $(use_with elogind) \ - $(use_with systemd) \ - $(use_with xtrans) \ - $(use_enable debug) \ - $(use_enable ipv6) -} - -src_install() { - mate_src_install - - dodir /etc/X11/Sessions/ - exeinto /etc/X11/Sessions/ - doexe "${FILESDIR}"/MATE - - dodir /usr/share/mate/applications/ - insinto /usr/share/mate/applications/ - doins "${FILESDIR}"/defaults.list - - dodir /etc/X11/xinit/xinitrc.d/ - exeinto /etc/X11/xinit/xinitrc.d/ - doexe "${FILESDIR}"/15-xdg-data-mate - - # This should be done in MATE too, see Gentoo bug #270852 - doexe "${FILESDIR}"/10-user-dirs-update-mate -} diff --git a/mate-base/mate-session-manager/mate-session-manager-1.23.0.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.24.1.ebuild index e42570ea404c..5e56cead46fc 100644 --- a/mate-base/mate-session-manager/mate-session-manager-1.23.0.ebuild +++ b/mate-base/mate-session-manager/mate-session-manager-1.24.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,11 +12,11 @@ fi DESCRIPTION="MATE session manager" HOMEPAGE="https://mate-desktop.org/" -LICENSE="GPL-2 LGPL-2 FDL-1.1" +LICENSE="GPL-2+ GPL-3+ HPND LGPL-2+ LGPL-2.1+" SLOT="0" -IUSE="debug elibc_FreeBSD elogind gnome-keyring ipv6 systemd +xtrans" +IUSE="debug elogind gles2 gnome-keyring ipv6 systemd +xtrans" -REQUIRED_USE="?? ( elogind systemd )" +REQUIRED_USE="^^ ( elogind systemd )" # x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and # create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_* @@ -37,35 +37,35 @@ COMMON_DEPEND=" x11-libs/libXrender x11-libs/libXtst x11-libs/pango - virtual/libintl - elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) + gles2? ( media-libs/mesa[egl,gles2] ) systemd? ( sys-apps/systemd ) - !systemd? ( - elogind? ( sys-auth/elogind ) - !elogind? ( >=sys-auth/consolekit-0.9.2 ) - ) - xtrans? ( x11-libs/xtrans )" + elogind? ( sys-auth/elogind ) + xtrans? ( x11-libs/xtrans ) +" RDEPEND="${COMMON_DEPEND} + mate-base/mate-desktop + virtual/libintl x11-apps/xdpyinfo x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk gnome-keyring? ( gnome-base/gnome-keyring ) - !<gnome-base/gdm-2.20.4" + !<gnome-base/gdm-2.20.4 +" DEPEND="${COMMON_DEPEND} >=dev-lang/perl-5 dev-util/glib-utils - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.10.40 - virtual/pkgconfig" + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" MATE_FORCE_AUTORECONF=true src_configure() { mate_src_configure \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ $(use_with elogind) \ + $(use_with gles2 libglesv2) \ $(use_with systemd) \ $(use_with xtrans) \ $(use_enable debug) \ @@ -75,18 +75,15 @@ src_configure() { src_install() { mate_src_install - dodir /etc/X11/Sessions/ exeinto /etc/X11/Sessions/ doexe "${FILESDIR}"/MATE - dodir /usr/share/mate/applications/ insinto /usr/share/mate/applications/ doins "${FILESDIR}"/defaults.list - dodir /etc/X11/xinit/xinitrc.d/ exeinto /etc/X11/xinit/xinitrc.d/ - doexe "${FILESDIR}"/15-xdg-data-mate + newexe "${FILESDIR}"/15-xdg-data-mate-r2 15-xdg-data-mate # This should be done in MATE too, see Gentoo bug #270852 - doexe "${FILESDIR}"/10-user-dirs-update-mate + newexe "${FILESDIR}"/10-user-dirs-update-mate-r2 10-user-dirs-update-mate } diff --git a/mate-base/mate-session-manager/metadata.xml b/mate-base/mate-session-manager/metadata.xml index 7e0d422231f9..18dc0a0f8cea 100644 --- a/mate-base/mate-session-manager/metadata.xml +++ b/mate-base/mate-session-manager/metadata.xml @@ -1,15 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>mate@gentoo.org</email> - <name>Gentoo MATE Desktop</name> - </maintainer> - <use> - <flag name="xtrans">Build with Xtrans support; + <maintainer type="project"> + <email>mate@gentoo.org</email> + <name>Gentoo MATE Desktop</name> + </maintainer> + <upstream> + <remote-id type="github">mate-desktop/mate-session-manager</remote-id> + </upstream> + <use> + <flag name="xtrans">Build with Xtrans support; WARNING: Disabling this flag will result in ICE binding on all interfaces</flag> - </use> - <upstream> - <remote-id type="github">mate-desktop/mate-session-manager</remote-id> - </upstream> -</pkgmetadata> + </use> + <origin>mate-overlay</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/mate-base/mate-settings-daemon/metadata.xml b/mate-base/mate-settings-daemon/metadata.xml index 1b788213f0ac..a00e610499f7 100644 --- a/mate-base/mate-settings-daemon/metadata.xml +++ b/mate-base/mate-settings-daemon/metadata.xml @@ -1,14 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>mate@gentoo.org</email> - <name>Gentoo MATE Desktop</name> - </maintainer> - <upstream> - <remote-id type="github">mate-desktop/mate-settings-daemon</remote-id> - </upstream> - <use> - <flag name="rfkill">build support for rfkill</flag> - </use> -</pkgmetadata> + <maintainer type="project"> + <email>mate@gentoo.org</email> + <name>Gentoo MATE Desktop</name> + </maintainer> + <upstream> + <remote-id type="github">mate-desktop/mate-settings-daemon</remote-id> + </upstream> + <use> + <flag name="rfkill">build support for rfkill</flag> + </use> + <origin>mate-overlay</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/mate-base/mate/metadata.xml b/mate-base/mate/metadata.xml index da90dca1bd5f..28d5a0fd37d8 100644 --- a/mate-base/mate/metadata.xml +++ b/mate-base/mate/metadata.xml @@ -1,27 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>mate@gentoo.org</email> - <name>Gentoo MATE Desktop</name> - </maintainer> - <use> - <flag name="base">Install base MATE Desktop applications that are + <maintainer type="project"> + <email>mate@gentoo.org</email> + <name>Gentoo MATE Desktop</name> + </maintainer> + + <use> + <flag name="base">Install base MATE Desktop applications that are recommended for the most common usage; for example, this installs the file manager. Disable this and other USE flags if you want a more minimal MATE Desktop.</flag> - <flag name="notification">Force notification daemon to default to MATE's + <flag name="notification">Force notification daemon to default to MATE's notification daemon. Enabled by default. Disable if it causes conflicts with other installed desktop environments.</flag> - <flag name="themes">Install MATE Desktop's themes; if you use other + <flag name="themes">Install MATE Desktop's themes; if you use other themes, you can disable this to spare some space and time.</flag> - <flag name="extras">Install additional MATE Desktop applications that + <flag name="extras">Install additional MATE Desktop applications that are recommended for extended usage of the MATE Desktop as upstream sees it; for example, this installs MATE Desktop's office related applications. Disable this if you plan to use your own non-MATE Desktop alternatives or a custom mixture of MATE and non-MATE packages.</flag> - <flag name="help">Install <pkg>gnome-extra/yelp</pkg> to handle in application + <flag name="help">Install <pkg>gnome-extra/yelp</pkg> to handle in application help menus and documentation browsing</flag> - </use> -</pkgmetadata> + </use> + <origin>mate-overlay</origin> +</pkgmetadata>
\ No newline at end of file |