Commit graph

132 commits

Author SHA1 Message Date
Ivailo Monev
a66eaa8870 remove unused 'connectTimeElapsed' member
upstream commits:
9f74b840f9

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-11 00:05:45 +02:00
Ivailo Monev
9202e9fa7a Merge branch 'master' of https://github.com/fluxer/katie 2016-01-11 00:02:05 +02:00
Ivailo Monev
31c620ea32 remove declaration of method nowhere defined
upstream commits:
e5724533e4

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-11 00:01:00 +02:00
Ivailo Monev
3cb92b865f Debian package file fixes
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-10 16:11:10 -05:00
Ivailo Monev
115d268e24 add (experimental) Debian package files
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-10 22:12:38 +02:00
Ivailo Monev
0e4b0509c8 fix copy-paste mistake in PulseAudio CMake module
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-10 21:06:33 +02:00
Ivailo Monev
959340d2ca adjust phonon component to recent PulseAudio CMake module changes
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-10 21:01:23 +02:00
Ivailo Monev
5a9e3319b2 do not require NAS on Arch Linux
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-10 14:56:30 +02:00
Ivailo Monev
4205a2ec19 rework KATIE_SETUP_SOURCES CMake macro
now that the assembler language is enabled in the build system the macro
turned out to be a bit bogus and it has to handle sources control too
because some CPU specifiec sources were, previously, added unconditionally
to targets leading to build failures (especially with assembly).

CPU tests now declare variables that are cached and can be changed by the
user to avoid touching parent scope from the test macros (previously
functions for that reason).

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-10 14:53:19 +02:00
Ivailo Monev
bc4cd78da8 set CPACK_PACKAGE_CONTACT for DEB generator
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-10 01:26:16 +02:00
Ivailo Monev
bd7b59f74f fix build without CUPS
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-10 00:47:47 +02:00
Ivailo Monev
1cf997dde5 enable assembler language for the build, not needed for now
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-10 00:30:42 +02:00
Ivailo Monev
ef8c202c4c improve GLib2 and D-Bus detection 2016-01-10 00:06:18 +02:00
Ivailo Monev
223d0b4567 rewrite some CMake modules, improve others
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-09 23:55:09 +02:00
Ivailo Monev
df31068ba9 remove QMetaObjectExtraData and put everything into QMetaObject
upstream commits:
67f58040ea

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-09 19:55:15 +02:00
Ivailo Monev
1ba689a9cd remove qt3 remains from uic tool
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-09 19:21:58 +02:00
Ivailo Monev
19c3d3439c remove support for legacy uic3 from designer component
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-09 18:59:46 +02:00
Ivailo Monev
cce9b525e6 do not build utilities by default
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-09 18:52:14 +02:00
Ivailo Monev
2a9abe2adb initialize dynamic meta object extradata
upstream commits:
979cb5a09e

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-09 17:16:52 +02:00
Ivailo Monev
2388dc8e17 bring QtDBus meta-object generator in sync with moc
upstream commits:
4ec2b37542

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-09 15:40:41 +02:00
Ivailo Monev
a396feff1d flag meta objects generated by QtDBus
upstream commits:
78cf553469

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-09 15:32:46 +02:00
Ivailo Monev
3a479bd2ac sync metaobject builder with moc
this includes a few upstream changes as well as a few of my own as I'm not
convinced that it should be merged into the core module yet as is done in
Qt5. the important thing is that debug builds will no longer cause assert.

upstream commits:
b184dd0a01
0cb7a66989

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-09 15:18:17 +02:00
Ivailo Monev
357110ccf6 avoid duplicating flags/types in qmetaobjectbuilder
upstream commits:
d30515104d

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-09 13:06:43 +02:00
Ivailo Monev
99c1ef0f89 rewrite translations script and update the trranslations 2016-01-09 12:55:18 +02:00
Ivailo Monev
4016b14a9b rewrite GLib2 CMake module, minor build system cleanups
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-09 00:40:52 +02:00
Ivailo Monev
7a38466cec replace operator with a directive in qmap
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-08 18:05:45 +02:00
Ivailo Monev
3c30575030 fix yet another instance of QmlJsParser
upstream commits:
b1da4fb044

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-06 21:28:03 +02:00
Ivailo Monev
fb59e641d4 normalize signatures for signals and slots via the utility
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-06 21:22:52 +02:00
Ivailo Monev
8cb361d459 fix copy and paste error
upstream commits:
4b7a0a0717

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-06 20:36:28 +02:00
Ivailo Monev
0e92dc53c2 make sure that the itemview's count property is reliable
upstream commits:
f09b12cea1

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-06 20:24:56 +02:00
Ivailo Monev
6b7bdd2736 stop using function deprecated in D-Bus 1.2
upstream commits:
f92e844b2b

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-05 17:28:02 +02:00
Ivailo Monev
c61720a0e2 remove code for non-DBus linked build
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-05 17:23:22 +02:00
Ivailo Monev
0e5b3473cf sync PropertyFlags and MethodFlags
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-05 17:02:05 +02:00
Ivailo Monev
1f1beedfbb update translations
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-05 17:01:06 +02:00
Ivailo Monev
99440e1fab add task to be done
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-05 16:57:14 +02:00
Ivailo Monev
e971c2e024 update MuSQL CMake module documentation
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-05 16:56:29 +02:00
Ivailo Monev
5f30ffe788 simplify translations script
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2015-12-30 10:44:42 +02:00
Ivailo Monev
cdf942c03d fix regression in the MySQL CMake module
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2015-12-30 10:16:54 +02:00
Ivailo Monev
620e4ff6b8 rewrite some cmake modules
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2015-12-30 10:09:12 +02:00
Ivailo Monev
8f556d5eb7 update package files
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2015-12-30 10:06:08 +02:00
Ivailo Monev
948dcce516 remove reundant variable declaration from main mkspecs file
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2015-12-29 11:42:46 +02:00
Ivailo Monev
e79584a534 fix build failure of collectio generator since translations changes
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2015-12-29 11:36:51 +02:00
Ivailo Monev
c045e6060f update and merge translations, add script for the task too
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2015-12-29 11:30:14 +02:00
Ivailo Monev
ae509dc625 add nas as optional dependency to package recipe for entropy
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2015-12-29 10:40:58 +02:00
Ivailo Monev
ede0027a91 regernate lupdate parser and add script for doing so in the future
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2015-12-28 12:48:54 +02:00
Ivailo Monev
0ca078feeb regernate qml parser and add script for doing so in the future
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2015-12-28 12:23:10 +02:00
Ivailo Monev
b4eed76918 update package files
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2015-12-25 04:47:42 +02:00
Ivailo Monev
6076081016 make it easy for vendors to override misc installation paths
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-01 00:13:29 +02:00
Ivailo Monev
b5347a5613 handle installation without RPATH on UNIX properly
the custom ld.so.conf file ensures that the Katie libraries get
registered in the cache so that when installed in location other than
/usr/lib or other standard libraries path executables can operate.

Even the default libraries path (/usr/local/lib/katie) is
non-standard and requires the config, unless CMAKE_SKIP_INSTALL_RPATH
if set to ON but because RPATH is considered security issue it is
unlikely that binary distributors will turn it on when building Katie

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2015-12-30 22:45:32 +02:00
Ivailo Monev
36ee28ba99 minor cleanups
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2015-12-30 09:50:34 +02:00