Merge updates from master

This commit is contained in:
Repository mirror & CI
2025-01-11 14:48:20 +00:00
9 changed files with 26 additions and 133 deletions

View File

@@ -1 +1 @@
DIST gbinder-1.1.41.tar.gz 206398 BLAKE2B 47f841f00a4f1e5730adf7e31b8bc09d029235048315458fd0eed3ca437f29f6a02bc4a6921d6378bb8c16ae97a6e85bcdf68253504f37ad4e8e0921869f18d1 SHA512 f2131a08ba4498b72ad39f1844cd415e182cce394bc5834c1ae188928700188ded7b0d826a74ea7e261cfb0ebb773f829c6eb017d6bef606f3f2837559bb9277
DIST gbinder-1.1.42.tar.gz 207656 BLAKE2B 5f278490720f9b95f94a63d718d30e7a61c53ba4f943e676b7d76899660da91603a37953c764e1810eaea088de29f50e07ae8cb90cfbd17bd6a5db03bdffc314 SHA512 4d229e957188064817d6b40f693cf6fe9b44efae34ad15ac4314c7f0e3c49dc17835984fa741f7b90d8a2016234f2e7e78cc56f73625156e2aedab73faa93553

View File

@@ -1,40 +0,0 @@
diff --git a/Makefile b/Makefile
index e838b7e..4ce2039 100644
--- a/Makefile
+++ b/Makefile
@@ -136,20 +136,20 @@ FULL_CFLAGS = $(BASE_FLAGS) $(CFLAGS) $(DEFINES) $(WARNINGS) $(INCLUDES) \
-MMD -MP $(shell pkg-config --cflags $(PKGS))
FULL_LDFLAGS = $(BASE_FLAGS) $(LDFLAGS) -shared -Wl,-soname,$(LIB_SONAME) \
$(shell pkg-config --libs $(PKGS)) -lpthread
-DEBUG_FLAGS = -g
+DEBUG_FLAGS =
RELEASE_FLAGS =
-COVERAGE_FLAGS = -g
+COVERAGE_FLAGS =
KEEP_SYMBOLS ?= 0
ifneq ($(KEEP_SYMBOLS),0)
-RELEASE_FLAGS += -g
+#RELEASE_FLAGS += -g
endif
DEBUG_LDFLAGS = $(FULL_LDFLAGS) $(DEBUG_LIBS) $(DEBUG_FLAGS)
RELEASE_LDFLAGS = $(FULL_LDFLAGS) $(RELEASE_LIBS) $(RELEASE_FLAGS)
-DEBUG_CFLAGS = $(FULL_CFLAGS) $(DEBUG_FLAGS) -DDEBUG
-RELEASE_CFLAGS = $(FULL_CFLAGS) $(RELEASE_FLAGS) -O2
-COVERAGE_CFLAGS = $(FULL_CFLAGS) $(COVERAGE_FLAGS) --coverage
+DEBUG_CFLAGS = $(FULL_CFLAGS) $(DEBUG_FLAGS)
+RELEASE_CFLAGS = $(FULL_CFLAGS) $(RELEASE_FLAGS)
+COVERAGE_CFLAGS = $(FULL_CFLAGS) $(COVERAGE_FLAGS)
#
# Files
@@ -275,7 +275,7 @@ $(DEBUG_SO): $(DEBUG_OBJS)
$(RELEASE_SO): $(RELEASE_OBJS)
$(LD) $(RELEASE_OBJS) $(RELEASE_LDFLAGS) -o $@
ifeq ($(KEEP_SYMBOLS),0)
- $(STRIP) $@
+# $(STRIP) $@
endif
$(DEBUG_LIB): $(DEBUG_OBJS)

View File

@@ -1,49 +0,0 @@
diff --git a/Makefile b/Makefile
index e838b7e..adb886f 100644
--- a/Makefile
+++ b/Makefile
@@ -140,15 +140,15 @@ DEBUG_FLAGS = -g
RELEASE_FLAGS =
COVERAGE_FLAGS = -g
-KEEP_SYMBOLS ?= 0
-ifneq ($(KEEP_SYMBOLS),0)
-RELEASE_FLAGS += -g
-endif
+#KEEP_SYMBOLS ?= 0
+#ifneq ($(KEEP_SYMBOLS),0)
+#RELEASE_FLAGS += -g
+#endif
DEBUG_LDFLAGS = $(FULL_LDFLAGS) $(DEBUG_LIBS) $(DEBUG_FLAGS)
RELEASE_LDFLAGS = $(FULL_LDFLAGS) $(RELEASE_LIBS) $(RELEASE_FLAGS)
DEBUG_CFLAGS = $(FULL_CFLAGS) $(DEBUG_FLAGS) -DDEBUG
-RELEASE_CFLAGS = $(FULL_CFLAGS) $(RELEASE_FLAGS) -O2
+RELEASE_CFLAGS = $(FULL_CFLAGS) $(RELEASE_FLAGS)
COVERAGE_CFLAGS = $(FULL_CFLAGS) $(COVERAGE_FLAGS) --coverage
#
@@ -274,17 +274,17 @@ $(DEBUG_SO): $(DEBUG_OBJS)
$(RELEASE_SO): $(RELEASE_OBJS)
$(LD) $(RELEASE_OBJS) $(RELEASE_LDFLAGS) -o $@
-ifeq ($(KEEP_SYMBOLS),0)
- $(STRIP) $@
-endif
+#ifeq ($(KEEP_SYMBOLS),0)
+# $(STRIP) $@
+#endif
$(DEBUG_LIB): $(DEBUG_OBJS)
$(AR) rc $@ $?
ranlib $@
-$(RELEASE_LIB): $(RELEASE_OBJS)
- $(AR) rc $@ $?
- ranlib $@
+$(RELEASE_LIB): $(RELEASE_OBJS)
+ $(AR) rc $@ $?
+ ranlib $@
$(DEBUG_LINK):
ln -sf $(LIB_SO) $@

View File

@@ -0,0 +1,24 @@
From 46d9899f5a512d0e9b851cb55b06a27fc2b7a638 Mon Sep 17 00:00:00 2001
From: Takuya Wakazono <pastalian46@gmail.com>
Date: Wed, 1 Jan 2025 21:03:48 +0900
Subject: [PATCH] Explicitly declare function parameters for C23 compatibility
In C23, void foo() is equivalent to void foo(void). Therefore, functions
must explicitly declare their parameters.
---
src/gbinder_writer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gbinder_writer.c b/src/gbinder_writer.c
index 1e93700..7308818 100644
--- a/src/gbinder_writer.c
+++ b/src/gbinder_writer.c
@@ -1324,7 +1324,7 @@ gbinder_writer_alloc(
GBinderWriter* self,
gsize size,
gpointer (*alloc)(gsize),
- void (*dealloc)())
+ void (*dealloc)(gpointer))
{
GBinderWriterData* data = gbinder_writer_data(self);

View File

@@ -31,6 +31,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/gbinder-1.1.36-respect-env.patch"
"${FILESDIR}/gbinder-1.1.42-C23-compat.patch"
)
src_prepare() {

View File

@@ -1 +0,0 @@
DIST colored-2.2.4.tar.bz2 18246 BLAKE2B 0895ad4c0851af77526309d991f0271d1837087ecf1562031fdd391fa820e6973155ce5b9be66c527855331f25195ef327508bcfbba5bc5bb31d9a5b0c13d30f SHA512 4ae77b2b72d06c9da3dfe232cc4eac2414c350d8b19905005f1f0d31b208238b1462f59468d89860fb2c4617e47c81b48f0780a22969dc2ee83c90ffd2dd5431

View File

@@ -1,23 +0,0 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=flit
PYTHON_COMPAT=( python3_{10..12} pypy3 )
inherit distutils-r1
DESCRIPTION="Very simple Python library for color and formatting in terminal"
HOMEPAGE="https://gitlab.com/dslackw/colored"
SRC_URI="https://gitlab.com/dslackw/${PN}/-/archive/${PV}/${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
DOCS=( CHANGES.md README.rst docs )
# Until we find a way to set colored as unaware of TTY, we should not test as
# half of them fail, see https://gitlab.com/dslackw/colored/-/issues/32
# distutils_enable_tests pytest

View File

@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<longdescription lang="en">
Very simple Python library for color and formatting in terminal.
Collection of color codes and names for 256 color terminal setups.
</longdescription>
<upstream>
<bugs-to>https://gitlab.com/dslackw/colored/-/issues</bugs-to>
<remote-id type="gitlab">dslackw/colored</remote-id>
<remote-id type="pypi">colored</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -67,11 +67,6 @@ sci-physics/openmodelica
gui-apps/coreterminal
gui-apps/coreapps-meta
# Takuya Wakazono <pastalian46@gmail.com> (2024-12-07)
# No reverse dependencies left.
# Removal on 2025-01-07. Bug #929981.
dev-python/colored
# Gasc Henri <gasc@eurecom.fr> (2024-12-05)
# Last release was in 2017, 2 commits in the last 3 years
# Removal on 2025-01-05