Skip to content

update submodules and small fixes to build without errors - #261

Open
azhang wants to merge 71 commits into
overtake:masterfrom
azhang:master
Open

update submodules and small fixes to build without errors#261
azhang wants to merge 71 commits into
overtake:masterfrom
azhang:master

Conversation

@azhang

@azhang azhang commented Jan 29, 2019

Copy link
Copy Markdown
  • I wasn't able to find any references to basicDomain so I commented it out.
  • merge error included in commit
  • updated submodule commit hashes
  • thrid-party/libjpeg-turbo/jconfig.h the version line gave me an error so I made it a string
  • update readme to include appVersion

Manual changes necessary to make it fully buildable:
update Sparkle submodule to use overtake's commit, or use master branch and apply this change:

~/s/T/s/Sparkle git:master ❯❯❯ git diff                                                                                                                                                                                                                                 ✱
diff --git a/Sparkle.xcodeproj/project.pbxproj b/Sparkle.xcodeproj/project.pbxproj
index 2175a81e..435394a3 100644
--- a/Sparkle.xcodeproj/project.pbxproj
+++ b/Sparkle.xcodeproj/project.pbxproj
@@ -2832,6 +2832,7 @@
                        baseConfigurationReference = FA1941CA0D94A70100DD942E /* ConfigFrameworkDebug.xcconfig */;
                        buildSettings = {
                                CLANG_ENABLE_MODULES = YES;
+                               CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)AppStore";
                                DEFINES_MODULE = YES;
                                LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
                                SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -2844,6 +2845,7 @@
                        baseConfigurationReference = FA1941D50D94A70100DD942E /* ConfigFrameworkRelease.xcconfig */;
                        buildSettings = {
                                CLANG_ENABLE_MODULES = YES;
+                               CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/DebugHockeyApp";
                                DEFINES_MODULE = YES;
                                LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
                                SWIFT_VERSION = 3.0;

NOTE: CFBundleVersion needs to be updated to the actual bundle version and the basicDomain needs to be fixed.

overtake and others added 30 commits November 7, 2017 18:39
Make PIP show on all desktop/fullscreen apps
…mprovements

* commit 'fb5afb361c2b365d8f1fd2cf72b2873f04a0e0a1':
  Show a half-visible fourth row of reply markup buttons, if there are more than three rows. Refactor constants in reply markup layout
  Make PIP show on all desktop/fullscreen apps
* design-improvements:
  no message
  no message
  no message
  no message
  no message
  no message
  no message
  no message
  no message
  Show a half-visible fourth row of reply markup buttons, if there are more than three rows. Refactor constants in reply markup layout
  Make PIP show on all desktop/fullscreen apps
  no message

# Conflicts:
#	Telegram-Mac.xcworkspace/xcuserdata/mikhailfilimonov.xcuserdatad/UserInterfaceState.xcuserstate
#	Telegram-Mac.xcworkspace/xcuserdata/mikhailfilimonov.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
#	Telegram-Mac/Info.plist
#	TelegramShare/Info.plist
Implement scroll for InstantView using space/shift space key combinations
* 'master' of https://github.com/overtake/TelegramSwift:
  Implement scroll for InstantView using space/shift space key combinations

# Conflicts:
#	Telegram-Mac/en.lproj/Localizable.strings
3.9.2 release
overtake and others added 25 commits August 14, 2018 11:50
# Conflicts:
#	TGUIKit/TGUIKit/MajorNavigationController.swift
#	TGUIKit/TGUIKit/Window.swift
#	Telegram-Mac.xcworkspace/xcuserdata/mikhailfilimonov.xcuserdatad/UserInterfaceState.xcuserstate
#	Telegram-Mac/ApplicationContext.swift
#	Telegram-Mac/ChatController.swift
#	Telegram-Mac/CoreExtension.swift
#	Telegram-Mac/GridMessageItem.swift
#	Telegram-Mac/Info.plist
#	Telegram-Mac/ReplyModel.swift
#	Telegram-Mac/TGModernGrowingTextView.m
#	Telegram-Mac/en.lproj/Localizable.strings
#	TelegramShare/Info.plist
# Conflicts:
#	Telegram-Mac/Info.plist
#	Telegram.xcodeproj/project.pbxproj
#	TelegramShare/Info.plist
# Conflicts:
#	Telegram-Mac/GalleryModernControls.swift
#	Telegram-Mac/Info.plist
#	Telegram.xcodeproj/project.pbxproj
#	TelegramShare/Info.plist
@CLAassistant

CLAassistant commented Jan 29, 2019

Copy link
Copy Markdown

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 3 committers have signed the CLA.

✅ iSevenDays
❌ overtake
❌ blepc
You have signed the CLA already but the status is still pending? Let us recheck it.

@overtake
overtake force-pushed the master branch 3 times, most recently from 9aa8690 to 579cebb Compare September 22, 2025 14:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

5 participants