From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 518021382B5 for ; Tue, 14 Jun 2016 11:56:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D0336E08F5; Tue, 14 Jun 2016 11:56:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 669C6E08F5 for ; Tue, 14 Jun 2016 11:56:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E856F340751 for ; Tue, 14 Jun 2016 11:56:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4344316C5 for ; Tue, 14 Jun 2016 11:56:42 +0000 (UTC) From: "Tiziano Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tiziano Müller" Message-ID: <1465905394.199453aebd02d24f6cc2036fe5c9718abb47da31.dev-zero@gentoo> Subject: [gentoo-commits] dev/dev-zero:master commit in: app-office/toggldesktop/files/, app-office/toggldesktop/ X-VCS-Repository: dev/dev-zero X-VCS-Files: app-office/toggldesktop/Manifest app-office/toggldesktop/files/toggldesktop-7.3.321-unbundle.patch app-office/toggldesktop/toggldesktop-7.3.321.ebuild X-VCS-Directories: app-office/toggldesktop/ app-office/toggldesktop/files/ X-VCS-Committer: dev-zero X-VCS-Committer-Name: Tiziano Müller X-VCS-Revision: 199453aebd02d24f6cc2036fe5c9718abb47da31 X-VCS-Branch: master Date: Tue, 14 Jun 2016 11:56:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 42348335-1f15-49c7-9181-8e56f5ecaa15 X-Archives-Hash: 44b0ff9da7d2bb11daf4d268b6cb29cf commit: 199453aebd02d24f6cc2036fe5c9718abb47da31 Author: Tiziano Müller gentoo org> AuthorDate: Tue Jun 14 11:56:34 2016 +0000 Commit: Tiziano Müller gentoo org> CommitDate: Tue Jun 14 11:56:34 2016 +0000 URL: https://gitweb.gentoo.org/dev/dev-zero.git/commit/?id=199453ae app-office/toggldesktop: initial commit app-office/toggldesktop/Manifest | 1 + .../files/toggldesktop-7.3.321-unbundle.patch | 168 +++++++++++++++++++++ .../toggldesktop/toggldesktop-7.3.321.ebuild | 54 +++++++ 3 files changed, 223 insertions(+) diff --git a/app-office/toggldesktop/Manifest b/app-office/toggldesktop/Manifest new file mode 100644 index 0000000..82ac12b --- /dev/null +++ b/app-office/toggldesktop/Manifest @@ -0,0 +1 @@ +DIST toggldesktop-7.3.321.tar.gz 30506829 SHA256 7c22fcc51ba6a9f878fc870ebe6d164d733991169e744306ae0c46d04b0afe9d SHA512 d3e6a39b8ad852a4eeb0de2eb1f48105f4a0e1affb90ebe73d267d3b5c04f0c4e34e96f38c63c733cbc5e68e397d8b88b9fdeffcea70952c88d188628f45de1f WHIRLPOOL c947ead083d66c5233f1580f0e94bbe5f917959b62df59b9893d6e2e40cb48755093c37b612b6c57f33f59896ea4a74c180035a330fdb94adb66324edd11c280 diff --git a/app-office/toggldesktop/files/toggldesktop-7.3.321-unbundle.patch b/app-office/toggldesktop/files/toggldesktop-7.3.321-unbundle.patch new file mode 100644 index 0000000..55e3667 --- /dev/null +++ b/app-office/toggldesktop/files/toggldesktop-7.3.321-unbundle.patch @@ -0,0 +1,168 @@ +diff --git a/src/lib/linux/TogglDesktopLibrary/TogglDesktopLibrary.pro b/src/lib/linux/TogglDesktopLibrary/TogglDesktopLibrary.pro +index 7951b6e..13bf349 100644 +--- a/src/lib/linux/TogglDesktopLibrary/TogglDesktopLibrary.pro ++++ b/src/lib/linux/TogglDesktopLibrary/TogglDesktopLibrary.pro +@@ -35,7 +35,6 @@ SOURCES += \ + ../../../gui.cc \ + ../../../netconf.cc \ + ../../../https_client.cc \ +- $$PWD/../../../../third_party/jsoncpp/dist/jsoncpp.cpp \ + ../../../toggl_api.cc \ + ../../../toggl_api_private.cc \ + ../../../model_change.cc \ +@@ -52,41 +51,7 @@ SOURCES += \ + ../../../user.cc \ + ../../../websocket_client.cc \ + ../../../window_change_recorder.cc \ +- ../../../workspace.cc \ +- ../../../../third_party/lua/src/lapi.c \ +- ../../../../third_party/lua/src/lauxlib.c \ +- ../../../../third_party/lua/src/lbaselib.c \ +- ../../../../third_party/lua/src/lbitlib.c \ +- ../../../../third_party/lua/src/lcode.c \ +- ../../../../third_party/lua/src/lcorolib.c \ +- ../../../../third_party/lua/src/lctype.c \ +- ../../../../third_party/lua/src/ldblib.c \ +- ../../../../third_party/lua/src/ldebug.c \ +- ../../../../third_party/lua/src/ldo.c \ +- ../../../../third_party/lua/src/ldump.c \ +- ../../../../third_party/lua/src/lfunc.c \ +- ../../../../third_party/lua/src/lgc.c \ +- ../../../../third_party/lua/src/linit.c \ +- ../../../../third_party/lua/src/liolib.c \ +- ../../../../third_party/lua/src/llex.c \ +- ../../../../third_party/lua/src/lmathlib.c \ +- ../../../../third_party/lua/src/lmem.c \ +- ../../../../third_party/lua/src/loadlib.c \ +- ../../../../third_party/lua/src/lobject.c \ +- ../../../../third_party/lua/src/lopcodes.c \ +- ../../../../third_party/lua/src/loslib.c \ +- ../../../../third_party/lua/src/lparser.c \ +- ../../../../third_party/lua/src/lstate.c \ +- ../../../../third_party/lua/src/lstring.c \ +- ../../../../third_party/lua/src/lstrlib.c \ +- ../../../../third_party/lua/src/ltable.c \ +- ../../../../third_party/lua/src/ltablib.c \ +- ../../../../third_party/lua/src/ltm.c \ +- ../../../../third_party/lua/src/luac.c \ +- ../../../../third_party/lua/src/lundump.c \ +- ../../../../third_party/lua/src/lutf8lib.c \ +- ../../../../third_party/lua/src/lvm.c \ +- ../../../../third_party/lua/src/lzio.c ++ ../../../workspace.cc + + HEADERS += \ + ../../../base_model.h \ +@@ -125,84 +90,18 @@ HEADERS += \ + ../../../user.h \ + ../../../websocket_client.h \ + ../../../window_change_recorder.h \ +- ../../../workspace.h \ +- ../../../../third_party/lua/src/lapi.h \ +- ../../../../third_party/lua/src/lauxlib.h \ +- ../../../../third_party/lua/src/lcode.h \ +- ../../../../third_party/lua/src/lctype.h \ +- ../../../../third_party/lua/src/ldebug.h \ +- ../../../../third_party/lua/src/ldo.h \ +- ../../../../third_party/lua/src/lfunc.h \ +- ../../../../third_party/lua/src/lgc.h \ +- ../../../../third_party/lua/src/llex.h \ +- ../../../../third_party/lua/src/llimits.h \ +- ../../../../third_party/lua/src/lmem.h \ +- ../../../../third_party/lua/src/lobject.h \ +- ../../../../third_party/lua/src/lopcodes.h \ +- ../../../../third_party/lua/src/lparser.h \ +- ../../../../third_party/lua/src/lprefix.h \ +- ../../../../third_party/lua/src/lstate.h \ +- ../../../../third_party/lua/src/lstring.h \ +- ../../../../third_party/lua/src/ltable.h \ +- ../../../../third_party/lua/src/ltm.h \ +- ../../../../third_party/lua/src/lua.hpp \ +- ../../../../third_party/lua/src/luaconf.h \ +- ../../../../third_party/lua/src/lualib.h \ +- ../../../../third_party/lua/src/lundump.h \ +- ../../../../third_party/lua/src/lvm.h \ +- ../../../../third_party/lua/src/lzio.h \ +- ../../../../third_party/lua/src/lua.h ++ ../../../workspace.h + +-pocolib = $$PWD/../../../../third_party/poco/lib/Linux/$$system(uname -m) +-openssldir = $$PWD/../../../../third_party/openssl +- +-LIBS += -L$$OUT_PWD/ +-LIBS += -L$$pocolib -lPocoDataSQLite -lPocoData -lPocoNet -lPocoNetSSL -lPocoCrypto -lPocoUtil -lPocoXML -lPocoFoundation +-LIBS += -L$$openssldir -lssl -lcrypto ++LIBS += -lPocoDataSQLite -lPocoData -lPocoNet -lPocoNetSSL -lPocoCrypto -lPocoUtil -lPocoXML -lPocoFoundation ++LIBS += -lssl -lcrypto + LIBS += -lX11 ++LIBS += -ljsoncpp ++LIBS += -llua5.2 + +-INCLUDEPATH += $$PWD/../../../../third_party/jsoncpp/dist +-DEPENDPATH += $$PWD/../../../../third_party/jsoncpp/dist +- +-INCLUDEPATH += $$PWD/../../../../third_party/lua/src +-DEPENDPATH += $$PWD/../../../../third_party/lua/src +- +-INCLUDEPATH += $$PWD/../../../../third_party/poco/Foundation/include +-DEPENDPATH += $$PWD/../../../../third_party/poco/Foundation/include +- +-INCLUDEPATH += $$PWD/../../../../third_party/poco/Util/include +-DEPENDPATH += $$PWD/../../../../third_party/poco/Util/include +- +-INCLUDEPATH += $$PWD/../../../../third_party/poco/Data/include +-DEPENDPATH += $$PWD/../../../../third_party/poco/Data/include +- +-INCLUDEPATH += $$PWD/../../../../third_party/poco/Data/SQLite/include +-DEPENDPATH += $$PWD/../../../../third_party/poco/Data/SQLite/include +- +-INCLUDEPATH += $$PWD/../../../../third_party/openssl/include +-DEPENDPATH += $$PWD/../../../../third_party/openssl/include +- +-INCLUDEPATH += $$PWD/../../../../third_party/poco/Crypto/include +-DEPENDPATH += $$PWD/../../../../third_party/poco/Crypto/include +- +-INCLUDEPATH += $$PWD/../../../../third_party/poco/Net/include +-DEPENDPATH += $$PWD/../../../../third_party/poco/Net/include +- +-INCLUDEPATH += $$PWD/../../../../third_party/poco/NetSSL_OpenSSL/include +-DEPENDPATH += $$PWD/../../../../third_party/poco/NetSSL_OpenSSL/include +- +-INCLUDEPATH += $$PWD/../../../../third_party/poco/Data/SQLite/src +-DEPENDPATH += $$PWD/../../../../third_party/poco/Data/SQLite/src ++INCLUDEPATH += /usr/include/jsoncpp ++INCLUDEPATH += /usr/include/lua5.2 + + #QMAKE_CXXFLAGS += -fsanitize=thread -fPIE + #QMAKE_LFLAGS += -pie -fsanitize=thread + + QMAKE_CXXFLAGS += -std=c++11 +- +-unix:!mac{ +- QMAKE_LFLAGS += -Wl,--rpath=\\\$\$\ORIGIN +- QMAKE_LFLAGS += -Wl,--rpath=\\\$\$\ORIGIN/lib +- QMAKE_LFLAGS += -Wl,--rpath=\\\$\$\ORIGIN/lib +- QMAKE_RPATH= +-} +- +diff --git a/src/ui/linux/TogglDesktop/TogglDesktop.pro b/src/ui/linux/TogglDesktop/TogglDesktop.pro +index f86de87..0c69c44 100644 +--- a/src/ui/linux/TogglDesktop/TogglDesktop.pro ++++ b/src/ui/linux/TogglDesktop/TogglDesktop.pro +@@ -81,15 +81,11 @@ FORMS += \ + feedbackdialog.ui \ + idlenotificationdialog.ui + +-QMAKE_RPATHDIR += $$PWD/../../../lib/linux/TogglDesktopLibrary/build/release +-QMAKE_RPATHDIR += $$PWD/../../../../third_party/bugsnag-qt/build/release +- + LIBS += -L$$PWD/../../../lib/linux/TogglDesktopLibrary/build/release -lTogglDesktopLibrary +-LIBS += -L$$PWD/../../../../third_party/bugsnag-qt/build/release -lbugsnag-qt ++LIBS += -lbugsnag-qt + LIBS += -lX11 -lXss + + INCLUDEPATH += $$PWD/../../../ +-INCLUDEPATH += $$PWD/../../../../third_party/bugsnag-qt + INCLUDEPATH += $$PWD/../../../../third_party/qt-oauth-lib + + QMAKE_RPATHDIR += . diff --git a/app-office/toggldesktop/toggldesktop-7.3.321.ebuild b/app-office/toggldesktop/toggldesktop-7.3.321.ebuild new file mode 100644 index 0000000..1caec43 --- /dev/null +++ b/app-office/toggldesktop/toggldesktop-7.3.321.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit qmake-utils + +DESCRIPTION="Toggl Desktop app" +HOMEPAGE="https://github.com/toggl/toggldesktop https://www.toggl.com" +SRC_URI="https://github.com/toggl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="dev-libs/poco:=[crypto,data,json,net,sqlite,ssl,xml] + dev-cpp/bugsnag-qt + dev-qt/qtcore:5= + dev-qt/qtgui:5= + dev-lang/lua:5.2 + dev-libs/openssl:=" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-unbundle.patch" ) + +src_configure() { + # https://github.com/toggl/toggldesktop/wiki/Building-Toggl-Desktop-from-source-for-usage-with-live-servers + sed -i \ + -e 's|development|production|' \ + src/ui/linux/TogglDesktop/TogglDesktop.pro || die + sed -i \ + -e '/urls::SetUseStagingAsBackend/,+1d' \ + src/context.cc || die + + cd "${S}/src/lib/linux/TogglDesktopLibrary" + eqmake5 TogglDesktopLibrary.pro + + cd "${S}/src/ui/linux/TogglDesktop" + eqmake5 TogglDesktop.pro +} + +src_compile() { + emake -C src/lib/linux/TogglDesktopLibrary + emake -C src/ui/linux/TogglDesktop +} + +src_install() { + dolib src/lib/linux/TogglDesktopLibrary/build/release/libTogglDesktopLibrary.so.1 + dobin src/ui/linux/TogglDesktop/build/release/TogglDesktop + + dodoc -r AUTHORS README.md docs/ +}