From 14a6858a7d8bc085420a1430b3a3f67885019f27 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 29 Aug 2023 04:04:16 +0100 Subject: gentoo auto-resync : 29:08:2023 - 04:04:16 --- media-radio/Manifest.gz | Bin 5184 -> 5184 bytes media-radio/cqrlog/Manifest | 6 +-- media-radio/cqrlog/cqrlog-2.4.0.ebuild | 38 ----------------- media-radio/cqrlog/cqrlog-2.5.2.ebuild | 2 +- .../cqrlog/files/cqrlog-2.4.0-makefile.patch | 36 ---------------- .../cqrlog/files/cqrlog-2.5.2-makefile.patch | 46 +++++++++++++++++++++ 6 files changed, 49 insertions(+), 79 deletions(-) delete mode 100644 media-radio/cqrlog/cqrlog-2.4.0.ebuild delete mode 100644 media-radio/cqrlog/files/cqrlog-2.4.0-makefile.patch create mode 100644 media-radio/cqrlog/files/cqrlog-2.5.2-makefile.patch (limited to 'media-radio') diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz index 3caf705dc4b3..b912007cdf57 100644 Binary files a/media-radio/Manifest.gz and b/media-radio/Manifest.gz differ diff --git a/media-radio/cqrlog/Manifest b/media-radio/cqrlog/Manifest index 96594755157c..d60af13d3caf 100644 --- a/media-radio/cqrlog/Manifest +++ b/media-radio/cqrlog/Manifest @@ -1,6 +1,4 @@ -AUX cqrlog-2.4.0-makefile.patch 1651 BLAKE2B 9258aae8d919ce89df3108c7e421463d7e30090eaa2fdbdc9de3d5cee8c890ec58d553992342665287f5133db1ff04ff0dffb772578253934663ef5626673244 SHA512 75ae44d33a2eec6ff00b0845656ea015ca7c4af03de4ceb8c29864e649c6e8427c00e0bddd51bb07966970f7dfc0a590853cf7b752375ca024f01ff2a7586355 -DIST cqrlog-2.4.0.tar.gz 12361259 BLAKE2B 1779abd8983b66e966b73c157e322b489c3b4005cbc84952af1d708f7d9623efa7f6abc0515ab09f13765523fa373a2829a41da43b4b0f2edaea05e1b182b5a1 SHA512 aec7b43a0d4d1cd5b1af140db149058b4cff4893e6d8ed8d1ced729bedf27baa36b71d9fa7e5312ab94dd692953346d20f7f5a55a05ba91e4eccb17919d6d49a +AUX cqrlog-2.5.2-makefile.patch 2147 BLAKE2B 5bdb29c577da7f293d5962f6b7cd469b15ec26d442aae45520b52c146815db477c368a832934cd4b658f6fc46334850c764da1e853bfc38eacd4ed5065a5960d SHA512 a2c564d5ef939c7ad1ad6291cb230221e5fa83b051c951cf61f7d057c59c274648979b3d0cdce825d33ed3b096873f4fd3fe9f2583d13d501630209c6083c43b DIST cqrlog-2.5.2.tar.gz 14469864 BLAKE2B 3e978733d79e3563ed815296393a6fa0f681f79e7ee612a01183c25bf5ba431025dbc6a50a128a30f9be79f90a352cead904bfcde9b95669c14ba8c97a3ac1b8 SHA512 5546117f0dcec7529505d6f979be2c9eeebdcf499493971b19d4301296b52a0612d490b6e3f1f4fa759d9f3d2fc0b9b42fbf0e8de862b25ddc75819855dfb407 -EBUILD cqrlog-2.4.0.ebuild 747 BLAKE2B 6ade7847c575fa083c250c798e9f2ede1e45f525d746bce502823cb2fc78cb09af9636e8ecf1331e2f0543599ebf06afbe69fbd72a28e936d8b8a4d47e4490bc SHA512 67d0ec89deda7104ad825803cd8b1917d541a139e44d3009326abf19b9040329c64e9b7c09fa35e99b6900318f498cd5173cfd50677e3003f19c903f6f0fea1a -EBUILD cqrlog-2.5.2.ebuild 744 BLAKE2B f8f3c2afbade10220e8469d4f0d575a255a78a098ba9cbc5d08f1dde7322f306b7d5f05f5b9c410c9172def62e200dcaf44cd77c466cb06ad0d26db9ed9495ee SHA512 2dc6f900416c17688948c549d1d6a187a7726ca2f65c6396a5d6a6f13b305475db49a260d5e240aaca1d6f9a6fedd871e691ac5e192cc64e61496e3106fc34dd +EBUILD cqrlog-2.5.2.ebuild 744 BLAKE2B 0a235be9d8620a6f8a734546057f769f35fed9a862411219500b4ca5ce45f8e967aaa3a238565e77bf952d3945a64d0e88e5a6e0b3cfacd6ff5735cba0ed7ed5 SHA512 868571f34c4ef985ac5c9aa5808538fd6d262b4fe7aa9f4a8475acfde36a693ea69665d1c4684b9c3bfa346f1a46b1bb515c6121fea034461a63ea34840ea9c9 MISC metadata.xml 246 BLAKE2B 2adee89bec0a5c14403bb3c987964c83c2d67671b520d75c829e216b33d2bb67448d4af1a50f98ab96040ff8eb812735972fa0148a51c047b93bb106deb459fa SHA512 6750c978adc7c091932f664a114bc941757560e8c6776c29d66751f00f69243d52a5ee06bb8d687ef6141a2cf8bef6b48ce215e62955fbc4eef60f6974e120d5 diff --git a/media-radio/cqrlog/cqrlog-2.4.0.ebuild b/media-radio/cqrlog/cqrlog-2.4.0.ebuild deleted file mode 100644 index f1bd0065b1e1..000000000000 --- a/media-radio/cqrlog/cqrlog-2.4.0.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit optfeature - -DESCRIPTION="CQRLOG is an advanced ham radio logger based on MySQL database" -HOMEPAGE="https://www.cqrlog.com/ https://github.com/ok2cqr/cqrlog" -SRC_URI="https://github.com/ok2cqr/cqrlog/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND=" - >=dev-lang/lazarus-1.8.0 - >=dev-lang/fpc-3.0.2 -" -RDEPEND=" - ${DEPEND} - dev-libs/atk - dev-libs/glib - virtual/mysql[server] - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+ - x11-libs/libX11 - x11-libs/pango -" - -PATCHES=( - "${FILESDIR}/${P}-makefile.patch" -) - -pkg_postist() { - optfeature "monitoring radio settings" media-libs/hamlib -} diff --git a/media-radio/cqrlog/cqrlog-2.5.2.ebuild b/media-radio/cqrlog/cqrlog-2.5.2.ebuild index 4c5c33a315cc..9f9d82abbbdf 100644 --- a/media-radio/cqrlog/cqrlog-2.5.2.ebuild +++ b/media-radio/cqrlog/cqrlog-2.5.2.ebuild @@ -29,7 +29,7 @@ RDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-2.4.0-makefile.patch" + "${FILESDIR}/${PN}-2.5.2-makefile.patch" ) pkg_postist() { diff --git a/media-radio/cqrlog/files/cqrlog-2.4.0-makefile.patch b/media-radio/cqrlog/files/cqrlog-2.4.0-makefile.patch deleted file mode 100644 index 52169214b3ee..000000000000 --- a/media-radio/cqrlog/files/cqrlog-2.4.0-makefile.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/Makefile b/Makefile -index 0b1d1ef..1b98acf 100644 ---- a/Makefile -+++ b/Makefile -@@ -3,11 +3,10 @@ ST=strip - datadir = $(DESTDIR)/usr/share/cqrlog - bindir = $(DESTDIR)/usr/bin - sharedir = $(DESTDIR)/usr/share --tmpdir = /tmp -+tmpdir := $(shell mktemp -d) - - cqrlog: src/cqrlog.lpi -- $(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi -- $(ST) src/cqrlog -+ $(CC) -d --ws=gtk2 --max-process-count=1 --lazarusdir=/usr/share/lazarus --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi - gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz - - clean: -@@ -38,7 +37,7 @@ install: - install -d -v $(sharedir)/pixmaps/cqrlog - install -d -v $(sharedir)/icons/cqrlog - install -d -v $(sharedir)/applications -- install -d -v $(sharedir)/appdata -+ install -d -v $(sharedir)/metainfo - install -d -v $(sharedir)/man/man1 - install -v -m 0755 src/cqrlog $(bindir) - install -v -m 0755 tools/cqrlog-apparmor-fix $(datadir)/cqrlog-apparmor-fix -@@ -61,7 +60,7 @@ install: - # install -v -m 0644 images/icon/256x256/* $(datadir)/images/icon/256x256/ - # install -v -m 0644 images/* $(datadir)/images/ - install -v -m 0644 tools/cqrlog.desktop $(sharedir)/applications/cqrlog.desktop -- install -v -m 0644 tools/cqrlog.appdata.xml $(sharedir)/appdata/cqrlog.appdata.xml -+ install -v -m 0644 tools/cqrlog.appdata.xml $(sharedir)/metainfo/cqrlog.appdata.xml - install -v -m 0644 images/icon/32x32/cqrlog.png $(sharedir)/pixmaps/cqrlog/cqrlog.png - install -v -m 0644 images/icon/128x128/cqrlog.png $(sharedir)/icons/cqrlog.png - install -v -m 0644 src/changelog.html $(datadir)/changelog.html diff --git a/media-radio/cqrlog/files/cqrlog-2.5.2-makefile.patch b/media-radio/cqrlog/files/cqrlog-2.5.2-makefile.patch new file mode 100644 index 000000000000..a580df8bf7c5 --- /dev/null +++ b/media-radio/cqrlog/files/cqrlog-2.5.2-makefile.patch @@ -0,0 +1,46 @@ +--- a/Makefile ++++ b/Makefile +@@ -3,12 +3,10 @@ + datadir = $(DESTDIR)/usr/share/cqrlog + bindir = $(DESTDIR)/usr/bin + sharedir = $(DESTDIR)/usr/share +-tmpdir = /tmp ++tmpdir := $(shell mktemp -d) + + cqrlog: src/cqrlog.lpi +- $(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi +- $(ST) src/cqrlog +- gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz ++ $(CC) -d --ws=gtk2 --max-process-count=1 --lazarusdir=/usr/share/lazarus --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi + + clean: + rm -f -v src/*.o src/*.ppu src/*.bak src/lnet/lib/*.ppu src/lnet/lib/*.o src/lnet/lib/*.bak src/cqrlog src/cqrlog.compiled src/ipc/*.o src/ipc/*.ppu src/cqrlog.or +@@ -37,7 +35,7 @@ + install -d -v $(sharedir)/pixmaps/cqrlog + install -d -v $(sharedir)/icons/cqrlog + install -d -v $(sharedir)/applications +- install -d -v $(sharedir)/appdata ++ install -d -v $(sharedir)/metainfo + install -d -v $(sharedir)/man/man1 + install -v -m 0755 src/cqrlog $(bindir) + install -v -m 0755 tools/cqrlog-apparmor-fix $(datadir)/cqrlog-apparmor-fix +@@ -60,7 +58,7 @@ + # install -v -m 0644 images/icon/256x256/* $(datadir)/images/icon/256x256/ + # install -v -m 0644 images/* $(datadir)/images/ + install -v -m 0644 tools/cqrlog.desktop $(sharedir)/applications/cqrlog.desktop +- install -v -m 0644 tools/cqrlog.appdata.xml $(sharedir)/appdata/cqrlog.appdata.xml ++ install -v -m 0644 tools/cqrlog.appdata.xml $(sharedir)/metainfo/cqrlog.appdata.xml + install -v -m 0644 images/icon/32x32/cqrlog.png $(sharedir)/pixmaps/cqrlog/cqrlog.png + install -v -m 0644 images/icon/128x128/cqrlog.png $(sharedir)/icons/cqrlog.png + install -v -m 0644 src/changelog.html $(datadir)/changelog.html +@@ -74,9 +72,8 @@ + gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz + + cqrlog_qt5: src/cqrlog.lpi +- $(CC) --ws=qt5 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi ++ $(CC) -d --ws=qt5 --max-process-count=1 --lazarusdir=/usr/share/lazarus --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi + $(ST) src/cqrlog +- gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz + + cqrlog_qt5_debug: src/cqrlog.lpi + $(CC) --ws=qt5 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi -- cgit v1.2.3