diff options
author | Serge Pavlyuk | 2019-02-27 15:39:50 +0300 |
---|---|---|
committer | Serge Pavlyuk | 2019-02-27 15:41:55 +0300 |
commit | 529c924d4a5be4361fd561ec7466a31e0e778d28 (patch) | |
tree | f02390781fd3272cc32611b362453286add92750 | |
parent | 684321dc84799dbbefb7e63cf0bac428459c22e3 (diff) | |
download | aur-529c924d4a5be4361fd561ec7466a31e0e778d28.tar.gz |
7.4.347
-rw-r--r-- | .SRCINFO | 27 | ||||
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | PKGBUILD | 103 | ||||
-rw-r--r-- | jsoncpp.patch | 14 | ||||
-rw-r--r-- | production.patch | 13 |
5 files changed, 58 insertions, 100 deletions
@@ -1,28 +1,27 @@ pkgbase = toggldesktop pkgdesc = Toggl time tracking software - pkgver = 7.4.144 - pkgrel = 3 + pkgver = 7.4.347 + pkgrel = 1 url = https://github.com/toggl/toggldesktop arch = x86_64 license = BSD - makedepends = readline - makedepends = gendesk + makedepends = cmake depends = libxss - depends = gcc-libs depends = qt5-base - depends = qt5-declarative - depends = qt5-location - depends = qt5-sensors - depends = qt5-svg - depends = qt5-webchannel - depends = qt5-webkit + depends = qt5-webengine depends = qt5-x11extras + depends = openssl + depends = poco + depends = lua + depends = jsoncpp conflicts = toggldesktop-bin conflicts = toggl-bin - source = toggldesktop-7.4.144.tar.gz::https://github.com/toggl/toggldesktop/archive/v7.4.144.tar.gz + source = toggldesktop-7.4.347.tar.gz::https://github.com/toggl/toggldesktop/archive/v7.4.347.tar.gz source = production.patch - sha512sums = 08bf840dc84bf16689bebcd21f25de493d6d245b65229fb01ddad67c3c878dbdda9e66952ae86e24f5d52a30edd08576f8e1755702956223dfd6c29000365359 - sha512sums = 484c6e3ba73e2f2ccbe9737424bee68624bd8d46a06735937b3ca134aa34ad9e335b260f7d22bcd3e351ae9d8b989ef048e78cf7ed52bac363bb651a7d229428 + source = jsoncpp.patch + sha512sums = d6dbbef0039f9f4b0e5a560d716cb1dcfb9e4d7bb2b590b89269e3cc1625a0e58ab73bbc5a8df852e420f6422aa031b47df5b6a3bf12e01fb07d5a4aca92a09e + sha512sums = 90ed77b0c2b6708c256e5f8fd74d37275cd85ccb81b6eeffa96f6adb22441b853386d6b16a157522d77820a032daf044917d2fb885a15502d218e3e48458e75a + sha512sums = 1b340bf5df760c47b0a8c7ba46c783ed2821ef4336d350a346782e74f0308ec96d350a6fe7acee59441f24b42ee55904095beba1162ac49de6418a7cfd139e63 pkgname = toggldesktop diff --git a/.gitignore b/.gitignore index 325feebfe3f2..06c798ea3e94 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,6 @@ *.pkg.tar.xz *.tar.gz *.sig +.idea src/ pkg/ @@ -4,113 +4,56 @@ # Contributor: phi-mah pkgname=toggldesktop -pkgver=7.4.144 -pkgrel=3 +pkgver=7.4.347 +pkgrel=1 pkgdesc="Toggl time tracking software" arch=('x86_64') url="https://github.com/toggl/toggldesktop" license=('BSD') depends=('libxss' - 'gcc-libs' 'qt5-base' - 'qt5-declarative' - 'qt5-location' - 'qt5-sensors' - 'qt5-svg' - 'qt5-webchannel' - 'qt5-webkit' - 'qt5-x11extras') -makedepends=('readline' 'gendesk') + 'qt5-webengine' + 'qt5-x11extras' + 'openssl' + 'poco' + 'lua' + 'jsoncpp' + ) +makedepends=('cmake') source=("${pkgname}-${pkgver}.tar.gz::https://github.com/toggl/toggldesktop/archive/v${pkgver}.tar.gz" - "production.patch") + "production.patch" + 'jsoncpp.patch') -sha512sums=('08bf840dc84bf16689bebcd21f25de493d6d245b65229fb01ddad67c3c878dbdda9e66952ae86e24f5d52a30edd08576f8e1755702956223dfd6c29000365359' - '484c6e3ba73e2f2ccbe9737424bee68624bd8d46a06735937b3ca134aa34ad9e335b260f7d22bcd3e351ae9d8b989ef048e78cf7ed52bac363bb651a7d229428') +sha512sums=('d6dbbef0039f9f4b0e5a560d716cb1dcfb9e4d7bb2b590b89269e3cc1625a0e58ab73bbc5a8df852e420f6422aa031b47df5b6a3bf12e01fb07d5a4aca92a09e' + '90ed77b0c2b6708c256e5f8fd74d37275cd85ccb81b6eeffa96f6adb22441b853386d6b16a157522d77820a032daf044917d2fb885a15502d218e3e48458e75a' + '1b340bf5df760c47b0a8c7ba46c783ed2821ef4336d350a346782e74f0308ec96d350a6fe7acee59441f24b42ee55904095beba1162ac49de6418a7cfd139e63') conflicts=('toggldesktop-bin' 'toggl-bin') prepare() { - cd "${srcdir}" - - ( cd "${pkgname}-${pkgver}" # patch to build for production # https://github.com/toggl/toggldesktop/wiki/Building-Toggl-Desktop-from-source-for-usage-with-live-servers - msg2 "production patch" patch -p1 < ../production.patch - ) - - # make the run script - cat << EOF > ${pkgname} -#!/bin/bash -exec /opt/${pkgname}/TogglDesktop.sh "\$@" -EOF - - # generate a desktop file - gendesk -f -n --pkgname "${pkgname}" --pkgdesc "${pkgdesc}" --name "Toggl Desktop" + patch -p1 < ../jsoncpp.patch } build() { - cd "${srcdir}/${pkgname}-${pkgver}" - make -j1 deps - make -j1 + mkdir -p build + cd build + cmake ../${pkgname}-${pkgver} -DCMAKE_INSTALL_PREFIX=/usr + make } package() { - cd "${srcdir}" - install -Dm644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" - install -Dm755 ${pkgname} ${pkgdir}/usr/bin/${pkgname} + cd build + make DESTDIR="$pkgdir/" install - cd "${pkgname}-${pkgver}" + cd "../${pkgname}-${pkgver}" # license file in standard location install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - out="${pkgdir}/opt/${pkgname}" - - # Copy Toggl Desktop shared library - install -Dm644 src/lib/linux/TogglDesktopLibrary/build/release/libTogglDesktopLibrary.so.1 ${out}/lib/libTogglDesktopLibrary.so.1 - - # Copy Poco shared library - install -Dm644 src/lib/linux/TogglDesktopLibrary/build/release/libPocoCrypto.so.50 ${out}/lib/libPocoCrypto.so.50 - install -Dm644 src/lib/linux/TogglDesktopLibrary/build/release/libPocoData.so.50 ${out}/lib/libPocoData.so.50 - install -Dm644 src/lib/linux/TogglDesktopLibrary/build/release/libPocoDataSQLite.so.50 ${out}/lib/libPocoDataSQLite.so.50 - install -Dm644 src/lib/linux/TogglDesktopLibrary/build/release/libPocoFoundation.so.50 ${out}/lib/libPocoFoundation.so.50 - install -Dm644 src/lib/linux/TogglDesktopLibrary/build/release/libPocoJSON.so.50 ${out}/lib/libPocoJSON.so.50 - install -Dm644 src/lib/linux/TogglDesktopLibrary/build/release/libPocoNet.so.50 ${out}/lib/libPocoNet.so.50 - install -Dm644 src/lib/linux/TogglDesktopLibrary/build/release/libPocoNetSSL.so.50 ${out}/lib/libPocoNetSSL.so.50 - install -Dm644 src/lib/linux/TogglDesktopLibrary/build/release/libPocoUtil.so.50 ${out}/lib/libPocoUtil.so.50 - install -Dm644 src/lib/linux/TogglDesktopLibrary/build/release/libPocoXML.so.50 ${out}/lib/libPocoXML.so.50 - - # Copy openssl shared library - install -Dm644 src/lib/linux/TogglDesktopLibrary/build/release/libcrypto.so.1.1 ${out}/lib/libcrypto.so.1.1 - install -Dm644 src/lib/linux/TogglDesktopLibrary/build/release/libssl.so.1.1 ${out}/lib/libssl.so.1.1 - - # Copy README - install -Dm644 src/ui/linux/README ${out} - - # Copy Bugsnag library - install -Dm644 third_party/bugsnag-qt/build/release/libbugsnag-qt.so.1 ${out}/lib/libbugsnag-qt.so.1 - - # Copy executable - install -Dm755 src/ui/linux/TogglDesktop/build/release/TogglDesktop ${out} - - # Copy startup script - install -Dm755 src/ui/linux/TogglDesktop.sh ${out} - - # Copy icons - install -Dm644 src/ui/linux/TogglDesktop/icons/1024x1024/${pkgname}_gray.png ${out}/icons/1024x1024/${pkgname}_gray.png - for res in 1024x1024 128x128 16x16 24x24 256x256 32x32 48x48 64x64 96x96; do - install -Dm644 src/ui/linux/TogglDesktop/icons/${res}/${pkgname}.png ${out}/icons/${res}/${pkgname}.png - done - - # Copy certificate bundle - install -Dm644 src/ssl/cacert.pem ${out} - - # link icon for desktop file - install -dm755 "${pkgdir}/usr/share/pixmaps/" - ln -s "/opt/${pkgname}/icons/1024x1024/${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png" } # vim:set ts=2 sw=2 et: diff --git a/jsoncpp.patch b/jsoncpp.patch new file mode 100644 index 000000000000..ba3c96917f7d --- /dev/null +++ b/jsoncpp.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b52dbb3..f278060 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -36,7 +36,8 @@ if(NOT USE_BUNDLED_LIBRARIES) + include_directories(${LUA_INCLUDE_DIRS}) + + # Look for JSON +- find_package(jsoncpp CONFIG) ++ pkg_search_module(jsoncpp jsoncpp) ++ include_directories(${jsoncpp_INCLUDE_DIRS}) + + # Look for Qxt + pkg_search_module(QXT_CORE QxtCore-qt5) diff --git a/production.patch b/production.patch index 561787deb12c..90a7325d878b 100644 --- a/production.patch +++ b/production.patch @@ -1,5 +1,5 @@ diff --git a/src/context.cc b/src/context.cc -index cecc136b0..df6f43288 100644 +index 7c9f0fb..8d839ab 100644 --- a/src/context.cc +++ b/src/context.cc @@ -76,7 +76,7 @@ Context::Context(const std::string app_name, const std::string app_version) @@ -8,20 +8,21 @@ index cecc136b0..df6f43288 100644 , sync_interval_seconds_(0) -, update_check_disabled_(false) +, update_check_disabled_(true) - , had_something_to_push_(false) + , trigger_sync_(false) + , trigger_push_(false) , quit_(false) - , ui_updater_(this, &Context::uiUpdaterActivity) -@@ -90,8 +90,6 @@ Context::Context(const std::string app_name, const std::string app_version) +@@ -92,9 +92,6 @@ Context::Context(const std::string app_name, const std::string app_version) Poco::Net::HTTPSStreamFactory::registerFactory(); } - urls::SetUseStagingAsBackend( - app_version.find("7.0.0") != std::string::npos); - +- Poco::ErrorHandler::set(&error_handler_); Poco::Net::initializeSSL(); + diff --git a/src/ui/linux/TogglDesktop/TogglDesktop.pro b/src/ui/linux/TogglDesktop/TogglDesktop.pro -index bf49aaa41..cc6b6a4ef 100644 +index 4bbf84b..cf44f8e 100644 --- a/src/ui/linux/TogglDesktop/TogglDesktop.pro +++ b/src/ui/linux/TogglDesktop/TogglDesktop.pro @@ -8,7 +8,7 @@ VERSION = 7.0.0 |