first attempt at switching to OBS, compiles, but doesn't run yet

6 files changed, 46 insertions, 28 deletions

diff --git a/build/build-small.bat b/build/build-small.bat
index 9bc59029..c6618802 100644
--- a/build/build-small.bat
+++ b/build/build-small.bat
@@ -36,19 +36,23 @@ copy %DEPS_ROOT%\bin\libglib-2.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libgmodule-2.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libgobject-2.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libgthread-2.0-0.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libpng14-14.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libpng15-15.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libgdk-win32-2.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libcairo-2.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libfontconfig-1.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libexpat-1.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\freetype6.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libfreetype-6.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libjasper-1.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libjpeg-8.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libpango-1.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libpangocairo-1.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libpangoft2-1.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libpangowin32-1.0-0.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libpixman-1-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libatk-1.0-0.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\intl.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libxml2.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libintl-8.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libtiff-3.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libxml2-2.dll %XCHAT_DEST%
 xcopy /q /s /i %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines\libpixmap.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\
 copy %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines
 xcopy /q /s /i %DEPS_ROOT%\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\
diff --git a/build/dep-extract.bat b/build/dep-extract.bat
index 05e40e02..c3aba497 100644
--- a/build/dep-extract.bat
+++ b/build/dep-extract.bat
@@ -1,9 +1,14 @@
 @echo off

-set PATH=%PROGRAMW6432%\7-Zip

+set PATH=%PATH%;%PROGRAMW6432%\7-Zip

 cd ..\dep-x64

 7z x *.zip

 7z x *.7z

 cd ..\dep-x86

+7z x -y *.rpm

+7z x *.cpio

+del *.cpio

+xcopy /q /s /i usr\i686-w64-mingw32\sys-root\mingw\* .

+rmdir /q /s usr

 7z x *.zip

 7z x *.7z

 pause

diff --git a/config.h b/config.h
index 80bbc5d2..20150285 100644
--- a/config.h
+++ b/config.h
@@ -2,6 +2,7 @@
 #define ENABLE_NLS
 #define USE_GMODULE
 #define USE_PLUGIN
+#define USE_OPENSSL
 #define USE_LIBSEXY
 #define HAVE_ISO_CODES
 #define PACKAGE_NAME "xchat"
diff --git a/dep-x86/deps-x86.txt b/dep-x86/deps-x86.txt
index 02fcf172..07c4359b 100644
--- a/dep-x86/deps-x86.txt
+++ b/dep-x86/deps-x86.txt
@@ -1,24 +1,32 @@
-http://ftp.gnome.org/pub/gnome/binaries/win32/atk/1.32/atk_1.32.0-1_win32.zip

-http://ftp.gnome.org/pub/gnome/binaries/win32/atk/1.32/atk-dev_1.32.0-1_win32.zip

-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/cairo_1.10.2-1_win32.zip

-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/cairo-dev_1.10.2-1_win32.zip

-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/expat_2.0.1-1_win32.zip

-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/fontconfig_2.8.0-2_win32.zip

-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/freetype_2.4.4-1_win32.zip

-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/gdk-pixbuf/2.22/gdk-pixbuf_2.22.1-1_win32.zip

-http://ftp.gnome.org/pub/gnome/binaries/win32/gdk-pixbuf/2.22/gdk-pixbuf-dev_2.22.1-1_win32.zip

-http://ftp.gnome.org/pub/gnome/binaries/win32/glib/2.26/glib_2.26.1-1_win32.zip

-http://ftp.gnome.org/pub/gnome/binaries/win32/glib/2.26/glib-dev_2.26.1-1_win32.zip

-http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.22/gtk+_2.22.1-1_win32.zip

-http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.22/gtk+-dev_2.22.1-1_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://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/noarch/mingw32-atk-2.0.1-1.1.noarch.rpm

+http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/noarch/mingw32-atk-devel-2.0.1-1.1.noarch.rpm

+http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/noarch/mingw32-cairo-devel-1.10.2-6.24.noarch.rpm

+http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/noarch/mingw32-expat-2.0.1-4.21.noarch.rpm

+http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/noarch/mingw32-fontconfig-2.8.0-5.22.noarch.rpm

+http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/noarch/mingw32-freetype-2.4.6-1.1.noarch.rpm

+http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/noarch/mingw32-gettext-runtime-0.18.1.1-13.14.noarch.rpm

+http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/noarch/mingw32-gettext-tools-0.18.1.1-13.14.noarch.rpm

+http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/noarch/mingw32-libcairo2-1.10.2-6.24.noarch.rpm

+http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/noarch/mingw32-libexpat-2.0.1-4.21.noarch.rpm

+http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/noarch/mingw32-libintl-0.18.1.1-13.14.noarch.rpm

+http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/noarch/mingw32-libintl-devel-0.18.1.1-13.14.noarch.rpm

