rrankin pushed to rpms/gputils (main). "upgrade to 1.5.2"
by notifications＠fedoraproject.org
Notification time stamped 2023-01-01 10:37:24 UTC
From 32f881afb34248196db859d212df39f00311932f Mon Sep 17 00:00:00 2001
From: Roy Rankin <rrankin(a)ihug.com.au>
Date: Jan 01 2023 10:37:14 +0000
Subject: upgrade to 1.5.2
---
diff --git a/.gitignore b/.gitignore
index d3d4eab..9219618 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ gputils-0.13.7.tar.gz
/gputils-1.3.0.tar.gz
/gputils-1.4.2-1.tar.gz
/gputils-1.5.0-1.tar.bz2
+/gputils-1.5.2.tar.bz2
diff --git a/gpasm_1.5.0.patch b/gpasm_1.5.0.patch
deleted file mode 100644
index 60344d5..0000000
--- a/gpasm_1.5.0.patch
+++ /dev/null
@@ -1,542 +0,0 @@
-Index: gpasm/symbol_list.c
-===================================================================
---- gpasm/symbol_list.c (revision 1311)
-+++ gpasm/symbol_list.c (nonexistent)
-@@ -1,145 +0,0 @@
--/* Symbol list support.
--
-- Copyright (C) 2016 Molnar Karoly
--
--This file is part of gputils.
--
--gputils is free software; you can redistribute it and/or modify
--it under the terms of the GNU General Public License as published by
--the Free Software Foundation; either version 2, or (at your option)
--any later version.
--
--gputils is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--GNU General Public License for more details.
--
--You should have received a copy of the GNU General Public License
--along with gputils; see the file COPYING. If not, write to
--the Free Software Foundation, 59 Temple Place - Suite 330,
--Boston, MA 02111-1307, USA. */
--
--#include "stdhdr.h"
--
--#include "libgputils.h"
--#include "gpasm.h"
--#include "coff.h"
--#include "symbol_list.h"
--
--/*------------------------------------------------------------------------------------------------*/
--
--/* Auxiliary function for this module. */
--
--static void
--_node_free(void *Node)
--{
-- symbol_node_t *n;
--
-- n = (symbol_node_t *)Node;
--
-- if (n->name != NULL) {
-- free(n->name);
-- }
--
-- free(n);
--}
--
--/*------------------------------------------------------------------------------------------------*/
--
--/* Initialize the symbol list. */
--
--void
--symbol_list_init(void)
--{
-- gp_list_set_delete_node_func(&state.obj.symbol_fifo, _node_free);
--}
--
--/*------------------------------------------------------------------------------------------------*/
--
--/* Add a new symbol to the list (fifo). */
--
--void
--symbol_list_add_symbol(const symbol_t *Symbol, const char *Name, unsigned int Symbol_number,
-- int Section_number, unsigned int Base_class, unsigned int Byte_address)
--{
-- symbol_node_t *node;
--
--
-- if (state.pass != 1) {
-- return;
-- }
--
-- node = (symbol_node_t *)gp_list_node_append(&state.obj.symbol_fifo, gp_list_node_new(sizeof(symbol_node_t)));
-- node->symbol = Symbol;
-- node->name = GP_Strdup(Name);
-- node->symbol_number = Symbol_number;
-- node->section_number = Section_number;
-- node->base_class = Base_class;
-- node->byte_address = Byte_address;
--}
--
--/*------------------------------------------------------------------------------------------------*/
--
--/* Empties the list up to this symbol. */
--
--void
--symbol_list_flush_symbols(const char *End_symbol_name)
--{
-- symbol_node_t *node;
-- const symbol_t *symbol;
-- const char *name;
-- const variable_t *var;
-- char *coff_name;
--
-- if (state.obj.symbol_fifo.first == NULL) {
-- return;
-- }
--
-- node = state.obj.symbol_fifo.curr;
-- while (node != NULL) {
-- symbol = node->symbol;
--
-- if (symbol != NULL) {
-- /* This is a "normal" symbol, not section or other. */
-- name = gp_sym_get_symbol_name(symbol);
-- var = (const variable_t *)gp_sym_get_symbol_annotation(symbol);
-- assert(var != NULL);
-- coff_name = coff_local_name(name);
-- /* Create new symbol. */
-- coff_add_sym(coff_name, var->value, var->type, node->section_number);
--
-- if (coff_name != NULL) {
-- free(coff_name);
-- }
-- }
--
-- if ((End_symbol_name != NULL) && (strcmp(node->name, End_symbol_name) == 0)) {
-- node = node->next;
-- break;
-- }
--
-- node = node->next;
-- }
--
-- state.obj.symbol_fifo.curr = node;
--}
--
--/*------------------------------------------------------------------------------------------------*/
--
--/* Restores the current pointer of list to the beginning. */
--
--void
--symbol_list_reset(void)
--{
-- gp_list_reset(&state.obj.symbol_fifo);
--}
--
--/*------------------------------------------------------------------------------------------------*/
--
--/* Freeing the entire list. */
--
--void
--symbol_list_free(void)
--{
-- gp_list_delete(&state.obj.symbol_fifo);
--}
-
-Property changes on: gpasm/symbol_list.c
-___________________________________________________________________
-Deleted: svn:eol-style
-## -1 +0,0 ##
--native
-\ No newline at end of property
-Deleted: svn:keywords
-## -1 +0,0 ##
--Author Date Id Revision
-\ No newline at end of property
-Index: gpasm/symbol_list.h
-===================================================================
---- gpasm/symbol_list.h (revision 1311)
-+++ gpasm/symbol_list.h (nonexistent)
-@@ -1,55 +0,0 @@
--/* Symbol list support.
--
-- Copyright (C) 2016 Molnar Karoly
--
--This file is part of gputils.
--
--gputils is free software; you can redistribute it and/or modify
--it under the terms of the GNU General Public License as published by
--the Free Software Foundation; either version 2, or (at your option)
--any later version.
--
--gputils is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--GNU General Public License for more details.
--
--You should have received a copy of the GNU General Public License
--along with gputils; see the file COPYING. If not, write to
--the Free Software Foundation, 59 Temple Place - Suite 330,
--Boston, MA 02111-1307, USA. */
--
--#ifndef __SYMBOL_LIST_H__
--#define __SYMBOL_LIST_H__
--
--#include "gpasm.h"
--
--typedef struct symbol_node {
-- /* This always should be the first item! (gplist.c) */
-- GPNodeHeader(struct symbol_node);
--
-- const symbol_t *symbol;
-- char *name;
-- unsigned int symbol_number;
-- int section_number;
-- unsigned int base_class;
-- unsigned int byte_address;
--} symbol_node_t;
--
--typedef struct symbol_list {
-- /* head of symbol nodes
-- * tail of symbol nodes
-- * number of symbol nodes */
-- GPListHeader(symbol_node_t);
--} symbol_list_t;
--
--extern void symbol_list_init(void);
--
--extern void symbol_list_add_symbol(const symbol_t *Symbol, const char *Name, unsigned int Symbol_number,
-- int Section_number, unsigned int Base_class, unsigned int Byte_address);
--
--extern void symbol_list_flush_symbols(const char *End_symbol_name);
--extern void symbol_list_reset(void);
--extern void symbol_list_free(void);
--
--#endif /* __SYMBOL_LIST_H__ */
-
-Property changes on: gpasm/symbol_list.h
-___________________________________________________________________
-Deleted: svn:eol-style
-## -1 +0,0 ##
--native
-\ No newline at end of property
-Deleted: svn:keywords
-## -1 +0,0 ##
--Author Date Id Revision
-\ No newline at end of property
-Index: gpasm/Makefile.am
-===================================================================
---- gpasm/Makefile.am (revision 1311)
-+++ gpasm/Makefile.am (revision 1312)
-@@ -39,8 +39,6 @@
- scan.l \
- special.c \
- special.h \
-- symbol_list.c \
-- symbol_list.h \
- util.c
-
- gpasm_SOURCES = main.c
-Index: gpasm/Makefile.in
-===================================================================
---- gpasm/Makefile.in (revision 1311)
-+++ gpasm/Makefile.in (revision 1312)
-@@ -113,7 +113,7 @@
- gpasm.$(OBJEXT) gpmsg.$(OBJEXT) lst.$(OBJEXT) macro.$(OBJEXT) \
- parse.$(OBJEXT) ppparse.$(OBJEXT) ppscan.$(OBJEXT) \
- preprocess.$(OBJEXT) processor.$(OBJEXT) scan.$(OBJEXT) \
-- special.$(OBJEXT) symbol_list.$(OBJEXT) util.$(OBJEXT)
-+ special.$(OBJEXT) util.$(OBJEXT)
- libgpasm_a_OBJECTS = $(am_libgpasm_a_OBJECTS)
- am__installdirs = "$(DESTDIR)$(bindir)"
- PROGRAMS = $(bin_PROGRAMS)
-@@ -347,8 +347,6 @@
- scan.l \
- special.c \
- special.h \
-- symbol_list.c \
-- symbol_list.h \
- util.c
-
- gpasm_SOURCES = main.c
-@@ -480,7 +478,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/processor.Po(a)am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scan.Po(a)am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/special.Po(a)am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/symbol_list.Po(a)am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po(a)am__quote@
-
- .c.o:
-Index: gpasm/coff.c
-===================================================================
---- gpasm/coff.c (revision 1311)
-+++ gpasm/coff.c (revision 1312)
-@@ -89,8 +89,6 @@
- state.obj.flags = Flags;
-
- if (!state.obj.enabled) {
-- symbol_list_add_symbol(NULL, Name, state.obj.symbol_num - 2, state.obj.section_num, C_SECTION,
-- state.byte_addr);
- state.byte_addr = Address;
- return;
- }
-@@ -97,8 +95,6 @@
-
- assert(state.obj.object != NULL);
-
-- symbol_list_flush_symbols(Name);
--
- state.obj.section = gp_coffgen_add_section(state.obj.object, Name, Data);
- state.obj.section->address = Address;
- state.obj.section->shadow_address = Address;
-@@ -199,8 +195,6 @@
- /* store data from the last section */
- coff_close_section();
-
-- symbol_list_flush_symbols(NULL);
--
- /* update relocation symbol pointers */
- _update_reloc_ptr();
-
-@@ -248,8 +242,6 @@
- state.obj.flags = Flags;
-
- if (!state.obj.enabled) {
-- symbol_list_add_symbol(NULL, Name, state.obj.symbol_num - 2, state.obj.section_num, C_SECTION,
-- state.byte_addr);
- state.byte_addr = Address;
- return;
- }
-@@ -256,8 +248,6 @@
-
- assert(state.obj.object != NULL);
-
-- symbol_list_flush_symbols(Name);
--
- /* store data from the last section */
- coff_close_section();
-
-@@ -446,7 +436,6 @@
- state.obj.symbol_num += 2;
-
- if (!state.obj.enabled) {
-- symbol_list_add_symbol(NULL, ".file", state.obj.symbol_num - 2, 0, C_FILE, state.byte_addr);
- return NULL;
- }
-
-@@ -481,12 +470,9 @@
- state.obj.symbol_num++;
-
- if (!state.obj.enabled) {
-- symbol_list_add_symbol(NULL, ".eof", state.obj.symbol_num - 1, 0, C_EOF, state.byte_addr);
- return;
- }
-
-- symbol_list_flush_symbols(".eof");
--
- /* add .eof symbol */
- symbol = gp_coffgen_add_symbol(state.obj.object, ".eof", N_DEBUG);
- symbol->class = C_EOF;
-@@ -508,13 +494,9 @@
- state.obj.symbol_num++;
-
- if (!state.obj.enabled) {
-- symbol_list_add_symbol(NULL, ".list", state.obj.symbol_num - 1, state.obj.section_num, C_LIST,
-- state.byte_addr);
- return;
- }
-
-- symbol_list_flush_symbols(".list");
--
- /* add .list symbol */
- symbol = gp_coffgen_add_symbol(state.obj.object, ".list", N_DEBUG);
- symbol->value = state.src_list.last->line_number;
-@@ -537,13 +519,9 @@
- state.obj.symbol_num++;
-
- if (!state.obj.enabled) {
-- symbol_list_add_symbol(NULL, ".nolist", state.obj.symbol_num - 1, state.obj.section_num, C_LIST,
-- state.byte_addr);
- return;
- }
-
-- symbol_list_flush_symbols(".nolist");
--
- /* add .nolist symbol */
- symbol = gp_coffgen_add_symbol(state.obj.object, ".nolist", N_DEBUG);
- symbol->value = state.src_list.last->line_number;
-@@ -563,13 +541,9 @@
- state.obj.symbol_num += 2;
-
- if (!state.obj.enabled) {
-- symbol_list_add_symbol(NULL, ".direct", state.obj.symbol_num - 2, state.obj.section_num, C_NULL,
-- state.byte_addr);
- return;
- }
-
-- symbol_list_flush_symbols(".direct");
--
- /* add .direct symbol */
- symbol = gp_coffgen_add_symbol(state.obj.object, ".direct", state.obj.section_num);
- symbol->value = gp_processor_insn_from_byte_c(state.device.class, state.byte_addr);
-@@ -593,13 +567,9 @@
-
- state.obj.symbol_num += 2;
- if (!state.obj.enabled) {
-- symbol_list_add_symbol(NULL, ".ident", state.obj.symbol_num - 2, state.obj.section_num, C_NULL,
-- state.byte_addr);
- return;
- }
-
-- symbol_list_flush_symbols(".ident");
--
- /* add .ident symbol */
- symbol = gp_coffgen_add_symbol(state.obj.object, ".ident", N_DEBUG);
-
-Index: gpasm/directive.c
-===================================================================
---- gpasm/directive.c (revision 1311)
-+++ gpasm/directive.c (revision 1312)
-@@ -2210,7 +2210,7 @@
- org = gp_processor_insn_from_byte_p(state.processor, begin_byte_addr);
-
- if ((gp_processor_is_config_org(state.processor, org) < 0) &&
-- (gp_processor_is_idlocs_org(state.processor, org) < 0) &&
-+ (gp_processor_is_idlocs_org(state.processor, org) < 0) &&
- (gp_processor_is_eeprom_org(state.processor, org) < 0)) {
- if ((state.mode == MODE_ABSOLUTE) || !(SECTION_FLAGS & (STYP_DATA | STYP_BPACK))) {
- if ((state.byte_addr - begin_byte_addr) & 1) {
-@@ -2488,7 +2488,6 @@
-
- if ((state.pass == 2) && (new_class || new_type)) {
- /* Up to this point creates each symbol. */
-- symbol_list_flush_symbols(symbol_name);
- coff_symbol = gp_coffgen_find_symbol(state.obj.object, symbol_name);
- assert(coff_symbol != NULL);
-
-@@ -2579,8 +2578,6 @@
-
- if (eval_enforce_simple(p)) {
- symbol_name = PnSymbol(p);
-- /* Up to this point creates each symbol. */
-- symbol_list_flush_symbols(symbol_name);
- /* lookup the symbol */
- coff_symbol = gp_coffgen_find_symbol(state.obj.object, symbol_name);
-
-@@ -4746,8 +4743,6 @@
-
- if (eval_enforce_simple(p)) {
- symbol_name = PnSymbol(p);
-- /* Up to this point creates each symbol. */
-- symbol_list_flush_symbols(symbol_name);
- coff_symbol = gp_coffgen_find_symbol(state.obj.object, symbol_name);
-
- if (coff_symbol == NULL) {
-Index: gpasm/gpasm.c
-===================================================================
---- gpasm/gpasm.c (revision 1311)
-+++ gpasm/gpasm.c (revision 1312)
-@@ -963,7 +963,6 @@
- state.cmd_line.processor = true;
- }
-
-- symbol_list_init();
- _set_global_constants();
-
- state.pass = 1;
-@@ -1013,7 +1012,6 @@
- state.cmd_line.processor = true;
- }
-
-- symbol_list_reset();
- _set_global_constants();
-
- open_src(state.src_file_name, false);
-@@ -1064,7 +1062,6 @@
-
- file_free();
- gp_bitarray_delete(&state.badrom);
-- symbol_list_free();
- gpmsg_close();
- return (((state.num.errors > 0) || (gp_num_errors > 0)) ? EXIT_FAILURE : EXIT_SUCCESS);
- }
-Index: gpasm/gpasm.h.in
-===================================================================
---- gpasm/gpasm.h.in (revision 1311)
-+++ gpasm/gpasm.h.in (revision 1312)
-@@ -22,8 +22,6 @@
- #ifndef __GPASM_H__
- #define __GPASM_H__
-
--#include "symbol_list.h"
--
- #define GPASM_VERSION_STRING ("gpasm-" VERSION " #" @REVISION@ " (" __DATE__ ")")
-
- /* This symbol will get placed into the symbol table for the 16bit cores
-@@ -363,7 +361,6 @@
- gp_symbol_t *debug_file; /* Debug information for high level langs. */
- unsigned int debug_line;
- gp_boolean newcoff;
-- symbol_list_t symbol_fifo;
- } obj;
-
- source_context_list_t src_list; /* The stack of source files. */
-Index: gpasm/util.c
-===================================================================
---- gpasm/util.c (revision 1311)
-+++ gpasm/util.c (revision 1312)
-@@ -28,7 +28,6 @@
- #include "gpmsg.h"
- #include "directive.h"
- #include "coff.h"
--#include "symbol_list.h"
-
- #define STR_INHX8M "inhx8m"
- #define STR_INHX8S "inhx8s"
-@@ -670,11 +669,12 @@
- set_global(const char *Name, gpasmVal Value, enum gpasmValTypes Type, gp_boolean Proc_dependent,
- gp_boolean Has_no_value)
- {
-- symbol_t *sym;
-- variable_t *var;
-- unsigned int flags;
-- int section_number;
-- unsigned int class;
-+ symbol_t* sym;
-+ variable_t* var;
-+ unsigned int flags;
-+ int section_number;
-+ unsigned int class;
-+ char* coff_name;
-
- /* Search the entire stack (i.e. include macro's local symbol tables) for the symbol.
- If not found, then add it to the global symbol table. */
-@@ -702,8 +702,6 @@
- gp_sym_annotate_symbol(sym, var);
-
- if (set_symbol_attr(§ion_number, &class, Type)) {
-- /* Gives to the list the properties of this prospective symbol. */
-- symbol_list_add_symbol(sym, Name, state.obj.symbol_num, section_number, class, state.byte_addr);
- /* Increment the index into the coff symbol table for the relocations. */
- state.obj.symbol_num++;
- }
-@@ -730,6 +728,13 @@
- else if (var->value != Value) {
- gpmsg_verror(GPE_DIFFLAB, NULL, Name);
- }
-+
-+ coff_name = coff_local_name(Name);
-+ coff_add_sym(coff_name, Value, var->type, state.obj.section_num);
-+
-+ if (coff_name != NULL) {
-+ free(coff_name);
-+ }
- }
- }
-
diff --git a/gpasm_1.5.2.patch b/gpasm_1.5.2.patch
new file mode 100644
index 0000000..1963b5e
--- /dev/null
+++ b/gpasm_1.5.2.patch
@@ -0,0 +1,24 @@
+Index: gpasm/directive.c
+===================================================================
+--- gpasm/directive.c (revision 1330)
++++ gpasm/directive.c (working copy)
+@@ -128,6 +128,19 @@
+ --Max_size;
+ break;
+
++ // special characters
++ case '0': //(NULL)
++ case 'a': //(bell)
++ case 'b': //(backspace)
++ case 't': //(tab)
++ case 'n': //(newline)
++ case 'v': //(vertical tab)
++ case 'f': //(form feed)
++ case 'r': //(return)
++ *d++ = '\\';
++ *d++ = ch;
++ break;
++
+ default: {
+ *d++ = ch;
+ --Max_size;
diff --git a/gplink_1.5.0.patch b/gplink_1.5.0.patch
deleted file mode 100644
index 06d36bd..0000000
--- a/gplink_1.5.0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: libgputils/gpcod.c
-===================================================================
---- libgputils/gpcod.c (revision 1312)
-+++ libgputils/gpcod.c (working copy)
-@@ -206,7 +206,7 @@
-
- for (i = mem_base; (i - mem_base) <= I_MEM_MAX; i += 2) {
- if (((i - mem_base) < I_MEM_MAX) &&
-- (Class->i_memory_get(Mem, i, &insn, NULL, NULL) == W_USED_ALL)) {
-+ (Class->i_memory_get(Mem, i, &insn, NULL, NULL))) {
- gp_cod_emit_opcode(dbi, i, insn);
-
- if (!used_flag) {
diff --git a/gputils.spec b/gputils.spec
index 308c92a..420fc1d 100644
--- a/gputils.spec
+++ b/gputils.spec
@@ -1,15 +1,13 @@
Name: gputils
-Version: 1.5.0
-Release: 10%{?dist}
+Version: 1.5.2
+Release: 0%{?dist}
Summary: Development utilities for Microchip (TM) PIC (TM) microcontrollers
Summary(fr): Outils de développement pour les microcontrôleurs PIC (TM) de Microchip (TM)
License: GPLv2+
URL: http://gputils.sourceforge.net
-Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-1.tar.bz2
-Patch1: gplink_%{version}.patch
-Patch2: gpasm_%{version}.patch
-Patch3: link_%{version}.patch
+Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch1: gpasm_%{version}.patch
Provides: bundled(libiberty)
BuildRequires: gcc
@@ -37,8 +35,6 @@ This package containes gputils documentation and HTML documentation for supporte
%prep
%setup -q
%patch1 -p0
-%patch2 -p0
-%patch3 -p1
%build
autoconf -f -i
@@ -66,6 +62,9 @@ cp -f doc/%{name}.p* %{buildroot}/usr/share/doc/%{name}-doc/
%changelog
+* Sun Jan 01 2023 Roy Rankin <rrankin[AT]ihug[DOT]com[DOT]au> 1.5.2-0
+- Upstream release
+
* Thu Jul 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.5.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
diff --git a/link_1.5.0.patch b/link_1.5.0.patch
deleted file mode 100644
index 53dae32..0000000
--- a/link_1.5.0.patch
+++ /dev/null
@@ -1,307 +0,0 @@
-diff --git a/gputils/gpstrip.c b/gputils/gpstrip.c
-index dce5ddb..06b7d97 100644
---- a/gputils/gpstrip.c
-+++ b/gputils/gpstrip.c
-@@ -92,7 +92,7 @@ _conditional_remove(gp_symbol_t *Symbol)
- gp_message("removing symbol \"%s\"", Symbol->name);
- }
-
-- gp_coffgen_del_symbol(state.object, Symbol);
-+ gp_coffgen_del_symbol(state.object, Symbol, true);
- }
- }
-
-diff --git a/libgputils/gpcoffgen.c b/libgputils/gpcoffgen.c
-index 8ebcf15..dc60348 100644
---- a/libgputils/gpcoffgen.c
-+++ b/libgputils/gpcoffgen.c
-@@ -346,7 +346,7 @@ gp_coffgen_del_section_symbols(gp_object_t *Object, gp_section_t *Section)
- list = list->next;
-
- if (symbol->section == Section) {
-- gp_coffgen_del_symbol(Object, symbol);
-+ gp_coffgen_del_symbol(Object, symbol, true);
- }
- }
- }
-@@ -732,8 +732,10 @@ gp_coffgen_move_reserve_symbol(gp_object_t *Object, gp_symbol_t *Symbol)
- /* Delete the symbol from the object. */
-
- gp_boolean
--gp_coffgen_del_symbol(gp_object_t *Object, gp_symbol_t *Symbol)
-+gp_coffgen_del_symbol(gp_object_t *Object, gp_symbol_t *Symbol, gp_boolean Touch_number)
- {
-+ unsigned int n_deleted;
-+
- if (Object->symbol_list.first == NULL) {
- return false;
- }
-@@ -745,7 +747,13 @@ gp_coffgen_del_symbol(gp_object_t *Object, gp_symbol_t *Symbol)
- }
-
- gp_list_node_remove(&Object->symbol_list, Symbol);
-- Object->num_symbols -= 1 + gp_coffgen_free_symbol(Symbol);
-+
-+ n_deleted = 1 + gp_coffgen_free_symbol(Symbol);
-+
-+ if (Touch_number) {
-+ Object->num_symbols -= n_deleted;
-+ }
-+
- return true;
- }
-
-@@ -999,7 +1007,7 @@ _check_section_relocations(proc_class_t Class, gp_section_t *Section, unsigned i
- if (sym_sect == NULL) {
- /* This is an orphan symbol. */
- if (FlagIsClr(Behavior, RELOC_DISABLE_WARN)) {
-- if (FlagIsSet(Behavior, RELOC_ENABLE_CINIT_WARN) || (strcmp(symbol->name, "_cinit") != 0)) {
-+ if (FlagIsSet(Behavior, RELOC_ENABLE_CINIT_WARN) && (strcmp(symbol->name, "_cinit") != 0)) {
- gp_warning("Relocation symbol \"%s\" [0x%0*X] has no section. (pass %u)",
- symbol->name, Class->addr_digits, relocation->address, Pass);
- }
-diff --git a/libgputils/gpcoffgen.h b/libgputils/gpcoffgen.h
-index ffb5b5c..41d3f89 100644
---- a/libgputils/gpcoffgen.h
-+++ b/libgputils/gpcoffgen.h
-@@ -73,7 +73,7 @@ extern gp_symbol_t *gp_coffgen_add_symbol(gp_object_t *Object, const char *Name,
- extern gp_aux_t *gp_coffgen_add_aux(gp_object_t *Object, gp_symbol_t *Symbol);
- extern gp_aux_t *gp_coffgen_make_block_aux(gp_symbol_t *Symbol, unsigned int Num_auxsyms);
- extern gp_symbol_t *gp_coffgen_move_reserve_symbol(gp_object_t *Object, gp_symbol_t *Symbol);
--extern gp_boolean gp_coffgen_del_symbol(gp_object_t *Object, gp_symbol_t *Symbol);
-+extern gp_boolean gp_coffgen_del_symbol(gp_object_t *Object, gp_symbol_t *Symbol, gp_boolean Touch_number);
- extern gp_symbol_t **gp_coffgen_make_symbol_array(const gp_object_t *Object, int (*Cmp)(const void *, const void *));
- extern const char *gp_coffgen_symbol_type_to_str(uint8_t Type);
- extern const char *gp_coffgen_symbol_derived_type_to_str(uint32_t Type);
-diff --git a/libgputils/gpcofflink.c b/libgputils/gpcofflink.c
-index 7511c36..1283e63 100644
---- a/libgputils/gpcofflink.c
-+++ b/libgputils/gpcofflink.c
-@@ -174,9 +174,12 @@ gp_cofflink_clean_table(gp_object_t *Object, symbol_table_t *Symbols)
- const gp_coffsymbol_t *var;
- const symbol_t *sym;
- gp_symbol_t *next;
-+ int num_clean_errors;
-
- gp_debug("Cleaning symbol table.");
-
-+ num_clean_errors = gp_real_num_errors();
-+
- /* point all relocations to the symbol definitions */
- section = Object->section_list.first;
- while (section != NULL) {
-@@ -186,13 +189,17 @@ gp_cofflink_clean_table(gp_object_t *Object, symbol_table_t *Symbols)
-
- if (gp_coffgen_is_external_symbol(symbol)) {
- /* This is an external symbol defined elsewhere. */
-- sym = gp_sym_get_symbol(Symbols, symbol->name);
-- assert(sym != NULL);
-- var = (const gp_coffsymbol_t *)gp_sym_get_symbol_annotation(sym);
-- assert(var != NULL);
-- symbol = var->symbol;
-- assert(symbol != NULL);
-- relocation->symbol = symbol;
-+ sym = gp_sym_get_symbol(Symbols, symbol->name);
-+ if (sym == NULL) {
-+ gp_error("Non-existent external symbol - \"%s\" - used in \"%s\" section.", symbol->name, section->name);
-+ }
-+ else {
-+ var = (const gp_coffsymbol_t *)gp_sym_get_symbol_annotation(sym);
-+ assert(!(var == NULL));
-+ symbol = var->symbol;
-+ assert(!(symbol == NULL));
-+ relocation->symbol = symbol;
-+ }
- }
-
- relocation = relocation->next;
-@@ -201,13 +208,17 @@ gp_cofflink_clean_table(gp_object_t *Object, symbol_table_t *Symbols)
- section = section->next;
- }
-
-+ if (gp_real_num_errors() > num_clean_errors) {
-+ exit(1);
-+ }
-+
- symbol = Object->symbol_list.first;
- while (symbol != NULL) {
- next = symbol->next;
-
- if (gp_coffgen_is_external_symbol(symbol)) {
- gp_debug(" removed symbol \"%s\"", symbol->name);
-- gp_coffgen_del_symbol(Object, symbol);
-+ gp_coffgen_del_symbol(Object, symbol, true);
- }
-
- symbol = next;
-@@ -265,7 +276,7 @@ gp_cofflink_combine_overlay(gp_object_t *Object, gp_boolean Remove_symbol)
-
- /* Remove the section symbol. */
- if (Remove_symbol) {
-- gp_coffgen_del_symbol(Object, second->symbol);
-+ gp_coffgen_del_symbol(Object, second->symbol, true);
- }
-
- /* Update the symbol table */
-@@ -1570,6 +1581,7 @@ _patch_addr(gp_object_t *Object, gp_section_t *Section, const gp_reloc_t *Reloca
- int bank;
- int page;
- gp_boolean write_data;
-+ const insn_t *instruction;
-
- class = Object->class;
- num_pages = gp_processor_num_pages(Object->processor);
-@@ -1602,9 +1614,23 @@ _patch_addr(gp_object_t *Object, gp_section_t *Section, const gp_reloc_t *Reloca
- data = class->reloc_goto(value);
- break;
-
-- case RELOC_LOW:
-- data = value & 0xff;
-+ case RELOC_LOW: {
-+ instruction = class->find_insn(class, current_value);
-+
-+ if (instruction == NULL) {
-+ gp_error("No instruction for %#x at %#x(%s/%s)", current_value,
-+ byte_addr, Section->name, symbol->name);
-+ return;
-+ }
-+
-+ if (instruction->class == INSN_CLASS_LIT8) {
-+ data = value & 0xff;
-+ }
-+ else {
-+ data = class->reloc_f(value);
-+ }
- break;
-+ }
-
- case RELOC_HIGH:
- data = class->reloc_high(FlagIsSet(symbol->section->flags, STYP_ROM_AREA), value);
-diff --git a/libgputils/gpmessage.c b/libgputils/gpmessage.c
-index 0a640eb..1573193 100644
---- a/libgputils/gpmessage.c
-+++ b/libgputils/gpmessage.c
-@@ -34,14 +34,20 @@ int gp_num_errors = 0;
- int gp_num_warnings = 0;
- int gp_num_messages = 0;
-
-+static int _real_num_errors = 0;
-+static int _real_num_warnings = 0;
-+static int _real_num_messages = 0;
-+
- /*------------------------------------------------------------------------------------------------*/
-
- void
--gp_error(const char *Format, ...)
-+gp_error(const char* Format, ...)
- {
- va_list args;
- char buffer[BUFSIZ];
-
-+ _real_num_errors++;
-+
- if (gp_message_disable) {
- return;
- }
-@@ -62,11 +68,13 @@ gp_error(const char *Format, ...)
- /*------------------------------------------------------------------------------------------------*/
-
- void
--gp_warning(const char *Format, ...)
-+gp_warning(const char* Format, ...)
- {
- va_list args;
- char buffer[BUFSIZ];
-
-+ _real_num_warnings++;
-+
- if (gp_message_disable) {
- return;
- }
-@@ -87,11 +95,13 @@ gp_warning(const char *Format, ...)
- /*------------------------------------------------------------------------------------------------*/
-
- void
--gp_message(const char *Format, ...)
-+gp_message(const char* Format, ...)
- {
- va_list args;
- char buffer[BUFSIZ];
-
-+ _real_num_messages++;
-+
- if (gp_message_disable) {
- return;
- }
-@@ -112,7 +122,7 @@ gp_message(const char *Format, ...)
- /*------------------------------------------------------------------------------------------------*/
-
- void
--gp_debug(const char *Format, ...)
-+gp_debug(const char* Format, ...)
- {
- va_list args;
- char buffer[BUFSIZ];
-@@ -131,3 +141,27 @@ gp_debug(const char *Format, ...)
-
- printf("debug: %s\n", buffer);
- }
-+
-+/*------------------------------------------------------------------------------------------------*/
-+
-+int
-+gp_real_num_errors(void)
-+{
-+ return _real_num_errors;
-+}
-+
-+/*------------------------------------------------------------------------------------------------*/
-+
-+int
-+gp_real_num_warnings(void)
-+{
-+ return _real_num_warnings;
-+}
-+
-+/*------------------------------------------------------------------------------------------------*/
-+
-+int
-+gp_real_num_messages(void)
-+{
-+ return _real_num_messages;
-+}
-diff --git a/libgputils/gpmessage.h b/libgputils/gpmessage.h
-index d2f6ffa..2329f4c 100644
---- a/libgputils/gpmessage.h
-+++ b/libgputils/gpmessage.h
-@@ -30,9 +30,13 @@ extern int gp_num_errors;
- extern int gp_num_warnings;
- extern int gp_num_messages;
-
--extern void gp_error(const char *Format, ...);
--extern void gp_warning(const char *Format, ...);
--extern void gp_message(const char *Format, ...);
--extern void gp_debug(const char *Format, ...);
-+extern void gp_error(const char* Format, ...);
-+extern void gp_warning(const char* Format, ...);
-+extern void gp_message(const char* Format, ...);
-+extern void gp_debug(const char* Format, ...);
-+
-+extern int gp_real_num_errors(void);
-+extern int gp_real_num_warnings(void);
-+extern int gp_real_num_messages(void);
-
- #endif
-diff --git a/libgputils/gpreadobj.c b/libgputils/gpreadobj.c
-index f1cc22d..57de3f0 100644
---- a/libgputils/gpreadobj.c
-+++ b/libgputils/gpreadobj.c
-@@ -648,7 +648,7 @@ _clean_symbol_table(gp_object_t *Object)
- for (i = 0; i < curr_symbol->aux_list.num_nodes; ++i) {
- aux_symbol = next_symbol;
- next_symbol = next_symbol->next;
-- gp_coffgen_del_symbol(Object, aux_symbol);
-+ gp_coffgen_del_symbol(Object, aux_symbol, false);
- }
- }
- curr_symbol = curr_symbol->next;
diff --git a/sources b/sources
index 2dadcbb..dd898ca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gputils-1.5.0-1.tar.bz2) = 18cbc2c5d52a67f40ac99a7966ecff07cf0eb114aa919c76dedffc311e4dfa23f72b7ab842416f54be156891db8d80e616c4591ceb27280a5a833364ffd49a41
+SHA512 (gputils-1.5.2.tar.bz2) = 43ed508d164152bf36e4f27b09656e6e3d58fc174806ad57d6415e6e2726a56381b1323be3acfc635f2a05babade695e9777b0db8b5f4b90da00b9d29e75eddc
https://src.fedoraproject.org/rpms/gputils/c/32f881afb34248196db859d212df...
1 year, 4 months
mtasaka pushed to rpms/rubygem-hoe (rawhide). "4.0.1"
by notifications＠fedoraproject.org
Notification time stamped 2023-01-01 09:01:28 UTC
From 3725f17718ca84e8cae05ebd758f2290923f162e Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Jan 01 2023 09:01:20 +0000
Subject: 4.0.1
---
diff --git a/rubygem-hoe.spec b/rubygem-hoe.spec
index 8953fce..0d7b4a3 100644
--- a/rubygem-hoe.spec
+++ b/rubygem-hoe.spec
@@ -3,7 +3,7 @@
Summary: Hoe is a simple rake/rubygems helper for project Rakefiles
Name: rubygem-%{gem_name}
-Version: 3.26.0
+Version: 4.0.1
Release: 1%{?dist}
License: MIT
URL: http://rubyforge.org/projects/seattlerb/
@@ -130,6 +130,9 @@ popd
%{gem_docdir}
%changelog
+* Sun Jan 1 2023 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 4.0.1-1
+- 4.0.1
+
* Fri Oct 21 2022 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 3.26.0-1
- 3.26.0
diff --git a/sources b/sources
index a87c23e..2140989 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (hoe-3.26.0.gem) = 0b069b0b2b181b81770568186f9d81b0f8fe48644a4b29bb2dd8084dc60886c7a06fa0e7be81854b5b653afc38c908622f08066656d9b625ab595615ef2918c3
+SHA512 (hoe-4.0.1.gem) = b1e7e6dd5bfdd47bd1f01463afea3cbf0d41e6190e75538a1d7bcea1fa10a9fd561d670064f78a069d7cf25d762e0f196fbe5fca2b7783bd780b3debe8ffa3c9
https://src.fedoraproject.org/rpms/rubygem-hoe/c/3725f17718ca84e8cae05ebd...
1 year, 4 months
pampelmuse pushed to rpms/fluidsynth (epel9). "Update to 2.3.1"
by notifications＠fedoraproject.org
Notification time stamped 2023-01-01 08:49:02 UTC
From abce4b10672ea5069b1b7ed7813f56dbf1f4c566 Mon Sep 17 00:00:00 2001
From: Christoph Karl <ckarl(a)zorro.wonderland.loc>
Date: Dec 30 2022 07:05:00 +0000
Subject: Update to 2.3.1
---
diff --git a/.gitignore b/.gitignore
index 3087ae2..cd8809a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ fluidsynth-1.1.1.tar.gz
/fluidsynth-2.2.8.tar.gz
/fluidsynth-2.2.9.tar.gz
/fluidsynth-2.3.0.tar.gz
+/fluidsynth-2.3.1.tar.gz
diff --git a/fluidsynth-fedora-defaults.patch b/fluidsynth-fedora-defaults.patch
index 7695aa5..3ca98db 100644
--- a/fluidsynth-fedora-defaults.patch
+++ b/fluidsynth-fedora-defaults.patch
@@ -6,4 +6,4 @@
+SOUND_FONT=/usr/share/soundfonts/default.sf2
# Additional optional parameters (may be useful, see 'man fluidsynth' for further info)
- #OTHER_OPTS='-a alsa -m alsa_seq -r 48000'
+ #OTHER_OPTS='-a alsa -m alsa_seq -p FluidSynth\ GM -r 48000'
diff --git a/fluidsynth-fedora-service.patch b/fluidsynth-fedora-service.patch
index 48d0ff7..00d1999 100644
--- a/fluidsynth-fedora-service.patch
+++ b/fluidsynth-fedora-service.patch
@@ -1,7 +1,7 @@
---- fluidsynth-2.3.0.org/fluidsynth.service.in 2022-09-30 07:13:28.719819083 +0200
-+++ fluidsynth-2.3.0/fluidsynth.service.in 2022-09-30 07:15:18.425188712 +0200
-@@ -7,9 +7,9 @@ After=sound.target
- ProtectSystem=full
+--- fluidsynth-2.3.1.org/fluidsynth.service.in 2022-12-30 07:48:18.445912018 +0100
++++ fluidsynth-2.3.1/fluidsynth.service.in 2022-12-30 07:48:53.318076806 +0100
+@@ -19,9 +19,9 @@ ProtectControlGroups=true
+ PrivateUsers=yes
Type=notify
NotifyAccess=main
-EnvironmentFile=@FLUID_DAEMON_ENV_FILE@
diff --git a/fluidsynth.spec b/fluidsynth.spec
index 4bf80f4..ab26784 100644
--- a/fluidsynth.spec
+++ b/fluidsynth.spec
@@ -1,7 +1,7 @@
Summary: Real-time software synthesizer
Name: fluidsynth
-Version: 2.3.0
+Version: 2.3.1
Release: 1%{?dist}
URL: http://www.fluidsynth.org/
Source0: https://github.com/Fluidsynth/fluidsynth/archive/v%{version}/fluidsynth-%...
@@ -131,6 +131,9 @@ install -m 644 fluidsynth.service.in $RPM_BUILD_ROOT/usr/lib/systemd/user/fluids
%changelog
+* Fri Dec 30 2022 Christoph Karl <pampelmuse [AT] gmx [DOT] at> - 2.3.1-1
+- Update to 2.3.1
+
* Fri Sep 30 2022 Christoph Karl <pampelmuse [AT] gmx [DOT] at> - 2.3.0-1
- Update to 2.3.0
diff --git a/sources b/sources
index 75d9326..93844e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fluidsynth-2.3.0.tar.gz) = 621a54f7d9845a9350381e9aa99f342b28050e1dd80983e69828acc685ace39ee5376f8e40d7a93ddb247718e4bcfb3f196cbd4027343251f8c0fbe3c0d219ed
+SHA512 (fluidsynth-2.3.1.tar.gz) = 1633294bf6c714361c381151b62d9dd2c8f388490153e7964bfa14fd647a681db9ebfe1de0a06279972d6c5b30377f67361feb4db186b1faa235600f0ae02b22
https://src.fedoraproject.org/rpms/fluidsynth/c/abce4b10672ea5069b1b7ed78...
1 year, 4 months
mtasaka pushed to rpms/rubygem-minitest (rawhide). "5.17.0"
by notifications＠fedoraproject.org
Notification time stamped 2023-01-01 08:25:05 UTC
From 336960a3c8932993e827f770f2d442731bed310d Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Jan 01 2023 08:24:57 +0000
Subject: 5.17.0
---
diff --git a/rubygem-minitest.spec b/rubygem-minitest.spec
index f9f7de9..7af86b2 100644
--- a/rubygem-minitest.spec
+++ b/rubygem-minitest.spec
@@ -2,7 +2,7 @@
%global gem_name minitest
Name: rubygem-%{gem_name}
-Version: 5.16.3
+Version: 5.17.0
Release: 200%{?dist}
Summary: minitest provides a complete suite of testing facilities
License: MIT
@@ -93,6 +93,9 @@ popd
%{gem_instdir}/design_rationale.rb
%changelog
+* Sun Jan 1 2023 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 5.17.0-200
+- 5.17.0
+
* Thu Aug 18 2022 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 5.16.3-200
- 5.16.3
diff --git a/sources b/sources
index 48c2a4f..d1985b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (minitest-5.16.3.gem) = 1463b12842a914df663d0d796bafd418ead038d32c935f3970062492f248f3f4fcf3a5c2f45e2fb71ac13e3b94fca1e6497e7cd7fe9e7050587b7efe2b275453
+SHA512 (minitest-5.17.0.gem) = 00374b0d0c86d0ec2d285bc4053b6851e1a59e86f7a3ab3db8ccac1db222256edb58514c666763047cec95cf099b1738765a3e9eec9aee3386b187e9fe0f59f9
https://src.fedoraproject.org/rpms/rubygem-minitest/c/336960a3c8932993e82...
1 year, 4 months
mtasaka pushed to rpms/twincam (rawhide). "fix for libcamera 0.0.3 API"
by notifications＠fedoraproject.org
Notification time stamped 2023-01-01 07:51:46 UTC
From c9295067b652028bb8e038c8535d27173eda281e Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Jan 01 2023 07:51:33 +0000
Subject: fix for libcamera 0.0.3 API
---
diff --git a/twincam-0.5.4-libcamera-003.patch b/twincam-0.5.4-libcamera-003.patch
new file mode 100644
index 0000000..5744106
--- /dev/null
+++ b/twincam-0.5.4-libcamera-003.patch
@@ -0,0 +1,13 @@
+diff -urp twincam-0.5.4.old/src/camera_session.cpp twincam-0.5.4/src/camera_session.cpp
+--- twincam-0.5.4.old/src/camera_session.cpp 2022-08-24 05:50:36.000000000 +0900
++++ twincam-0.5.4/src/camera_session.cpp 2023-01-01 16:42:41.196263751 +0900
+@@ -67,7 +67,7 @@ int CameraSession::validateConfig() {
+ }
+
+ std::unique_ptr<CameraConfiguration> cfg =
+- camera_->generateConfiguration({libcamera::Viewfinder});
++ camera_->generateConfiguration({libcamera::StreamRole::Viewfinder});
+ if (!cfg || cfg->size() != 1) {
+ EPRINT("Failed to get default stream configuration\n");
+ camera_->release();
+twincam-0.5.4/src のみに存在: camera_session.cpp~
diff --git a/twincam.spec b/twincam.spec
index 72ddee9..5375a59 100644
--- a/twincam.spec
+++ b/twincam.spec
@@ -8,6 +8,9 @@ Summary: A lightweight camera application
License: GPLv2
URL: https://github.com/ericcurtin/twincam
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+# Due to libcamera 0.0.3 API change:
+# https://git.libcamera.org/libcamera/libcamera.git/commit/?id=81e7689bb168...
+Patch0: twincam-0.5.4-libcamera-003.patch
BuildRequires: meson
BuildRequires: gcc-c++
@@ -27,7 +30,7 @@ ExcludeArch: %ix86
%{summary}.
%prep
-%autosetup
+%autosetup -p1
%build
%meson
@@ -64,6 +67,7 @@ dracut -f
%changelog
* Sun Jan 01 2023 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 0.5.4-6
- Rebuild for new libcamera again
+- Patch for libcamera 0.0.3 API change
* Wed Dec 07 2022 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 0.5.4-5
- Rebuild for new libcamera
https://src.fedoraproject.org/rpms/twincam/c/c9295067b652028bb8e038c8535d...
1 year, 4 months
mtasaka pushed to rpms/twincam (rawhide). "Rebuild for new libcamera again"
by notifications＠fedoraproject.org
Notification time stamped 2023-01-01 07:25:07 UTC
From 4045be8b1bf465f4a837df54209b9ecd44bc9e81 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Jan 01 2023 07:25:00 +0000
Subject: Rebuild for new libcamera again
---
diff --git a/twincam.spec b/twincam.spec
index 42e18c8..72ddee9 100644
--- a/twincam.spec
+++ b/twincam.spec
@@ -2,7 +2,7 @@
Name: twincam
Version: 0.5.4
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: A lightweight camera application
License: GPLv2
@@ -62,6 +62,9 @@ dracut -f
%{_unitdir}/multi-user.target.wants/twincam-quit.service
%changelog
+* Sun Jan 01 2023 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 0.5.4-6
+- Rebuild for new libcamera again
+
* Wed Dec 07 2022 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 0.5.4-5
- Rebuild for new libcamera
https://src.fedoraproject.org/rpms/twincam/c/4045be8b1bf465f4a837df54209b...
1 year, 4 months