/pidgin/main: 3ee9b2690519: win32: gtk.zip generation more verbo...

[Tomasz Wasilczyk]

Changeset: 3ee9b26905190cfcf451fbd5cc9cb64f2c6576ad
Author:	 Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date:	 2013-08-03 21:34 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/3ee9b2690519

Description:

win32: gtk.zip generation more verbose, add missing files to uninstaller, add missing dependencies for build

diffstat:

 pidgin/win32/nsis/generate_gtk_zip.sh  |  2 ++
 pidgin/win32/nsis/pidgin-installer.nsi |  7 +++++++
 pidgin/win32/prepare-workspace.sh      |  4 ++++
 3 files changed, 13 insertions(+), 0 deletions(-)

diffs (52 lines):

diff --git a/pidgin/win32/nsis/generate_gtk_zip.sh b/pidgin/win32/nsis/generate_gtk_zip.sh
--- a/pidgin/win32/nsis/generate_gtk_zip.sh
+++ b/pidgin/win32/nsis/generate_gtk_zip.sh
@@ -67,9 +67,11 @@ if [ "$CHECK_SHA1SUM" != "$BUNDLE_SHA1SU
 	if [[ "$PIDGIN_VERSION" == *"devel" ]]; then
 		echo "Continuing GTK+ Bundle creation for development version of Pidgin"
 	else
+		echo "Couldn't download GTK+ Bundle"
 		exit 1
 	fi
 else
+	echo "GTK+ Bundle is up to date"
 	exit 0
 fi
 
diff --git a/pidgin/win32/nsis/pidgin-installer.nsi b/pidgin/win32/nsis/pidgin-installer.nsi
--- a/pidgin/win32/nsis/pidgin-installer.nsi
+++ b/pidgin/win32/nsis/pidgin-installer.nsi
@@ -562,12 +562,19 @@ Section Uninstall
     RMDir "$INSTDIR\ca-certs"
     RMDir /r "$INSTDIR\locale"
     RMDir /r "$INSTDIR\pixmaps"
+	RMDir /r "$INSTDIR\theme"
     Delete "$INSTDIR\plugins\autoaccept.dll"
     Delete "$INSTDIR\plugins\buddynote.dll"
     Delete "$INSTDIR\plugins\convcolors.dll"
     Delete "$INSTDIR\plugins\extplacement.dll"
     Delete "$INSTDIR\plugins\gtkbuddynote.dll"
     Delete "$INSTDIR\plugins\history.dll"
+	Delete "$INSTDIR\plugins\internalkeyring.dll"
+	Delete "$INSTDIR\plugins\libfacebook.dll"
+	Delete "$INSTDIR\plugins\libgtalk.dll"
+	Delete "$INSTDIR\plugins\ssl-gnutls.dll"
+	Delete "$INSTDIR\plugins\webkit.dll"
+	Delete "$INSTDIR\plugins\wincred.dll"
     Delete "$INSTDIR\plugins\iconaway.dll"
     Delete "$INSTDIR\plugins\idle.dll"
     Delete "$INSTDIR\plugins\joinpart.dll"
diff --git a/pidgin/win32/prepare-workspace.sh b/pidgin/win32/prepare-workspace.sh
--- a/pidgin/win32/prepare-workspace.sh
+++ b/pidgin/win32/prepare-workspace.sh
@@ -78,6 +78,10 @@ ARC_GT7="${DOWNLOAD_HOST}mingw32-gdk-pix
 ARCHIVES+="ARC_GT7 "
 ARC_GT8="${DOWNLOAD_HOST}mingw32-pango-devel-1.34.0-2.3.noarch.rpm;gtk: Pango;1.34.0-2.3;c875ae60dacf05b642d7da5f289a3c58ff9b0e52;${OBS_SKIP};${GTK_DIR}"
 ARCHIVES+="ARC_GT8 "
+ARC_GT9="${DOWNLOAD_HOST}mingw32-glib2-2.36.1-1.1.noarch.rpm;gtk: Glib runtimes;2.36.1-1.1;ed468f064f61c5a12b716c83cba8ccbe05d22992;${OBS_SKIP};${GTK_DIR}"
+ARCHIVES+="ARC_GT9 "
+ARC_G10="${DOWNLOAD_HOST}mingw32-libintl-0.18.1.1-13.6.noarch.rpm;gtk: libintl;0.18.1.1-13.6;0e6fde8e86788874366f308e25634f95613e906a;${OBS_SKIP};${GTK_DIR}"
+ARCHIVES+="ARC_G10 "
 
 ARC_ENC="${DOWNLOAD_HOST}mingw32-enchant-devel-1.6.0-3.9.noarch.rpm;Enchant;1.6.0-3.9;1daadbb4fbeb06a6ad26bed916dc2a980d971c49;${OBS_SKIP};enchant-1.6"
 ARCHIVES+="ARC_ENC "