Skip to content

Omemo indication #19

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

Open
wants to merge 5 commits into
base: lurch-0.6.8+carbons-0.2.1
Choose a base branch
from
Open

Omemo indication #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f39f0eb
Bump carbons to compilable version (waiting for 0.2.3)
shtrom Feb 11, 2020
806fb3f
Update Copyright notice for 2020
shtrom Feb 11, 2020
b3277ca
Cleanup and improve Adium build targets
shtrom Feb 11, 2020
b8179f6
Point lurch to wnereiz:dev to test gkdr/lurch#129 as a solution for #6
shtrom Feb 11, 2020
6670386
Bump to 0.0.4-pre2
shtrom Feb 11, 2020
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
0 0001-Fix-Release-Debug-build.patch → 0001-Fix-Release-Debug-build.adium.patch
View file
Open in desktop
File renamed without changes.
0 ...t-1.6.2-from-some-checkout-I-had-ly.patch → ...2-from-some-checkout-I-had-ly.adium.patch
View file
Open in desktop
File renamed without changes.
0 ...Disable-i386-ARCH-in-AutoHyperlinks.patch → ...e-i386-ARCH-in-AutoHyperlinks.adium.patch
View file
Open in desktop
File renamed without changes.
0 0004-Fix-fileEncoding-in-Slovak-l10n.patch → ...x-fileEncoding-in-Slovak-l10n.adium.patch
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Versioning](http://semver.org/spec/v2.0.0.html).
### Changed
- Bump lurch to 0.6.8
- Bump carbons to 0.2.2
- Try out https://github.com/wnereiz'l OMEMO indication branch

### Added
- This Changelog!
Expand Down
6 changes: 3 additions & 3 deletions Lurch4Adium/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>0.0.4-pre</string>
<string>0.0.4-pre2</string>
<key>CFBundleSignature</key>
<string>AdIM</string>
<key>CFBundleVersion</key>
<string>0.0.4-pre</string>
<string>0.0.4-pre2</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2017--2019 Olivier Mehani. GPLv3+</string>
<string>Copyright © 2017--2020 Olivier Mehani. GPLv3+</string>
<key>NSPrincipalClass</key>
<string>Lurch4Adium</string>
</dict>
Expand Down
19 changes: 8 additions & 11 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,7 @@ BUILDCONFIGURATION=Release

CWD=$(shell pwd)
ADIUM_FRAMEWORK_PATH=$(CWD)/Frameworks/adium
ADIUM_PATCHES= \
0001-Fix-Release-Debug-build.patch \
0002-Reimport-libgcrypt-1.6.2-from-some-checkout-I-had-ly.patch \
0003-Disable-i386-ARCH-in-AutoHyperlinks.patch \
0004-Fix-fileEncoding-in-Slovak-l10n.patch \
# END OF ADIUM_PATCHES
ADIUM_PATCHES=$(sort $(wildcard *.adium.patch))

GLIB_FRAMEWORK_PATH=$(ADIUM_FRAMEWORK_PATH)/Frameworks/libglib.framework
GLIB_CFLAGS=$(addprefix -I,$(wildcard $(GLIB_FRAMEWORK_PATH)/Headers))
Expand Down Expand Up @@ -37,10 +32,8 @@ all: build-l4a

prepare: prepare-vendor

build-adium:
$(ADIUM_FRAMEWORK_PATH)/build/Release-Debug/AIUtilities.framework/AIUtilities \
$(ADIUM_FRAMEWORK_PATH)/build/Release-Debug/Adium.framework/AIUtilities \
$(ADIUM_FRAMEWORK_PATH)/build/Release-Debug/AdiumLibpurple.framework/AIUtilities
patch-adium: $(ADIUM_FRAMEWORK_PATH)/.patched
build-adium: $(ADIUM_FRAMEWORK_PATH)/.built
build-carbons: vendor/carbons/build/carbons.a
build-lurch: vendor/lurch/build/lurch.a
build-mxml: vendor/mxml/libmxml.a
Expand Down Expand Up @@ -75,7 +68,10 @@ $(ADIUM_FRAMEWORK_PATH)/.patched: $(ADIUM_PATCHES) $(ADIUM_FRAMEWORK_PATH)/Makef
cat $${PATCH} | git -C $(ADIUM_FRAMEWORK_PATH)/ am; \
done
touch $@
$(ADIUM_FRAMEWORK_PATH)/.built: $(ADIUM_FRAMEWORK_PATH)/.patched
$(ADIUM_FRAMEWORK_PATH)/.built: $(ADIUM_FRAMEWORK_PATH)/.patched \
$(ADIUM_FRAMEWORK_PATH)/build/Release-Debug/AIUtilities.framework/AIUtilities \
$(ADIUM_FRAMEWORK_PATH)/build/Release-Debug/Adium.framework/AIUtilities \
$(ADIUM_FRAMEWORK_PATH)/build/Release-Debug/AdiumLibpurple.framework/AIUtilities
$(MAKE) -C $(ADIUM_FRAMEWORK_PATH) adium
touch $@

Expand Down Expand Up @@ -115,6 +111,7 @@ clean-adium:
test ! -e $(ADIUM_FRAMEWORK_PATH)/.built || $(MAKE) -C $(ADIUM_FRAMEWORK_PATH) clean
rm -f $(ADIUM_FRAMEWORK_PATH)/.built
test ! -e $(ADIUM_FRAMEWORK_PATH)/.patched || git -C $(ADIUM_FRAMEWORK_PATH)/ checkout HEAD~$(words $(ADIUM_PATCHES))
rm -rf /Users/omehani/src/Lurch4Adium/.git/modules/Frameworks/adium/rebase-apply/
rm -f $(ADIUM_FRAMEWORK_PATH)/.patched
clean-carbons:
test ! -f vendor/carbons/Makefile || $(MAKE) -C vendor/carbons clean
Expand Down
2 changes: 1 addition & 1 deletion vendor/carbons
Open in desktop
Submodule carbons updated 4 files
+1 −0 src/carbons.c
+0 −13 src/carbons.h
+17 −0 src/carbons_int.h
+2 −1 test/test_carbons.c
2 changes: 1 addition & 1 deletion vendor/lurch
Open in desktop
Submodule lurch updated 14 files
+22 −0 .appveyor.yml
+50 −5 Makefile
+1 −1 README.md
+1 −1 lib/libomemo
+142 −275 src/lurch.c
+1 −1 src/lurch.h
+554 −0 src/lurch_api.c
+100 −0 src/lurch_api.h
+270 −0 src/lurch_cmd_ui.c
+10 −0 src/lurch_cmd_ui.h
+166 −0 src/lurch_util.c
+51 −0 src/lurch_util.h
+674 −0 test/test_lurch_api.c
+216 −0 test/test_lurch_util.c