Remove creation of libudev symlink in installers on Linux (Issue cztomczak#148).

cztomczak · cztomczak · commit ba9c5b9d18e1 · 2016-06-30T08:35:01.000+02:00
Debian package installer still needs fixes - Chromium SVN links don't
work anymore.
diff --git a/src/linux/installer/.gitignore b/src/linux/installer/.gitignore
@@ -1,2 +1,3 @@
 /cefpython3-*/
 /deb_archive/
+*.tar.gz
diff --git a/src/linux/installer/debian.postinst b/src/linux/installer/debian.postinst
@@ -14,25 +14,6 @@ chmod 666 /usr/share/pyshared/cefpython3/debug.log
 chmod 666 /usr/share/pyshared/cefpython3/examples/debug.log
 chmod 666 /usr/share/pyshared/cefpython3/examples/wx/debug.log
 
-# Check if libudev.so.0 exists and if not, create
-# a symbolic link to libudev.so.1. See issues 145 
-# and 105 in the CEFPython Issue Tracker.
-# -- Sequence of these dirs does matter, on first
-# -- match searching should be stopped.
-declare -a libdirs=("/lib/x86_64-linux-gnu" "/usr/lib64" 
-                    "/lib/i386-linux-gnu" "/usr/lib")
-for libdir in "${libdirs[@]}"
-do
-    libudev_1="$libdir/libudev.so.1"
-    libudev_0="$libdir/libudev.so.0"
-    if [ -f $libudev_1 ] && ! [ -f $libudev_0 ];
-    then
-        echo "ln -sf $libudev_1 $libudev_0"
-        ln -sf "$libudev_1" "$libudev_0"
-        break
-    fi    
-done
-
 # This creates symbolic links in /usr/lib/pymodules/.../cefpython3/
 # for all the files. This is no more required, as in make-deb.py
 # we're modify the deb archive and moving the /usr/lib/pyshared/.../
diff --git a/src/linux/installer/deps.txt b/src/linux/installer/deps.txt
@@ -1,30 +1,30 @@
 gconf-service
 libasound2 (>= 1.0.23)
 libatk1.0-0 (>= 1.12.4)
-libc6 (>= 2.11)
+libc6 (>= 2.12)
 libcairo2 (>= 1.6.0)
-libcap2 (>= 2.10)
 libcups2 (>= 1.4.0)
 libdbus-1-3 (>= 1.2.14)
 libexpat1 (>= 1.95.8)
 libfontconfig1 (>= 2.8.0)
 libfreetype6 (>= 2.3.9)
 libgcc1 (>= 1:4.1.1)
 libgconf-2-4 (>= 2.31.1)
-libgcrypt11 (>= 1.4.5)
 libgdk-pixbuf2.0-0 (>= 2.22.0)
-libglib2.0-0 (>= 2.18.0)
+libglib2.0-0 (>= 2.26.0)
 libgtk2.0-0 (>= 2.24.0)
 libnspr4 (>= 1.8.0.10)
-libnss3 (>= 3.14.3)
-libpango1.0-0 (>= 1.22.0)
+libnss3 (>= 3.12.4)
+libpango1.0-0 (>= 1.14.0)
 libstdc++6 (>= 4.6)
 libx11-6 (>= 2:1.4.99.1)
 libxcomposite1 (>= 1:0.3-1)
+libxcursor1 (>> 1.1.2)
 libxdamage1 (>= 1:1.1)
 libxext6
 libxfixes3
 libxi6 (>= 2:1.2.99.4)
+libxrandr2 (>= 2:1.2.99.2)
 libxrender1
 libxss1
 libxtst6
diff --git a/src/linux/installer/find-deps.py b/src/linux/installer/find-deps.py
@@ -59,6 +59,7 @@ def get_branch():
     return branch
 
 def get_chromium_revision(branch):
+    # TODO: revision not needed anymore, see new GIT link in get_chrome_deps()
     url = "http://src.chromium.org/viewvc" \
           "/chrome/branches/%s/src/chrome/VERSION" % branch
     contents = fetch_url(url)
@@ -70,6 +71,8 @@ def get_chromium_revision(branch):
     return revision
 
 def get_chrome_deps(revision):
+    # TODO: new GIT link: https://chromium.googlesource.com/chromium ..
+    #     /src/+/51.0.2704.104/chrome/installer/linux/debian/expected_deps_x64
     # Currently works only with SVN up to Chrome revision 293233.
     base_url = "http://src.chromium.org/svn/trunk/src" \
                "/chrome/installer/linux/debian"
@@ -162,26 +165,14 @@ def package_exists(package):
 def get_final_deps(chrome_deps, cef_deps):
     final_deps = chrome_deps
     chrome_deps_names = []
-    chrome_libudev0_dep = ""
     for chrome_dep in chrome_deps:
         chrome_dep_name = get_chrome_dep_name(chrome_dep)
         chrome_deps_names.append(chrome_dep_name)
-        if chrome_dep_name == "libudev0":
-            chrome_libudev0_dep = chrome_dep
     for cef_dep in cef_deps:
         if cef_dep not in chrome_deps_names:
             final_deps.append(cef_dep)
     log("Found %d CEF deps that were not listed in Chrome deps" % \
             (len(final_deps)-len(chrome_deps)) )
-    # See Issue 145. libudev.so.0 may be missing and postinstall
-    # script creates a symlink. Not sure how Google Chrome can
-    # have libudev0 in deps and deb package can install fine.
-    if chrome_libudev0_dep and chrome_libudev0_dep in final_deps:
-        log("Removing '%s' from final deps (Issue 145)" % chrome_libudev0_dep)
-        final_deps.remove(chrome_libudev0_dep)
-    if "libudev0" in final_deps:
-        log("Removing 'libudev0' from final deps (Issue 145)")
-        final_deps.remove("libudev0")        
     log("Found %d final deps:" % len(final_deps))
     print("-" * 80)
     print("\n".join(final_deps))
diff --git a/src/linux/installer/setup.py.template b/src/linux/installer/setup.py.template
@@ -20,23 +20,7 @@ def post_install():
     """ Post install tasks """
     print("[setup.py] post_install()")
     
-    # Check if libudev.so.0 exists and if not, create
-    # a symbolic link to libudev.so.1. See issues 145 
-    # and 105 in the CEFPython Issue Tracker.
-    # -- Sequence of these dirs does matter, on first
-    # -- match searching should be stopped.
-    libdirs = ["/lib/x86_64-linux-gnu", "/usr/lib64", 
-               "/lib/i386-linux-gnu", "/usr/lib"]
-    for libdir in libdirs:
-        if os.path.exists(libdir+"/libudev.so.1") \
-                and not os.path.exists(libdir+"/libudev.so.0"):
-            libudev1 = "%s/libudev.so.1" % libdir
-            libudev0 = "%s/libudev.so.0" % libdir
-            print("[setup.py] ln -sf %s %s" % (libudev1, libudev0))
-            subprocess.call("ln -sf %s %s" % (libudev1, libudev0), shell=True)
-            break
-    
-    # Find package directory. 
+    # Find package directory.
     # Do not import from local cefpython3/ directory.
     del sys.path[0]
     sys.path.append('')

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`/cefpython3-*/`
`2`	`2`	`/deb_archive/`
	`3`	`+*.tar.gz`