* [gentoo-commits] repo/gentoo:master commit in: net-im/openmittsu/files/, net-im/openmittsu/
@ 2017-02-15 12:33 Ulrich Müller
0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2017-02-15 12:33 UTC (permalink / raw
To: gentoo-commits
commit: 1b3025bcd147286244c69b2c6d7b10cd2e98d869
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 12:28:00 2017 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 12:28:00 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b3025bc
net-im/openmittsu: Fix compile failure in format.h.
Bug: 609366
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../files/openmittsu-0.9.2_p78-fmt.patch | 49 ++++++++++++++++++++++
net-im/openmittsu/openmittsu-0.9.2_p78.ebuild | 1 +
2 files changed, 50 insertions(+)
diff --git a/net-im/openmittsu/files/openmittsu-0.9.2_p78-fmt.patch b/net-im/openmittsu/files/openmittsu-0.9.2_p78-fmt.patch
new file mode 100644
index 0000000000..19b55701e8
--- /dev/null
+++ b/net-im/openmittsu/files/openmittsu-0.9.2_p78-fmt.patch
@@ -0,0 +1,49 @@
+https://bugs.gentoo.org/609366
+Backported from https://github.com/fmtlib/fmt.git:
+
+commit abbefd71666055daac9e14e78262620f9e845850
+Author: Victor Zverovich <victor.zverovich@gmail.com>
+Date: Wed Oct 19 06:52:55 2016 -0700
+
+ CHAR_WIDTH -> CHAR_SIZE to avoid collision with ISO/IEC TS 18661-1:2014 macro
+
+--- openMittsu-0.9.2_p78-orig/3rdparty/spdlog/include/spdlog/details/format.h
++++ openMittsu-0.9.2_p78/3rdparty/spdlog/include/spdlog/details/format.h
+@@ -2163,29 +2163,29 @@
+ typedef typename BasicWriter<Char>::CharPtr CharPtr;
+ Char fill = internal::CharTraits<Char>::cast(spec_.fill());
+ CharPtr out = CharPtr();
+- const unsigned CHAR_WIDTH = 1;
+- if (spec_.width_ > CHAR_WIDTH)
++ const unsigned CHAR_SIZE = 1;
++ if (spec_.width_ > CHAR_SIZE)
+ {
+ out = writer_.grow_buffer(spec_.width_);
+ if (spec_.align_ == ALIGN_RIGHT)
+ {
+- std::uninitialized_fill_n(out, spec_.width_ - CHAR_WIDTH, fill);
+- out += spec_.width_ - CHAR_WIDTH;
++ std::uninitialized_fill_n(out, spec_.width_ - CHAR_SIZE, fill);
++ out += spec_.width_ - CHAR_SIZE;
+ }
+ else if (spec_.align_ == ALIGN_CENTER)
+ {
+ out = writer_.fill_padding(out, spec_.width_,
+- internal::check(CHAR_WIDTH), fill);
++ internal::check(CHAR_SIZE), fill);
+ }
+ else
+ {
+- std::uninitialized_fill_n(out + CHAR_WIDTH,
+- spec_.width_ - CHAR_WIDTH, fill);
++ std::uninitialized_fill_n(out + CHAR_SIZE,
++ spec_.width_ - CHAR_SIZE, fill);
+ }
+ }
+ else
+ {
+- out = writer_.grow_buffer(CHAR_WIDTH);
++ out = writer_.grow_buffer(CHAR_SIZE);
+ }
+ *out = internal::CharTraits<Char>::cast(value);
+ }
diff --git a/net-im/openmittsu/openmittsu-0.9.2_p78.ebuild b/net-im/openmittsu/openmittsu-0.9.2_p78.ebuild
index 8bbdab52d8..3cbd7a1482 100644
--- a/net-im/openmittsu/openmittsu-0.9.2_p78.ebuild
+++ b/net-im/openmittsu/openmittsu-0.9.2_p78.ebuild
@@ -38,6 +38,7 @@ src_prepare() {
sed -i "/git_describe_checkout/\
s/.*/set(OPENMITTSU_GIT_VERSION_STRING \"${PV/_p/-}-00000000\")/" \
CMakeLists.txt || die
+ eapply "${FILESDIR}"/${P}-fmt.patch
cmake-utils_src_prepare
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/openmittsu/files/, net-im/openmittsu/
@ 2017-11-30 22:53 Ulrich Müller
0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2017-11-30 22:53 UTC (permalink / raw
To: gentoo-commits
commit: f44c18ebd3eaa57664260f788881fb815397ebd3
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 30 22:52:31 2017 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 30 22:53:05 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f44c18eb
net-im/openmittsu: Version bump.
Package-Manager: Portage-2.3.16, Repoman-2.3.6
net-im/openmittsu/Manifest | 3 +-
.../openmittsu-0.9.9.48-disable-googletest.patch | 79 ++++++++++++++++++++++
net-im/openmittsu/openmittsu-0.9.9.48.ebuild | 53 +++++++++++++++
3 files changed, 134 insertions(+), 1 deletion(-)
diff --git a/net-im/openmittsu/Manifest b/net-im/openmittsu/Manifest
index 71482fa0281..524ec0f9cff 100644
--- a/net-im/openmittsu/Manifest
+++ b/net-im/openmittsu/Manifest
@@ -1 +1,2 @@
-DIST openmittsu-0.9.2.109.tar.xz 1314888 SHA256 cf012e36ce157023082c8efa04ce6d4521ac16044334647c860a07b2ff94ea35 SHA512 ad70ff7c3ceedcf1d6711468152199742533b8f42abbae5ce52f3e29882ae6aea566e8a39258a3d3676a91774e144a70d91967b31e4634f23d527f14325d0a5b WHIRLPOOL f0843eaa35507374a69977c0e023c060f47448d72ea77c3f640b2b5e1ddd87dff756c31c3827c043107af798b5abb58287b07dba8c841be57167d1e8787b1a24
+DIST openmittsu-0.9.2.109.tar.xz 1314888 BLAKE2B 2c3b2e3e333d2e4ee2cf591fdaffc1b9e7b3b99d45093295ae9246e65b414124ad7a3e04ae558a1bd54c8704b3cf0858cbc53e6f30870b96a491fd1a9f8f7272 SHA512 ad70ff7c3ceedcf1d6711468152199742533b8f42abbae5ce52f3e29882ae6aea566e8a39258a3d3676a91774e144a70d91967b31e4634f23d527f14325d0a5b
+DIST openmittsu-0.9.9.48.tar.xz 2026628 BLAKE2B eafd2bc537a22b140e01e14da363d3943e24b86754a090fd1ed2ac80f1030e1a2fb30ee8a5395c6c9a143d5922354ac67e3376a94c34f670f8cbcfddc27da112 SHA512 e24ec8e0792df13e781080fe42934035f74b82be62a8ce4913175a13ee3acbead069d169871405f4312927165a7049291d009c7f968b088bdbb3e294f9ef2443
diff --git a/net-im/openmittsu/files/openmittsu-0.9.9.48-disable-googletest.patch b/net-im/openmittsu/files/openmittsu-0.9.9.48-disable-googletest.patch
new file mode 100644
index 00000000000..ceb162d5e6b
--- /dev/null
+++ b/net-im/openmittsu/files/openmittsu-0.9.9.48-disable-googletest.patch
@@ -0,0 +1,79 @@
+Disable googletest for now, in order to avoid accessing the network
+at configure time.
+
+--- openmittsu-0.9.9.48-orig/CMakeLists.txt
++++ openmittsu-0.9.9.48/CMakeLists.txt
+@@ -212,28 +212,6 @@
+ # Add the binary dir include directory
+ include_directories("${PROJECT_BINARY_DIR}/include")
+
+-##########################################################
+-#
+-# Google Testing Framework
+-#
+-##########################################################
+-# Download and unpack googletest at configure time
+-configure_file("${PROJECT_SOURCE_DIR}/cmake/GoogleTest.cmake.in" googletest-download/CMakeLists.txt)
+-execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
+- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/googletest-download" )
+-execute_process(COMMAND "${CMAKE_COMMAND}" --build .
+- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/googletest-download" )
+-
+-# Prevent GoogleTest from overriding our compiler/linker options
+-# when building with Visual Studio
+-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+-
+-# Add googletest directly to our build. This adds
+-# the following targets: gtest, gtest_main, gmock
+-# and gmock_main
+-add_subdirectory("${CMAKE_BINARY_DIR}/googletest-src"
+- "${CMAKE_BINARY_DIR}/googletest-build" EXCLUDE_FROM_ALL)
+-
+
+ # Main Sources
+ file(GLOB OPENMITTSU_HEADERS ${PROJECT_SOURCE_DIR}/src/*.h)
+@@ -399,24 +377,17 @@
+
+ add_executable(openMittsuVersionInfo ${OPENMITTSU_BUILDTOOLS_VERSIONINFO_HEADERS} ${OPENMITTSU_BUILDTOOLS_VERSIONINFO_SOURCES_CPP} ${OPENMITTSU_HEADERS_GENERATED} ${OPENMITTSU_SOURCES_GENERATED})
+
+-add_executable(openMittsuTests ${OPENMITTSU_TEST_MAIN_FILE} ${OPENMITTSU_TEST_FILES}
+- ${OPENMITTSU_RESOURCESOURCES}
+-)
+-
+ if (MSVC)
+ set_target_properties(openMittsu PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS")
+ endif(MSVC)
+
+ # Add target link dependencies
+-target_link_libraries(openMittsuCore ${Libsodium_LIBRARIES} gtest)
++target_link_libraries(openMittsuCore ${Libsodium_LIBRARIES})
+ target_link_libraries(openMittsu ${LIBQRENCODE_LIBRARY})
+
+-add_dependencies(openMittsuTests gtest)
+-
+ # Use the required modules from Qt 5.
+ target_link_libraries(openMittsuCore Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia Qt5::Sql)
+ target_link_libraries(openMittsu openMittsuCore Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia Qt5::Sql)
+-target_link_libraries(openMittsuTests openMittsuCore Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia Qt5::Sql)
+ target_link_libraries(openMittsuVersionInfo Qt5::Core)
+
+ # Link against libc++abi if requested.
+@@ -424,7 +395,6 @@
+ target_link_libraries(openMittsu "c++abi")
+ target_link_libraries(openMittsuCore "c++abi")
+ target_link_libraries(openMittsuVersionInfo "c++abi")
+- target_link_libraries(openMittsuTests "c++abi")
+ endif(OPENMITTSU_LINK_LIBCXXABI)
+
+ # Targets, CPACK...
+@@ -438,10 +408,6 @@
+ RUNTIME
+ DESTINATION bin
+ COMPONENT installComponent)
+-install(TARGETS openMittsuTests
+- RUNTIME
+- DESTINATION bin
+- COMPONENT installComponent)
+
+ if (MSVC)
+ set(OPENMITTSU_WINDEPLOYQT_EXE "${Qt5Core_DIR}/../../../bin/windeployqt.exe")
diff --git a/net-im/openmittsu/openmittsu-0.9.9.48.ebuild b/net-im/openmittsu/openmittsu-0.9.9.48.ebuild
new file mode 100644
index 00000000000..241dd833295
--- /dev/null
+++ b/net-im/openmittsu/openmittsu-0.9.9.48.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils desktop
+
+DESCRIPTION="An open source chat client for Threema-style end-to-end encrypted chat networks"
+HOMEPAGE="https://www.openmittsu.de/"
+# git-archive-all.sh snapshot of https://github.com/blizzard4591/openMittsu.git
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2+ BitstreamVera OFL-1.1 Apache-2.0 CC0-1.0 MIT BSD-2 Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-db/qt5-sqlcipher
+ >=dev-libs/libsodium-1.0.11:=
+ >=dev-qt/qtcore-5.7.1:5=
+ >=dev-qt/qtgui-5.7.1:5=
+ >=dev-qt/qtmultimedia-5.7.1:5=
+ >=dev-qt/qtnetwork-5.7.1:5=[ssl]
+ >=dev-qt/qtsql-5.7.1:5=[sqlite]
+ >=dev-qt/qtwidgets-5.7.1:5=
+ >=media-gfx/qrencode-3.4.4-r1:="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-disable-googletest.patch
+)
+
+DOCS=(
+ README.md
+ Example-client-configuration-file.ini
+ Example-contacts-file.txt
+)
+
+src_configure() {
+ local mycmakeargs=(
+ # set version manually, since autodetection works only with git
+ "-DOPENMITTSU_CUSTOM_VERSION_STRING=${PV%.*}-${PV##*.}-00000000"
+ "-DOPENMITTSU_DISABLE_VERSION_UPDATE_CHECK=ON"
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ local my_pn="openMittsu"
+ cmake-utils_src_install
+ newicon resources/icon.png ${my_pn}.png
+ make_desktop_entry ${my_pn} ${my_pn} ${my_pn}
+ rm "${ED}"/usr/bin/${my_pn}VersionInfo || die
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/openmittsu/files/, net-im/openmittsu/
@ 2019-03-18 18:12 Ulrich Müller
0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2019-03-18 18:12 UTC (permalink / raw
To: gentoo-commits
commit: 187ed6563f0116aea83531f9a29886ffd5d077e4
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 18 18:09:58 2019 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 18 18:11:38 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=187ed656
net-im/openmittsu: Version bump.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
net-im/openmittsu/Manifest | 1 +
.../files/openmittsu-0.9.13.32-fix-tests.patch | 11 ++++
net-im/openmittsu/openmittsu-0.9.13.32.ebuild | 62 ++++++++++++++++++++++
3 files changed, 74 insertions(+)
diff --git a/net-im/openmittsu/Manifest b/net-im/openmittsu/Manifest
index a7d34aafaa5..b2ec10b9ce7 100644
--- a/net-im/openmittsu/Manifest
+++ b/net-im/openmittsu/Manifest
@@ -1,2 +1,3 @@
DIST openmittsu-0.9.11.0.tar.xz 1408088 BLAKE2B 6c16ea2c35c0a4e02b2735d292516e22c238ca6d3f32f2869be8fec265f099761a5afef0303b2bd84c8f2e5383d7fff6dd18b2e57fc0d12da30a8d8a1637242b SHA512 534a589aa7bf4aa1be4e7d887ef1d4b025eeb1f82d8503cb048a7802ad4380c78224acae4a5f41a56be838a5a43af78f496bd0336034232208bc4de49a71b4d5
+DIST openmittsu-0.9.13.32.tar.xz 2078892 BLAKE2B 4960d3046dfe45568f56ddc4ad77677992ac4dc4d618a926a15b35431955c8f30aa20ad236cc3143bc1a24f64a4635fdc072a1c9f921238f1283b81b3d6befb7 SHA512 671ce8ed1a6f9aa8d15ee0d72ce78e2b5aef556243efacec4b0b434eaf5b0bd1b34aa6a0391e42ead9007011cca88e7ba2649f16456a2bf74d22355d1f308a0f
DIST openmittsu-0.9.9.48.tar.xz 2026628 BLAKE2B eafd2bc537a22b140e01e14da363d3943e24b86754a090fd1ed2ac80f1030e1a2fb30ee8a5395c6c9a143d5922354ac67e3376a94c34f670f8cbcfddc27da112 SHA512 e24ec8e0792df13e781080fe42934035f74b82be62a8ce4913175a13ee3acbead069d169871405f4312927165a7049291d009c7f968b088bdbb3e294f9ef2443
diff --git a/net-im/openmittsu/files/openmittsu-0.9.13.32-fix-tests.patch b/net-im/openmittsu/files/openmittsu-0.9.13.32-fix-tests.patch
new file mode 100644
index 00000000000..c89d24536ae
--- /dev/null
+++ b/net-im/openmittsu/files/openmittsu-0.9.13.32-fix-tests.patch
@@ -0,0 +1,11 @@
+--- openmittsu-0.9.13.32-orig/CMakeLists.txt
++++ openmittsu-0.9.13.32/CMakeLists.txt
+@@ -570,7 +570,7 @@
+ target_link_libraries(openMittsu openMittsuCore Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia Qt5::MultimediaWidgets Qt5::Sql)
+ target_link_libraries(openMittsuVersionInfo Qt5::Core)
+ if (OPENMITTSU_ENABLE_TESTS)
+- target_link_libraries(openMittsuTests openMittsuCore Qt5::Core Qt5::Network Qt5::Multimedia Qt5::MultimediaWidgets Qt5::Sql gmock gtest)
++ target_link_libraries(openMittsuTests openMittsuCore Qt5::Core Qt5::Network Qt5::Multimedia Qt5::MultimediaWidgets Qt5::Sql gmock gtest pthread)
+ endif (OPENMITTSU_ENABLE_TESTS)
+
+ # Link against libc++abi if requested.
diff --git a/net-im/openmittsu/openmittsu-0.9.13.32.ebuild b/net-im/openmittsu/openmittsu-0.9.13.32.ebuild
new file mode 100644
index 00000000000..5c132dd83ec
--- /dev/null
+++ b/net-im/openmittsu/openmittsu-0.9.13.32.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils desktop
+
+DESCRIPTION="An open source chat client for Threema-style end-to-end encrypted chat networks"
+HOMEPAGE="https://www.openmittsu.de/"
+# git-archive-all.sh snapshot of https://github.com/blizzard4591/openMittsu.git
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2+ BitstreamVera OFL-1.1 Apache-2.0 CC0-1.0 MIT BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="dev-db/qt5-sqlcipher
+ >=dev-libs/libsodium-1.0.11:=
+ >=dev-qt/qtcore-5.7.1:5=
+ >=dev-qt/qtgui-5.7.1:5=
+ >=dev-qt/qtmultimedia-5.7.1:5=
+ >=dev-qt/qtnetwork-5.7.1:5=[ssl]
+ >=dev-qt/qtsql-5.7.1:5=[sqlite]
+ >=dev-qt/qtwidgets-5.7.1:5=
+ >=media-gfx/qrencode-3.4.4-r1:="
+DEPEND="${RDEPEND}
+ test? ( >=dev-cpp/gtest-1.8.0 )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-tests.patch
+)
+
+DOCS=(
+ README.md
+ Example-client-configuration-file.ini
+ Example-contacts-file.txt
+)
+
+src_configure() {
+ local mycmakeargs=(
+ # set version manually, since autodetection works only with git
+ "-DOPENMITTSU_CUSTOM_VERSION_STRING=${PV%.*}-${PV##*.}-00000000"
+ "-DOPENMITTSU_DISABLE_VERSION_UPDATE_CHECK=ON"
+ "-DOPENMITTSU_ENABLE_TESTS=$(usex test)"
+ )
+ cmake-utils_src_configure
+}
+
+src_test() {
+ cd "${BUILD_DIR}" || die
+ ./openMittsuTests || die
+}
+
+src_install() {
+ local my_pn="openMittsu"
+ cmake-utils_src_install
+ newicon resources/icon.png ${my_pn}.png
+ make_desktop_entry ${my_pn} ${my_pn} ${my_pn}
+ rm "${ED}"/usr/bin/${my_pn}VersionInfo || die
+ rm -f "${ED}"/usr/bin/${my_pn}Tests || die
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/openmittsu/files/, net-im/openmittsu/
@ 2019-03-18 18:12 Ulrich Müller
0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2019-03-18 18:12 UTC (permalink / raw
To: gentoo-commits
commit: 4ecb44abefa303798a215efa56caf32e4674ff44
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 18 18:11:08 2019 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 18 18:11:39 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ecb44ab
net-im/openmittsu: Remove old.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
net-im/openmittsu/Manifest | 1 -
.../openmittsu-0.9.9.48-disable-googletest.patch | 79 ----------------------
net-im/openmittsu/openmittsu-0.9.9.48.ebuild | 53 ---------------
3 files changed, 133 deletions(-)
diff --git a/net-im/openmittsu/Manifest b/net-im/openmittsu/Manifest
index b2ec10b9ce7..ec17a980fa3 100644
--- a/net-im/openmittsu/Manifest
+++ b/net-im/openmittsu/Manifest
@@ -1,3 +1,2 @@
DIST openmittsu-0.9.11.0.tar.xz 1408088 BLAKE2B 6c16ea2c35c0a4e02b2735d292516e22c238ca6d3f32f2869be8fec265f099761a5afef0303b2bd84c8f2e5383d7fff6dd18b2e57fc0d12da30a8d8a1637242b SHA512 534a589aa7bf4aa1be4e7d887ef1d4b025eeb1f82d8503cb048a7802ad4380c78224acae4a5f41a56be838a5a43af78f496bd0336034232208bc4de49a71b4d5
DIST openmittsu-0.9.13.32.tar.xz 2078892 BLAKE2B 4960d3046dfe45568f56ddc4ad77677992ac4dc4d618a926a15b35431955c8f30aa20ad236cc3143bc1a24f64a4635fdc072a1c9f921238f1283b81b3d6befb7 SHA512 671ce8ed1a6f9aa8d15ee0d72ce78e2b5aef556243efacec4b0b434eaf5b0bd1b34aa6a0391e42ead9007011cca88e7ba2649f16456a2bf74d22355d1f308a0f
-DIST openmittsu-0.9.9.48.tar.xz 2026628 BLAKE2B eafd2bc537a22b140e01e14da363d3943e24b86754a090fd1ed2ac80f1030e1a2fb30ee8a5395c6c9a143d5922354ac67e3376a94c34f670f8cbcfddc27da112 SHA512 e24ec8e0792df13e781080fe42934035f74b82be62a8ce4913175a13ee3acbead069d169871405f4312927165a7049291d009c7f968b088bdbb3e294f9ef2443
diff --git a/net-im/openmittsu/files/openmittsu-0.9.9.48-disable-googletest.patch b/net-im/openmittsu/files/openmittsu-0.9.9.48-disable-googletest.patch
deleted file mode 100644
index ceb162d5e6b..00000000000
--- a/net-im/openmittsu/files/openmittsu-0.9.9.48-disable-googletest.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Disable googletest for now, in order to avoid accessing the network
-at configure time.
-
---- openmittsu-0.9.9.48-orig/CMakeLists.txt
-+++ openmittsu-0.9.9.48/CMakeLists.txt
-@@ -212,28 +212,6 @@
- # Add the binary dir include directory
- include_directories("${PROJECT_BINARY_DIR}/include")
-
--##########################################################
--#
--# Google Testing Framework
--#
--##########################################################
--# Download and unpack googletest at configure time
--configure_file("${PROJECT_SOURCE_DIR}/cmake/GoogleTest.cmake.in" googletest-download/CMakeLists.txt)
--execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
-- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/googletest-download" )
--execute_process(COMMAND "${CMAKE_COMMAND}" --build .
-- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/googletest-download" )
--
--# Prevent GoogleTest from overriding our compiler/linker options
--# when building with Visual Studio
--set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
--
--# Add googletest directly to our build. This adds
--# the following targets: gtest, gtest_main, gmock
--# and gmock_main
--add_subdirectory("${CMAKE_BINARY_DIR}/googletest-src"
-- "${CMAKE_BINARY_DIR}/googletest-build" EXCLUDE_FROM_ALL)
--
-
- # Main Sources
- file(GLOB OPENMITTSU_HEADERS ${PROJECT_SOURCE_DIR}/src/*.h)
-@@ -399,24 +377,17 @@
-
- add_executable(openMittsuVersionInfo ${OPENMITTSU_BUILDTOOLS_VERSIONINFO_HEADERS} ${OPENMITTSU_BUILDTOOLS_VERSIONINFO_SOURCES_CPP} ${OPENMITTSU_HEADERS_GENERATED} ${OPENMITTSU_SOURCES_GENERATED})
-
--add_executable(openMittsuTests ${OPENMITTSU_TEST_MAIN_FILE} ${OPENMITTSU_TEST_FILES}
-- ${OPENMITTSU_RESOURCESOURCES}
--)
--
- if (MSVC)
- set_target_properties(openMittsu PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS")
- endif(MSVC)
-
- # Add target link dependencies
--target_link_libraries(openMittsuCore ${Libsodium_LIBRARIES} gtest)
-+target_link_libraries(openMittsuCore ${Libsodium_LIBRARIES})
- target_link_libraries(openMittsu ${LIBQRENCODE_LIBRARY})
-
--add_dependencies(openMittsuTests gtest)
--
- # Use the required modules from Qt 5.
- target_link_libraries(openMittsuCore Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia Qt5::Sql)
- target_link_libraries(openMittsu openMittsuCore Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia Qt5::Sql)
--target_link_libraries(openMittsuTests openMittsuCore Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia Qt5::Sql)
- target_link_libraries(openMittsuVersionInfo Qt5::Core)
-
- # Link against libc++abi if requested.
-@@ -424,7 +395,6 @@
- target_link_libraries(openMittsu "c++abi")
- target_link_libraries(openMittsuCore "c++abi")
- target_link_libraries(openMittsuVersionInfo "c++abi")
-- target_link_libraries(openMittsuTests "c++abi")
- endif(OPENMITTSU_LINK_LIBCXXABI)
-
- # Targets, CPACK...
-@@ -438,10 +408,6 @@
- RUNTIME
- DESTINATION bin
- COMPONENT installComponent)
--install(TARGETS openMittsuTests
-- RUNTIME
-- DESTINATION bin
-- COMPONENT installComponent)
-
- if (MSVC)
- set(OPENMITTSU_WINDEPLOYQT_EXE "${Qt5Core_DIR}/../../../bin/windeployqt.exe")
diff --git a/net-im/openmittsu/openmittsu-0.9.9.48.ebuild b/net-im/openmittsu/openmittsu-0.9.9.48.ebuild
deleted file mode 100644
index 241dd833295..00000000000
--- a/net-im/openmittsu/openmittsu-0.9.9.48.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop
-
-DESCRIPTION="An open source chat client for Threema-style end-to-end encrypted chat networks"
-HOMEPAGE="https://www.openmittsu.de/"
-# git-archive-all.sh snapshot of https://github.com/blizzard4591/openMittsu.git
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2+ BitstreamVera OFL-1.1 Apache-2.0 CC0-1.0 MIT BSD-2 Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-db/qt5-sqlcipher
- >=dev-libs/libsodium-1.0.11:=
- >=dev-qt/qtcore-5.7.1:5=
- >=dev-qt/qtgui-5.7.1:5=
- >=dev-qt/qtmultimedia-5.7.1:5=
- >=dev-qt/qtnetwork-5.7.1:5=[ssl]
- >=dev-qt/qtsql-5.7.1:5=[sqlite]
- >=dev-qt/qtwidgets-5.7.1:5=
- >=media-gfx/qrencode-3.4.4-r1:="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-disable-googletest.patch
-)
-
-DOCS=(
- README.md
- Example-client-configuration-file.ini
- Example-contacts-file.txt
-)
-
-src_configure() {
- local mycmakeargs=(
- # set version manually, since autodetection works only with git
- "-DOPENMITTSU_CUSTOM_VERSION_STRING=${PV%.*}-${PV##*.}-00000000"
- "-DOPENMITTSU_DISABLE_VERSION_UPDATE_CHECK=ON"
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- local my_pn="openMittsu"
- cmake-utils_src_install
- newicon resources/icon.png ${my_pn}.png
- make_desktop_entry ${my_pn} ${my_pn} ${my_pn}
- rm "${ED}"/usr/bin/${my_pn}VersionInfo || die
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/openmittsu/files/, net-im/openmittsu/
@ 2023-07-27 18:59 Ulrich Müller
0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2023-07-27 18:59 UTC (permalink / raw
To: gentoo-commits
commit: 854d872deedb4caad66493df0993d6124588b38f
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 27 18:58:06 2023 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 27 18:59:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=854d872d
net-im/openmittsu: drop 0.9.15.0
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
net-im/openmittsu/Manifest | 1 -
.../files/openmittsu-0.9.13.32-fix-tests.patch | 11 ----
net-im/openmittsu/openmittsu-0.9.15.0.ebuild | 63 ----------------------
3 files changed, 75 deletions(-)
diff --git a/net-im/openmittsu/Manifest b/net-im/openmittsu/Manifest
index 2937b3a1a154..f396862e2e46 100644
--- a/net-im/openmittsu/Manifest
+++ b/net-im/openmittsu/Manifest
@@ -1,2 +1 @@
DIST openmittsu-0.10.0.0.tar.xz 2345724 BLAKE2B 407fe07147b17e6ac6ec2381e77256d09824fce87f1d9d141d2940e566191e911b05fb3d6701d342be9bb667551903f4f8913cbb25f504100e92ab4a38339555 SHA512 d4334c8516efcd63a3e9dfcf9f9655922aa14b2574f39269cf7019a8c951144569138c2a0a75abb16e2746a33002f0c07ef6c86dbdb5405e11c315ec630eb0d0
-DIST openmittsu-0.9.15.0.tar.xz 2302908 BLAKE2B 2800004968a1965d0c91197402618ae4ebaeb7a7d977e79654f296d7d2ca1466d26b86d99810e0502e9eced27e5a664dbb4b0113ec344367fb7b85557ebc0381 SHA512 9e00828053506cf233a4cede49c501da903cc36d49379b891e4186cf10cacfbd596b4d2b7ac551e2e6340a878bfa1155f8696e179ed9dd1c2ecbff61430ed7f9
diff --git a/net-im/openmittsu/files/openmittsu-0.9.13.32-fix-tests.patch b/net-im/openmittsu/files/openmittsu-0.9.13.32-fix-tests.patch
deleted file mode 100644
index c89d24536ae9..000000000000
--- a/net-im/openmittsu/files/openmittsu-0.9.13.32-fix-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- openmittsu-0.9.13.32-orig/CMakeLists.txt
-+++ openmittsu-0.9.13.32/CMakeLists.txt
-@@ -570,7 +570,7 @@
- target_link_libraries(openMittsu openMittsuCore Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia Qt5::MultimediaWidgets Qt5::Sql)
- target_link_libraries(openMittsuVersionInfo Qt5::Core)
- if (OPENMITTSU_ENABLE_TESTS)
-- target_link_libraries(openMittsuTests openMittsuCore Qt5::Core Qt5::Network Qt5::Multimedia Qt5::MultimediaWidgets Qt5::Sql gmock gtest)
-+ target_link_libraries(openMittsuTests openMittsuCore Qt5::Core Qt5::Network Qt5::Multimedia Qt5::MultimediaWidgets Qt5::Sql gmock gtest pthread)
- endif (OPENMITTSU_ENABLE_TESTS)
-
- # Link against libc++abi if requested.
diff --git a/net-im/openmittsu/openmittsu-0.9.15.0.ebuild b/net-im/openmittsu/openmittsu-0.9.15.0.ebuild
deleted file mode 100644
index 945996c436ae..000000000000
--- a/net-im/openmittsu/openmittsu-0.9.15.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop
-
-DESCRIPTION="Open source chat client for Threema-style end-to-end encrypted chat networks"
-HOMEPAGE="https://www.openmittsu.de/"
-# git-archive-all.sh snapshot of https://github.com/blizzard4591/openMittsu.git
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2+ BitstreamVera OFL-1.1 Apache-2.0 CC0-1.0 MIT BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-db/qt5-sqlcipher
- >=dev-libs/libsodium-1.0.11:=
- >=dev-qt/qtcore-5.7.1:5=
- >=dev-qt/qtgui-5.7.1:5=
- >=dev-qt/qtmultimedia-5.7.1:5=[widgets]
- >=dev-qt/qtnetwork-5.7.1:5=[ssl]
- >=dev-qt/qtsql-5.7.1:5=[sqlite]
- >=dev-qt/qtwidgets-5.7.1:5=
- >=media-gfx/qrencode-3.4.4-r1:="
-DEPEND="${RDEPEND}
- test? ( >=dev-cpp/gtest-1.8.0 )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.9.13.32-fix-tests.patch
-)
-
-DOCS=(
- README.md
- Example-client-configuration-file.ini
- Example-contacts-file.txt
-)
-
-src_configure() {
- local mycmakeargs=(
- # set version manually, since autodetection works only with git
- "-DOPENMITTSU_CUSTOM_VERSION_STRING=${PV%.*}-${PV##*.}-00000000"
- "-DOPENMITTSU_DISABLE_VERSION_UPDATE_CHECK=ON"
- "-DOPENMITTSU_ENABLE_TESTS=$(usex test)"
- )
- cmake_src_configure
-}
-
-src_test() {
- cd "${BUILD_DIR}" || die
- ./openMittsuTests || die
-}
-
-src_install() {
- local my_pn="openMittsu"
- cmake_src_install
- newicon resources/icon.png ${my_pn}.png
- make_desktop_entry ${my_pn} ${my_pn} ${my_pn}
- rm "${ED}"/usr/bin/${my_pn}VersionInfo || die
- rm -f "${ED}"/usr/bin/${my_pn}Tests || die
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/openmittsu/files/, net-im/openmittsu/
@ 2025-01-06 19:12 Ulrich Müller
0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2025-01-06 19:12 UTC (permalink / raw
To: gentoo-commits
commit: a4ab3980c72340b201652071461b3afaf3c49dab
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 6 18:47:27 2025 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 6 19:12:43 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4ab3980
net-im/openmittsu: Replace root certificate
Closes: https://bugs.gentoo.org/947496
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
.../openmittsu/files/openmittsu-0.10.0.0-root-cert.pem | 16 ++++++++++++++++
...tsu-0.10.0.0.ebuild => openmittsu-0.10.0.0-r1.ebuild} | 12 +++++++++++-
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/net-im/openmittsu/files/openmittsu-0.10.0.0-root-cert.pem b/net-im/openmittsu/files/openmittsu-0.10.0.0-root-cert.pem
new file mode 100644
index 000000000000..b1cf1fd3a13b
--- /dev/null
+++ b/net-im/openmittsu/files/openmittsu-0.10.0.0-root-cert.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIICjzCCAhWgAwIBAgIQXIuZxVqUxdJxVt7NiYDMJjAKBggqhkjOPQQDAzCBiDEL
+MAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNl
+eSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMT
+JVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAwMjAx
+MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgT
+Ck5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVUaGUg
+VVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlm
+aWNhdGlvbiBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQarFRaqflo
+I+d61SRvU8Za2EurxtW20eZzca7dnNYMYf3boIkDuAUU7FfO7l0/4iGzzvfUinng
+o4N+LZfQYcTxmdwlkWOrfzCjtHDix6EznPO/LlxTsV+zfTJ/ijTjeXmjQjBAMB0G
+A1UdDgQWBBQ64QmG1M8ZwpZ2dEl23OA1xmNjmjAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjA2Z6EWCNzklwBBHU6+4WMB
+zzuqQhFkoJ2UOQIReVx7Hfpkue4WQrO/isIJxOzksU0CMQDpKmFHjFJKS04YcPbW
+RNZu9YO6bVi9JNlWSOrvxKJGgYhqOkbRqZtNyWHa0V1Xahg=
+-----END CERTIFICATE-----
diff --git a/net-im/openmittsu/openmittsu-0.10.0.0.ebuild b/net-im/openmittsu/openmittsu-0.10.0.0-r1.ebuild
similarity index 82%
rename from net-im/openmittsu/openmittsu-0.10.0.0.ebuild
rename to net-im/openmittsu/openmittsu-0.10.0.0-r1.ebuild
index dc31c3a2ca06..55d3ee7bb812 100644
--- a/net-im/openmittsu/openmittsu-0.10.0.0.ebuild
+++ b/net-im/openmittsu/openmittsu-0.10.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -39,6 +39,16 @@ DOCS=(
CMAKE_BUILD_TYPE="Gentoo"
+src_prepare() {
+ cmake_src_prepare
+
+ # Replace the root certificate
+ # https://crt.sh/?id=2841410 - USERTrust ECC Certification Authority
+ local cert=$(base64 -w 0 "${FILESDIR}"/${P}-root-cert.pem || die)
+ sed -i -e "/Certificate.*Literal/s/\".*\"/\"${cert}\"/" \
+ src/network/ServerConfiguration.cpp || die
+}
+
src_configure() {
local mycmakeargs=(
# set version manually, since autodetection works only with git
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-01-06 19:13 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-27 18:59 [gentoo-commits] repo/gentoo:master commit in: net-im/openmittsu/files/, net-im/openmittsu/ Ulrich Müller
-- strict thread matches above, loose matches on Subject: below --
2025-01-06 19:12 Ulrich Müller
2019-03-18 18:12 Ulrich Müller
2019-03-18 18:12 Ulrich Müller
2017-11-30 22:53 Ulrich Müller
2017-02-15 12:33 Ulrich Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox