adium 4968:7f98f2c6290d: Merged adium-1.5.3 into adium-1.6
commits at adium.im
commits at adium.im
Wed Aug 8 14:18:37 UTC 2012
details: http://hg.adium.im/adium/rev/7f98f2c6290d
revision: 4968:7f98f2c6290d
branch: adium-1.6
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Wed Aug 08 16:16:15 2012 +0200
Merged adium-1.5.3 into adium-1.6
Subject: adium 4969:58b5c02fd64e: Merged with rob-to86.
details: http://hg.adium.im/adium/rev/58b5c02fd64e
revision: 4969:58b5c02fd64e
branch: adium-1.6
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Wed Aug 08 16:18:05 2012 +0200
Merged with rob-to86.
diffs (149 lines):
diff -r 2eac73592046 -r 58b5c02fd64e ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt Sun Aug 05 22:46:04 2012 +0200
+++ b/ChangeLogs/Changes.txt Wed Aug 08 16:18:05 2012 +0200
@@ -1,13 +1,16 @@
Adium Version History
-----------------------
-Version 1.5.3 (XX/XX/XXXX)
+Version 1.5.3 (8/XX/2012)
* Fixed another problem with the transcript viewer causing search to fail when closing and reopening the window. (#13586, #15699)
* Fixed a problem with iTunes 10.6.3 on Mac OS X 10.6.8 causing the chat window's toolbar to break. (#16046)
+ * Fixed crash at startup that was meant to be fixed in 1.5.2. (#15787)
+ * Fixed a crash when receiving invalid XML on 10.8. (#16095)
* Fixed an issue that caused logging in to Facebook to fail when login approvals are enabled. (#15705)
* Icons set for group chat bookmarks will now show up on the tab bar in the chat window. (Andreas Marienborg) (#14484)
* Fixed tables not being declared as such via VoiceOver. (Marco Zehe) (#16085)
+ * Fixed a problem with emoticons scaling disproportionately in the yMous message style when using OS X 10.8.
* Improved memory use slightly.
- * Fixed a crash when receiving invalid XML on 10.8. (#16095)
+
Version 1.5.2 (7/21/2012)
* Fixed an issue where the log indexer would never finish.
diff -r 2eac73592046 -r 58b5c02fd64e Frameworks/AutoHyperlinks Framework/xcconfigs/AutoHyperlinks.xcconfig
--- a/Frameworks/AutoHyperlinks Framework/xcconfigs/AutoHyperlinks.xcconfig Sun Aug 05 22:46:04 2012 +0200
+++ b/Frameworks/AutoHyperlinks Framework/xcconfigs/AutoHyperlinks.xcconfig Wed Aug 08 16:18:05 2012 +0200
@@ -4,7 +4,7 @@
GCC_WARN_SHADOW = YES
GCC_C_LANGUAGE_STANDARD = gnu99
GCC_VERSION = com.apple.compilers.llvm.clang.1_0
-SDKROOT = macosx10.6
+SDKROOT = macosx
SYMROOT = ../../build
MACOSX_DEPLOYMENT_TARGET = 10.6
GCC_WARN_ABOUT_MISSING_NEWLINE = YES
diff -r 2eac73592046 -r 58b5c02fd64e Other/Adium Spotlight Importer/GetMetadataForHTMLLog.m
--- a/Other/Adium Spotlight Importer/GetMetadataForHTMLLog.m Sun Aug 05 22:46:04 2012 +0200
+++ b/Other/Adium Spotlight Importer/GetMetadataForHTMLLog.m Wed Aug 08 16:18:05 2012 +0200
@@ -146,14 +146,14 @@
/* Find the length of STRING, but scan at most MAXLEN characters.
If no '\0' terminator is found in that many characters, return MAXLEN. */
-static size_t
+size_t
strnlen (const char *string, size_t maxlen)
{
const char *end = memchr (string, '\0', maxlen);
return end ? (size_t) (end - string) : maxlen;
}
-static char *strndup (const char *s, size_t n)
+char *strndup (const char *s, size_t n)
{
size_t len = strnlen (s, n);
char *nouveau = malloc (len + 1);
diff -r 2eac73592046 -r 58b5c02fd64e Plists/Info.plist
--- a/Plists/Info.plist Sun Aug 05 22:46:04 2012 +0200
+++ b/Plists/Info.plist Wed Aug 08 16:18:05 2012 +0200
@@ -354,7 +354,7 @@
<key>CFBundleExecutable</key>
<string>Adium</string>
<key>CFBundleGetInfoString</key>
- <string>1.6, Copyright © 2001-2012 The Adium Team</string>
+ <string>1.6hg, Copyright © 2001-2012 The Adium Team</string>
<key>CFBundleHelpBookFolder</key>
<string>AdiumHelp</string>
<key>CFBundleHelpBookName</key>
@@ -370,7 +370,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.6</string>
+ <string>1.6hg</string>
<key>CFBundleSignature</key>
<string>AdIM</string>
<key>CFBundleURLTypes</key>
@@ -469,7 +469,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>1.6</string>
+ <string>1.6hg</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.social-networking</string>
<key>LSFileQuarantineEnabled</key>
diff -r 2eac73592046 -r 58b5c02fd64e Release/Makefile
--- a/Release/Makefile Sun Aug 05 22:46:04 2012 +0200
+++ b/Release/Makefile Wed Aug 08 16:18:05 2012 +0200
@@ -69,9 +69,9 @@
endif
ifeq ($(BUILD_IN_DEBUG_MODE),TRUE)
- BUILDSTYLE=Release-Debug
+ BUILDSTYLE=Release-Debug
else
- BUILDSTYLE=Release
+ BUILDSTYLE=Release
endif
BUILDFLAGS+="BUILDCONFIGURATION=$(BUILDSTYLE)"
@@ -194,10 +194,35 @@
./make-diskimage.sh $(BUILD_DIR)/$(RELEASE_NAME).dmg $(ADIUM_DIR) "Adium $(VERSION)" dmg_adium.scpt $(ART_DIR)
ifeq ($(OFFICIAL_BUILD),TRUE)
- @echo DSA for Sparkle: `ruby sign_update.rb $(BUILD_DIR)/$(RELEASE_NAME_ESCAPED).dmg ~/adium-dsa-sign/dsa_priv.pem`
+ $(eval DSA := $(shell ruby sign_update.rb $(BUILD_DIR)/$(RELEASE_NAME_ESCAPED).dmg ~/adium-dsa-sign/dsa_priv.pem))
+ @echo DSA for Sparkle: $(DSA)
endif
- @echo Build finished. `md5 $(BUILD_DIR)/$(RELEASE_NAME_ESCAPED).dmg`
+ $(eval MDFIVEHASH := $(shell md5 -q $(BUILD_DIR)/$(RELEASE_NAME_ESCAPED).dmg))
+ @echo Build finished. $(MDFIVEHASH)
+
+ifeq ($(OFFICIAL_BUILD),TRUE)
+ifeq ($(BETA),TRUE)
+ @echo Add this to beta/index.php:
+ @echo " array("
+ @echo " \"ver\" => \"$(VERSION)\","
+ @echo " \"rev\" => \"`hg parent --template {node\|short}`\","
+ @echo " \"date\" => \"`date +"%Y-%m-%d"`\","
+ @echo " \"md5\" => \"$(MDFIVEHASH)\","
+ @echo " \"dsa\" => \"$(DSA)\""
+ @echo " ),"
+
+ @echo
+ @echo Add this to sparkle/appcast-beta.xml:
+ @echo " <item>"
+ @echo " <title>Adium $(VERSION)</title>"
+ @echo " <pubDate>`date +"%a, %d %b %Y %H:%M:%S %z"`</pubDate>"
+ @echo " <sparkle:releaseNotesLink>http://beta.adium.im/?notemplate</sparkle:releaseNotesLink>"
+ @echo " <sparkle:minimumSystemVersion>10.6.8</sparkle:minimumSystemVersion>"
+ @echo " <enclosure sparkle:dsaSignature=\"$(DSA)\" sparkle:version=\"$(VERSION)\" url=\"http://download.adium.im/Adium_$(VERSION).dmg\" length=\"`stat -f %z $(BUILD_DIR)/$(RELEASE_NAME_ESCAPED).dmg`\" type=\"application/octet-stream\"/>"
+ @echo " </item>"
+endif
+endif
#This is what nightly builds use. Does not update because buildbot does.
nightly: version clean compile createfolder prepare-release-bundle diskimage
diff -r 2eac73592046 -r 58b5c02fd64e xcconfigs/Base.xcconfig
--- a/xcconfigs/Base.xcconfig Sun Aug 05 22:46:04 2012 +0200
+++ b/xcconfigs/Base.xcconfig Wed Aug 08 16:18:05 2012 +0200
@@ -6,7 +6,7 @@
GCC_WARN_SHADOW = YES
GCC_C_LANGUAGE_STANDARD = gnu99
GCC_VERSION = com.apple.compilers.llvm.clang.1_0
-SDKROOT = macosx10.6
+SDKROOT = macosx
MACOSX_DEPLOYMENT_TARGET = 10.6
GCC_WARN_ABOUT_MISSING_NEWLINE = YES
GCC_WARN_UNUSED_VARIABLE = YES
More information about the commits
mailing list