* [gentoo-commits] dev/dev-zero:master commit in: app-office/toggldesktop/files/, app-office/toggldesktop/
@ 2016-06-14 11:56 Tiziano Müller
0 siblings, 0 replies; 2+ messages in thread
From: Tiziano Müller @ 2016-06-14 11:56 UTC (permalink / raw
To: gentoo-commits
commit: 199453aebd02d24f6cc2036fe5c9718abb47da31
Author: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 11:56:34 2016 +0000
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> 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/
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] dev/dev-zero:master commit in: app-office/toggldesktop/files/, app-office/toggldesktop/
@ 2016-07-20 12:23 Tiziano Müller
0 siblings, 0 replies; 2+ messages in thread
From: Tiziano Müller @ 2016-07-20 12:23 UTC (permalink / raw
To: gentoo-commits
commit: d3b538e759026998d87ac0212b103d7cc3edb255
Author: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 08:58:26 2016 +0000
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 08:58:26 2016 +0000
URL: https://gitweb.gentoo.org/dev/dev-zero.git/commit/?id=d3b538e7
app-office/toggldesktop: version bump
app-office/toggldesktop/Manifest | 2 +-
...sktop-7.3.321-unbundle.patch => toggldesktop-7.3.326-unbundle.patch} | 0
.../{toggldesktop-7.3.323.ebuild => toggldesktop-7.3.326.ebuild} | 0
3 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/toggldesktop/Manifest b/app-office/toggldesktop/Manifest
index 4ffebd1..5df8fb3 100644
--- a/app-office/toggldesktop/Manifest
+++ b/app-office/toggldesktop/Manifest
@@ -1 +1 @@
-DIST toggldesktop-7.3.323.tar.gz 30523209 SHA256 ce07170c857db43ef3868215e40961c6fc8228c6a70ec6d74e5a1a557de2f09a SHA512 e4fc5e90bcdbb0b78fa9d6fac48197925a6bbd20963cf626aecafe0432f1197cafce2af8e6133b5a2f7049474690ca20fc0b1505dc2fe7da88bc70cb236057b2 WHIRLPOOL 4f172c4e15991266c0e79fcd73390191a2b5d108c1e985dd4b81688705870487f9793967505a6dd7c5d937d613dfc6984229b614318d6afc3d30536d45aef7a5
+DIST toggldesktop-7.3.326.tar.gz 30524053 SHA256 3351a9099e1f11fbdc612b5619c43e4f7b150935832dc433372cfbead92efdb0 SHA512 637001f38224728f9ea4313a890eb99231d801809363ba46e25ac3b0254320d4c9f1a771dc7d9abf16d908cbaf7f7197f461855ab2d3adc3645102e471d545b3 WHIRLPOOL a8e3c156c0389fff5a372747ae33876b1d255aae9b6d68a98cb2525379dc5cb621394a05243cb4c44b1058783d95b54d7065702077599c8f51137a93eb1ffafb
diff --git a/app-office/toggldesktop/files/toggldesktop-7.3.321-unbundle.patch b/app-office/toggldesktop/files/toggldesktop-7.3.326-unbundle.patch
similarity index 100%
rename from app-office/toggldesktop/files/toggldesktop-7.3.321-unbundle.patch
rename to app-office/toggldesktop/files/toggldesktop-7.3.326-unbundle.patch
diff --git a/app-office/toggldesktop/toggldesktop-7.3.323.ebuild b/app-office/toggldesktop/toggldesktop-7.3.326.ebuild
similarity index 100%
rename from app-office/toggldesktop/toggldesktop-7.3.323.ebuild
rename to app-office/toggldesktop/toggldesktop-7.3.326.ebuild
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-07-20 12:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-20 12:23 [gentoo-commits] dev/dev-zero:master commit in: app-office/toggldesktop/files/, app-office/toggldesktop/ Tiziano Müller
-- strict thread matches above, loose matches on Subject: below --
2016-06-14 11:56 Tiziano Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox