Attachment 51492 Details for Bug 78193 – gdesklets.diff

[patch] gdesklets.diff

gdesklets.diff (text/plain), 10.63 KB, created by Franz Klammer on 2005-02-28 13:20:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Franz Klammer

Created: 2005-02-28 13:20:08 UTC

Size: 10.63 KB

patch

obsolete

>diff -Nur gdesklets.orig/Makefile gdesklets/Makefile
>--- gdesklets.orig/Makefile	Mon Feb 21 09:54:47 2005
>+++ gdesklets/Makefile	Mon Feb 28 14:06:41 2005
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	gdesklets
>-PORTVERSION=	0.33.1
>-PORTREVISION=	1
>+PORTVERSION=	0.34
> CATEGORIES=	deskutils gnome
> MASTER_SITES=	http://www.pycage.de/download/${PORTNAME}/
> DISTNAME=	gDesklets-${PORTVERSION}
>@@ -18,7 +17,8 @@
> BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2
> LIB_DEPENDS=	gtop-2.0.2:${PORTSDIR}/devel/libgtop2
> RUN_DEPENDS=	${PYXML} \
>-		${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2
>+		${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2 \
>+		${PYTHON_SITELIBDIR}/gtk-2.0/gtkhtml2.so:${PORTSDIR}/x11-toolkits/py-gnome-extras
> 
> USE_BZIP2=	yes
> USE_GMAKE=	yes
>@@ -36,15 +36,7 @@
> post-install:
> 	@${MKDIR} ${PREFIX}/share/gnome/gdesklets/Displays
> 	@${MKDIR} ${PREFIX}/share/gnome/gdesklets/Sensors
>-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/lib/gdesklets/config
>-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/lib/gdesklets/data
>-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/lib/gdesklets/desktop
>-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/lib/gdesklets/display
>-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/lib/gdesklets/factory
>-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/lib/gdesklets/libdesklets
>-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/lib/gdesklets/main
>-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/lib/gdesklets/sensor
>-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/lib/gdesklets/utils
>+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/lib/gdesklets
> 	@${CAT} ${PKGMESSAGE}
> 
> .include <bsd.port.mk>
>diff -Nur gdesklets.orig/distinfo gdesklets/distinfo
>--- gdesklets.orig/distinfo	Fri Feb 18 14:03:18 2005
>+++ gdesklets/distinfo	Mon Feb 28 12:18:41 2005
>@@ -1,2 +1,2 @@
>-MD5 (gDesklets-0.33.1.tar.bz2) = db252b31b56b1c2f49312d5837c311b8
>-SIZE (gDesklets-0.33.1.tar.bz2) = 690678
>+MD5 (gDesklets-0.34.tar.bz2) = 26300dd23f06bb41b08ce0cd3979d1e5
>+SIZE (gDesklets-0.34.tar.bz2) = 724198
>diff -Nur gdesklets.orig/files/patch-Controls::ArrayBuffer::__init__.py gdesklets/files/patch-Controls::ArrayBuffer::__init__.py
>--- gdesklets.orig/files/patch-Controls::ArrayBuffer::__init__.py	Thu Jan  1 01:00:00 1970
>+++ gdesklets/files/patch-Controls::ArrayBuffer::__init__.py	Mon Feb 28 14:08:14 2005
>@@ -0,0 +1,13 @@
>+--- Controls/ArrayBuffer/__init__.py.orig	Mon Feb 28 14:07:04 2005
>++++ Controls/ArrayBuffer/__init__.py	Mon Feb 28 14:07:25 2005
>+@@ -3,6 +3,10 @@
>+ # ArrayBuffer Class
>+ #
>+ #
>++
>++from libdesklets.controls import Control
>++from IArrayBuffer import *
>++
>+ class ArrayBuffer(Control, IArrayBuffer):
>+ 
>+         #
>diff -Nur gdesklets.orig/files/patch-main::__init__.py gdesklets/files/patch-main::__init__.py
>--- gdesklets.orig/files/patch-main::__init__.py	Sun Jan 30 22:41:31 2005
>+++ gdesklets/files/patch-main::__init__.py	Mon Feb 28 12:13:37 2005
>@@ -1,11 +1,11 @@
>---- main/__init__.py.orig	Sun Jan 30 22:40:29 2005
>-+++ main/__init__.py	Sun Jan 30 22:40:54 2005
>-@@ -4,7 +4,7 @@
>- # gDesklets home paths
>- HOME = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir))
>- USERHOME = os.path.join(os.path.expanduser("~"), ".gdesklets")
>+--- main/__init__.py.orig	Mon Feb 28 12:11:37 2005
>++++ main/__init__.py	Mon Feb 28 12:12:18 2005
>+@@ -20,7 +20,7 @@
>+     USERHOME = os.path.join(os.environ["APPDATA"], "gDesklets")
>+ else:
>+     USERHOME = os.path.join(os.path.expanduser("~"), ".gdesklets")
> -OLDHOME = os.path.join(HOME, os.pardir, os.pardir, "share", "gdesklets")
> +OLDHOME = os.path.join(HOME, os.pardir, os.pardir, "share", "gnome", "gdesklets")
>  
>+ 
>  # we need the DISPLAY variable
>- try:
>diff -Nur gdesklets.orig/files/patch-utils::utils.c gdesklets/files/patch-utils::utils.c
>--- gdesklets.orig/files/patch-utils::utils.c	Thu Feb 17 22:17:22 2005
>+++ gdesklets/files/patch-utils::utils.c	Mon Feb 28 12:16:39 2005
>@@ -1,5 +1,5 @@
>---- utils/utils.c.orig	Thu Dec 16 19:02:08 2004
>-+++ utils/utils.c	Thu Feb 17 21:28:55 2005
>+--- utils/utils.c.orig	Sun Feb  6 22:11:42 2005
>++++ utils/utils.c	Mon Feb 28 12:15:54 2005
> @@ -12,14 +12,14 @@
>  
>    if(G_UNLIKELY(PyGObject_Type == NULL))
>@@ -10,7 +10,7 @@
>        module = PyImport_ImportModule("gobject");
>  
>        if(!module)
>- 	goto err_gobject;
>+         goto err_gobject;
>  
> -      PyObject *moddict = PyModule_GetDict(module);
> +      moddict = PyModule_GetDict(module);
>diff -Nur gdesklets.orig/pkg-plist gdesklets/pkg-plist
>--- gdesklets.orig/pkg-plist	Mon Feb 21 09:54:47 2005
>+++ gdesklets/pkg-plist	Mon Feb 28 12:51:23 2005
>@@ -1,5 +1,13 @@
> bin/gdesklets
> bin/gdesklets-display-thumbnailer
>+lib/gdesklets/Controls/ArrayBuffer/__init__.py
>+lib/gdesklets/Controls/ArrayBuffer/__init__.pyc
>+lib/gdesklets/Controls/ArrayBuffer/IArrayBuffer.py
>+lib/gdesklets/Controls/ArrayBuffer/IArrayBuffer.pyc
>+lib/gdesklets/Controls/EventPipe/__init__.py
>+lib/gdesklets/Controls/EventPipe/__init__.pyc
>+lib/gdesklets/Controls/EventPipe/IEventPipe.py
>+lib/gdesklets/Controls/EventPipe/IEventPipe.pyc
> lib/gdesklets/Controls/Calendar/ICalendar.py
> lib/gdesklets/Controls/Calendar/ICalendar.pyc
> lib/gdesklets/Controls/Calendar/ICalendar.pyo
>@@ -60,6 +68,9 @@
> lib/gdesklets/config/ConfigDialog.py
> lib/gdesklets/config/ConfigDialog.pyc
> lib/gdesklets/config/ConfigDialog.pyo
>+lib/gdesklets/config/ConfigDPI.py
>+lib/gdesklets/config/ConfigDPI.pyc
>+lib/gdesklets/config/ConfigDPI.pyo
> lib/gdesklets/config/ConfigEnum.py
> lib/gdesklets/config/ConfigEnum.pyc
> lib/gdesklets/config/ConfigEnum.pyo
>@@ -75,9 +86,9 @@
> lib/gdesklets/config/ConfigManager.py
> lib/gdesklets/config/ConfigManager.pyc
> lib/gdesklets/config/ConfigManager.pyo
>-lib/gdesklets/config/ConfigSettings.py
>-lib/gdesklets/config/ConfigSettings.pyc
>-lib/gdesklets/config/ConfigSettings.pyo
>+lib/gdesklets/config/ConfigUnit.py
>+lib/gdesklets/config/ConfigUnit.pyc
>+lib/gdesklets/config/ConfigUnit.pyo
> lib/gdesklets/config/ConfigString.py
> lib/gdesklets/config/ConfigString.pyc
> lib/gdesklets/config/ConfigString.pyo
>@@ -90,12 +101,21 @@
> lib/gdesklets/config/ConfigWidget.py
> lib/gdesklets/config/ConfigWidget.pyc
> lib/gdesklets/config/ConfigWidget.pyo
>+lib/gdesklets/config/DaemonConfigger.py
>+lib/gdesklets/config/DaemonConfigger.pyc
>+lib/gdesklets/config/DaemonConfigger.pyo
>+lib/gdesklets/config/DisplayConfigger.py
>+lib/gdesklets/config/DisplayConfigger.pyc
>+lib/gdesklets/config/DisplayConfigger.pyo
> lib/gdesklets/config/GConfBackend.py
> lib/gdesklets/config/GConfBackend.pyc
> lib/gdesklets/config/GConfBackend.pyo
> lib/gdesklets/config/StateSaver.py
> lib/gdesklets/config/StateSaver.pyc
> lib/gdesklets/config/StateSaver.pyo
>+lib/gdesklets/config/Win32Backend.py
>+lib/gdesklets/config/Win32Backend.pyc
>+lib/gdesklets/config/Win32Backend.pyo
> lib/gdesklets/config/__init__.py
> lib/gdesklets/config/__init__.pyc
> lib/gdesklets/config/__init__.pyo
>@@ -125,6 +145,9 @@
> lib/gdesklets/display/GlassWindow.py
> lib/gdesklets/display/GlassWindow.pyc
> lib/gdesklets/display/GlassWindow.pyo
>+lib/gdesklets/display/Layouter.py
>+lib/gdesklets/display/Layouter.pyc
>+lib/gdesklets/display/Layouter.pyo
> lib/gdesklets/display/Plug.py
> lib/gdesklets/display/Plug.pyc
> lib/gdesklets/display/Plug.pyo
>@@ -179,9 +202,6 @@
> lib/gdesklets/display/__init__.py
> lib/gdesklets/display/__init__.pyc
> lib/gdesklets/display/__init__.pyo
>-lib/gdesklets/display/layouters.py
>-lib/gdesklets/display/layouters.pyc
>-lib/gdesklets/display/layouters.pyo
> lib/gdesklets/display/targetregistry.py
> lib/gdesklets/display/targetregistry.pyc
> lib/gdesklets/display/targetregistry.pyo
>@@ -278,9 +298,6 @@
> lib/gdesklets/main/DisplayList.py
> lib/gdesklets/main/DisplayList.pyc
> lib/gdesklets/main/DisplayList.pyo
>-lib/gdesklets/main/LogViewer.py
>-lib/gdesklets/main/LogViewer.pyc
>-lib/gdesklets/main/LogViewer.pyo
> lib/gdesklets/main/MetaData.py
> lib/gdesklets/main/MetaData.pyc
> lib/gdesklets/main/MetaData.pyo
>@@ -314,15 +331,18 @@
> lib/gdesklets/plugin/__init__.py
> lib/gdesklets/plugin/__init__.pyc
> lib/gdesklets/plugin/__init__.pyo
>+lib/gdesklets/scripting/ElementWrapper.py
>+lib/gdesklets/scripting/ElementWrapper.pyc
>+lib/gdesklets/scripting/ElementWrapper.pyo
> lib/gdesklets/scripting/ControlWrapper.py
> lib/gdesklets/scripting/ControlWrapper.pyc
> lib/gdesklets/scripting/ControlWrapper.pyo
> lib/gdesklets/scripting/Script.py
> lib/gdesklets/scripting/Script.pyc
> lib/gdesklets/scripting/Script.pyo
>-lib/gdesklets/scripting/TargetWrapper.py
>-lib/gdesklets/scripting/TargetWrapper.pyc
>-lib/gdesklets/scripting/TargetWrapper.pyo
>+lib/gdesklets/scripting/Scriptlet.py
>+lib/gdesklets/scripting/Scriptlet.pyc
>+lib/gdesklets/scripting/Scriptlet.pyo
> lib/gdesklets/scripting/Vault.py
> lib/gdesklets/scripting/Vault.pyc
> lib/gdesklets/scripting/Vault.pyo
>@@ -427,6 +447,16 @@
> lib/gdesklets/shell/plugins/gDeskletsClient/__init__.pyc
> lib/gdesklets/shell/plugins/gDeskletsClient/__init__.pyo
> lib/gdesklets/test-control.py
>+lib/gdesklets/test-control.pyc
>+lib/gdesklets/utils/DOM.py
>+lib/gdesklets/utils/DOM.pyc
>+lib/gdesklets/utils/DOM.pyo
>+lib/gdesklets/utils/Element.py
>+lib/gdesklets/utils/Element.pyc
>+lib/gdesklets/utils/Element.pyo
>+lib/gdesklets/utils/ErrorFormatter.py
>+lib/gdesklets/utils/ErrorFormatter.pyc
>+lib/gdesklets/utils/ErrorFormatter.pyo
> lib/gdesklets/utils/BGWatcher.py
> lib/gdesklets/utils/BGWatcher.pyc
> lib/gdesklets/utils/BGWatcher.pyo
>@@ -436,6 +466,9 @@
> lib/gdesklets/utils/HIGDialog.py
> lib/gdesklets/utils/HIGDialog.pyc
> lib/gdesklets/utils/HIGDialog.pyo
>+lib/gdesklets/utils/LogView.py
>+lib/gdesklets/utils/LogView.pyc
>+lib/gdesklets/utils/LogView.pyo
> lib/gdesklets/utils/Observable.py
> lib/gdesklets/utils/Observable.pyc
> lib/gdesklets/utils/Observable.pyo
>@@ -454,9 +487,6 @@
> lib/gdesklets/utils/Trie.py
> lib/gdesklets/utils/Trie.pyc
> lib/gdesklets/utils/Trie.pyo
>-lib/gdesklets/utils/TypeConverter.py
>-lib/gdesklets/utils/TypeConverter.pyc
>-lib/gdesklets/utils/TypeConverter.pyo
> lib/gdesklets/utils/Unit.py
> lib/gdesklets/utils/Unit.pyc
> lib/gdesklets/utils/Unit.pyo
>@@ -490,6 +520,12 @@
> lib/gdesklets/utils/svg.so
> lib/gdesklets/utils/systray.so
> lib/gdesklets/utils/tiling.so
>+lib/gdesklets/utils/typeconverter.py
>+lib/gdesklets/utils/typeconverter.pyc
>+lib/gdesklets/utils/typeconverter.pyo
>+lib/gdesklets/utils/vfs.py
>+lib/gdesklets/utils/vfs.pyc
>+lib/gdesklets/utils/vfs.pyo
> lib/gdesklets/utils/wallpaper.py
> lib/gdesklets/utils/wallpaper.pyc
> lib/gdesklets/utils/wallpaper.pyo
>@@ -581,6 +617,8 @@
> @dirrm lib/gdesklets/Controls/Sensors
> @dirrm lib/gdesklets/Controls/HDDTemp
> @dirrm lib/gdesklets/Controls/Calendar
>+@dirrm lib/gdesklets/Controls/EventPipe
>+@dirrm lib/gdesklets/Controls/ArrayBuffer
> @dirrm lib/gdesklets/Controls
> @dirrm lib/gdesklets
> @exec update-mime-database %D/share/mime

Actions: View | Diff

Attachments on bug 78193: 51492