From 674c621b92fffd8acaf7f4ce290890828028f36f Mon Sep 17 00:00:00 2001 From: Alexander Pyhalov Date: Thu, 7 Jul 2016 14:22:57 +0300 Subject: [PATCH] gnome-desktop: switch to Python 2.7 --- .../{ => desktop/gnome2}/gnome-desktop/Makefile | 25 ++++++++++++++++------ .../gnome2}/gnome-desktop/files/gnome-about.ksh | 0 .../gnome2}/gnome-desktop/files/gnome-cleanup | 0 .../gnome2}/gnome-desktop/files/po-sun/Makefile | 0 .../gnome2}/gnome-desktop/files/po-sun/ar.po | 0 .../gnome2}/gnome-desktop/files/po-sun/ca.po | 0 .../gnome2}/gnome-desktop/files/po-sun/cs.po | 0 .../gnome2}/gnome-desktop/files/po-sun/de.po | 0 .../gnome2}/gnome-desktop/files/po-sun/es.po | 0 .../gnome2}/gnome-desktop/files/po-sun/fr.po | 0 .../files/po-sun/gnome-desktop-sun.pot | 0 .../gnome2}/gnome-desktop/files/po-sun/hu.po | 0 .../gnome2}/gnome-desktop/files/po-sun/id.po | 0 .../gnome2}/gnome-desktop/files/po-sun/it.po | 0 .../gnome2}/gnome-desktop/files/po-sun/ja.po | 0 .../gnome2}/gnome-desktop/files/po-sun/ko.po | 0 .../gnome2}/gnome-desktop/files/po-sun/nl.po | 0 .../gnome2}/gnome-desktop/files/po-sun/pl.po | 0 .../gnome2}/gnome-desktop/files/po-sun/pt_BR.po | 0 .../gnome2}/gnome-desktop/files/po-sun/ru.po | 0 .../gnome2}/gnome-desktop/files/po-sun/sv.po | 0 .../gnome2}/gnome-desktop/files/po-sun/zh_CN.po | 0 .../gnome2}/gnome-desktop/files/po-sun/zh_HK.po | 0 .../gnome2}/gnome-desktop/files/po-sun/zh_TW.po | 0 .../gnome2}/gnome-desktop/gnome-desktop.license | 0 .../gnome2}/gnome-desktop/gnome-desktop.p5m | 2 +- .../gnome-desktop/patches/05-thumbnails.patch | 0 .../gnome-desktop-01-jds-about-branding.patch | 0 .../patches/gnome-desktop-02-xrandr-probing.patch | 0 29 files changed, 20 insertions(+), 7 deletions(-) rename components/{ => desktop/gnome2}/gnome-desktop/Makefile (73%) rename components/{ => desktop/gnome2}/gnome-desktop/files/gnome-about.ksh (100%) rename components/{ => desktop/gnome2}/gnome-desktop/files/gnome-cleanup (100%) rename components/{ => desktop/gnome2}/gnome-desktop/files/po-sun/Makefile (100%) rename components/{ => desktop/gnome2}/gnome-desktop/files/po-sun/ar.po (100%) rename components/{ => desktop/gnome2}/gnome-desktop/files/po-sun/ca.po (100%) rename components/{ => desktop/gnome2}/gnome-desktop/files/po-sun/cs.po (100%) rename components/{ => desktop/gnome2}/gnome-desktop/files/po-sun/de.po (100%) rename components/{ => desktop/gnome2}/gnome-desktop/files/po-sun/es.po (100%) rename components/{ => desktop/gnome2}/gnome-desktop/files/po-sun/fr.po (100%) rename components/{ => desktop/gnome2}/gnome-desktop/files/po-sun/gnome-desktop-sun.pot (100%) rename components/{ => desktop/gnome2}/gnome-desktop/files/po-sun/hu.po (100%) rename components/{ => desktop/gnome2}/gnome-desktop/files/po-sun/id.po (100%) rename components/{ => desktop/gnome2}/gnome-desktop/files/po-sun/it.po (100%) rename components/{ => desktop/gnome2}/gnome-desktop/files/po-sun/ja.po (100%) rename components/{ => desktop/gnome2}/gnome-desktop/files/po-sun/ko.po (100%) rename components/{ => desktop/gnome2}/gnome-desktop/files/po-sun/nl.po (100%) rename components/{ => desktop/gnome2}/gnome-desktop/files/po-sun/pl.po (100%) rename components/{ => desktop/gnome2}/gnome-desktop/files/po-sun/pt_BR.po (100%) rename components/{ => desktop/gnome2}/gnome-desktop/files/po-sun/ru.po (100%) rename components/{ => desktop/gnome2}/gnome-desktop/files/po-sun/sv.po (100%) rename components/{ => desktop/gnome2}/gnome-desktop/files/po-sun/zh_CN.po (100%) rename components/{ => desktop/gnome2}/gnome-desktop/files/po-sun/zh_HK.po (100%) rename components/{ => desktop/gnome2}/gnome-desktop/files/po-sun/zh_TW.po (100%) rename components/{ => desktop/gnome2}/gnome-desktop/gnome-desktop.license (100%) rename components/{ => desktop/gnome2}/gnome-desktop/gnome-desktop.p5m (99%) rename components/{ => desktop/gnome2}/gnome-desktop/patches/05-thumbnails.patch (100%) rename components/{ => desktop/gnome2}/gnome-desktop/patches/gnome-desktop-01-jds-about-branding.patch (100%) rename components/{ => desktop/gnome2}/gnome-desktop/patches/gnome-desktop-02-xrandr-probing.patch (100%) diff --git a/components/gnome-desktop/Makefile b/components/desktop/gnome2/gnome-desktop/Makefile similarity index 73% rename from components/gnome-desktop/Makefile rename to components/desktop/gnome2/gnome-desktop/Makefile index 85873064a..155f054e9 100644 --- a/components/gnome-desktop/Makefile +++ b/components/desktop/gnome2/gnome-desktop/Makefile @@ -13,11 +13,11 @@ # Copyright (c) 2014 Ken Mays # -include ../../make-rules/shared-macros.mk +include ../../../../make-rules/shared-macros.mk COMPONENT_NAME= gnome-desktop COMPONENT_VERSION= 2.32.1 -COMPONENT_REVISION= 3 +COMPONENT_REVISION= 4 COMPONENT_PROJECT_URL= http://www.gnome.org COMPONENT_SUMMARY= Gnome Desktop Library COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) @@ -30,6 +30,8 @@ include $(WS_TOP)/make-rules/prep.mk include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk +PYTHON_VERSION=2.7 + PATH=/usr/gnu/bin:/usr/bin COMPONENT_PREP_ACTION = ( cd $(@D) && \ @@ -56,7 +58,6 @@ CONFIGURE_OPTIONS+= --with-gnome-distributor-version="GNOME $(COMPONENT_VERSION) CONFIGURE_ENV+= PYTHON="$(PYTHON)" - # common targets build: $(BUILD_32_and_64) @@ -64,6 +65,18 @@ install: $(INSTALL_32_and_64) test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += SUNWcs +REQUIRED_PACKAGES += gnome/config/gconf +REQUIRED_PACKAGES += library/desktop/cairo +REQUIRED_PACKAGES += library/desktop/gdk-pixbuf +REQUIRED_PACKAGES += library/desktop/gtk2 +REQUIRED_PACKAGES += library/desktop/startup-notification +REQUIRED_PACKAGES += library/glib2 +REQUIRED_PACKAGES += library/python/gnome-python-27 +REQUIRED_PACKAGES += library/python/pycairo-27 +REQUIRED_PACKAGES += library/python/pygobject-27 +REQUIRED_PACKAGES += library/python/pygtk2-27 +REQUIRED_PACKAGES += runtime/python-27 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += x11/library/libx11 +REQUIRED_PACKAGES += x11/library/libxrandr diff --git a/components/gnome-desktop/files/gnome-about.ksh b/components/desktop/gnome2/gnome-desktop/files/gnome-about.ksh similarity index 100% rename from components/gnome-desktop/files/gnome-about.ksh rename to components/desktop/gnome2/gnome-desktop/files/gnome-about.ksh diff --git a/components/gnome-desktop/files/gnome-cleanup b/components/desktop/gnome2/gnome-desktop/files/gnome-cleanup similarity index 100% rename from components/gnome-desktop/files/gnome-cleanup rename to components/desktop/gnome2/gnome-desktop/files/gnome-cleanup diff --git a/components/gnome-desktop/files/po-sun/Makefile b/components/desktop/gnome2/gnome-desktop/files/po-sun/Makefile similarity index 100% rename from components/gnome-desktop/files/po-sun/Makefile rename to components/desktop/gnome2/gnome-desktop/files/po-sun/Makefile diff --git a/components/gnome-desktop/files/po-sun/ar.po b/components/desktop/gnome2/gnome-desktop/files/po-sun/ar.po similarity index 100% rename from components/gnome-desktop/files/po-sun/ar.po rename to components/desktop/gnome2/gnome-desktop/files/po-sun/ar.po diff --git a/components/gnome-desktop/files/po-sun/ca.po b/components/desktop/gnome2/gnome-desktop/files/po-sun/ca.po similarity index 100% rename from components/gnome-desktop/files/po-sun/ca.po rename to components/desktop/gnome2/gnome-desktop/files/po-sun/ca.po diff --git a/components/gnome-desktop/files/po-sun/cs.po b/components/desktop/gnome2/gnome-desktop/files/po-sun/cs.po similarity index 100% rename from components/gnome-desktop/files/po-sun/cs.po rename to components/desktop/gnome2/gnome-desktop/files/po-sun/cs.po diff --git a/components/gnome-desktop/files/po-sun/de.po b/components/desktop/gnome2/gnome-desktop/files/po-sun/de.po similarity index 100% rename from components/gnome-desktop/files/po-sun/de.po rename to components/desktop/gnome2/gnome-desktop/files/po-sun/de.po diff --git a/components/gnome-desktop/files/po-sun/es.po b/components/desktop/gnome2/gnome-desktop/files/po-sun/es.po similarity index 100% rename from components/gnome-desktop/files/po-sun/es.po rename to components/desktop/gnome2/gnome-desktop/files/po-sun/es.po diff --git a/components/gnome-desktop/files/po-sun/fr.po b/components/desktop/gnome2/gnome-desktop/files/po-sun/fr.po similarity index 100% rename from components/gnome-desktop/files/po-sun/fr.po rename to components/desktop/gnome2/gnome-desktop/files/po-sun/fr.po diff --git a/components/gnome-desktop/files/po-sun/gnome-desktop-sun.pot b/components/desktop/gnome2/gnome-desktop/files/po-sun/gnome-desktop-sun.pot similarity index 100% rename from components/gnome-desktop/files/po-sun/gnome-desktop-sun.pot rename to components/desktop/gnome2/gnome-desktop/files/po-sun/gnome-desktop-sun.pot diff --git a/components/gnome-desktop/files/po-sun/hu.po b/components/desktop/gnome2/gnome-desktop/files/po-sun/hu.po similarity index 100% rename from components/gnome-desktop/files/po-sun/hu.po rename to components/desktop/gnome2/gnome-desktop/files/po-sun/hu.po diff --git a/components/gnome-desktop/files/po-sun/id.po b/components/desktop/gnome2/gnome-desktop/files/po-sun/id.po similarity index 100% rename from components/gnome-desktop/files/po-sun/id.po rename to components/desktop/gnome2/gnome-desktop/files/po-sun/id.po diff --git a/components/gnome-desktop/files/po-sun/it.po b/components/desktop/gnome2/gnome-desktop/files/po-sun/it.po similarity index 100% rename from components/gnome-desktop/files/po-sun/it.po rename to components/desktop/gnome2/gnome-desktop/files/po-sun/it.po diff --git a/components/gnome-desktop/files/po-sun/ja.po b/components/desktop/gnome2/gnome-desktop/files/po-sun/ja.po similarity index 100% rename from components/gnome-desktop/files/po-sun/ja.po rename to components/desktop/gnome2/gnome-desktop/files/po-sun/ja.po diff --git a/components/gnome-desktop/files/po-sun/ko.po b/components/desktop/gnome2/gnome-desktop/files/po-sun/ko.po similarity index 100% rename from components/gnome-desktop/files/po-sun/ko.po rename to components/desktop/gnome2/gnome-desktop/files/po-sun/ko.po diff --git a/components/gnome-desktop/files/po-sun/nl.po b/components/desktop/gnome2/gnome-desktop/files/po-sun/nl.po similarity index 100% rename from components/gnome-desktop/files/po-sun/nl.po rename to components/desktop/gnome2/gnome-desktop/files/po-sun/nl.po diff --git a/components/gnome-desktop/files/po-sun/pl.po b/components/desktop/gnome2/gnome-desktop/files/po-sun/pl.po similarity index 100% rename from components/gnome-desktop/files/po-sun/pl.po rename to components/desktop/gnome2/gnome-desktop/files/po-sun/pl.po diff --git a/components/gnome-desktop/files/po-sun/pt_BR.po b/components/desktop/gnome2/gnome-desktop/files/po-sun/pt_BR.po similarity index 100% rename from components/gnome-desktop/files/po-sun/pt_BR.po rename to components/desktop/gnome2/gnome-desktop/files/po-sun/pt_BR.po diff --git a/components/gnome-desktop/files/po-sun/ru.po b/components/desktop/gnome2/gnome-desktop/files/po-sun/ru.po similarity index 100% rename from components/gnome-desktop/files/po-sun/ru.po rename to components/desktop/gnome2/gnome-desktop/files/po-sun/ru.po diff --git a/components/gnome-desktop/files/po-sun/sv.po b/components/desktop/gnome2/gnome-desktop/files/po-sun/sv.po similarity index 100% rename from components/gnome-desktop/files/po-sun/sv.po rename to components/desktop/gnome2/gnome-desktop/files/po-sun/sv.po diff --git a/components/gnome-desktop/files/po-sun/zh_CN.po b/components/desktop/gnome2/gnome-desktop/files/po-sun/zh_CN.po similarity index 100% rename from components/gnome-desktop/files/po-sun/zh_CN.po rename to components/desktop/gnome2/gnome-desktop/files/po-sun/zh_CN.po diff --git a/components/gnome-desktop/files/po-sun/zh_HK.po b/components/desktop/gnome2/gnome-desktop/files/po-sun/zh_HK.po similarity index 100% rename from components/gnome-desktop/files/po-sun/zh_HK.po rename to components/desktop/gnome2/gnome-desktop/files/po-sun/zh_HK.po diff --git a/components/gnome-desktop/files/po-sun/zh_TW.po b/components/desktop/gnome2/gnome-desktop/files/po-sun/zh_TW.po similarity index 100% rename from components/gnome-desktop/files/po-sun/zh_TW.po rename to components/desktop/gnome2/gnome-desktop/files/po-sun/zh_TW.po diff --git a/components/gnome-desktop/gnome-desktop.license b/components/desktop/gnome2/gnome-desktop/gnome-desktop.license similarity index 100% rename from components/gnome-desktop/gnome-desktop.license rename to components/desktop/gnome2/gnome-desktop/gnome-desktop.license diff --git a/components/gnome-desktop/gnome-desktop.p5m b/components/desktop/gnome2/gnome-desktop/gnome-desktop.p5m similarity index 99% rename from components/gnome-desktop/gnome-desktop.p5m rename to components/desktop/gnome2/gnome-desktop/gnome-desktop.p5m index d6e62942b..104911bcb 100644 --- a/components/gnome-desktop/gnome-desktop.p5m +++ b/components/desktop/gnome2/gnome-desktop/gnome-desktop.p5m @@ -25,7 +25,7 @@ license gnome-desktop.license license='GPLv2, LGPLv2, FDLv1.1' default facet.doc.html true> default facet.locale.%<\1> true> -file usr/bin/gnome-about path=usr/lib/gnome-about mode=0555 pkg.depend.bypass-generate=.* +file usr/bin/gnome-about path=usr/lib/gnome-about mode=0555 pkg.depend.bypass-generate=.*option.* file files/gnome-about.ksh path=usr/bin/gnome-about file path=usr/include/gnome-desktop-2.0/libgnome/gnome-desktop-item.h diff --git a/components/gnome-desktop/patches/05-thumbnails.patch b/components/desktop/gnome2/gnome-desktop/patches/05-thumbnails.patch similarity index 100% rename from components/gnome-desktop/patches/05-thumbnails.patch rename to components/desktop/gnome2/gnome-desktop/patches/05-thumbnails.patch diff --git a/components/gnome-desktop/patches/gnome-desktop-01-jds-about-branding.patch b/components/desktop/gnome2/gnome-desktop/patches/gnome-desktop-01-jds-about-branding.patch similarity index 100% rename from components/gnome-desktop/patches/gnome-desktop-01-jds-about-branding.patch rename to components/desktop/gnome2/gnome-desktop/patches/gnome-desktop-01-jds-about-branding.patch diff --git a/components/gnome-desktop/patches/gnome-desktop-02-xrandr-probing.patch b/components/desktop/gnome2/gnome-desktop/patches/gnome-desktop-02-xrandr-probing.patch similarity index 100% rename from components/gnome-desktop/patches/gnome-desktop-02-xrandr-probing.patch rename to components/desktop/gnome2/gnome-desktop/patches/gnome-desktop-02-xrandr-probing.patch -- 2.11.4.GIT