spelling for x64 using own enchant build
This commit is contained in:
		
							parent
							
								
									707c6faecd
								
							
						
					
					
						commit
						33814ec9d1
					
				
					 9 changed files with 37 additions and 22 deletions
				
			
		| 
						 | 
				
			
			@ -1,16 +1,19 @@
 | 
			
		|||
http://ftp.acc.umu.se/pub/gnome/binaries/win64/atk/1.32/atk_1.32.0-1_win64.zip
 | 
			
		||||
http://ftp.acc.umu.se/pub/gnome/binaries/win64/atk/1.32/atk-dev_1.32.0-1_win64.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/cairo_1.10.0-1_win64.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/cairo-dev_1.10.0-1_win64.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win64/atk/1.30/atk_1.30.0-1_win64.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win64/atk/1.30/atk-dev_1.30.0-1_win64.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/cairo_1.8.10-3_win64.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/cairo-dev_1.8.10-3_win64.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/expat_2.0.1-3_win64.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/fontconfig_2.8.0-2_win64.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/freetype_2.4.2-1_win64.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/gettext-runtime_0.18.1.1-2_win64.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/gettext-runtime-dev_0.18.1.1-2_win64.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/gettext-runtime_0.17-3_win64.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/gettext-runtime-dev_0.17-3_win64.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/libpng_1.4.3-1_win64.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win64/glib/2.26/glib_2.26.0-1_win64.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win64/glib/2.26/glib-dev_2.26.0-1_win64.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win64/gtk+/2.22/gtk+_2.22.0-1_win64.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win64/gtk+/2.22/gtk+-dev_2.22.0-1_win64.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win64/pango/1.28/pango_1.28.3-1_win64.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win64/pango/1.28/pango-dev_1.28.3-1_win64.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/pkg-config_0.23-2_win64.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win64/gdk-pixbuf/2.22/gdk-pixbuf_2.22.0-1_win64.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win64/gdk-pixbuf/2.22/gdk-pixbuf-dev_2.22.0-1_win64.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win64/glib/2.24/glib_2.24.0-1_win64.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win64/glib/2.24/glib-dev_2.24.0-1_win64.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win64/gtk+/2.16/gtk+_2.16.6-2_win64.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win64/gtk+/2.16/gtk+-dev_2.16.6-2_win64.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win64/pango/1.28/pango_1.28.0-1_win64.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win64/pango/1.28/pango-dev_1.28.0-1_win64.zip
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -10,6 +10,7 @@ http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/freetype_2.4.2-1_win3
 | 
			
		|||
http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/gettext-runtime_0.18.1.1-2_win32.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/gettext-runtime-dev_0.18.1.1-2_win32.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/libpng_1.4.3-1_win32.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/pkg-config_0.23-3_win32.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/zlib_1.2.5-2_win32.zip
 | 
			
		||||
http://ftp.acc.umu.se/pub/gnome/binaries/win32/gdk-pixbuf/2.22/gdk-pixbuf_2.22.0-1_win32.zip
 | 
			
		||||
http://ftp.acc.umu.se/pub/gnome/binaries/win32/gdk-pixbuf/2.22/gdk-pixbuf-dev_2.22.0-1_win32.zip
 | 
			
		||||
| 
						 | 
				
			
			@ -17,5 +18,5 @@ http://ftp.gnome.org/pub/gnome/binaries/win32/glib/2.26/glib_2.26.0-2_win32.zip
 | 
			
		|||
http://ftp.gnome.org/pub/gnome/binaries/win32/glib/2.26/glib-dev_2.26.0-2_win32.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.22/gtk+_2.22.0-2_win32.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.22/gtk+-dev_2.22.0-2_win32.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win32/pango/1.28/pango_1.28.3-1_win32.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win32/pango/1.28/pango-dev_1.28.3-1_win32.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win32/pango/1.28/pango_1.28.1-2_win32.zip
 | 
			
		||||
http://ftp.gnome.org/pub/gnome/binaries/win32/pango/1.28/pango-dev_1.28.1-2_win32.zip
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,6 +2,7 @@
 | 
			
		|||
set GTK_BIN=c:\mozilla-build\build\xchat-dev64\bin
 | 
			
		||||
set SSL_BIN=c:\mozilla-build\build\openssl-wdk-1.0.0a-x64\bin
 | 
			
		||||
set LUA_BIN=c:\mozilla-build\build\lua-wdk-5.1.4-2-x64\bin
 | 
			
		||||
set MINGW_BIN=c:\mozilla-build\mingw64\bin
 | 
			
		||||
set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-uni
 | 
			
		||||
copy ..\src\fe-gtk\xchat.exe %XCHAT_DEST%\xchat.exe.x64
 | 
			
		||||
copy %GTK_BIN%\libgtk-win32-2.0-0.dll %XCHAT_DEST%\libgtk-win32-2.0-0.dll.x64
 | 
			
		||||
