From ac0a13e957d357c262d68eda9fcc403815b005b0 Mon Sep 17 00:00:00 2001 From: Joe Sapp Date: Sat, 8 May 2010 19:04:24 +0000 Subject: Added patch to try to fix bug #314653 (Portage version: 2.1.8.3/cvs/Linux x86_64) --- gnome-extra/gdesklets-core/ChangeLog | 9 +- .../gdesklets-core/files/gdesklets-control-getid | 14 +-- .../files/gdesklets-core-getid-fix.patch | 14 +++ .../gdesklets-core/gdesklets-core-0.36.2-r1.ebuild | 133 -------------------- .../gdesklets-core/gdesklets-core-0.36.2-r2.ebuild | 134 +++++++++++++++++++++ 5 files changed, 161 insertions(+), 143 deletions(-) create mode 100644 gnome-extra/gdesklets-core/files/gdesklets-core-getid-fix.patch delete mode 100644 gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r1.ebuild create mode 100644 gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r2.ebuild (limited to 'gnome-extra/gdesklets-core') diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog index fa2bc5463744..56e9c26be823 100644 --- a/gnome-extra/gdesklets-core/ChangeLog +++ b/gnome-extra/gdesklets-core/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnome-extra/gdesklets-core # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.122 2010/05/08 18:50:14 nixphoeni Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.123 2010/05/08 19:04:24 nixphoeni Exp $ + +*gdesklets-core-0.36.2-r2 (08 May 2010) + + 08 May 2010; Joe Sapp + -gdesklets-core-0.36.2-r1.ebuild, +gdesklets-core-0.36.2-r2.ebuild, + files/gdesklets-control-getid, +files/gdesklets-core-getid-fix.patch: + Added patch to try to fix bug #314653 08 May 2010; Joe Sapp -gdesklets-core-0.36.1-r2.ebuild: diff --git a/gnome-extra/gdesklets-core/files/gdesklets-control-getid b/gnome-extra/gdesklets-core/files/gdesklets-control-getid index f16771ad805b..9d55d0a5a542 100755 --- a/gnome-extra/gdesklets-core/files/gdesklets-control-getid +++ b/gnome-extra/gdesklets-core/files/gdesklets-control-getid @@ -1,7 +1,7 @@ #!/usr/bin/env python2 # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/files/gdesklets-control-getid,v 1.4 2010/05/08 03:20:21 nixphoeni Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/files/gdesklets-control-getid,v 1.5 2010/05/08 19:04:24 nixphoeni Exp $ # # A simple script to get the name and id from a Control. # Pretty much copied from test-control.py @@ -18,20 +18,16 @@ try: path = os.path.abspath(sys.argv[1]) folder, base = os.path.split(path) except: - #sys.exit("Usage: gdesklets-control-getid ") - print "ERROR_IN_CONTROL_INSTALLATION" - + sys.exit("ERROR IN CONTROL INSTALLATION") + os.chdir(folder) try: module = __import__(base) - os.chdir(base) clss = module.get_class() - ctrl = clss() - + except IOError: - #sys.exit("Could not load control %s." % (path)) - print folder + sys.exit("Could not load control in %s!" % (folder)) # Get the string in the form of "IMyControl:hash" and translate it to # "MyControl_hash" diff --git a/gnome-extra/gdesklets-core/files/gdesklets-core-getid-fix.patch b/gnome-extra/gdesklets-core/files/gdesklets-core-getid-fix.patch new file mode 100644 index 000000000000..ae458a3bb2b1 --- /dev/null +++ b/gnome-extra/gdesklets-core/files/gdesklets-core-getid-fix.patch @@ -0,0 +1,14 @@ +--- main/__init__.py 2009-09-20 20:02:48 +0000 ++++ main/__init__.py 2010-05-08 15:41:26 +0000 +@@ -16,8 +16,11 @@ + # case the DISPLAY variable doesn't contain the screen number) + DISPLAY = vfs.escape_path(gtk.gdk.Display(os.environ["DISPLAY"]).get_name()).replace("/", "_") + except: +- print "Error: could not open display", os.environ["DISPLAY"] +- sys.exit(1) ++ try: ++ print >> sys.stderr, "Error: could not open display", os.environ["DISPLAY"] ++ except: ++ print >> sys.stderr, "(could not get DISPLAY environment variable)" ++ DISPLAY = "0" + diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r1.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r1.ebuild deleted file mode 100644 index a08dab546d5f..000000000000 --- a/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r1.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r1.ebuild,v 1.1 2010/05/08 03:20:20 nixphoeni Exp $ - -EAPI=2 -# desklets don't run with USE=debug -GCONF_DEBUG="no" -PYTHON_DEPEND="2:2.4" - -inherit gnome2 python eutils autotools multilib bash-completion - -MY_PN="gDesklets" -MY_P="${MY_PN}-${PV}" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="GNOME Desktop Applets: Core library for desktop applets" -SRC_URI="http://archive.gdesklets.info/${MY_PN}/${MY_PN}-${PV}.tar.bz2" -HOMEPAGE="http://www.gdesklets.de" -LICENSE="GPL-2" - -SLOT="0" -IUSE="" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -# is libgsf needed for runtime or just compiling? -RDEPEND=">=dev-lang/python-2.3 - >=dev-libs/glib-2.4 - gnome-extra/libgsf - >=gnome-base/librsvg-2.8 - >=gnome-base/libgtop-2.8.2 - >=dev-python/pygtk-2.10 - >=dev-python/gnome-python-2.6 - >=dev-libs/expat-1.95.8 - >=dev-python/pyxml-0.8.3-r1" - -DEPEND="${RDEPEND} - sys-devel/gettext - dev-util/pkgconfig - dev-util/intltool" - -# Parallel makes sometimes break during install phase -MAKEOPTS="${MAKEOPTS} -j1" -# Force using MAKEOPTS with emake -USE_EINSTALL="0" -DOCS="AUTHORS ChangeLog NEWS README TODO" -CONVERT_SHEBANGS="ctrlinfo gdesklets gdesklets-daemon gdesklets-logview \ - gdesklets-shell test-control.py contrib/gdesklets-migration-tool" - -pkg_setup() { - - python_set_active_version 2 - -} - -src_prepare() { - - gnome2_src_prepare - - # Postpone pyc compiling until pkg_postinst - mv py-compile py-compile.orig - ln -s $(type -P true) py-compile - - eautoreconf - intltoolize --force || die - - python_convert_shebangs 2 ${CONVERT_SHEBANGS} - -} - -src_install() { - - gnome2_src_install - - # Install bash completion script - BASHCOMPLETION_NAME="gDesklets" \ - dobashcompletion "contrib/bash/gdesklets" - - # Install autostart script - insinto "/etc/xdg/autostart" - doins "contrib/gdesklets.desktop" - - # Install the gdesklets-control-getid script - insinto "/usr/$(get_libdir)/gdesklets" - insopts -m0555 - doins "${FILESDIR}/gdesklets-control-getid" - - # Ensure the global Displays and Controls directories exist - dodir "/usr/$(get_libdir)/gdesklets/Displays" - dodir "/usr/$(get_libdir)/gdesklets/Controls" - -} - -pkg_postinst() { - - gnome2_pkg_postinst - python_need_rebuild - # Compile pyc files on target system - python_mod_optimize "/usr/$(get_libdir)/gdesklets" - - echo - elog "gDesklets Displays are required before the library" - elog "will be usable. Core Displays (Calendar, Clock, Quote-of-the-Day," - elog "and the 15pieces game) are already installed in" - elog " ${ROOT}usr/$(get_libdir)/gdesklets/Displays" - elog "Additional Displays can be found in -" - elog " x11-plugins/desklet-* ," - elog "at http://www.gdesklets.de, or at http://archive.gdesklets.info" - elog - elog "Next you'll need to start gDesklets using" - elog " ${ROOT}usr/bin/gdesklets start" - elog "If you're using GNOME this can be done conveniently through" - elog "Applications->Accessories->gDesklets or automatically each login" - elog "under System->Preferences->Sessions" - elog - elog "If you're updating from a version less than 0.35_rc1," - elog "you can migrate your desklet configurations by" - elog "running" - elog " ${ROOT}usr/$(get_libdir)/gdesklets/contrib/gdesklets-migration-tool" - elog "after the first time you run gDesklets" - elog - - BASHCOMPLETION_NAME="gDesklets" bash-completion_pkg_postinst - -} - -pkg_postrm() { - - gnome2_pkg_postrm - # Cleanup after our cavalier python compilation - # The function takes care of ${ROOT} for us - python_mod_cleanup "/usr/$(get_libdir)/gdesklets" - -} diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r2.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r2.ebuild new file mode 100644 index 000000000000..f207a14a601d --- /dev/null +++ b/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r2.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r2.ebuild,v 1.1 2010/05/08 19:04:24 nixphoeni Exp $ + +EAPI=2 +# desklets don't run with USE=debug +GCONF_DEBUG="no" +PYTHON_DEPEND="2:2.4" + +inherit gnome2 python eutils autotools multilib bash-completion + +MY_PN="gDesklets" +MY_P="${MY_PN}-${PV}" +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="GNOME Desktop Applets: Core library for desktop applets" +SRC_URI="http://archive.gdesklets.info/${MY_PN}/${MY_PN}-${PV}.tar.bz2" +HOMEPAGE="http://www.gdesklets.de" +LICENSE="GPL-2" + +SLOT="0" +IUSE="" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +# is libgsf needed for runtime or just compiling? +RDEPEND=">=dev-lang/python-2.3 + >=dev-libs/glib-2.4 + gnome-extra/libgsf + >=gnome-base/librsvg-2.8 + >=gnome-base/libgtop-2.8.2 + >=dev-python/pygtk-2.10 + >=dev-python/gnome-python-2.6 + >=dev-libs/expat-1.95.8 + >=dev-python/pyxml-0.8.3-r1" + +DEPEND="${RDEPEND} + sys-devel/gettext + dev-util/pkgconfig + dev-util/intltool" + +# Parallel makes sometimes break during install phase +MAKEOPTS="${MAKEOPTS} -j1" +# Force using MAKEOPTS with emake +USE_EINSTALL="0" +DOCS="AUTHORS ChangeLog NEWS README TODO" +CONVERT_SHEBANGS="ctrlinfo gdesklets gdesklets-daemon gdesklets-logview \ + gdesklets-shell test-control.py contrib/gdesklets-migration-tool" + +pkg_setup() { + + python_set_active_version 2 + +} + +src_prepare() { + + epatch "${FILESDIR}/${PN}-getid-fix.patch" + gnome2_src_prepare + + # Postpone pyc compiling until pkg_postinst + mv py-compile py-compile.orig + ln -s $(type -P true) py-compile + + eautoreconf + intltoolize --force || die + + python_convert_shebangs 2 ${CONVERT_SHEBANGS} + +} + +src_install() { + + gnome2_src_install + + # Install bash completion script + BASHCOMPLETION_NAME="gDesklets" \ + dobashcompletion "contrib/bash/gdesklets" + + # Install autostart script + insinto "/etc/xdg/autostart" + doins "contrib/gdesklets.desktop" + + # Install the gdesklets-control-getid script + insinto "/usr/$(get_libdir)/gdesklets" + insopts -m0555 + doins "${FILESDIR}/gdesklets-control-getid" + + # Ensure the global Displays and Controls directories exist + dodir "/usr/$(get_libdir)/gdesklets/Displays" + dodir "/usr/$(get_libdir)/gdesklets/Controls" + +} + +pkg_postinst() { + + gnome2_pkg_postinst + python_need_rebuild + # Compile pyc files on target system + python_mod_optimize "/usr/$(get_libdir)/gdesklets" + + echo + elog "gDesklets Displays are required before the library" + elog "will be usable. Core Displays (Calendar, Clock, Quote-of-the-Day," + elog "and the 15pieces game) are already installed in" + elog " ${ROOT}usr/$(get_libdir)/gdesklets/Displays" + elog "Additional Displays can be found in -" + elog " x11-plugins/desklet-* ," + elog "at http://www.gdesklets.de, or at http://archive.gdesklets.info" + elog + elog "Next you'll need to start gDesklets using" + elog " ${ROOT}usr/bin/gdesklets start" + elog "If you're using GNOME this can be done conveniently through" + elog "Applications->Accessories->gDesklets or automatically each login" + elog "under System->Preferences->Sessions" + elog + elog "If you're updating from a version less than 0.35_rc1," + elog "you can migrate your desklet configurations by" + elog "running" + elog " ${ROOT}usr/$(get_libdir)/gdesklets/contrib/gdesklets-migration-tool" + elog "after the first time you run gDesklets" + elog + + BASHCOMPLETION_NAME="gDesklets" bash-completion_pkg_postinst + +} + +pkg_postrm() { + + gnome2_pkg_postrm + # Cleanup after our cavalier python compilation + # The function takes care of ${ROOT} for us + python_mod_cleanup "/usr/$(get_libdir)/gdesklets" + +} -- cgit v1.2.3-65-gdbad