[KildClient-cvs] kildclient branch win64 created. Release_3.2.0-37-g6365464

[ekalin <ek...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "kildclient".

The branch, win64 has been created
        at  636546410631f33371e869b93831ad3d35010548 (commit)

- Log -----------------------------------------------------------------
http://kildclient.git.sourceforge.net/git/gitweb.cgi?p=kildclient/kildclient;a=commit;h=636546410631f33371e869b93831ad3d35010548

commit 636546410631f33371e869b93831ad3d35010548
Author: Eduardo M KALINOWSKI <ed...@ka...>
Date:   Thu Sep 7 12:40:28 2023 -0300

    Changes to compile a 64-bit version; see NOTES.win64

diff --git a/win32/NOTES.win64 b/win32/NOTES.win64
new file mode 100644
index 0000000..6af892d
--- /dev/null
+++ b/win32/NOTES.win64
@@ -0,0 +1,16 @@
+Notes for a 64-bit version
+--------------------------
+
+- Compilation works fine, it's just a matter of using the mingw64-
+  version of the packages. The Dockerfile has been adapter for that.
+  The 64-bit version sets __MINGW32__ as well, no changes to the
+  source code were necessary.
+
+- The installer also works fine, jut some paths had to be changed, and
+  some settings to enable 64-bit mode.
+
+- Unfortunately the program seems to crash randomly; this would need
+  to be debugged.
+
+- If it ever works, then this directory and the files should be renamed
+  to something generic like 'windows'.
diff --git a/win32/kildclient.iss b/win32/kildclient.iss
index 5c7314a..760974f 100755
--- a/win32/kildclient.iss
+++ b/win32/kildclient.iss
@@ -17,11 +17,11 @@
 ; Directory where KildClient is built

 #define BuildDir   "Z:\work"

 ; Root of mingw32 files installed as Fedora files

-#define MingwDir   "Z:\mingw32\usr\i686-w64-mingw32\sys-root\mingw"

+#define MingwDir   "Z:\mingw64\usr\x86_64-w64-mingw32\sys-root\mingw"

 ; Strawberry Perl directory

-#define PerlDir    "Z:\mingw32\opt\strawberryperl\perl"

+#define PerlDir    "Z:\mingw64\opt\strawberryperl\perl"

 ; Directory of Perl modules (not in the mingw root, used for JSON.pm)

-#define SysPerlDir "Z:\mingw32\usr\share\perl5\vendor_perl"

+#define SysPerlDir "Z:\mingw64\usr\share\perl5\vendor_perl"

 

 [Setup]

 AppId={#AppId}

@@ -42,6 +42,8 @@ SolidCompression=true
 AppCopyright=This program is released under the GNU General Public License

 ShowLanguageDialog=yes

 RestartIfNeededByRun=yes

+ArchitecturesAllowed=x64

+ArchitecturesInstallIn64BitMode=x64

 

 [Languages]

 Name: eng; MessagesFile: compiler:Default.isl

@@ -139,7 +141,7 @@ Source: {#MingwDir}\bin\libhunspell-1.7-0.dll; DestDir: {app}\bin; Flags: ignore
 Source: {#MingwDir}\lib\enchant-2\enchant_hunspell.dll; DestDir: {app}\lib\enchant-2; Flags: ignoreversion

 

 ;;; Perl

-Source: {#PerlDir}\bin\libgcc_s_dw2-1.dll; DestDir: {app}\bin; Flags: ignoreversion

+Source: {#PerlDir}\bin\libgcc_s_seh-1.dll; DestDir: {app}\bin; Flags: ignoreversion

 Source: {#PerlDir}\bin\libstdc++-6.dll; DestDir: {app}\bin; Flags: ignoreversion

 Source: {#PerlDir}\bin\libwinpthread-1.dll; DestDir: {app}\bin; Flags: ignoreversion

 Source: {#PerlDir}\bin\perl532.dll; DestDir: {app}\bin; Flags: ignoreversion

diff --git a/win32/mingw32-kildclient-docker/Dockerfile b/win32/mingw32-kildclient-docker/Dockerfile
index 7d6ffd3..cb6fd12 100644
--- a/win32/mingw32-kildclient-docker/Dockerfile
+++ b/win32/mingw32-kildclient-docker/Dockerfile
@@ -7,7 +7,7 @@ COPY macros.image-language-conf /etc/rpm/macros.image-language-conf
 RUN dnf -y install passwd
 
 RUN useradd ekalin \
- && echo "mingw32-kildclient" | passwd --stdin ekalin
+ && echo "mingw-kildclient" | passwd --stdin ekalin
 
 # ssh server
 RUN dnf -y install openssh-server
@@ -19,18 +19,18 @@ RUN dnf -y install \
     gettext-devel \
     glib2-devel \
     make \
-    mingw32-gcc \
-    mingw32-gnutls \
-    mingw32-gtk3 \
-    mingw32-gtkspell3 \
-    mingw32-libgnurx \
+    mingw64-gcc \
+    mingw64-gnutls \
+    mingw64-gtk3 \
+    mingw64-gtkspell3 \
+    mingw64-libgnurx \
     perl-XML-LibXML \
     perl-JSON \
     unzip \
  && dnf clean all
 
 RUN curl -o /tmp/strawberryperl.zip \
-            https://strawberryperl.com/download/5.32.1.1/strawberry-perl-5.32.1.1-32bit.zip \
+            https://strawberryperl.com/download/5.32.1.1/strawberry-perl-5.32.1.1-64bit.zip \
  && mkdir /opt/strawberryperl \
  && unzip /tmp/strawberryperl.zip -d /opt/strawberryperl \
  && rm /tmp/strawberryperl.zip

-----------------------------------------------------------------------


hooks/post-receive
-- 
kildclient