From 79713fd5fb94135acd5f95922c95134e890c7238 Mon Sep 17 00:00:00 2001 From: Denis Reva Date: Sat, 11 Jan 2025 17:51:47 +0500 Subject: [PATCH] dev-libs/gbinder: add 1.1.42, drop 1.1.41 Closes: https://bugs.gentoo.org/944771 Signed-off-by: Denis Reva --- dev-libs/gbinder/Manifest | 2 +- .../files/gbinder-1.1.30-r3-respect-env.patch | 40 --------------- .../files/gbinder-1.1.30-respect-env.patch | 49 ------------------- .../files/gbinder-1.1.42-C23-compat.patch | 24 +++++++++ ...er-1.1.41.ebuild => gbinder-1.1.42.ebuild} | 1 + 5 files changed, 26 insertions(+), 90 deletions(-) delete mode 100644 dev-libs/gbinder/files/gbinder-1.1.30-r3-respect-env.patch delete mode 100644 dev-libs/gbinder/files/gbinder-1.1.30-respect-env.patch create mode 100644 dev-libs/gbinder/files/gbinder-1.1.42-C23-compat.patch rename dev-libs/gbinder/{gbinder-1.1.41.ebuild => gbinder-1.1.42.ebuild} (95%) diff --git a/dev-libs/gbinder/Manifest b/dev-libs/gbinder/Manifest index 02628c71e4..f3d0a10756 100644 --- a/dev-libs/gbinder/Manifest +++ b/dev-libs/gbinder/Manifest @@ -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 diff --git a/dev-libs/gbinder/files/gbinder-1.1.30-r3-respect-env.patch b/dev-libs/gbinder/files/gbinder-1.1.30-r3-respect-env.patch deleted file mode 100644 index 5f9d974f95..0000000000 --- a/dev-libs/gbinder/files/gbinder-1.1.30-r3-respect-env.patch +++ /dev/null @@ -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) diff --git a/dev-libs/gbinder/files/gbinder-1.1.30-respect-env.patch b/dev-libs/gbinder/files/gbinder-1.1.30-respect-env.patch deleted file mode 100644 index 62358758b0..0000000000 --- a/dev-libs/gbinder/files/gbinder-1.1.30-respect-env.patch +++ /dev/null @@ -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) $@ diff --git a/dev-libs/gbinder/files/gbinder-1.1.42-C23-compat.patch b/dev-libs/gbinder/files/gbinder-1.1.42-C23-compat.patch new file mode 100644 index 0000000000..8da1e882eb --- /dev/null +++ b/dev-libs/gbinder/files/gbinder-1.1.42-C23-compat.patch @@ -0,0 +1,24 @@ +From 46d9899f5a512d0e9b851cb55b06a27fc2b7a638 Mon Sep 17 00:00:00 2001 +From: Takuya Wakazono +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); + diff --git a/dev-libs/gbinder/gbinder-1.1.41.ebuild b/dev-libs/gbinder/gbinder-1.1.42.ebuild similarity index 95% rename from dev-libs/gbinder/gbinder-1.1.41.ebuild rename to dev-libs/gbinder/gbinder-1.1.42.ebuild index 45bba52648..0c032fae73 100644 --- a/dev-libs/gbinder/gbinder-1.1.41.ebuild +++ b/dev-libs/gbinder/gbinder-1.1.42.ebuild @@ -31,6 +31,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/gbinder-1.1.36-respect-env.patch" + "${FILESDIR}/gbinder-1.1.42-C23-compat.patch" ) src_prepare() {