mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
x11-libs/xapp: drop 2.8.2-r1
Closes: https://bugs.gentoo.org/926946 Signed-off-by: Matthew S. Turnbull <sparky@bluefang-logic.com> Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
This commit is contained in:
Matthew S. Turnbull
committed by
Eli Schwartz
Eli Schwartz
parent
6d732c90e3
commit
c34ecee326
@@ -1,2 +1 @@
|
||||
DIST xapp-2.8.2.tar.gz 272539 BLAKE2B 1e2fb92b976196c2e9f36e322656ee40252e4c358a13361a054ead88e6fa3df35a53f1b0ee594df4189a68c1739c4a040558fac533ace095536fcc1dca76954b SHA512 97d19b95626a37fc08a0a159be741de5d9bcc034484e977bd739b91bd37122fcf2f3479285d544282a92c8fa180b116db1ad5e96fe19284c62287d3c5b135163
|
||||
DIST xapp-2.8.5.tar.gz 274241 BLAKE2B 86b38dcab542e934f65e2fb11a5c1e7a5e26e8c725c5c91fed7bec6e0676f40ab6fd85b0421378e4860271ef1c9954d8c5a42b465232670d3d695dcda0734e0b SHA512 133a01309f0bc33a0aa73ee86eb8900573b4ab5b84e9e503b04b246448bce0b05880403288a739c5e252a2276311afba86c9c687887dd6e8c528734e328c6ee7
|
||||
|
||||
@@ -1,106 +0,0 @@
|
||||
From fda9544509c1b3c2c5417a4b27490e7a07e480ec Mon Sep 17 00:00:00 2001
|
||||
From: Sparky Bluefang <sparky@bluefang-logic.com>
|
||||
Date: Tue, 27 Jun 2023 21:54:08 -0400
|
||||
Subject: [PATCH 1/2] Remove unused meson scripts
|
||||
|
||||
---
|
||||
libxapp/install_generated_header.py | 12 ------------
|
||||
meson-scripts/install_generated_header.py | 12 ------------
|
||||
2 files changed, 24 deletions(-)
|
||||
delete mode 100644 libxapp/install_generated_header.py
|
||||
delete mode 100644 meson-scripts/install_generated_header.py
|
||||
|
||||
diff --git a/libxapp/install_generated_header.py b/libxapp/install_generated_header.py
|
||||
deleted file mode 100644
|
||||
index d487ad9..0000000
|
||||
--- a/libxapp/install_generated_header.py
|
||||
+++ /dev/null
|
||||
@@ -1,12 +0,0 @@
|
||||
-#!/usr/bin/python3
|
||||
-
|
||||
-import os
|
||||
-import sys
|
||||
-import subprocess
|
||||
-
|
||||
-install_dir = os.path.join(os.environ['MESON_INSTALL_DESTDIR_PREFIX'], 'include', 'xapp', 'libxapp')
|
||||
-header_path = os.path.join(os.environ['MESON_BUILD_ROOT'], 'libxapp', sys.argv[1])
|
||||
-
|
||||
-print("\nInstalling generated header '%s' to %s\n" % (sys.argv[1], install_dir))
|
||||
-
|
||||
-subprocess.call(['cp', header_path, install_dir])
|
||||
diff --git a/meson-scripts/install_generated_header.py b/meson-scripts/install_generated_header.py
|
||||
deleted file mode 100644
|
||||
index d487ad9..0000000
|
||||
--- a/meson-scripts/install_generated_header.py
|
||||
+++ /dev/null
|
||||
@@ -1,12 +0,0 @@
|
||||
-#!/usr/bin/python3
|
||||
-
|
||||
-import os
|
||||
-import sys
|
||||
-import subprocess
|
||||
-
|
||||
-install_dir = os.path.join(os.environ['MESON_INSTALL_DESTDIR_PREFIX'], 'include', 'xapp', 'libxapp')
|
||||
-header_path = os.path.join(os.environ['MESON_BUILD_ROOT'], 'libxapp', sys.argv[1])
|
||||
-
|
||||
-print("\nInstalling generated header '%s' to %s\n" % (sys.argv[1], install_dir))
|
||||
-
|
||||
-subprocess.call(['cp', header_path, install_dir])
|
||||
|
||||
From dac2e1ab74c3eb109b928ccba66b805e9a40aaee Mon Sep 17 00:00:00 2001
|
||||
From: Sparky Bluefang <sparky@bluefang-logic.com>
|
||||
Date: Tue, 2 Jan 2024 23:46:57 -0500
|
||||
Subject: [PATCH 2/2] Add confiure options for environment specific
|
||||
integrations
|
||||
|
||||
---
|
||||
meson_options.txt | 10 ++++++++++
|
||||
scripts/meson.build | 7 +++++--
|
||||
status-applets/meson.build | 4 +++-
|
||||
3 files changed, 18 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index a36933a..3ea5310 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -28,3 +28,13 @@ option('debian_derivative',
|
||||
value: false,
|
||||
description: 'Use paths specific to Debian and derivatives.'
|
||||
)
|
||||
+option('mate',
|
||||
+ type: 'boolean',
|
||||
+ value: true,
|
||||
+ description: 'Install mate specific items.'
|
||||
+)
|
||||
+option('xfce',
|
||||
+ type: 'boolean',
|
||||
+ value: true,
|
||||
+ description: 'Install xfce specific items.'
|
||||
+)
|
||||
diff --git a/scripts/meson.build b/scripts/meson.build
|
||||
index b210f45..7b1c1bc 100644
|
||||
--- a/scripts/meson.build
|
||||
+++ b/scripts/meson.build
|
||||
@@ -1,8 +1,11 @@
|
||||
scripts = files(
|
||||
'pastebin',
|
||||
'upload-system-info',
|
||||
- 'xapp-gpu-offload',
|
||||
- 'xfce4-set-wallpaper')
|
||||
+ 'xapp-gpu-offload')
|
||||
+
|
||||
+if get_option('xfce')
|
||||
+ scripts += files('xfce4-set-wallpaper')
|
||||
+endif
|
||||
|
||||
install_data(scripts,
|
||||
install_dir: join_paths(get_option('prefix'), get_option('bindir')),
|
||||
diff --git a/status-applets/meson.build b/status-applets/meson.build
|
||||
index 979682e..b464d49 100644
|
||||
--- a/status-applets/meson.build
|
||||
+++ b/status-applets/meson.build
|
||||
@@ -1 +1,3 @@
|
||||
-subdir('mate')
|
||||
+if get_option('mate')
|
||||
+ subdir('mate')
|
||||
+endif
|
||||
@@ -1,104 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{10..12} )
|
||||
VALA_USE_DEPEND="vapigen"
|
||||
|
||||
inherit gnome2-utils vala meson python-r1
|
||||
|
||||
DESCRIPTION="Cross-desktop libraries and common resources"
|
||||
HOMEPAGE="https://github.com/linuxmint/xapp/"
|
||||
LICENSE="LGPL-3 xfce? ( GPL-3 )"
|
||||
|
||||
SRC_URI="https://github.com/linuxmint/xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
|
||||
|
||||
SLOT="0"
|
||||
IUSE="gtk-doc introspection mate xfce"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
DEPEND="
|
||||
>=dev-libs/glib-2.44.0:2
|
||||
dev-libs/libdbusmenu[gtk3]
|
||||
gnome-base/libgnomekbd:=
|
||||
x11-libs/cairo
|
||||
>=x11-libs/gdk-pixbuf-2.22.0:2[introspection?]
|
||||
>=x11-libs/gtk+-3.22.0:3[introspection?]
|
||||
x11-libs/libxkbfile
|
||||
x11-libs/libX11
|
||||
x11-libs/pango
|
||||
"
|
||||
RDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
${DEPEND}
|
||||
dev-python/pygobject:3[${PYTHON_USEDEP}]
|
||||
"
|
||||
BDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
$(vala_depend)
|
||||
dev-python/pygobject:3[${PYTHON_USEDEP}]
|
||||
dev-util/gdbus-codegen
|
||||
dev-util/glib-utils
|
||||
sys-apps/dbus
|
||||
sys-devel/gettext
|
||||
|
||||
gtk-doc? (
|
||||
dev-util/gtk-doc
|
||||
)
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
# Make desktop environment integrations optional
|
||||
# https://github.com/linuxmint/xapp/pull/176
|
||||
"${FILESDIR}"/${PN}-optional-de-options.patch
|
||||
|
||||
# don't install pastebin upload wrapper
|
||||
"${FILESDIR}"/0001-don-t-install-pastebin-upload-wrapper.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
vala_src_prepare
|
||||
default
|
||||
|
||||
# Fix meson helpers
|
||||
python_setup
|
||||
python_fix_shebang .
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local emesonargs=(
|
||||
$(meson_use gtk-doc docs)
|
||||
$(meson_use mate)
|
||||
$(meson_use xfce)
|
||||
-Dpy-overrides-dir="/pygobject"
|
||||
)
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
meson_src_install
|
||||
|
||||
# copy pygobject files to each active python target
|
||||
# work-around for "py-overrides-dir" only supporting a single target
|
||||
install_pygobject_override() {
|
||||
PYTHON_GI_OVERRIDESDIR=$("${EPYTHON}" -c 'import gi;print(gi._overridesdir)' || die)
|
||||
einfo "gobject overrides directory: ${PYTHON_GI_OVERRIDESDIR}"
|
||||
mkdir -p "${D}/${PYTHON_GI_OVERRIDESDIR}/" || die
|
||||
cp -r "${D}"/pygobject/* "${D}/${PYTHON_GI_OVERRIDESDIR}/" || die
|
||||
python_optimize "${D}/${PYTHON_GI_OVERRIDESDIR}/"
|
||||
}
|
||||
python_foreach_impl install_pygobject_override
|
||||
rm -r "${D}/pygobject" || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_icon_cache_update
|
||||
gnome2_schemas_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_icon_cache_update
|
||||
gnome2_schemas_update
|
||||
}
|
||||
Reference in New Issue
Block a user