please test gdesklets-0.30 on 4.x

[Franz Klammer]

Pav Lucistnik wrote:
> 
> calendar
> 
> can't load sensor Calendar. 
> 

found a solution/workaround:
Calendar try to import a module that doesn't exist any more in 0.30.

attached a patch (hi! mezz ;-)).

think we should not remove gdesklets-0.26 from ports tree instead
it should be still there a gdesklets-old or something like that.
i'm sure there are more desklets who cause problems after the update.

franz.
-------------- next part --------------
diff -Nur gdesklets-calendar.orig/Makefile gdesklets-calendar/Makefile
--- gdesklets-calendar.orig/Makefile	Mon May  3 01:36:55 2004
+++ gdesklets-calendar/Makefile	Mon Aug 16 18:40:25 2004
@@ -29,6 +29,7 @@
 
 do-build:
 	@${WRKSRC}/Install_${NAME}_Sensor.bin --nomsg ${WRKSRC}
+	@${PATCH} -d ${WRKSRC}/${NAME} -sp0 < ${PATCHDIR}/postbuild-__init__.py
 	@${CAT} pkg-message | ${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; s|%%NAME%%|${NAME}|g' > ${PKGMESSAGE}
 
 do-install:
@@ -46,7 +47,6 @@
 
 post-install:
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${DATADIR}/gdesklets/Sensors/${NAME}
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${DATADIR}/gdesklets/Sensors/${NAME}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff -Nur gdesklets-calendar.orig/files/postbuild-__init__.py gdesklets-calendar/files/postbuild-__init__.py
--- gdesklets-calendar.orig/files/postbuild-__init__.py	Thu Jan  1 01:00:00 1970
+++ gdesklets-calendar/files/postbuild-__init__.py	Mon Aug 16 18:36:52 2004
@@ -0,0 +1,15 @@
+--- __init__.py.orig	Mon Aug 16 18:36:01 2004
++++ __init__.py	Mon Aug 16 18:36:14 2004
+@@ -2,7 +2,11 @@
+ import os
+ 
+ from sensor.Sensor import Sensor
+-from main import admin
++# gdesklets-0.30 workaround
++try:
++    from main import admin		# gdesklets 0.26.2
++except:
++    from display import Window as admin	# gdesklets 0.30
+ 
+ from utils import i18n
+ from utils.datatypes import *
diff -Nur gdesklets-calendar.orig/pkg-plist gdesklets-calendar/pkg-plist
--- gdesklets-calendar.orig/pkg-plist	Sun Jan  4 15:37:55 2004
+++ gdesklets-calendar/pkg-plist	Mon Aug 16 18:41:24 2004
@@ -4,40 +4,29 @@
 share/gnome/gdesklets/Displays/Calendar/gfx/prev.png
 share/gnome/gdesklets/Sensors/Calendar/__init__.py
 share/gnome/gdesklets/Sensors/Calendar/__init__.pyc
-share/gnome/gdesklets/Sensors/Calendar/__init__.pyo
 share/gnome/gdesklets/Sensors/Calendar/cal.py
 share/gnome/gdesklets/Sensors/Calendar/cal.pyc
-share/gnome/gdesklets/Sensors/Calendar/cal.pyo
 share/gnome/gdesklets/Sensors/Calendar/docdb.py
 share/gnome/gdesklets/Sensors/Calendar/docdb.pyc
-share/gnome/gdesklets/Sensors/Calendar/docdb.pyo
 share/gnome/gdesklets/Sensors/Calendar/ev_editor.py
 share/gnome/gdesklets/Sensors/Calendar/ev_editor.pyc
-share/gnome/gdesklets/Sensors/Calendar/ev_editor.pyo
 share/gnome/gdesklets/Sensors/Calendar/ev_list.py
 share/gnome/gdesklets/Sensors/Calendar/ev_list.pyc
-share/gnome/gdesklets/Sensors/Calendar/ev_list.pyo
 share/gnome/gdesklets/Sensors/Calendar/ev_viewer.py
 share/gnome/gdesklets/Sensors/Calendar/ev_viewer.pyc
-share/gnome/gdesklets/Sensors/Calendar/ev_viewer.pyo
 share/gnome/gdesklets/Sensors/Calendar/event.py
 share/gnome/gdesklets/Sensors/Calendar/event.pyc
-share/gnome/gdesklets/Sensors/Calendar/event.pyo
 share/gnome/gdesklets/Sensors/Calendar/events.py
 share/gnome/gdesklets/Sensors/Calendar/events.pyc
-share/gnome/gdesklets/Sensors/Calendar/events.pyo
 share/gnome/gdesklets/Sensors/Calendar/evtypes.py
 share/gnome/gdesklets/Sensors/Calendar/evtypes.pyc
-share/gnome/gdesklets/Sensors/Calendar/evtypes.pyo
 share/gnome/gdesklets/Sensors/Calendar/gfx/calendar.png
 share/gnome/gdesklets/Sensors/Calendar/gfx/event.png
 share/gnome/gdesklets/Sensors/Calendar/gfx/recurrency.png
 share/gnome/gdesklets/Sensors/Calendar/helpers.py
 share/gnome/gdesklets/Sensors/Calendar/helpers.pyc
-share/gnome/gdesklets/Sensors/Calendar/helpers.pyo
 share/gnome/gdesklets/Sensors/Calendar/info_editor.py
 share/gnome/gdesklets/Sensors/Calendar/info_editor.pyc
-share/gnome/gdesklets/Sensors/Calendar/info_editor.pyo
 share/gnome/gdesklets/Sensors/Calendar/locale/ca/LC_MESSAGES/calendar-sensor.mo
 share/gnome/gdesklets/Sensors/Calendar/locale/de/LC_MESSAGES/calendar-sensor.mo
 share/gnome/gdesklets/Sensors/Calendar/locale/de_DE/LC_MESSAGES/calendar-sensor.mo
@@ -45,7 +34,6 @@
 share/gnome/gdesklets/Sensors/Calendar/locale/fr/LC_MESSAGES/calendar-sensor.mo
 share/gnome/gdesklets/Sensors/Calendar/recurrence_editor.py
 share/gnome/gdesklets/Sensors/Calendar/recurrence_editor.pyc
-share/gnome/gdesklets/Sensors/Calendar/recurrence_editor.pyo
 @dirrm share/gnome/gdesklets/Sensors/Calendar/locale/fr/LC_MESSAGES
 @dirrm share/gnome/gdesklets/Sensors/Calendar/locale/fr
 @dirrm share/gnome/gdesklets/Sensors/Calendar/locale/es/LC_MESSAGES