SOURCES: wine-doors-runtime-deps.patch - updated to 0.1.3

[adamg]

Author: adamg                        Date: Sun Feb 15 08:57:29 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated to 0.1.3

---- Files affected:
SOURCES:
   wine-doors-runtime-deps.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/wine-doors-runtime-deps.patch
diff -u SOURCES/wine-doors-runtime-deps.patch:1.1 SOURCES/wine-doors-runtime-deps.patch:1.2
--- SOURCES/wine-doors-runtime-deps.patch:1.1	Tue Jan 22 13:57:37 2008
+++ SOURCES/wine-doors-runtime-deps.patch	Sun Feb 15 09:57:23 2009
@@ -1,58 +1,100 @@
---- wine-doors-0.1.2/setup.py~	2008-01-21 21:00:40.000000000 +0100
-+++ wine-doors-0.1.2/setup.py	2008-01-22 13:42:36.730291231 +0100
-@@ -100,55 +100,6 @@
-     if command == "install":
-         depsmet = True
-         hasui = True
+--- wine-doors-0.1.3/setup.py~	2009-02-15 09:49:23.267899683 +0100
++++ wine-doors-0.1.3/setup.py	2009-02-15 09:50:56.823940683 +0100
+@@ -168,97 +168,6 @@
+         if sysinstall:
+             print "Performing system install with parameters: " + final + "  " + prefix
+ 
+-        # Required deps
+-        missing_required = []
+-
+-        # Check deps
 -        print "Checking dependencies"
--        print "  wine . . . ",
--        if os.popen( "which wine" ).read().rstrip() != "":
+-        print "  wine >= 1.0 . . . ",
+-        if findexec( "wine" ) and WineVerGtThan( "1.0" ):
 -            print "Found"
 -        else:
 -            print "Not found !"
--            depsmet = False
+-            missing_required.append("wine")
+-
 -        print "  cabextract . . . ",
--        if os.popen( "which cabextract" ).read().rstrip() != "":
+-        if findexec( "cabextract" ):
 -            print "Found"
 -        else:
 -            print "Not found !"
--            depsmet = False
--        print "  tar . . . ",
--        if os.popen( "which tar" ).read().rstrip() != "":
+-            missing_required.append("cabextract")
+-
+-        print "  orange . . . ",
+-        if findexec( "orange" ):
 -            print "Found"
 -        else:
 -            print "Not found !"
--            depsmet = False
--        print "  ps . . . ",
--        if os.popen( "which ps" ).read().rstrip() != "":
+-            missing_required.append("orange")
+-       
+-        print "  unzip . . . ",
+-        if findexec( "unzip" ):
 -            print "Found"
 -        else:
 -            print "Not found !"
--            depsmet = False
--            
--        print "  pygtk . . . (python-gtk2)",
--        try:
--            import gtk, gobject
+-            missing_required.append("unzip")
+-
+-        print "  pgrep . . . ",
+-        if findexec( "pgrep" ):
+-            print "Found"
+-        else:
+-            print "Not found !"
+-            missing_required.append("pgrep")
+-
+-        print "  stat . . . ",
+-        if findexec( "stat" ):
+-            print "Found"
+-        else:
+-            print "Not found !"
+-            missing_required.append("stat")
+-
+-        # Python modules
+-        print "  python-gtk2 . . . ",
+-        if findmodule( "gtk" ) and findmodule( "gobject" ):
+-            hasui = True
 -            print "Found"
--        except:
+-        else:
 -            print "Not found"
 -            hasui = False
 -
--        print "  pycairo . . . (python-cairo)",
--        try:
--            import cairo
+-        print "  python-glade2 . . . ",
+-        if findmodule( "gtk.glade" ):
+-            hasui = True
 -            print "Found"
--        except:
+-        else:
 -            print "Not found"
 -            hasui = False
 -
--        print "  rsvg . . . (python-gnome2-desktop)",
--        try:
--            import rsvg
+-        print "  python-cairo . . . ",
+-        if findmodule( "cairo" ):
+-            hasui = True
 -            print "Found"
--        except:
+-        else:
 -            print "Not found"
 -            hasui = False
- 
-         if not depsmet:
-             print "Dependencies not met"
+-
+-        print "  rsvg . . . (python-gnome2-desktop or gnome-python2-rsvg)",
+-        if findmodule( "rsvg" ):
+-            hasui = True
+-            print "Found"
+-        else:
+-            print "Not found"
+-            hasui = False
+-
+-        if missing_required and not nodeps:
+-            print
+-            print "The following dependencies are required to install wine-doors:"
+-            print missing_required
+-            sys.exit(1)
+-
+-        if not hasui:
+-            print "One of the required modules for the wine-doors user interface is missing"
+-            print "the wine-doors command line interface is available, for more information" 
+-            print "try running: " + prefix_bin + "wine-doors --help"
+-            
+         if not os.path.isdir( prefix_conf ):
+             os.makedirs( prefix_conf )
+         conf_file = prefix_conf + "/preferences.xml"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/wine-doors-runtime-deps.patch?r1=1.1&r2=1.2&f=u