From 32c3d701ce795fbd091ea38d1bb41c808c8e4315 Mon Sep 17 00:00:00 2001 From: Marek Szuba Date: Mon, 28 Aug 2023 22:01:16 +0100 Subject: media-radio/cqrlog: do not pre-compress the man pages Signed-off-by: Marek Szuba --- 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 ++++++++++++++++++++++ 3 files changed, 47 insertions(+), 37 deletions(-) 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 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-65-gdbad