[Pkg-privacy-commits] [pidgin-otr] 24/255: * Makefile.mingw: Build under newer mingw cross-compilation environment.

Ximin Luo infinity0 at moszumanska.debian.org
Sat Aug 22 12:51:18 UTC 2015


This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch experimental
in repository pidgin-otr.

commit 4fcc43177c8dea0a319c0ecc1696485f523edfcd
Author: cypherpunk <cypherpunk>
Date:   Tue Nov 28 23:37:59 2006 +0000

    	* Makefile.mingw: Build under newer mingw cross-compilation
    	environment.
    
    	* gtk-dialog.c: Change "gtkstock.h" to "gaimstock.h" to match
    	gaim-2.0.0beta5.
    
    	* packaging/windows/gaim-otr.nsi: New version from Paul.
---
 ChangeLog                      |  10 +++++
 Makefile.mingw                 |   7 ++-
 gtk-dialog.c                   |   2 +-
 packaging/windows/gaim-otr.nsi | 100 ++++++++++++++++++++++-------------------
 4 files changed, 68 insertions(+), 51 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 31e9566..ae0a58f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-11-28
+
+	* Makefile.mingw: Build under newer mingw cross-compilation
+	environment.
+
+	* gtk-dialog.c: Change "gtkstock.h" to "gaimstock.h" to match
+	gaim-2.0.0beta5.
+
+	* packaging/windows/gaim-otr.nsi: New version from Paul.
+
 2006-07-24
 
 	* otr-plugin.c: Use g_fopen() to open the otr files, so that on
diff --git a/Makefile.mingw b/Makefile.mingw
index 5021a6a..6e14c14 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -4,7 +4,7 @@ WIN32=1
 GAIM_OTR_VERSION = 3.0.0
 
 # Replace this with the path to the GAIM headers
-GAIM_SOURCE ?= /usr/include/gaim
+GAIM_SOURCE ?= /usr/i586-mingw32msvc/include/gaim
 
 # If you don't have pkg-config, put the appropriate -I entry on the next line
 GTK_HDRS ?= `pkg-config --cflags glib-2.0 gtk+-2.0`
@@ -26,9 +26,8 @@ LIBOTRINCDIR = /usr/i586-mingw32msvc/include
 LIBOTRLIBDIR = /usr/i586-mingw32msvc/lib
 TARGET = gaim-otr.dll
 LDFLAGS = -Wl,--enable-auto-image-base
-LDLIBS = $(LIBOTRLIBDIR)/libotr.a -lgtk-win32-2.0-0 -latk-1.0-0 -lpango-1.0-0 \
-         -lglib-2.0-0 -lgdk_pixbuf-2.0-0 -lgdk-win32-2.0-0 -lgobject-2.0-0 \
-	 -lgaim -lgcrypt -lgpg-error
+LDLIBS = $(LIBOTRLIBDIR)/libotr.a -lgtk-win32-2.0 -lglib-2.0 -lgdk_pixbuf-2.0 \
+	 -lgobject-2.0 -lgaim -lgtkgaim -lgcrypt -lgpg-error
 else
 FPIC = -fPIC
 LDFLAGS = -module -avoid-version
diff --git a/gtk-dialog.c b/gtk-dialog.c
index b12633f..b42a909 100644
--- a/gtk-dialog.c
+++ b/gtk-dialog.c
@@ -30,7 +30,7 @@
 #if GAIM_MAJOR_VERSION < 2
 #include "stock.h"
 #else
-#include "gtkstock.h"
+#include "gaimstock.h"
 #endif
 #include "plugin.h"
 #include "notify.h"
diff --git a/packaging/windows/gaim-otr.nsi b/packaging/windows/gaim-otr.nsi
index 9ad658e..a7ff749 100644
--- a/packaging/windows/gaim-otr.nsi
+++ b/packaging/windows/gaim-otr.nsi
@@ -3,11 +3,12 @@
 ;
 ; known issue. installer induced uninstaller abortion causes overwrite by installer without
 ; uninstall.
+; v3.0.1    - Version for gaim-2.0.0 beta5
 ; v3.0.0   - Bump version number.
 ; v2.0.2   - Bump version number.
 ; v2.0.1   - Bump version number.
 ; v2.0.0-2 - linking to libotr-2.0.1
-; v2.0.0   - Bump version number. Fixed upgrading gaim-otr (it didn't overwrite the dll)
+; v2.0.0   - Bump version number. Fixed upgrading gaim2-otr (it didn't overwrite the dll)
 ;            bug reported by Aldert Hazenberg <aldert at xelerance.com>
 ;          - Added many safeguards and fixed conditions of failures when gaim is running
 ;             during install, or failed to (un)install previously.
@@ -22,7 +23,7 @@
 ; todo: SetBrandingImage
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "gaim-otr"
-!define PRODUCT_VERSION "3.0.0"
+!define PRODUCT_VERSION "3.0.1"
 !define PRODUCT_PUBLISHER "Cypherpunks CA"
 !define PRODUCT_WEB_SITE "http://www.cypherpunks.ca/otr/"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
@@ -39,7 +40,7 @@
 ; Welcome page
 !insertmacro MUI_PAGE_WELCOME
 ; License page
-!insertmacro MUI_PAGE_LICENSE "COPYING.txt"
+!insertmacro MUI_PAGE_LICENSE "c:\otr\COPYING.txt"
 ; Directory page
 !insertmacro MUI_PAGE_DIRECTORY
 ; Instfiles page
@@ -58,9 +59,9 @@
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
 OutFile "${PRODUCT_NAME}-${PRODUCT_VERSION}.exe"
-InstallDir "$PROGRAMFILES\gaim-otr"
-InstallDirRegKey HKEY_LOCAL_MACHINE SOFTWARE\Gaim-otr "Install_Dir"
-;WriteRegStr HKLM "SOFTWARE\gaim-otr" "gaimdir" ""
+InstallDir "$PROGRAMFILES\gaim2-otr"
+InstallDirRegKey HKEY_LOCAL_MACHINE SOFTWARE\gaim-otr "Install_Dir"
+;WriteRegStr HKLM "SOFTWARE\gaim2-otr" "gaimdir" ""
 
 Var "GaimDir"
 
@@ -70,42 +71,42 @@ ShowUnInstDetails show
 Section "MainSection" SEC01
 ;InstallDir "$PROGRAMFILES\Gaim\plugins"
 
-; uninstall previous gaim-otr install if found.
+; uninstall previous gaim2-otr install if found.
 Call UnInstOld
  ;Check for gaim installation
 Call GetGaimInstPath
-WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "SOFTWARE\gaim-otr" "gaimdir" "$GaimDir"
+WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "SOFTWARE\gaim2-otr" "gaimdir" "$GaimDir"
 
 	SetOutPath "$INSTDIR"
   SetOverwrite on
-  File "gaim-otr.dll"
+  File "c:\otr\gaim2-otr.dll"
   ; move to gaim plugin directory, check if not busy (gaim is running)
 	call CopyDLL
   ; hard part is done, do the rest now.
   SetOverwrite on	  
-  File "README.Toolkit.txt"
-	File "README.txt"
-	File "Protocol.txt"
-	File "COPYING.txt"
-	File "COPYING.LIB.txt"
-	File "otr_mackey.exe"
-	File "otr_modify.exe"
-	File "otr_parse.exe"
-	File "otr_readforge.exe"
-	File "otr_remac.exe"
-	File "otr_sesskeys.exe"
-	File "gaim-otr.nsi"
+  File "c:\otr\README.Toolkit.txt"
+	File "c:\otr\README.txt"
+	File "c:\otr\Protocol-v2.html"
+	File "c:\otr\COPYING.txt"
+	File "c:\otr\COPYING.LIB.txt"
+	File "c:\otr\otr_mackey.exe"
+	File "c:\otr\otr_modify.exe"
+	File "c:\otr\otr_parse.exe"
+	File "c:\otr\otr_readforge.exe"
+	File "c:\otr\otr_remac.exe"
+	File "c:\otr\otr_sesskeys.exe"
+	File "c:\otr\gaim-otr.nsi"
 SectionEnd
 
 Section -AdditionalIcons
-  CreateDirectory "$SMPROGRAMS\Gaim-otr"
-  CreateShortCut "$SMPROGRAMS\Gaim-otr\Uninstall.lnk" "$INSTDIR\gaim-otr-uninst.exe"
+  CreateDirectory "$SMPROGRAMS\gaim2-otr"
+  CreateShortCut "$SMPROGRAMS\gaim2-otr\Uninstall.lnk" "$INSTDIR\gaim2-otr-uninst.exe"
 SectionEnd
 
 Section -Post
-  WriteUninstaller "$INSTDIR\gaim-otr-uninst.exe"
+  WriteUninstaller "$INSTDIR\gaim2-otr-uninst.exe"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\gaim-otr-uninst.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\gaim2-otr-uninst.exe"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
@@ -123,10 +124,10 @@ Function un.onInit
 FunctionEnd
 
 Section Uninstall
-  Delete "$INSTDIR\gaim-otr-uninst.exe"
+  Delete "$INSTDIR\gaim2-otr-uninst.exe"
 	Delete "$INSTDIR\README.Toolkit.txt"
 	Delete "$INSTDIR\README.txt"
-	Delete "$INSTDIR\Protocol.txt"
+	Delete "$INSTDIR\Protocol-v2.txt"
 	Delete "$INSTDIR\COPYING.txt"
 	Delete "$INSTDIR\COPYING.LIB.txt"
 	Delete "$INSTDIR\otr_mackey.exe"
@@ -135,22 +136,29 @@ Section Uninstall
 	Delete "$INSTDIR\otr_readforge.exe"
 	Delete "$INSTDIR\otr_remac.exe"
 	Delete "$INSTDIR\otr_sesskeys.exe"
-	Delete "$INSTDIR\gaim-otr.nsi"
-  Delete "$SMPROGRAMS\Gaim-otr\Uninstall.lnk"
-  RMDir "$SMPROGRAMS\Gaim-otr"
+	Delete "$INSTDIR\gaim2-otr.nsi"
+  Delete "$SMPROGRAMS\gaim2-otr\Uninstall.lnk"
+  RMDir "$SMPROGRAMS\gaim2-otr"
   RMDir "$INSTDIR"
   
-  ReadRegStr $GaimDir HKLM Software\Gaim-otr "gaimdir"
+	ReadRegStr $GaimDir HKLM Software\gaim-otr "gaimdir"
 	IfFileExists "$GaimDir\plugins\gaim-otr.dll" dodelete
-  ReadRegStr $GaimDir HKCU Software\Gaim-otr "gaimdir"
+  ReadRegStr $GaimDir HKCU Software\gaim-otr "gaimdir"
 	IfFileExists "$GaimDir\plugins\gaim-otr.dll" dodelete
-  MessageBox MB_OK|MB_ICONINFORMATION "Could not find gaim plugin directory, gaim-otr.dll not uninstalled!" IDOK ok
+	
+  ReadRegStr $GaimDir HKLM Software\gaim2-otr "gaimdir"
+	IfFileExists "$GaimDir\plugins\gaim2-otr.dll" dodelete
+  ReadRegStr $GaimDir HKCU Software\gaim2-otr "gaimdir"
+	IfFileExists "$GaimDir\plugins\gaim2-otr.dll" dodelete
+  MessageBox MB_OK|MB_ICONINFORMATION "Could not find gaim plugin directory, gaim2-otr.dll not uninstalled!" IDOK ok
 dodelete:
 	Delete "$GaimDir\plugins\gaim-otr.dll"
-	IfFileExists "$GaimDir\plugins\gaim-otr.dll" 0 +2
-		MessageBox MB_OK|MB_ICONINFORMATION "gaim-otr.dll is busy. Probably Gaim is still running. Please delete $GaimDir\plugins\gaim-otr.dll manually."
+	Delete "$GaimDir\plugins\gaim2-otr.dll"
+	
+	IfFileExists "$GaimDir\plugins\gaim2-otr.dll" 0 +2
+		MessageBox MB_OK|MB_ICONINFORMATION "gaim2-otr.dll is busy. Probably Gaim is still running. Please delete $GaimDir\plugins\gaim2-otr.dll manually."
   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
-  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "SOFTWARE\Gaim-otr\gaimdir"
+  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "SOFTWARE\gaim2-otr\gaimdir"
 ok:
 SetAutoClose true
 SectionEnd
@@ -165,7 +173,7 @@ Function GetGaimInstPath
 cont:
 	StrCpy $GaimDir $0
 	;MessageBox MB_OK|MB_ICONINFORMATION "Gaim plugin directory found at $GaimDir\plugins ."
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "SOFTWARE\gaim-otr" "gaimdir" "$GaimDir"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "SOFTWARE\gaim2-otr" "gaimdir" "$GaimDir"
 FunctionEnd
 
 Function UnInstOld
@@ -173,7 +181,7 @@ Function UnInstOld
 	  ReadRegStr $0 ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString"
 		IfFileExists "$0" deinst cont
 	deinst:
-		MessageBox MB_OK|MB_ICONEXCLAMATION  "Gaim-otr was already found on your system and will first be uninstalled"
+		MessageBox MB_OK|MB_ICONEXCLAMATION  "gaim2-otr was already found on your system and will first be uninstalled"
 		; the uninstaller copies itself to temp and execs itself there, so it can delete 
 		; everything including its own original file location. To prevent the installer and
 		; uninstaller racing you can't simply ExecWait.
@@ -187,7 +195,7 @@ Function UnInstOld
 			
 		;BringToFront
 	cont:
-		;MessageBox MB_OK|MB_ICONINFORMATION "No old GAIM-OTR found, continuing."
+		;MessageBox MB_OK|MB_ICONINFORMATION "No old gaim2-otr found, continuing."
 		
 FunctionEnd
 
@@ -195,19 +203,19 @@ Function CopyDLL
 SetOverwrite try
 ClearErrors
 ; 3 hours wasted so you guys don't need a reboot!
-; Rename /REBOOTOK "$INSTDIR\gaim-otr.dll" "$GaimDir\plugins\gaim-otr.dll"
-IfFileExists "$GaimDir\plugins\gaim-otr.dll" 0 copy ; remnant or uninstall prev version failed
-Delete "$GaimDir\plugins\gaim-otr.dll"
+; Rename /REBOOTOK "$INSTDIR\gaim2-otr.dll" "$GaimDir\plugins\gaim2-otr.dll"
+IfFileExists "$GaimDir\plugins\gaim2-otr.dll" 0 copy ; remnant or uninstall prev version failed
+Delete "$GaimDir\plugins\gaim2-otr.dll"
 copy:
 ClearErrors
-Rename "$INSTDIR\gaim-otr.dll" "$GaimDir\plugins\gaim-otr.dll"
+Rename "$INSTDIR\gaim2-otr.dll" "$GaimDir\plugins\gaim2-otr.dll"
 IfErrors dllbusy
 	Return
 dllbusy:
-	MessageBox MB_RETRYCANCEL "gaim-otr.dll is busy. Please close Gaim (including tray icon) and try again" IDCANCEL cancel
-	Delete "$GaimDir\plugins\gaim-otr.dll"
+	MessageBox MB_RETRYCANCEL "gaim2-otr.dll is busy. Please close Gaim (including tray icon) and try again" IDCANCEL cancel
+	Delete "$GaimDir\plugins\gaim2-otr.dll"
 	Goto copy
 	Return
 cancel:
-	Abort "Installation of gaim-otr aborted"
+	Abort "Installation of gaim2-otr aborted"
 FunctionEnd

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/pidgin-otr.git



More information about the Pkg-privacy-commits mailing list