blue/squawk
blue/squawk
2
3
Fork 8
Code Issues 23 Pull Requests 3 Actions Releases 10 Wiki Activity

got rid of organization name, made building with system qxmpp by default

Browse Source
This commit is contained in:
Blue 2019-10-10 14:45:21 +03:00
parent e2db64157e
commit 323a549eca
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -39,15 +39,15 @@ qt5_add_resources(RCC resources/resources.qrc)
add_executable(squawk ${squawk_SRC} ${RCC}) add_executable(squawk ${squawk_SRC} ${RCC})
target_link_libraries(squawk Qt5::Widgets) target_link_libraries(squawk Qt5::Widgets)
add_subdirectory(ui) option(SYSTEM_QXMPP "Use system qxmpp lib" ON)
add_subdirectory(core)
option(SYSTEM_QXMPP "Use system qxmpp lib" OFF)
if(NOT SYSTEM_QXMPP) if(NOT SYSTEM_QXMPP)
add_subdirectory(external/qxmpp) add_subdirectory(external/qxmpp)
endif() endif()
add_subdirectory(ui)
add_subdirectory(core)
target_link_libraries(squawk squawkUI) target_link_libraries(squawk squawkUI)
target_link_libraries(squawk squawkCORE) target_link_libraries(squawk squawkCORE)
target_link_libraries(squawk uuid) target_link_libraries(squawk uuid)
@ -56,7 +56,7 @@ add_dependencies(${CMAKE_PROJECT_NAME} translations)
# Install the executable # Install the executable
install(TARGETS squawk DESTINATION ${CMAKE_INSTALL_BINDIR}) install(TARGETS squawk DESTINATION ${CMAKE_INSTALL_BINDIR})
install(FILES ${QM_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/Macaw/Squawk/l10n) install(FILES ${QM_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/squawk/l10n)
install(FILES squawk.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps) install(FILES squawk.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps)
install(FILES squawk48.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/48x48/apps RENAME squawk.png) install(FILES squawk48.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/48x48/apps RENAME squawk.png)
install(FILES squawk64.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/64x64/apps RENAME squawk.png) install(FILES squawk64.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/64x64/apps RENAME squawk.png)

2
external/qxmpp vendored

@ -1 +1 @@
Subproject commit e6eb0b78d0cb17fccd5ddb60966ba2a0a2d2b593 Subproject commit b18a57daa33f0fefa5f4c63aa7f448b48d302e0d

8
main.cpp
View File

@ -36,10 +36,9 @@ int main(int argc, char *argv[])
QApplication app(argc, argv); QApplication app(argc, argv);
SignalCatcher sc(&app); SignalCatcher sc(&app);
QCoreApplication::setOrganizationName("Macaw"); QApplication::setApplicationName("squawk");
QCoreApplication::setOrganizationDomain("macaw.me"); QApplication::setApplicationDisplayName("Squawk");
QCoreApplication::setApplicationName("Squawk"); QApplication::setApplicationVersion("0.0.5");
QCoreApplication::setApplicationVersion("0.0.5");
QTranslator qtTranslator; QTranslator qtTranslator;
qtTranslator.load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath)); qtTranslator.load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
@ -49,6 +48,7 @@ int main(int argc, char *argv[])
QStringList shares = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation); QStringList shares = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation);
bool found = false; bool found = false;
for (QString share : shares) { for (QString share : shares) {
qDebug() << share;
found = myappTranslator.load(QLocale(), QLatin1String("squawk"), ".", share + "/l10n"); found = myappTranslator.load(QLocale(), QLatin1String("squawk"), ".", share + "/l10n");
if (found) { if (found) {
break; break;

14
packaging/Archlinux/PKGBUILD
View File

@ -5,15 +5,15 @@ pkgrel=1
pkgdesc="An XMPP desktop messenger, written on qt" pkgdesc="An XMPP desktop messenger, written on qt"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url="https://git.macaw.me/blue/squawk" url="https://git.macaw.me/blue/squawk"
license=('GPLv3') license=('GPL3')
depends=('qt5-base' 'qt5-svg' 'lmdb' 'qxmpp>=1.0.0' 'libutil-linux') depends=('hicolor-icon-theme' 'desktop-file-utils' 'lmdb' 'qxmpp>=1.0.0')
makedepends=('cmake>=3.3' 'imagemagick') makedepends=('cmake>=3.3' 'imagemagick' 'qt5-tools')
source=("https://git.macaw.me/blue/squawk/archive/master.tar.gz") source=("$pkgname-$pkgver.tar.gz")
md5sums=('SKIP') sha256sums=('12bfc517574387257a82143d8970ec0d8d434ccd32f7ac400355ed5fa18192ab')
build() { build() {
cd "$srcdir/squawk" cd "$srcdir/squawk"
cmake . -D SYSTEM_QXMPP:BOOL=True -D CMAKE_INSTALL_PREFIX=/usr -G Ninja cmake . -D CMAKE_INSTALL_PREFIX=/usr
cmake --build . cmake --build . -j $nproc
} }
package() { package() {
cd "$srcdir/squawk" cd "$srcdir/squawk"