| 
						 | 
				
			
			@ -23,13 +24,14 @@ copy %GTK_BIN%\libpangoft2-1.0-0.dll %XCHAT_DEST%\libpangoft2-1.0-0.dll.x64
 | 
			
		|||
copy %GTK_BIN%\libpangowin32-1.0-0.dll %XCHAT_DEST%\libpangowin32-1.0-0.dll.x64
 | 
			
		||||
copy %GTK_BIN%\libatk-1.0-0.dll %XCHAT_DEST%\libatk-1.0-0.dll.x64
 | 
			
		||||
copy %GTK_BIN%\libintl-8.dll %XCHAT_DEST%\libintl-8.dll.x64
 | 
			
		||||
copy %MINGW_BIN%\libgcc_s_sjlj-1.dll %XCHAT_DEST%\libgcc_s_sjlj-1.dll.x64
 | 
			
		||||
copy %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libpixmap.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\libpixmap.dll.x64
 | 
			
		||||
copy %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\libwimp.dll.x64
 | 
			
		||||
copy %GTK_BIN%\..\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\libgail.dll.x64
 | 
			
		||||
copy %SSL_BIN%\libeay32.dll %XCHAT_DEST%\libeay32.dll.x64
 | 
			
		||||
copy %SSL_BIN%\ssleay32.dll %XCHAT_DEST%\ssleay32.dll.x64
 | 
			
		||||
copy %SSL_BIN%\zlib1.dll %XCHAT_DEST%\zlib1.dll.x64
 | 
			
		||||
copy %GTK_BIN%\libenchant.dll %XCHAT_DEST%\libenchant.dll.x64
 | 
			
		||||
copy %GTK_BIN%\libenchant-1.dll %XCHAT_DEST%\libenchant-1.dll.x64
 | 
			
		||||
copy %GTK_BIN%\..\lib\enchant\libenchant_myspell.dll %XCHAT_DEST%\lib\enchant\libenchant_myspell.dll.x64
 | 
			
		||||
copy ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\xcewc.dll.x64
 | 
			
		||||
copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins\xclua.dll.x64
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,6 +2,7 @@
 | 
			
		|||
set GTK_BIN=c:\mozilla-build\build\xchat-dev32\bin
 | 
			
		||||
set SSL_BIN=c:\mozilla-build\build\openssl-wdk-1.0.0a-x86\bin
 | 
			
		||||
set LUA_BIN=c:\mozilla-build\build\lua-wdk-5.1.4-2-x86\bin
 | 
			
		||||
set MINGW_BIN=c:\mozilla-build\mingw32\bin
 | 
			
		||||
set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-uni
 | 
			
		||||
rmdir /q /s %XCHAT_DEST%
 | 
			
		||||
mkdir %XCHAT_DEST%
 | 
			
		||||
| 
						 | 
				
			
			@ -27,6 +28,7 @@ copy %GTK_BIN%\libpangoft2-1.0-0.dll %XCHAT_DEST%
 | 
			
		|||
copy %GTK_BIN%\libpangowin32-1.0-0.dll %XCHAT_DEST%
 | 
			
		||||
copy %GTK_BIN%\libatk-1.0-0.dll %XCHAT_DEST%
 | 
			
		||||
copy %GTK_BIN%\intl.dll %XCHAT_DEST%
 | 
			
		||||
copy %MINGW_BIN%\libgcc_s_sjlj-1.dll %XCHAT_DEST%
 | 
			
		||||
xcopy /q /s /i %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libpixmap.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\
 | 
			
		||||
copy %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines
 | 
			
		||||
xcopy /q /s /i %GTK_BIN%\..\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\
 | 
			
		||||
| 
						 | 
				
			
			@ -37,7 +39,7 @@ copy %SSL_BIN%\..\LICENSE.ZLIB %XCHAT_DEST%
 | 
			
		|||
copy %SSL_BIN%\libeay32.dll %XCHAT_DEST%
 | 
			
		||||
copy %SSL_BIN%\ssleay32.dll %XCHAT_DEST%
 | 
			
		||||
copy %SSL_BIN%\zlib1.dll %XCHAT_DEST%
 | 
			
		||||
copy %GTK_BIN%\libenchant.dll %XCHAT_DEST%
 | 
			
		||||
copy %GTK_BIN%\libenchant-1.dll %XCHAT_DEST%
 | 
			
		||||
xcopy /q /s /i %GTK_BIN%\..\lib\enchant\libenchant_myspell.dll %XCHAT_DEST%\lib\enchant\
 | 
			
		||||
xcopy /q /s /i ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\
 | 
			
		||||
copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -150,12 +150,15 @@ Source: "ssleay32.dll.x64"; DestDir: "{app}"; DestName: "ssleay32.dll"; Componen
 | 
			
		|||
