Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update submodules and small fixes to build without errors #261

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

update submodules and small fixes to build without errors #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
650c0f8
update submodules
blepc Jan 29, 2019
1c86433
misc fixes to enable build
blepc Jan 29, 2019
62fea8d
include appVersion in Config.swift
blepc Jan 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ let API_ID:Int32 = 'api_id'
let API_HASH:String = "api_hash"
let TEST_SERVER:Bool = false
let languagesCategory = "macos"
let appVersion:String = "your_version"
```
4. build and enjoy

Expand Down
26 changes: 13 additions & 13 deletions Telegram-Mac/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,19 +250,19 @@ class AppDelegate: NSResponder, NSApplicationDelegate, NSUserNotificationCenterD
self.proxyDisposable.set(nil)
}
#if !APP_STORE
if let postbox = postbox {
self.proxyDisposable.set((postbox.preferencesView(keys: [PreferencesKeys.networkSettings]) |> delay(5.0, queue: Queue.mainQueue()) |> deliverOnMainQueue).start(next: { settings in
let settings = settings.values[PreferencesKeys.networkSettings] as? NetworkSettings
if let applicationUpdateUrlPrefix = settings?.applicationUpdateUrlPrefix {
self.updater.basicDomain = applicationUpdateUrlPrefix
} else {
self.updater.basicDomain = nil
}
self.updater.checkForUpdatesInBackground()
}))
} else {
self.proxyDisposable.set(nil)
}
// if let postbox = postbox {
// self.proxyDisposable.set((postbox.preferencesView(keys: [PreferencesKeys.networkSettings]) |> delay(5.0, queue: Queue.mainQueue()) |> deliverOnMainQueue).start(next: { settings in
// let settings = settings.values[PreferencesKeys.networkSettings] as? NetworkSettings
// if let applicationUpdateUrlPrefix = settings?.applicationUpdateUrlPrefix {
// self.updater.basicDomain = applicationUpdateUrlPrefix
// } else {
// self.updater.basicDomain = nil
// }
// self.updater.checkForUpdatesInBackground()
// }))
// } else {
// self.proxyDisposable.set(nil)
// }
#endif
} else {
self.proxyDisposable.set(nil)
Expand Down
6 changes: 1 addition & 5 deletions Telegram-Mac/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<<<<<<< HEAD
<string>151700</string>
=======
<string>155529</string>
>>>>>>> IV2.0
<string>155531</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.social-networking</string>
<key>LSMinimumSystemVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion TelegramShare/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<key>CFBundleShortVersionString</key>
<string>4.9</string>
<key>CFBundleVersion</key>
<string>155529</string>
<string>155531</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSExtension</key>
Expand Down
2 changes: 1 addition & 1 deletion submodules/Postbox
Open in desktop
Submodule Postbox updated from 096a7b to 99f054
2 changes: 1 addition & 1 deletion submodules/Sparkle
Open in desktop
Submodule Sparkle updated 41 files
+5 −0 CHANGELOG
+1 −1 Configurations/ConfigCommon.xcconfig
+1 −1 README.markdown
+1 −1 Sparkle.podspec
+16 −365 Sparkle.xcodeproj/project.pbxproj
+8 −6 Sparkle.xcodeproj/xcshareddata/xcschemes/Distribution.xcscheme
+8 −6 Sparkle.xcodeproj/xcshareddata/xcschemes/Sparkle.xcscheme
+8 −6 Sparkle.xcodeproj/xcshareddata/xcschemes/UITests.xcscheme
+8 −6 Sparkle.xcodeproj/xcshareddata/xcschemes/generate_appcast.xcscheme
+9 −0 Sparkle/DarkAqua.css
+1 −0 Sparkle/SPUDownloaderDeprecated.m
+1 −0 Sparkle/SPUDownloaderProtocol.h
+3 −16 Sparkle/SPUDownloaderSession.m
+0 −26 Sparkle/SPUProxy.h
+0 −9 Sparkle/SPUProxy.m
+2 −6 Sparkle/SUAppcast.h
+3 −2 Sparkle/SUAppcast.m
+2 −2 Sparkle/SUAppcastItem.h
+4 −17 Sparkle/SUAppcastItem.m
+0 −118 Sparkle/SUAutomaticUpdateAlert.xib
+1 −1 Sparkle/SUBasicUpdateDriver.h
+27 −28 Sparkle/SUBasicUpdateDriver.m
+1 −0 Sparkle/SUSignatureVerifier.m
+8 −0 Sparkle/SUSignatures.m
+57 −3 Sparkle/SUUpdateAlert.m
+0 −247 Sparkle/SUUpdateAlert.xib
+1 −0 Sparkle/SUUpdateDriver.h
+2 −0 Sparkle/SUUpdateDriver.m
+0 −226 Sparkle/SUUpdatePermissionPrompt.xib
+3 −5 Sparkle/SUUpdateValidator.m
+1 −4 Sparkle/SUUpdater.h
+3 −23 Sparkle/SUUpdater.m
+1 −1 Sparkle/SUUpdaterPrivate.h
+1 −0 Sparkle/Sparkle.h
+2 −2 Sparkle/es.lproj/SUUpdatePermissionPrompt.xib
+3 −0 TestApplication/hr.lproj/InfoPlist.strings
+0 −258 TestApplication/hr.lproj/MainMenu.xib
+1 −1 TestApplication/sparkletestcast.xml
+14 −9 generate_appcast/ArchiveItem.swift
+2 −0 generate_keys/main.swift
+2 −0 sign_update/main.swift
2 changes: 1 addition & 1 deletion submodules/TelegramCore
Open in desktop
Submodule TelegramCore updated 74 files
+27 −7 TelegramCore.xcodeproj/project.pbxproj
+6 −4 TelegramCore/Account.swift
+37 −0 TelegramCore/AccountEnvironmentAttribute.swift
+33 −17 TelegramCore/AccountManager.swift
+7 −6 TelegramCore/AccountState.swift
+49 −33 TelegramCore/AccountStateManagementUtils.swift
+17 −1 TelegramCore/AccountStateManager.swift
+256 −223 TelegramCore/AccountStateReset.swift
+2 −47 TelegramCore/AccountViewTracker.swift
+38 −56 TelegramCore/AddPeerMember.swift
+31 −14 TelegramCore/AddressNames.swift
+77 −51 TelegramCore/Api0.swift
+680 −346 TelegramCore/Api1.swift
+236 −137 TelegramCore/Api3.swift
+13 −22 TelegramCore/ApiGroupOrChannel.swift
+6 −1 TelegramCore/ApplyUpdateMessage.swift
+11 −11 TelegramCore/Authorization.swift
+1 −1 TelegramCore/Buffer.swift
+12 −39 TelegramCore/CachedChannelData.swift
+13 −9 TelegramCore/CachedChannelParticipants.swift
+43 −8 TelegramCore/CachedGroupData.swift
+1 −6 TelegramCore/CanSendMessagesToPeer.swift
+12 −3 TelegramCore/ChannelAdminEventLogs.swift
+115 −92 TelegramCore/ChannelBlacklist.swift
+7 −3 TelegramCore/CloudChatRemoveMessagesOperation.swift
+1 −5 TelegramCore/CloudFileMediaResource.swift
+20 −19 TelegramCore/CreateGroup.swift
+1 −1 TelegramCore/EnqueueMessage.swift
+24 −14 TelegramCore/FetchChatList.swift
+1 −1 TelegramCore/FetchedMediaResource.swift
+14 −70 TelegramCore/GlobalNotificationSettings.swift
+1 −1 TelegramCore/HistoryViewChannelStateValidation.swift
+35 −30 TelegramCore/Holes.swift
+29 −29 TelegramCore/InvitationLinks.swift
+1 −2 TelegramCore/JSON.swift
+1 −1 TelegramCore/LoadMessagesIfNecessary.swift
+1 −1 TelegramCore/LoadedPeerFromMessage.swift
+2 −3 TelegramCore/ManagedAppConfigurationUpdates.swift
+9 −1 TelegramCore/ManagedCloudChatRemoveMessagesOperations.swift
+6 −5 TelegramCore/ManagedGlobalNotificationSettings.swift
+27 −27 TelegramCore/ManagedSecretChatOutgoingOperations.swift
+2 −3 TelegramCore/ManagedSynchronizeAppLogEventsOperations.swift
+142 −136 TelegramCore/ManagedSynchronizePinnedChatsOperations.swift
+22 −6 TelegramCore/MultipartUpload.swift
+8 −0 TelegramCore/Namespaces.swift
+1 −1 TelegramCore/OutgoingMessageWithChatContextResult.swift
+74 −125 TelegramCore/PeerAdmins.swift
+0 −8 TelegramCore/PeerParticipants.swift
+112 −96 TelegramCore/PeerPhotoUpdater.swift
+8 −1 TelegramCore/PendingMessageUploadedContent.swift
+8 −8 TelegramCore/ProcessSecretChatIncomingDecryptedOperations.swift
+4 −4 TelegramCore/RemovePeerChat.swift
+1 −2 TelegramCore/RemovePeerMember.swift
+2 −2 TelegramCore/RequestUserPhotos.swift
+241 −106 TelegramCore/SearchMessages.swift
+2 −2 TelegramCore/SearchPeers.swift
+1 −1 TelegramCore/Serialization.swift
+1 −1 TelegramCore/SingleMessageView.swift
+1 −1 TelegramCore/StandaloneUploadedMedia.swift
+82 −79 TelegramCore/SynchronizePeerReadState.swift
+150 −19 TelegramCore/TelegramChannel.swift
+23 −23 TelegramCore/TelegramChannelAdminRights.swift
+24 −20 TelegramCore/TelegramChannelBannedRights.swift
+68 −7 TelegramCore/TelegramGroup.swift
+24 −7 TelegramCore/TelegramMediaFile.swift
+7 −3 TelegramCore/TelegramMediaImage.swift
+4 −4 TelegramCore/TwoStepVerification.swift
+0 −54 TelegramCore/UpdateCachedChannelParticipants.swift
+11 −2 TelegramCore/UpdateCachedPeerData.swift
+19 −16 TelegramCore/UpdatePeerInfo.swift
+9 −14 TelegramCore/UpdatePinnedMessage.swift
+17 −15 TelegramCore/UpdatesApiUtils.swift
+108 −0 TelegramCore/Wallpaper.swift
+159 −63 TelegramCore/Wallpapers.swift
2 changes: 1 addition & 1 deletion submodules/Zip
Open in desktop
Submodule Zip updated 6 files
+1,002 −42 Zip.xcodeproj/project.pbxproj
+0 −2 Zip.xcodeproj/xcshareddata/xcschemes/Zip OSX.xcscheme
+0 −2 Zip.xcodeproj/xcshareddata/xcschemes/Zip tvOS.xcscheme
+0 −2 Zip.xcodeproj/xcshareddata/xcschemes/Zip.xcscheme
+0 −2 Zip.xcodeproj/xcshareddata/xcschemes/ZipTests.xcscheme
+83 −56 Zip/Zip.swift
2 changes: 1 addition & 1 deletion thrid-party/libjpeg-turbo/jconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#define JPEG_LIB_VERSION 62

/* libjpeg-turbo version */
#define LIBJPEG_TURBO_VERSION 2.0.1
#define LIBJPEG_TURBO_VERSION "2.0.1"

/* libjpeg-turbo version in integer form */
#define LIBJPEG_TURBO_VERSION_NUMBER 2000001
Expand Down