Merge updates from master

This commit is contained in:
Repository mirror & CI
2020-06-26 08:35:08 +00:00
13 changed files with 152 additions and 3 deletions

View File

@@ -1 +1 @@
DIST spotipy-2.12.0.tar.gz 86295 BLAKE2B 48b8a5ea0c400a4caa479c68ddf7321bd95ffae4351468b4bf62ae2681b629214aef3de855f0a252beb0a93aece58d7fbff94a1d242fa02ce59cc1cd9c03c654 SHA512 6176d11c0d61b6070ec96888abd7f28cb16c4b6d9221c43cb877a40079ecdf71af8dcfbb2383f712673c4a10cb23f3e3a2c28eb764698d323bd4178270a1f2d6
DIST spotipy-2.13.0.tar.gz 89735 BLAKE2B 79e8f8d0c64cc100301362891fc63f232d6197dd68d30df239b0eb53ab5ec8b44ad347adc1c49c0aea95abf4d689cd3c1e291df4586dfb43a8a77cb15f503547 SHA512 992ea7a7681a5179dea0f94fd6e0b1e9ef456f25d6386bebba7b5d71e394d227f671be81bba88578e1bd81e185c6dee710168696be8f026ecbf76da90bd35515

View File

@@ -35,6 +35,9 @@ python_prepare_all() {
# this test requires a spotify client ID
rm tests/integration/test_non_user_endpoints.py || die
# need internet access
sed -i -e 's:test_spotify_client_credentials_get_access_token:_&:' \
tests/unit/test_oauth.py || die
distutils-r1_python_prepare_all
}

View File

@@ -1,2 +1,2 @@
DIST technic-launcher-4.560.jar 5721038 BLAKE2B 67d1818702ab6e2682131a56e8063750be668087901f8fde74e2a6ee3b073135f247252640a05232da68d9889c47c61e0deebe1c55814f713e8bcead62eb9e67 SHA512 2342db37cab2b812319943e954f8859647a90dbc799e29cdbcd5afc36b3fbc80b9c11de45a3e700f4048a8663e19f8f7e6890bcac7d9b5b58a967547c9abca4f
DIST technic-launcher-4.564.jar 5721624 BLAKE2B 7396bda603da74c2eef268fc0ed9a96bf18538329566fc9820791d7665b6b828e859df5d9b94f8a4e90cc2ae94e578d9259a953ef8f2e4574ca94fdbfbd11641 SHA512 2fbef17032a8f42f44157c37a37e0c3561d060e4f2f809223a551035a9ee436ca4ec1f8b03bec5e9c8a6b24812723c3aea0aed6dfc0de179e4901a2234c0e50c
DIST technic-launcher.ico 15086 BLAKE2B 4f5be0661bfbdca971cf022767618acef1e912b60c3f0574f383a8bd0281a6d66ca1b8b105412ec9579f3999514a471412fb16da66d937acfb4d3236b8f99663 SHA512 c109113a0e1be10bc013bfb79b742396a768fa683860a83d734e158b709e66b9e21067e1791ae5f7a854ccd21b1bf9adf6eeb27bc33d9da03f902dfe5d8be710

View File

@@ -4,7 +4,7 @@
EAPI=7
DESCRIPTION="Full color painting software for Linux for illustration drawing"
HOMEPAGE="http://azsky2.html.xdomain.jp/linux/azpainter.html https://github.com/Symbian9/azpainter"
HOMEPAGE="http://azsky2.html.xdomain.jp/soft/azpainter.html https://github.com/Symbian9/azpainter"
SRC_URI="https://github.com/Symbian9/azpainter/releases/download/v${PV}/${P}.tar.xz"
LICENSE="GPL-3"

View File

@@ -1 +1,2 @@
DIST kColorPicker-0.1.2.tar.gz 11534 BLAKE2B 53acd4e9b7dbd4796a2a3dd1c20f36ac12c40570b083c4197d583ee422f9ec484ff62aae38353c6b03e699f29a93bfec4e7065a85da9c7a82a72e81cb139603d SHA512 d2c135c84000a0b3aae66fa90807c5d62f93588eda4e7ea503a94a236ee197e1b852d1b9c0bd9cdf611afa1b42ffbfcfa1d4c4f13ff88b9c8765f6a3631cfbc8
DIST kColorPicker-0.1.4.tar.gz 11438 BLAKE2B 407211d5938d78aa8bfe193c037a3224ab51cacec7213e4526689ba38a800db2f5df4b0804cd3cc428765a22f426b50d870a355ce07d3f40ff231b8d4f44bf93 SHA512 135b8e0e189feb724f6a4f6a09b8e18922d294fbb3c80cd8522acec272ad0503eff5bf375ae7d58b1dd2f891dc0df187b2a3442726f8ff980583c475090b8673

View File

@@ -0,0 +1,23 @@
# Copyright 2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake
DESCRIPTION="Qt based Color Picker with popup menu"
HOMEPAGE="https://github.com/ksnip/kColorPicker"
MY_PN=kColorPicker
MY_P="${MY_PN}-${PV}"
SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
LICENSE="LGPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="dev-qt/qtwidgets:5[png]"
RDEPEND="${DEPEND}"
BDEPEND=""
S="${WORKDIR}/${MY_P}"

View File