Source: "zlib1.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
 | 
			
		||||
Source: "zlib1.dll.x64"; DestDir: "{app}"; DestName: "zlib1.dll"; Components: libs; Tasks: x64
 | 
			
		||||
 | 
			
		||||
Source: "libenchant.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
 | 
			
		||||
Source: "libenchant.dll.x64"; DestDir: "{app}"; DestName: "libenchant.dll"; Components: libs; Tasks: x64
 | 
			
		||||
Source: "libenchant-1.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
 | 
			
		||||
Source: "libenchant-1.dll.x64"; DestDir: "{app}"; DestName: "libenchant-1.dll"; Components: libs; Tasks: x64
 | 
			
		||||
 | 
			
		||||
Source: "lib\enchant\libenchant_myspell.dll"; DestDir: "{app}\lib\enchant"; Components: libs; Tasks: x86
 | 
			
		||||
Source: "lib\enchant\libenchant_myspell.dll.x64"; DestDir: "{app}\lib\enchant"; DestName: "libenchant_myspell.dll"; Components: libs; Tasks: x64
 | 
			
		||||
 | 
			
		||||
Source: "libgcc_s_sjlj-1.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
 | 
			
		||||
Source: "libgcc_s_sjlj-1.dll.x64"; DestDir: "{app}"; DestName: "libgcc_s_sjlj-1.dll"; Components: libs; Tasks: x64
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
Source: "lib\gtk-2.0\2.10.0\engines\libpixmap.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: libs; Tasks: x86
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										2
									
								
								config.h
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								config.h
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -2,9 +2,7 @@
 | 
			
		|||
#define ENABLE_NLS
 | 
			
		||||
#define USE_GMODULE
 | 
			
		||||
#define USE_PLUGIN
 | 
			
		||||
#ifndef _WIN64
 | 
			
		||||
#define USE_LIBSEXY
 | 
			
		||||
#endif
 | 
			
		||||
#define PACKAGE_NAME "xchat"
 | 
			
		||||
#define PACKAGE_VERSION "1468"
 | 
			
		||||
#define XCHATLIBDIR "."
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										3
									
								
								ext/enchant/build-x64.bat
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								ext/enchant/build-x64.bat
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
@echo off
 | 
			
		||||
set PATH=c:\mozilla-build\mingw64\bin;c:\mozilla-build\msys\bin;c:\mozilla-build\build\xchat-dev64\bin
 | 
			
		||||
sh configure --exec-prefix=/usr/enchant-x64 --enable-myspell --disable-ispell --disable-aspell --disable-voikko --disable-uspell --disable-hspell --disable-zemberek
 | 
			
		||||
							
								
								
									
										3
									
								
								ext/enchant/build-x86.bat
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								ext/enchant/build-x86.bat
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
@echo off
 | 
			
		||||
set PATH=c:\mozilla-build\mingw32\bin;c:\mozilla-build\msys\bin;c:\mozilla-build\build\xchat-dev32\bin
 | 
			
		||||
sh configure --exec-prefix=/usr/enchant-x86 --enable-myspell --disable-ispell --disable-aspell --disable-voikko --disable-uspell --disable-hspell --disable-zemberek
 | 
			
		||||
| 
						 | 
				
			
			@ -1296,7 +1296,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/setup.c xchat-wdk/src/fe
 | 
			
		|||
 
 | 
			
		||||
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/sexy-spell-entry.c xchat-wdk/src/fe-gtk/sexy-spell-entry.c
 | 
			
		||||
--- xchat-wdk.orig/src/fe-gtk/sexy-spell-entry.c	2006-07-17 05:51:02 +0000
 | 
			
		||||
+++ xchat-wdk/src/fe-gtk/sexy-spell-entry.c	2010-10-02 15:39:36 +0000
 | 
			
		||||
+++ xchat-wdk/src/fe-gtk/sexy-spell-entry.c	2010-10-02 19:19:27 +0000
 | 
			
		||||
@@ -31,6 +31,20 @@
 | 
			
		||||
 /*#include "gtkspell-iso-codes.h"
 | 
			
		||||
 #include "sexy-marshal.h"*/
 | 
			
		||||
| 
						 | 
				
			
			@ -1323,7 +1323,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/sexy-spell-entry.c xchat
 | 
			
		|||
 	gpointer funcptr;
 | 
			
		||||
 
 | 
			
		||||
-	enchant = g_module_open("libenchant", 0);
 | 
			
		||||
+	enchant = g_module_open("libenchant.dll", 0);
 | 
			
		||||
+	enchant = g_module_open("libenchant-1.dll", 0);
 | 
			
		||||
 	if (enchant == NULL)
 | 
			
		||||
 	{
 | 
			
		||||
-		enchant = g_module_open("libenchant.so.1", 0);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue