From 650c0f8c3c41f13e4a4f16be0dc8a2306fe868c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allie=20c=28=20=E2=81=B0=20=E3=80=B0=20=E2=81=B0=20=29?= =?UTF-8?q?=E0=A9=AD?= <88z@pm.me> Date: Tue, 29 Jan 2019 12:52:53 +0900 Subject: [PATCH 1/3] update submodules --- submodules/Postbox | 2 +- submodules/TelegramCore | 2 +- submodules/Zip | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/submodules/Postbox b/submodules/Postbox index 096a7bde3..99f054425 160000 --- a/submodules/Postbox +++ b/submodules/Postbox @@ -1 +1 @@ -Subproject commit 096a7bde32619234f33178156e41ebf33277e7fc +Subproject commit 99f0544253be82d178466e6a056d4fc01e51e2ab diff --git a/submodules/TelegramCore b/submodules/TelegramCore index 331fcd9be..b595c5f2f 160000 --- a/submodules/TelegramCore +++ b/submodules/TelegramCore @@ -1 +1 @@ -Subproject commit 331fcd9be8d5b66b7d49c900667a683c8643a396 +Subproject commit b595c5f2f51eae2c21ae2c5f15f0a1b7e734a905 diff --git a/submodules/Zip b/submodules/Zip index 8069b6110..f8d36a76e 160000 --- a/submodules/Zip +++ b/submodules/Zip @@ -1 +1 @@ -Subproject commit 8069b6110cf4c9c4ef070b315b7b998135bb1d78 +Subproject commit f8d36a76e6a77d12daeeccc3b076ba83a9c9659b From 1c8643364c3a305b2ab93d3aa9a63d9e2aeba3b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allie=20c=28=20=E2=81=B0=20=E3=80=B0=20=E2=81=B0=20=29?= =?UTF-8?q?=E0=A9=AD?= <88z@pm.me> Date: Tue, 29 Jan 2019 12:55:41 +0900 Subject: [PATCH 2/3] misc fixes to enable build --- Telegram-Mac/AppDelegate.swift | 26 +++++++++++++------------- Telegram-Mac/Info.plist | 6 +----- TelegramShare/Info.plist | 2 +- submodules/Sparkle | 2 +- thrid-party/libjpeg-turbo/jconfig.h | 2 +- 5 files changed, 17 insertions(+), 21 deletions(-) diff --git a/Telegram-Mac/AppDelegate.swift b/Telegram-Mac/AppDelegate.swift index 23456c3b8..79a45adaa 100644 --- a/Telegram-Mac/AppDelegate.swift +++ b/Telegram-Mac/AppDelegate.swift @@ -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) diff --git a/Telegram-Mac/Info.plist b/Telegram-Mac/Info.plist index f8314341f..1b057ab4e 100644 --- a/Telegram-Mac/Info.plist +++ b/Telegram-Mac/Info.plist @@ -33,11 +33,7 @@ CFBundleVersion -<<<<<<< HEAD - 151700 -======= - 155529 ->>>>>>> IV2.0 + 155531 LSApplicationCategoryType public.app-category.social-networking LSMinimumSystemVersion diff --git a/TelegramShare/Info.plist b/TelegramShare/Info.plist index c4c18694f..412e2ba77 100644 --- a/TelegramShare/Info.plist +++ b/TelegramShare/Info.plist @@ -21,7 +21,7 @@ CFBundleShortVersionString 4.9 CFBundleVersion - 155529 + 155531 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSExtension diff --git a/submodules/Sparkle b/submodules/Sparkle index 62ebdc6d9..89b4bcde6 160000 --- a/submodules/Sparkle +++ b/submodules/Sparkle @@ -1 +1 @@ -Subproject commit 62ebdc6d9c61d57bd5a13a7f2db78805abed5175 +Subproject commit 89b4bcde61e195d1dcefe806b3ef3731fc22bfc4 diff --git a/thrid-party/libjpeg-turbo/jconfig.h b/thrid-party/libjpeg-turbo/jconfig.h index b62fa951c..ffc11c736 100755 --- a/thrid-party/libjpeg-turbo/jconfig.h +++ b/thrid-party/libjpeg-turbo/jconfig.h @@ -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 From 62fea8d364ff63da83cbf541eb9b312966215789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allie=20c=28=20=E2=81=B0=20=E3=80=B0=20=E2=81=B0=20=29?= =?UTF-8?q?=E0=A9=AD?= <88z@pm.me> Date: Tue, 29 Jan 2019 13:08:15 +0900 Subject: [PATCH 3/3] include appVersion in Config.swift --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c5f3743ff..a6b4d9919 100644 --- a/README.md +++ b/README.md @@ -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