@@ -1 +1,2 @@
DIST kImageAnnotator-0.2.1.tar.gz 107027 BLAKE2B 247ea31f3dfd90fd175b879c3fe06a50ee2ce8f3f2ce395efa1882fe8abc4be4e5a739782054682336cf327fe288d24b17971c89dfaf7f5202ba3f607165b0f2 SHA512 6f9d03b6d0d020c90fa050ac6be30b680db8dd3a2035db80856bb69c9e6ef0228b2d152c5f234caf6d3fe2d8433b17fbdfee728246f2a8c339936b6ba051a52b
DIST kImageAnnotator-0.3.0.tar.gz 128019 BLAKE2B 412748b432e41e6bdc01aa7270cbb32342016423beeca537c92096641e06f9a82a0ce7d1779fb25aec51e6e4c9451778fc339bb3c82edcdc56657ac810859447 SHA512 0d9e4ab5bdef1554e3b476e0d0e8f2ad08387abd94d9167c2b4987b0857294618b7a6626640381dade10c7eedaa5dec9e449715b46437c1d9a044142c15b7617

View File

@@ -0,0 +1,10 @@
--- a/src/annotations/undo/AddCommand.cpp
+++ b/src/annotations/undo/AddCommand.cpp
@@ -29,7 +29,6 @@ AddCommand::AddCommand(AbstractAnnotationItem *item, AnnotationArea *annotationA
AddCommand::~AddCommand()
{
- delete mItem;
}
void AddCommand::undo()

View File

@@ -0,0 +1,36 @@
From 94b08e1a3cef1d826ccae09a1287c2d5e327a293 Mon Sep 17 00:00:00 2001
From: Dave Flogeras <dflogeras2@gmail.com>
Date: Fri, 19 Jun 2020 09:23:29 -0300
Subject: [PATCH] Include GNUInstallDirs before using variables that rely on
it.
This was subtle because when building by hand, and running cmake
multiple times, it seems to cache the variable. However when building
for Gentoo in an ebuild, cmake makes one pass, and the
CMAKE_INSTALL_DATAROOTDIR variable is empty. This results in the
translation files going in the wrong place.
---
CMakeLists.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12ad227..5c14937 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,8 @@ set(CMAKE_AUTORCC ON)
option(BUILD_TESTS "Build Unit Tests" OFF)
option(BUILD_EXAMPLE "Build Example Application" ON)
+include(GNUInstallDirs)
+
if (WIN32)
set(KIMAGEANNOTATOR_LANG_INSTAL_DIR "translations")
elseif (APPLE)
@@ -27,7 +29,6 @@ if (UNIX)
find_package(X11 REQUIRED)
endif ()
-include(GNUInstallDirs)
include(FeatureSummary)
set(KCOLORPICKER_MIN_VERSION "0.1.4")

View File

@@ -0,0 +1,31 @@
# Copyright 2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake
DESCRIPTION="Tool for annotating images"
HOMEPAGE="https://github.com/ksnip/kImageAnnotator"
MY_PN=kImageAnnotator
MY_P="${MY_PN}-${PV}"
SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
LICENSE="LGPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="dev-qt/qtsvg:5
>=x11-libs/kcolorpicker-0.1.4"
RDEPEND="${DEPEND}"
BDEPEND=""
S="${WORKDIR}/${MY_P}"
src_prepare() {
default
eapply "${FILESDIR}"/fix-undo-command-delete-items-that-are-required.patch
eapply "${FILESDIR}"/include-gnuinstalldirs-before-use.patch
cmake_src_prepare
}

View File

@@ -1 +1,2 @@
DIST ksnip-1.6.2.tar.gz 221518 BLAKE2B a2e08b3dcfa448790a165a15e4e0c76771168d03756778b53ea79d7ebc3aad5efa50a18a6d4755a5c85ba3867e5d8e0c534af2cd0e7886db70ba407fb36185ff SHA512 2e40d12524a6a0d5bf321f7e5554a0a423e3fe7861118b6d6fc95e01e9558e63ce1519ed234ac514f3ade88d1d3261fb8f693e89d097059e1607f9bfd5227573
DIST ksnip-1.7.0.tar.gz 335727 BLAKE2B 2b7aab75917dfe5a5a2cf77ea96c78d35c6483705999e1a0be6de0ae00aa3c4a1ea5b6ea3923fc5624fe13cba4133e180367db224b094f4b2625d8b53951c2ec SHA512 833a8c07cdb71dd3437686b1eb350f45caa70614114145901dd05b3db9b62bc83702b258e5f414306d779e0febeba8605b586fc57f55907dc9bbb50da5a08703

View File

@@ -0,0 +1,43 @@
# Copyright 2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake desktop
DESCRIPTION="Ksnip is a Qt based cross-platform screenshot tool"
HOMEPAGE="https://github.com/ksnip/ksnip"
SRC_URI="https://github.com/ksnip/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="kde-frameworks/extra-cmake-modules:5"
RDEPEND="
dev-qt/qtdbus:5
dev-qt/qtnetwork:5
dev-qt/qtprintsupport:5
dev-qt/qtx11extras:5
dev-qt/qtxml:5
>=x11-libs/kimageannotator-0.3.0
x11-libs/libxcb"
BDEPEND=""
src_install() {
cmake_src_install
doicon -s scalable desktop/${PN}.svg
domenu desktop/${PN}.desktop
}
pkg_postinst() {
xdg_desktop_database_update
xdg_icon_cache_update
}
pkg_postrm() {
xdg_desktop_database_update
xdg_icon_cache_update
}