mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
gnome-extra/cjs: drop 6.2.0
Signed-off-by: Matthew S. Turnbull <sparky@bluefang-logic.com> Part-of: https://github.com/gentoo/gentoo/pull/43832 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Matthew S. Turnbull
committed by
Sam James
Sam James
parent
b725742783
commit
35645dbbb8
@@ -1,3 +1,2 @@
|
||||
DIST cjs-128.0.tar.gz 981542 BLAKE2B d4b516a8d02fcb297f23f277d8ac12f7cf3c8bf0eec41d22e01ea4ffd3995aedc1b20a173d44c3fc6827e4cb3366c277347fcd11e6362a66d682c47919f84fec SHA512 e7ad28a085788f05bc40dd8a86799c068e54e25d7ed349a610a8935c9de3bc556b72e4b7b2c158f84a4a62a4b10789a3b812ca9e3ae2b3e1b1db471e91ddee97
|
||||
DIST cjs-6.2.0.tar.gz 874457 BLAKE2B 7b1afda55bc0b5da165a20afa7be58382b8f03f1421bde960f6a3f134d7bdb2bdd44320b0b613f4f710258379da6666383a20d92556a1172971ca8340ae6d348 SHA512 5f7ce7f1ba648db834d7703e909ef65cf369d47147ca02e90b8844c31b4360dcc0fb94bbd3265632c3de8ef2b026934dd799b94a2ff3895442a2f9fc469f53db
|
||||
DIST cjs-6.4.0.tar.gz 874506 BLAKE2B 7cedfa8c9c3b53b417cbe6cebc335cb9ca056c6d98cb6c0abc03db5da678f275ff73b867b4c85289797c4701fe1f4dc10aa257eaa55b97824d9e4bebe61eadeb SHA512 525f19f7a5fba642b9d98ca29406d6663ca029d0f92d177bb10ffb68f03843085b86dfc623ef49ceada01dacb64e03742f16e9d7e2fb86a3cc67c25b6de4a616
|
||||
|
||||
@@ -1,95 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{11..14} )
|
||||
|
||||
inherit flag-o-matic meson pax-utils python-any-r1 virtualx
|
||||
|
||||
DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
|
||||
HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cjs"
|
||||
SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD CC0-1.0 MIT MPL-2.0 || ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
|
||||
IUSE="+cairo examples readline sysprof test"
|
||||
|
||||
RDEPEND="
|
||||
dev-lang/spidermonkey:115
|
||||
>=dev-libs/glib-2.66.0:2
|
||||
>=dev-libs/gobject-introspection-1.71.0:=
|
||||
>=dev-libs/libffi-3.3:0=
|
||||
|
||||
cairo? (
|
||||
x11-libs/cairo[glib,svg(+),X]
|
||||
x11-libs/libX11
|
||||
)
|
||||
readline? ( sys-libs/readline:0= )
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
|
||||
test? (
|
||||
sys-apps/dbus
|
||||
x11-libs/gtk+:3[introspection]
|
||||
)
|
||||
"
|
||||
BDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-6.2.0-glib-closure.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
python_fix_shebang build
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
append-cppflags -DG_DISABLE_CAST_CHECKS
|
||||
|
||||
# On musl, it's required that either gjs, pixman or gnome-shell to be built
|
||||
# with a larger stack otherwise librsvg fails to render a particular SVG, as
|
||||
# a result we fail to get gdm or gnome-shell running (greeted with a fail
|
||||
# whale screen). The bug has been reported to librsvg. This is ideally just
|
||||
# a temporary workaround until we understand what exactly needs a larger
|
||||
# stack size, as it's not sufficient to do just librsvg.
|
||||
#
|
||||
# Please refer to:
|
||||
# https://gitlab.gnome.org/GNOME/librsvg/-/issues/686
|
||||
# https://gitlab.gnome.org/GNOME/librsvg/-/issues/874
|
||||
#
|
||||
# TODO: Find an actual fix instead of increasing the stack
|
||||
use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
|
||||
|
||||
local emesonargs=(
|
||||
$(meson_feature cairo)
|
||||
$(meson_feature readline)
|
||||
$(meson_feature sysprof profiler)
|
||||
-Dinstalled_tests=false
|
||||
$(meson_use !test skip_dbus_tests)
|
||||
$(meson_use !test skip_gtk_tests)
|
||||
)
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
src_test() {
|
||||
virtx meson_src_test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
meson_src_install
|
||||
|
||||
if use examples; then
|
||||
docinto examples
|
||||
dodoc "${S}"/examples/*
|
||||
fi
|
||||
|
||||
# Required for cjs-console to run correctly on PaX systems
|
||||
pax-mark mr "${ED}/usr/bin/cjs-console"
|
||||
}
|
||||
@@ -1,103 +0,0 @@
|
||||
https://bugs.gentoo.org/946055
|
||||
https://github.com/linuxmint/cjs/commit/a4d0b0241582fdc5357a6bfc2b0ef2e05fea4893
|
||||
|
||||
From a4d0b0241582fdc5357a6bfc2b0ef2e05fea4893 Mon Sep 17 00:00:00 2001
|
||||
From: Rick Calixte <10281587+rcalixte@users.noreply.github.com>
|
||||
Date: Mon, 18 Nov 2024 13:16:15 -0500
|
||||
Subject: [PATCH] gjs-util: Backport private closure annotations patch (#126)
|
||||
|
||||
From: Philip Chimento <philip.chimento@gmail.com>
|
||||
Date: Sat, 27 Jul 2024 20:17:39 -0700
|
||||
Subject: GjsPrivate: Fix closure annotations
|
||||
|
||||
Apparently the closure annotation can be omitted if the parameter is named
|
||||
user_data. If it is needed because the parameter is not named
|
||||
user_data then the annotation should be on the callback argument and
|
||||
refer to the user data argument.
|
||||
|
||||
Ref:
|
||||
https://gitlab.gnome.org/GNOME/gjs/-/commit/1df5d72d8df383199dcd88cd1d16209617bf32ca
|
||||
|
||||
Co-authored-by: Fabio Fantoni <fantonifabio@tiscali.it>
|
||||
--- a/libgjs-private/gjs-util.c
|
||||
+++ b/libgjs-private/gjs-util.c
|
||||
@@ -235,7 +235,7 @@ void gjs_gtk_container_child_set_property(GObject* container, GObject* child,
|
||||
* @store: a #GListStore
|
||||
* @item: the new item
|
||||
* @compare_func: (scope call): pairwise comparison function for sorting
|
||||
- * @user_data: (closure): user data for @compare_func
|
||||
+ * @user_data: user data for @compare_func
|
||||
*
|
||||
* Inserts @item into @store at a position to be determined by the
|
||||
* @compare_func.
|
||||
@@ -258,7 +258,7 @@ unsigned int gjs_list_store_insert_sorted(GListStore *store, GObject *item,
|
||||
* gjs_list_store_sort:
|
||||
* @store: a #GListStore
|
||||
* @compare_func: (scope call): pairwise comparison function for sorting
|
||||
- * @user_data: (closure): user data for @compare_func
|
||||
+ * @user_data: user data for @compare_func
|
||||
*
|
||||
* Sort the items in @store according to @compare_func.
|
||||
*/
|
||||
@@ -270,7 +270,7 @@ void gjs_list_store_sort(GListStore *store, GjsCompareDataFunc compare_func,
|
||||
/**
|
||||
* gjs_gtk_custom_sorter_new:
|
||||
* @sort_func: (nullable) (scope call): function to sort items
|
||||
- * @user_data: (closure): user data for @compare_func
|
||||
+ * @user_data: user data for @sort_func
|
||||
* @destroy: destroy notify for @user_data
|
||||
*
|
||||
* Creates a new `GtkSorter` that works by calling @sort_func to compare items.
|
||||
@@ -305,7 +305,7 @@ GObject* gjs_gtk_custom_sorter_new(GjsCompareDataFunc sort_func,
|
||||
* gjs_gtk_custom_sorter_set_sort_func:
|
||||
* @sorter: a `GtkCustomSorter`
|
||||
* @sort_func: (nullable) (scope call): function to sort items
|
||||
- * @user_data: (closure): user data to pass to @sort_func
|
||||
+ * @user_data: user data to pass to @sort_func
|
||||
* @destroy: destroy notify for @user_data
|
||||
*
|
||||
* Sets (or unsets) the function used for sorting items.
|
||||
@@ -423,7 +423,7 @@ void gjs_log_set_writer_default() {
|
||||
/**
|
||||
* gjs_log_set_writer_func:
|
||||
* @func: (scope notified): callback with log data
|
||||
- * @user_data: (closure): user data for @func
|
||||
+ * @user_data: user data for @func
|
||||
* @user_data_free: (destroy user_data_free): destroy for @user_data
|
||||
*
|
||||
* Sets a given function as the writer function for structured logging,
|
||||
--- a/libgjs-private/gjs-util.h
|
||||
+++ b/libgjs-private/gjs-util.h
|
||||
@@ -124,11 +124,11 @@ typedef gboolean (*GjsBindingTransformFunc)(GBinding* binding,
|
||||
* @target:
|
||||
* @target_property:
|
||||
* @flags:
|
||||
- * @to_callback: (scope notified) (nullable):
|
||||
- * @to_data: (closure to_callback):
|
||||
+ * @to_callback: (scope notified) (nullable) (closure to_data):
|
||||
+ * @to_data:
|
||||
* @to_notify: (destroy to_data):
|
||||
- * @from_callback: (scope notified) (nullable):
|
||||
- * @from_data: (closure from_callback):
|
||||
+ * @from_callback: (scope notified) (nullable) (closure from_data):
|
||||
+ * @from_data:
|
||||
* @from_notify: (destroy from_data):
|
||||
*
|
||||
* Returns: (transfer none):
|
||||
@@ -149,11 +149,11 @@ GBinding* gjs_g_object_bind_property_full(
|
||||
* @target:
|
||||
* @target_property:
|
||||
* @flags:
|
||||
- * @to_callback: (scope notified) (nullable):
|
||||
- * @to_data: (closure to_callback):
|
||||
+ * @to_callback: (scope notified) (nullable) (closure to_data):
|
||||
+ * @to_data:
|
||||
* @to_notify: (destroy to_data):
|
||||
- * @from_callback: (scope notified) (nullable):
|
||||
- * @from_data: (closure from_callback):
|
||||
+ * @from_callback: (scope notified) (nullable) (closure from_data):
|
||||
+ * @from_data:
|
||||
* @from_notify: (destroy from_data):
|
||||
*/
|
||||
GJS_EXPORT
|
||||
|
||||
Reference in New Issue
Block a user