* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/glimpse/, media-gfx/glimpse/files/, profiles/
@ 2021-08-08 15:54 Anna Vyalkova
0 siblings, 0 replies; only message in thread
From: Anna Vyalkova @ 2021-08-08 15:54 UTC (permalink / raw
To: gentoo-commits
commit: b607c787b4e07589c39ec14f170f012eab64d5a6
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sun Aug 8 14:51:25 2021 +0000
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Sun Aug 8 15:53:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b607c787
media-gfx/glimpse: treeclean
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>
media-gfx/glimpse/Manifest | 1 -
.../glimpse-0.2.0_disable-failing-tests.patch | 29 ---
.../files/glimpse-0.2.0_fix_autoconf-2.70.patch | 58 ------
.../files/glimpse-0.2.0_fix_test-appdata.patch | 15 --
media-gfx/glimpse/glimpse-0.2.0.ebuild | 202 ---------------------
media-gfx/glimpse/metadata.xml | 20 --
profiles/package.mask | 6 -
7 files changed, 331 deletions(-)
diff --git a/media-gfx/glimpse/Manifest b/media-gfx/glimpse/Manifest
deleted file mode 100644
index 903e2ab63..000000000
--- a/media-gfx/glimpse/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST glimpse-0.2.0.tar.gz 42738232 BLAKE2B 3fe1148ecc5dc7d24849abf392a55e29e67d8f404a25b5cb868d7d812c79b856abd276591bd45490ded933b57a840400544b5cddbce267513ed7159955f50f2d SHA512 0511a42cf315dbd60a01de8f2101755179020f9b1ecc4812c85c890f60515685e08d02d97ffb48ccdc5908998f1c015f76af9f214293abeeea75bf8e8aa7570d
diff --git a/media-gfx/glimpse/files/glimpse-0.2.0_disable-failing-tests.patch b/media-gfx/glimpse/files/glimpse-0.2.0_disable-failing-tests.patch
deleted file mode 100644
index b74d7b809..000000000
--- a/media-gfx/glimpse/files/glimpse-0.2.0_disable-failing-tests.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From f82733908da155f598cfec46d132c3121d793030 Mon Sep 17 00:00:00 2001
-From: tastytea <tastytea@tastytea.de>
-Date: Wed, 21 Apr 2021 20:50:29 +0200
-Subject: [PATCH] Disable failing tests.
-
----
- app/tests/Makefile.am | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/app/tests/Makefile.am b/app/tests/Makefile.am
-index d4203358d0..54c51e8dc4 100644
---- a/app/tests/Makefile.am
-+++ b/app/tests/Makefile.am
-@@ -31,12 +31,8 @@ endif
- TESTS = \
- test-core \
- test-gimpidtable \
-- test-save-and-export \
- test-session-2-8-compatibility-multi-window \
- test-session-2-8-compatibility-single-window \
-- test-single-window-mode \
-- test-tools \
-- test-ui \
- test-xcf
-
- EXTRA_PROGRAMS = $(TESTS)
---
-2.26.3
-
diff --git a/media-gfx/glimpse/files/glimpse-0.2.0_fix_autoconf-2.70.patch b/media-gfx/glimpse/files/glimpse-0.2.0_fix_autoconf-2.70.patch
deleted file mode 100644
index 732cd9381..000000000
--- a/media-gfx/glimpse/files/glimpse-0.2.0_fix_autoconf-2.70.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From cebeb90a87105cd6e35bcb357d53cc04c828ca21 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sun, 25 Oct 2020 18:09:21 +0000
-Subject: [PATCH] configure.ac: fix `--with-linux-input` handling with upcoming
- autoconf-2.70
-
-Upcoming autoconf-2.70 exposes deficiency in configure.ac:
-
-```
-$ autoconf-2.70_beta2 && ./configure --host=x86_64-pc-linux-gnu
-./configure: line 1430: 5: Bad file descriptor
-checking whether is declared... ./configure: line 1432: ${+y}: bad
-```
-
-It happens because macros are called with parameters using insufficient quoting.
-
-More details at https://lists.gnu.org/archive/html/bug-autoconf/2020-10/msg00027.html
-
-The fix only amends `--with-linux-input`. Other cases of underquoting
-will need to be handled separately.
-
-Fix-by: Zack Weinberg
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- configure.ac | 17 ++++++++---------
- 1 file changed, 8 insertions(+), 9 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 96312f706e..63b85be07a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2135,15 +2135,14 @@ fi
- AC_ARG_WITH(linux-input, [ --without-linux-input don't build linux input event controller module])
-
- have_linux_input="no (linux input support disabled)"
--if test "x$with_linux_input" != "xno"; then
-- AC_CHECK_HEADER(linux/input.h,
-- AC_CHECK_DECL(KEY_OK,
-- have_linux_input=yes,
-- have_linux_input="no (needs Linux 2.6)",
-- [#include <linux/input.h>]))
--fi
--
--AM_CONDITIONAL(HAVE_LINUX_INPUT, test "x$have_linux_input" = xyes)
-+AS_IF([test "x$with_linux_input" != "xno"],
-+ [AC_CHECK_HEADER([linux/input.h],
-+ [AC_CHECK_DECL([KEY_OK],
-+ [have_linux_input=yes],
-+ [have_linux_input="no (needs Linux 2.6)"],
-+ [#include <linux/input.h>])])])
-+
-+AM_CONDITIONAL([HAVE_LINUX_INPUT], [test "x$have_linux_input" = xyes])
-
-
- ###############################
---
-GitLab
-
diff --git a/media-gfx/glimpse/files/glimpse-0.2.0_fix_test-appdata.patch b/media-gfx/glimpse/files/glimpse-0.2.0_fix_test-appdata.patch
deleted file mode 100644
index 25bf0b44d..000000000
--- a/media-gfx/glimpse/files/glimpse-0.2.0_fix_test-appdata.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/desktop/test-appdata.sh.in b/desktop/test-appdata.sh.in
-index 25be96b1c8..fb674360d9 100755
---- a/desktop/test-appdata.sh.in
-+++ b/desktop/test-appdata.sh.in
-@@ -2,7 +2,7 @@
-
- # TODO: use validate-strict when the last errors for a strict validation
- # are fixed.
--appstream-util validate-relax ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/org.glimpse_editor.Glimpse.appdata.xml && \
--appstream-util validate-relax ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/glimpse-data-extras.metainfo.xml && \
-+appstream-util validate-relax --nonet ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/org.glimpse_editor.Glimpse.appdata.xml && \
-+appstream-util validate-relax --nonet ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/glimpse-data-extras.metainfo.xml && \
- if [ $(expr @GIMP_MICRO_VERSION@ % 2) = 0 ]; then
- grep TODO ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/org.glimpse_editor.Glimpse.appdata.xml
- if [ $? = 0 ]; then
diff --git a/media-gfx/glimpse/glimpse-0.2.0.ebuild b/media-gfx/glimpse/glimpse-0.2.0.ebuild
deleted file mode 100644
index b20d0e5ac..000000000
--- a/media-gfx/glimpse/glimpse-0.2.0.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Based on media-gfx/gimp-2.10.18-r2.ebuild
-
-EAPI=7
-GNOME2_EAUTORECONF=yes
-WANT_AUTOMAKE=
-
-inherit autotools gnome2 toolchain-funcs virtualx
-
-DESCRIPTION="Image editor based on the GNU Image Manipulation Program"
-HOMEPAGE="https://glimpse-editor.org/"
-SRC_URI="https://github.com/glimpse-editor/Glimpse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+ LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript test udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/Glimpse-${PV}"
-
-COMMON_DEPEND="
- >=app-text/poppler-0.50[cairo]
- >=app-text/poppler-data-0.4.7
- >=dev-libs/atk-2.2.0
- >=dev-libs/glib-2.56.0:2
- >=dev-libs/json-glib-1.2.6
- dev-libs/libxml2:2
- dev-libs/libxslt
- >=gnome-base/librsvg-2.40.6:2
- >=media-gfx/mypaint-brushes-1.3.1:=
- >=media-libs/babl-0.1.78
- >=media-libs/fontconfig-2.12.4
- >=media-libs/freetype-2.1.7
- >=media-libs/gegl-0.4.22:0.4[cairo]
- >=media-libs/gexiv2-0.10.6
- >=media-libs/harfbuzz-0.9.19
- >=media-libs/lcms-2.8:2
- >=media-libs/libmypaint-1.5.1:=
- >=media-libs/libpng-1.6.25:0=
- >=media-libs/tiff-3.5.7:0
- net-libs/glib-networking[ssl]
- sys-libs/zlib
- virtual/jpeg
- >=x11-libs/cairo-1.12.2
- >=x11-libs/gdk-pixbuf-2.31:2
- >=x11-libs/gtk+-2.24.32:2
- x11-libs/libXcursor
- >=x11-libs/pango-1.29.4
- aalib? ( media-libs/aalib )
- alsa? ( >=media-libs/alsa-lib-1.0.0 )
- aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
- heif? ( >=media-libs/libheif-1.3.2:= )
- jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
- mng? ( media-libs/libmng:= )
- openexr? ( >=media-libs/openexr-1.6.1:= )
- postscript? ( app-text/ghostscript-gpl )
- udev? ( dev-libs/libgudev:= )
- unwind? ( >=sys-libs/libunwind-1.1.0:= )
- webp? ( >=media-libs/libwebp-0.6.0:= )
- wmf? ( >=media-libs/libwmf-0.2.8 )
- xpm? ( x11-libs/libXpm )
-"
-
-RDEPEND="
- !media-gfx/gimp
- ${COMMON_DEPEND}
- x11-themes/hicolor-icon-theme
- gnome? ( gnome-base/gvfs )
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- >=dev-lang/perl-5.10.0
- dev-libs/appstream-glib
- >=dev-util/intltool-0.40.1
- sys-apps/findutils
- >=sys-devel/gettext-0.19
- doc? ( dev-util/gtk-doc )
- test? ( x11-base/xorg-server[xvfb] )
-"
-BDEPEND="
- dev-util/gtk-update-icon-cache
- >=sys-devel/libtool-2.2
- virtual/pkgconfig
-"
-
-DOCS=( "AUTHORS" "HACKING.md" "NEWS" "README.md" )
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.2.0_fix_test-appdata.patch" # Bug 685210, bug #691070
- "${FILESDIR}/${PN}-0.2.0_fix_autoconf-2.70.patch" # Bug #776679
- "${FILESDIR}/${PN}-0.2.0_disable-failing-tests.patch" # Bug #784410
-)
-
-src_prepare() {
- if has_version "media-gfx/mypaint-brushes:2.0" ; then
- sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac \
- || die # bug #737794
- fi
-
- # Disable system CFLAGS suppressing on SSE{2,4.1} support tests by addition
- # of {SSE2,SSE4_1}_EXTRA_CFLAGS: bug #702554
- sed -i -e 's:\$intrinsics_save_CFLAGS \$SSE2_EXTRA_CFLAGS:\$SSE2_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' \
- -e 's:\$intrinsics_save_CFLAGS \$SSE4_1_EXTRA_CFLAGS:\$SSE4_1_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' configure.ac || die
-
- sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die # bug #494864
- sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' \
- -i configure.ac || die # bug #615144
-
- # Would normally be generated by autogen.sh.
- ! use doc && (echo "EXTRA_DIST = missing-gtk-doc" > gtk-doc.make || die)
- gnome2_src_prepare # calls eautoreconf
-
- sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' \
- -i configure || die # bug #615144
- fgrep -q GIMP_DISABLE_DEPRECATED configure || die # bug #615144, self-test
-
- export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-_adjust_sandbox() {
- # Bug #569738 and bug #591214
- local nv
- for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
- # We do not check for existence as they may show up later
- # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
- addwrite "${nv}"
- done
-
- addwrite /dev/dri/ # bug #574038 and bug #684886
- addwrite /dev/ati/ # bug #589198
- addwrite /proc/mtrr # bug #589198
-}
-
-src_configure() {
- _adjust_sandbox
-
- local myconf=(
- GEGL="${EPREFIX}"/usr/bin/gegl-0.4
-
- --enable-default-binary
-
- --disable-check-update
- --enable-mp
- --with-appdata-test
- --with-bug-report-url=https://bugs.gentoo.org/
- --with-xmc
- --without-libbacktrace
- --without-webkit
- --without-xvfb-run
- --disable-python
- $(use_enable cpu_flags_ppc_altivec altivec)
- $(use_enable cpu_flags_x86_mmx mmx)
- $(use_enable cpu_flags_x86_sse sse)
- $(use_enable vector-icons)
- $(use_with aalib aa)
- $(use_with alsa)
- $(use_with !aqua x)
- $(use_with heif libheif)
- $(use_with jpeg2k jpeg2000)
- $(use_with mng libmng)
- $(use_with openexr)
- $(use_with postscript gs)
- $(use_with udev gudev)
- $(use_with unwind libunwind)
- $(use_with webp)
- $(use_with wmf)
- $(use_with xpm libxpm)
- )
-
- gnome2_src_configure "${myconf[@]}"
-}
-
-src_compile() {
- export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004
- gnome2_src_compile
-}
-
-src_test() {
- virtx emake check
-}
-
-src_install() {
- gnome2_src_install
-
- # Workaround for bug #321111 to give Glimpse the least
- # precedence on PDF documents by default
- mv "${ED}"/usr/share/applications/{,zzz-}org.glimpse_editor.Glimpse.desktop || die
-
- find "${D}" -name '*.la' -type f -delete || die
-
- # Prevent dead symlink gimp-console.1 from downstream man page compression
- # (bug #433527)
- local gimp_app_version=$(grep '\[gimp_app_version' configure.ac \
- | sed -E 's/.*\[([2-9]\.[0-9]+)\].*/\1/')
- mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-}
diff --git a/media-gfx/glimpse/metadata.xml b/media-gfx/glimpse/metadata.xml
deleted file mode 100644
index ee7030aa6..000000000
--- a/media-gfx/glimpse/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>gentoo@tastytea.de</email>
- <name>Ronny (tastytea) Gutbrod</name>
- </maintainer>
- <upstream>
- <bugs-to>https://github.com/glimpse-editor/Glimpse/issues</bugs-to>
- <remote-id type="github">glimpse-editor/Glimpse</remote-id>
- </upstream>
- <use>
- <flag name="heif">
- Enable support for ISO/IEC 23008-12:2017 HEIF files
- </flag>
- <flag name="vector-icons">
- Enable support for vector icons (experimental)
- </flag>
- </use>
-</pkgmetadata>
diff --git a/profiles/package.mask b/profiles/package.mask
index 1bd87bae1..c0ba70998 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -13,12 +13,6 @@
# this entry to the relevant package.mask files in ::gentoo
>=sys-block/systemd-swap-4.4.0
-# Ronny (tastytea) Gutbrod <gentoo@tastytea.de> (2021-06-12)
-# Project is “On Hiatus” since 2021-05, it does not look like it will be
-# revived. Upstream recommends switching to media-gfx/gimp.
-# Masked for removal in 30 days.
-media-gfx/glimpse
-
# Alessandro Barbieri <lssndrbarbieri@gmail.com> (2021-06-20)
# Mask BH until next release
# Depend on boost version no longer available
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-08-08 15:54 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-08 15:54 [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/glimpse/, media-gfx/glimpse/files/, profiles/ Anna Vyalkova
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox