From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 02B1015807A for ; Mon, 7 Oct 2024 03:28:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 027EAE29A8; Mon, 7 Oct 2024 03:28:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F2749E29A8 for ; Mon, 7 Oct 2024 03:27:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4029D343182 for ; Mon, 7 Oct 2024 03:27:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A2059213D for ; Mon, 7 Oct 2024 03:27:57 +0000 (UTC) From: "Eli Schwartz" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Eli Schwartz" Message-ID: <1728271437.c15c11e6b83c6e140047c1647510370099be70f7.eschwartz@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitebrowser/, dev-db/sqlitebrowser/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/sqlitebrowser/Manifest dev-db/sqlitebrowser/files/sqlitebrowser-3.12.2-str-conflict-fix.patch dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild X-VCS-Directories: dev-db/sqlitebrowser/files/ dev-db/sqlitebrowser/ X-VCS-Committer: eschwartz X-VCS-Committer-Name: Eli Schwartz X-VCS-Revision: c15c11e6b83c6e140047c1647510370099be70f7 X-VCS-Branch: master Date: Mon, 7 Oct 2024 03:27:57 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 327df690-abf7-4faf-b1f8-2572f29edc53 X-Archives-Hash: a04b8710e211d40d8a4268cfb51d558e commit: c15c11e6b83c6e140047c1647510370099be70f7 Author: Mattéo Rossillol‑‑Laruelle protonmail com> AuthorDate: Wed Oct 2 09:02:52 2024 +0000 Commit: Eli Schwartz gentoo org> CommitDate: Mon Oct 7 03:23:57 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c15c11e6 dev-db/sqlitebrowser: drop 3.12.2-r2 Signed-off-by: Mattéo Rossillol‑‑Laruelle protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/38848 Signed-off-by: Eli Schwartz gentoo.org> dev-db/sqlitebrowser/Manifest | 1 - .../sqlitebrowser-3.12.2-str-conflict-fix.patch | 13 ---- .../sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild | 77 ---------------------- 3 files changed, 91 deletions(-) diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest index 11db8af4f79c..1cbffb5b668d 100644 --- a/dev-db/sqlitebrowser/Manifest +++ b/dev-db/sqlitebrowser/Manifest @@ -1,2 +1 @@ -DIST sqlitebrowser-3.12.2.tar.gz 3990817 BLAKE2B a0c1495814a814638428fa50e55d5afeb2d3f5c80c9aafbdea3cc444e8c681c48acd1f24126945a89d7284c3f0a23979f2b3541fae7c7a70803f7e7ad69be6f4 SHA512 a6afc0a4286f07adb7038f3a010c93e14204b477bde27b1599c9bfe3390422d3edfaa2a9381b1f13e63a7aaf90e931ee85358eb8b2c15b6ea55818d29c59395f DIST sqlitebrowser-3.13.0.tar.gz 4901507 BLAKE2B 4430944fb6f02a3e33aa6d3e5720faa8e43351314a0c21803fe8bed6d2241ca92830de7be33deb18294f0cad808c96d6c913bd9ddcd64d41a34db32349d44d88 SHA512 6261043cee7bc5c525b162e0b5d1ac38d380228ffd752e086fecb49c7f50b463a993a6128547d99addb0480ba71e4f6dd3a0c1e412a692ae86b0b183b7379610 diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.12.2-str-conflict-fix.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.12.2-str-conflict-fix.patch deleted file mode 100644 index 07284ca8ba0c..000000000000 --- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.12.2-str-conflict-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/version.h -+++ b/src/version.h -@@ -4,8 +4,8 @@ - #define MINOR_VERSION 12 - #define PATCH_VERSION 2 - --#define str(s) #s --#define xstr(s) str(s) -+#define stringize(s) #s -+#define xstr(s) stringize(s) - #define APP_VERSION xstr(MAJOR_VERSION) "." xstr(MINOR_VERSION) "." xstr(PATCH_VERSION) - - // If it is defined by the compiler, then it is a nightly build, and in the YYYYMMDD format. diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild deleted file mode 100644 index 0b6665b1dd80..000000000000 --- a/dev-db/sqlitebrowser/sqlitebrowser-3.12.2-r2.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic xdg - -DESCRIPTION="A light GUI editor for SQLite databases" -HOMEPAGE="https://sqlitebrowser.org/" - -if [[ "${PV}" = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" -else - SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 x86" -fi - -LICENSE="GPL-3+ MPL-2.0" -SLOT="0" -IUSE="sqlcipher test" -RESTRICT="!test? ( test )" - -DEPEND=" - app-editors/qhexedit2 - dev-db/sqlite:3 - dev-libs/qcustomplot - >=dev-qt/qtconcurrent-5.5:5 - >=dev-qt/qtcore-5.5:5 - >=dev-qt/qtgui-5.5:5 - >=dev-qt/qtnetwork-5.5:5[ssl] - >=dev-qt/qtprintsupport-5.5:5 - >=dev-qt/qtwidgets-5.5:5 - >=dev-qt/qtxml-5.5:5 - >=x11-libs/qscintilla-2.8.10:=[qt5(+)] - sqlcipher? ( dev-db/sqlcipher ) -" - -BDEPEND=" - >=dev-qt/linguist-tools-5.5:5 - test? ( >=dev-qt/qttest-5.5:5 ) -" - -RDEPEND=" - ${DEPEND} - >=dev-qt/qtsvg-5.5:5 -" - -PATCHES=( - "${FILESDIR}/${P}-str-conflict-fix.patch" -) - -src_prepare() { - cmake_src_prepare - - if ! use test; then - sed -i CMakeLists.txt \ - -e "/find_package/ s/ Test//" \ - -e "/set/ s/ Qt5::Test//" \ - || die "Cannot remove Qt Test from CMake dependencies" - fi -} - -src_configure() { - local mycmakeargs=( - -DENABLE_TESTING=$(usex test) - -DFORCE_INTERNAL_QCUSTOMPLOT=OFF - -DFORCE_INTERNAL_QHEXEDIT=OFF - -Dsqlcipher=$(usex sqlcipher) - ) - - # https://bugs.gentoo.org/855254 - append-flags -fno-strict-aliasing - filter-lto - - cmake_src_configure -}