+http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/noarch/mingw32-libjasper-1.900.1-6.24.noarch.rpm

+http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/noarch/mingw32-libjpeg-8c-2.28.noarch.rpm

+http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/noarch/mingw32-libpng-1.5.4-1.1.noarch.rpm

+http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/noarch/mingw32-libtiff-3.9.5-1.18.noarch.rpm

+http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/noarch/mingw32-libxml2-2.7.8-7.19.noarch.rpm

+http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/noarch/mingw32-libxml2-devel-2.7.8-7.19.noarch.rpm

+http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/noarch/mingw32-gdk-pixbuf-2.22.1-10.3.noarch.rpm

+http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/noarch/mingw32-gdk-pixbuf-devel-2.22.1-10.3.noarch.rpm

+http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/noarch/mingw32-gdk-pixbuf-devel-tools-2.22.1-10.3.noarch.rpm

+http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/noarch/mingw32-glib2-2.28.8-1.1.noarch.rpm

+http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/noarch/mingw32-glib2-devel-2.28.8-1.1.noarch.rpm

+http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/noarch/mingw32-gtk2-2.24.5-2.12.noarch.rpm

+http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/noarch/mingw32-gtk2-devel-2.24.5-2.12.noarch.rpm

+http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/noarch/mingw32-pango-1.28.4-4.28.noarch.rpm

+http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/noarch/mingw32-pango-devel-1.28.4-4.28.noarch.rpm

+http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/noarch/mingw32-pixman-0.22.2-1.1.noarch.rpm

 http://xchat-wdk.googlecode.com/files/Enchant-WDK%201.6.0-2%20x86.7z

 http://xchat-wdk.googlecode.com/files/Lua-WDK%205.1.4-2-2%20x86.7z

 http://xchat-wdk.googlecode.com/files/OpenSSL-WDK%201.0.0d%20x86.7z

 http://xchat-wdk.googlecode.com/files/myspell-20101001.7z

-http://xchat-wdk.googlecode.com/files/gettext-tools-0.17-msgfmt.zip

-http://xchat-wdk.googlecode.com/files/LibXML-WDK%202.7.8%20x86.7z

diff --git a/src/fe-gtk/xtext.c b/src/fe-gtk/xtext.c
index 47d7e3ee..d797e5ff 100644
--- a/src/fe-gtk/xtext.c
+++ b/src/fe-gtk/xtext.c
@@ -999,7 +999,7 @@ gtk_xtext_realize (GtkWidget * widget)
 
 	gdk_window_set_user_data (widget->window, widget);
 
-	xtext->depth = gdk_drawable_get_visual (widget->window)->depth;
+	xtext->depth = gdk_window_get_visual (widget->window)->depth;
 
 	val.subwindow_mode = GDK_INCLUDE_INFERIORS;
 	val.graphics_exposures = 0;
diff --git a/src/makeinc.skel.mak b/src/makeinc.skel.mak
index ec14b34a..90751dcd 100644
--- a/src/makeinc.skel.mak
+++ b/src/makeinc.skel.mak
@@ -7,9 +7,9 @@ CPPFLAGS = /c /MD /W0 /nologo /DWIN32
 LDFLAGS = /subsystem:windows /nologo
 LIBS = $(LIBS) gdi32.lib shell32.lib user32.lib advapi32.lib imm32.lib ole32.lib winmm.lib ws2_32.lib wininet.lib comdlg32.lib libeay32.lib ssleay32.lib
 
-GLIB = /I$(DEV)\include\glib-2.0 /I$(DEV)\lib\glib-2.0\include
+GLIB = /I$(DEV)\include\glib-2.0 /I$(DEV)\lib\glib-2.0\include /I$(DEV)\include\libxml2
 GTK = /I$(DEV)\include\gtk-2.0 /I$(DEV)\lib\gtk-2.0\include /I$(DEV)\include\atk-1.0 /I$(DEV)\include\cairo /I$(DEV)\include\pango-1.0 /I$(DEV)\include\gdk-pixbuf-2.0
-LIBS = $(LIBS) /libpath:$(DEV)\lib gtk-win32-2.0.lib gdk-win32-2.0.lib atk-1.0.lib gio-2.0.lib gdk_pixbuf-2.0.lib pangowin32-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib intl.lib libxml2.lib
+LIBS = $(LIBS) /libpath:$(DEV)\lib libgtk-win32-2.0.dll.a libgdk-win32-2.0.dll.a libatk-1.0.dll.a libgio-2.0.dll.a libgdk_pixbuf-2.0.dll.a libpangowin32-1.0.dll.a libpangocairo-1.0.dll.a libpango-1.0.dll.a libcairo.dll.a libgobject-2.0.dll.a libgmodule-2.0.dll.a libglib-2.0.dll.a libintl.dll.a libxml2.dll.a
 
 LUALIB = lua51
 LUAOUTPUT = xclua.dll