Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim

Commits:
6b63d91f by Philipp Hörist at 2018-10-24T17:09:54Z
Update ChangeLog

- - - - -
060332e3 by Philipp Hörist at 2018-10-24T17:10:22Z
Windows: Add folder to DLL search

This makes python look into the `bin` folder when searching for DLLs before
it trys C:\Windows or C:\Windows\system32 and potentially finds other versions 
of DLLs

Fixes #8968

- - - - -
4a812dce by Philipp Hörist at 2018-10-24T17:10:22Z
Fix Windows build

Appveyor adds ssl libs to the system folder which trips pythons ssl module

see https://github.com/appveyor/ci/issues/2571

- - - - -


3 changed files:

- ChangeLog
- appveyor.yml
- win/misc/create-launcher.py


Changes:

=====================================
ChangeLog
=====================================
@@ -1,4 +1,18 @@
-Gajim 1.0.99.1 (13 October 2018)
+Gajim 1.1.0 (TBA)
+
+  New
+
+  * Remove support for XEP-0091
+
+  Bug fixes
+
+  * 9322 Error when adding contact
+  * 9385 Ignore invalid bookmarks
+  * 9386 Discovery: Browsing nodes without identity
+  * 9393 Error when parsing invalid timestamps
+  * 9398 Error on jingle file transfer
+
+Gajim 1.0.99.1 (07 October 2018)
 
   New
 


=====================================
appveyor.yml
=====================================
@@ -18,6 +18,8 @@ clone_depth: 1
 #   - ps: iex ((new-object 
net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 
 build_script:
+  - del C:\Windows\System32\libssl-*.dll C:\Windows\system32\libcrypto-*.dll
+  - del C:\Windows\SysWOW64\libssl-*.dll C:\Windows\SysWOW64\libcrypto-*.dll
   - C:\msys64\usr\bin\pacman -Syuu --needed --noconfirm --noprogressbar 
--overwrite \\*
   - ps: |
         $env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString()


=====================================
win/misc/create-launcher.py
=====================================
@@ -87,10 +87,15 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE 
hPrevInstance,
     Py_FrozenFlag = 1;
     Py_Initialize();
     PySys_SetArgvEx(__argc, szArglist, 0);
-    result = PyRun_SimpleString("import sys; import os;"
-                                "sys.frozen=True;"
-                                "from gajim import gajim;"
-                                "gajim.main();");
+    result = PyRun_SimpleString(
+        "import sys; import os;"
+        "sys.frozen=True;"
+        "from pathlib import Path;"
+        "root_path = Path(sys.executable).parents[1];"
+        "from ctypes import windll;"
+        "windll.kernel32.SetDllDirectoryW(str(root_path / 'bin'));"
+        "from gajim import gajim;"
+        "gajim.main();");
     Py_Finalize();
     return result;
 }



View it on GitLab: 
https://dev.gajim.org/gajim/gajim/compare/3db2138e34f2380e65182d49d08ca25b2a2351ff...4a812dce670022cdda0fdcaa9796d5a90d6c34f5

-- 
View it on GitLab: 
https://dev.gajim.org/gajim/gajim/compare/3db2138e34f2380e65182d49d08ca25b2a2351ff...4a812dce670022cdda0fdcaa9796d5a90d6c34f5
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits

Reply via email to