1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Commit Graph

47 Commits

Author SHA1 Message Date
Zetok Zalbavar
fd36bdc89f
chore: merge separate gitignores into a single one 2016-10-15 10:00:30 +01:00
Zetok Zalbavar
a719f98570
docs(osx): remove obsolete info about osx updates 2016-10-11 17:47:28 +01:00
Zetok Zalbavar
0fecb55024
style(OSX build): change tabs to spaces and adjust style to existing one
Also remove unnecessary `function`, since it's equal to `()`.
2016-09-27 10:11:49 +01:00
Zetok Zalbavar
0da1a2fd8b
Merge pull request #3585
initramfs (3):
      chore: rewrite all links to the qTox repository from tux3 to qTox
      chore: rewrite forgotten tux3 link to qTox
      docs(INSTALL.md): remove unnecessary backticks in qTox URL
2016-08-04 11:20:23 +01:00
initramfs
b7aa982a57
chore: rewrite all links to the qTox repository from tux3 to qTox 2016-08-04 06:25:50 +08:00
iphydf
07ac196326
chore: Fix Mac OS X build.
- Add /usr/local to the search paths for includes and libs.
- Build toxcore before updating homebrew. Updating homebrew somehow breaks the
  toxcore build.
2016-08-03 22:46:37 +01:00
Zetok Zalbavar
4218429b47
Merge pull request #3340
RowenStipe (1):
      chore(travis): Allow for Travis deployment
2016-06-08 00:58:32 +01:00
RowenStipe
2639217747
chore(travis): Allow for Travis deployment
Allows for OSX packages through travis, .travis.yml requires editing

chore(travis): Let Travis deploy OSX

Allows Travis to start Deploying when ever a tag is applied.
2016-06-07 19:42:34 -04:00
Nils Fenner
792103f8b0
refactor(filter_audio): completely remove filter_audio dependency
The filter_audio API is not working for qTox/Tox and thus disabled by default via compiler switch. In current qTox UI, it is not configurable, even when this switch is enabled. According to issue #3194 the library is no longer maintained as well. I don't see any reason to keep it in qTox.
2016-06-04 22:12:27 +02:00
RowenStipe
9dd46c249b Applied ductile to home-brew's mouth on update 2016-03-22 14:36:30 -04:00
RowenStipe
ff41443b1e Make Brew quitter: Round 3 2016-03-22 14:20:05 -04:00
RowenStipe
bfe730241b Make update silent for travis 2016-03-22 14:06:18 -04:00
RowenStipe
ac72a12eb3 Auto ver finding for lib sodium & qt + attempt to make brew less noisy 2016-03-22 13:52:38 -04:00
Zetok Zalbavar
858c4b47fe
chore(osx): update building script to use Qt 5.6.0 2016-03-21 15:56:56 +00:00
Zetok Zalbavar
e5e4d561c9
fix(osx-script): remove unnecessary usage of sudo
Neither toxcore or filter_audio require `sudo` to be installed under
`libs/`.
2016-02-28 03:11:23 +00:00
Zetok Zalbavar
ef5b9b8c1e
Merge pull request #2962 from RowenStipe:patch_OSX-Script
Condensed a little bit and fixed function name
2016-02-20 11:24:56 +00:00
RowenStipe
ef608e1361 Condensed a little bit and fixed function name 2016-02-18 14:28:46 -05:00
RowenStipe
6e1b7b3464 Fix travis trying to pull qTox 2016-01-31 12:16:19 -05:00
RowenStipe
6d9551b1fd Updated script to work on user machines and not just travis. 2016-01-31 11:25:38 -05:00
Zetok Zalbavar
3723f4b465
osx build script: fix building on travis
copy libs/headers required by qTox into `libs/`
2016-01-27 03:08:58 +00:00
Zetok Zalbavar
0abeaa4b62
osx build script: install vpx and opus 2016-01-26 18:36:37 +00:00
Zetok Zalbavar
529349d8d3
osx build script: install toxcore into libs/ 2016-01-26 17:09:44 +00:00
RowenStipe
3a452a700f
General clean up 2016-01-26 16:22:06 +00:00
Zetok Zalbavar
5a02091441
Fix osx travis - use bootstrap-osx.sh 2016-01-26 16:21:10 +00:00
RowenStipe
ab769d1175
Updated libsodium check 2016-01-26 13:50:36 +00:00
Zetok Zalbavar
75607bcecc
Add travis (again)
Beside making it work again, there are some improvements:

Linux side:

* use minimal supported Qt version, currently it's 5.3
* use minimal supported GCC version, currently 4.8
* use newer ffmpeg version to compile against - 2.8.5
* compile qTox 2 times, first run without support for optional dependencies
* use ubuntu 14.04 for building (less deps needs to be compiled/added from PPAs)

OSX:
* add osx to build targets
2016-01-26 13:33:39 +00:00
RowenStipe
cc4dd1ab0f fixed small issue with functions 2016-01-26 07:28:07 -05:00
RowenStipe
f6d7033b51 Added copyright header 2016-01-26 06:55:28 -05:00
RowenStipe
36ecde07da Added script to set up OS X clients to build qTox 2016-01-26 06:52:15 -05:00
Rowen Stipe
e05e736d33 Performed auto-indentation
Ran an auto indentation script included in one of my text editors
(TextMate:greenheart:)
2016-01-19 04:36:41 -05:00
Rowen Stipe
f7c262fb07 Touchups
This commit has several touch ups that only effect the OS X clients.

`info.plist` and `qt.pro` are now configured to create an automatic
short version to help distinguish between clients clearly and include a
referenced file not put into the build when compiled.
`./img/icon/qtox_profile.icns’

`info.plist` also had it’s bundle version to be  updated to the 1.2.2
tag and supported languages added and fixed referenced file.

The default save location has also been moved to comply with the Tox
Client Standard. (Previous location was ~/Library/Prefrences/tox )

A basic bash profile mover has also been included to show I did think
of that.
2016-01-18 14:36:35 -05:00
Zetok Zalbavar
2acfeaf7c4
Change references to tox.im to tox.chat 2015-09-19 08:55:28 +01:00
ovalseven8
18c1fecec3 Remove link to libtoxcore.so 2015-09-12 21:53:12 +02:00
Sean Qureshi
e30b74a984
Switch to subtree 2014-12-16 02:51:31 -08:00
Sean Qureshi
1e2e482c68
Merge commit '8934a11dbffce6b0611d97d5748668a5cdb8ba8a' as 'osx/updater' 2014-12-16 02:51:14 -08:00
Sean
4a00125f7c Refactor OS X updater
Went and rewrote half of it in an actually sane manner, recursive functions > nested loops.
2014-12-11 21:29:09 -08:00
Sean
6797ebf0dc Gotta automatically launch qTox too 2014-11-19 23:11:12 -08:00
Sean
d6a6e18c36 Also not needed 2014-11-19 23:02:59 -08:00
Sean
70c34124cf Not needed 2014-11-19 23:02:34 -08:00
Sean
5d53d0eec2 Add OS X updater
Lovely tool I wrote to do an admin permissions prompt on OS X for every file in the update folder and install it, kills qtox and relaunches it automatically tool.

Go master race
2014-11-19 23:02:02 -08:00
Sean
04fd006d2f Create preinstall 2014-11-17 01:50:04 -08:00
Sean
5bd6cc7445 Create postinstall 2014-11-17 01:48:24 -08:00
Sean
e78e388676 Update makedist.sh 2014-11-17 01:45:55 -08:00
Sean Qureshi
ee2b3d188d Proper folder icon for OS X 2014-11-14 20:07:05 -08:00
Sean Qureshi
6565ebc0e4 Local install only 2014-11-14 17:06:28 -08:00
Sean Qureshi
96e7acaeaa port over makedist 2014-11-14 17:05:33 -08:00
Sean Qureshi
6aceab2746 Move to its own folder, fix mimetype 2014-11-14 13:59:46 -08:00