From 833996cbb047a74ec8dab103d93f4c6f2b8ae1da Mon Sep 17 00:00:00 2001 From: Eric Smith Date: Jun 07 2014 19:51:45 +0000 Subject: Update to latest upstream. --- diff --git a/.gitignore b/.gitignore index 29e2564..10f0b1a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /64tass-1.50.486.zip +/64tass-1.51.716-src.zip diff --git a/64tass-1.50.486-ptrcast.patch b/64tass-1.50.486-ptrcast.patch deleted file mode 100644 index 6295aaa..0000000 --- a/64tass-1.50.486-ptrcast.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up 64tass-1.50.486/obj.c.ptrcast 64tass-1.50.486/obj.c ---- 64tass-1.50.486/obj.c.ptrcast 2013-06-11 17:02:49.075972646 -0600 -+++ 64tass-1.50.486/obj.c 2013-06-11 17:03:25.127641322 -0600 -@@ -129,7 +129,7 @@ static int invalid_hash(const struct val - } - - static int gap_hash(const struct value_s *UNUSED(v1), struct value_s *UNUSED(v), linepos_t UNUSED(epoint)) { -- return (unsigned int)GAP_OBJ & ((~(unsigned int)0) >> 1); -+ return (intptr_t)GAP_OBJ & ((~(intptr_t)0) >> 1); - } - - static void invalid_convert(struct value_s *v1, struct value_s *v, obj_t UNUSED(t), linepos_t epoint, linepos_t UNUSED(epoint2)) { diff --git a/64tass-1.50.486-sizet.patch b/64tass-1.50.486-sizet.patch deleted file mode 100644 index e9f556d..0000000 --- a/64tass-1.50.486-sizet.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -up 64tass-1.50.486/misc.c.sizet 64tass-1.50.486/misc.c ---- 64tass-1.50.486/misc.c.sizet 2013-06-11 17:00:35.876501904 -0600 -+++ 64tass-1.50.486/misc.c 2013-06-11 17:02:16.489368315 -0600 -@@ -241,28 +241,28 @@ static void labelprint2(const struct avl - case D_BYTE: - fputs(" byte", flab); - if (l->value->u.code.size > 1) { -- fprintf(flab, " %x", l->value->u.code.size); -+ fprintf(flab, " %zx", l->value->u.code.size); - } - break; - case D_INT: - case D_WORD: - fputs(" word", flab); - if (l->value->u.code.size > 2) { -- fprintf(flab, " %x", l->value->u.code.size); -+ fprintf(flab, " %zx", l->value->u.code.size); - } - break; - case D_LINT: - case D_LONG: - fputs(" long", flab); - if (l->value->u.code.size > 3) { -- fprintf(flab, " %x", l->value->u.code.size); -+ fprintf(flab, " %zx", l->value->u.code.size); - } - break; - case D_DINT: - case D_DWORD: - fputs(" dword", flab); - if (l->value->u.code.size > 4) { -- fprintf(flab, " %x", l->value->u.code.size); -+ fprintf(flab, " %zx", l->value->u.code.size); - } - break; - case D_NONE: -diff -up 64tass-1.50.486/section.c.sizet 64tass-1.50.486/section.c ---- 64tass-1.50.486/section.c.sizet 2013-06-11 17:00:30.438400433 -0600 -+++ 64tass-1.50.486/section.c 2013-06-11 17:01:27.084451753 -0600 -@@ -151,7 +151,7 @@ void sectionprint(void) { - l = &root_section; - if (l->size) { - sprintf(temp, "$%04" PRIaddress, l->start); -- sprintf(temp2, "$%04" PRIaddress, l->start + l->size - 1); -+ sprintf(temp2, "$%04zx", l->start + l->size - 1); - printf("Section: %7s-%-7s\n", temp, temp2); - } - memprint(&l->mem); -@@ -160,7 +160,7 @@ void sectionprint(void) { - if (l->defpass == pass) { - if (l->size) { - sprintf(temp, "$%04" PRIaddress, l->start); -- sprintf(temp2, "$%04" PRIaddress, l->start + l->size - 1); -+ sprintf(temp2, "$%04zx", l->start + l->size - 1); - printf("Section: %7s-%-7s ", temp, temp2); - } else { - printf("Section: "); diff --git a/64tass.spec b/64tass.spec index 33b7513..b92be34 100644 --- a/64tass.spec +++ b/64tass.spec @@ -1,33 +1,13 @@ Name: 64tass -Version: 1.50.486 -Release: 2%{?dist} +Version: 1.51.716 +Release: 1%{?dist} Summary: 6502 assembler Group: Development/Languages License: GPLv2+ URL: http://tass64.sourceforge.net/ BuildRequires: w3m -# The following would meet the Fedora Packaging Guidelines for Source URLs -# for SourceForge, but it doesn't actually work! Despite the "/source/" in -# the path, it actually gets the *binary* release ZIP archives. This may have -# something to do with the fact that the source and binary release ZIP -# archives have the same name. I've requested that upstream start putting -# "-source" or "-src" in the names of the source archives, which hopefully -# would fix this problem. -# https://sourceforge.net/p/tass64/bugs/13/ -#Source0: http://downloads.sourceforge.net/tass64/source/%{name}-%{version}.zip - -Source0: http://sourceforge.net/projects/tass64/files/source/%{name}-%{version}.zip - -# Fix problem with printf conversions of size_t. Reported upstream with -# proposed patch: -# https://sourceforge.net/p/tass64/bugs/14/ -Patch0: 64tass-1.50.486-sizet.patch - -# Fix problem with cast of pointer to int. Reported upstream with -# proposed patch: -# https://sourceforge.net/p/tass64/bugs/15/ -Patch1: 64tass-1.50.486-ptrcast.patch +Source0: http://sourceforge.net/projects/tass64/files/source/%{name}-%{version}-src.zip %description 64tass is a multi-pass optimizing macro assembler for the 65xx series of @@ -35,9 +15,7 @@ processors. It supports the 6502, 65C02, R65C02, W65C02, 65CE02, 65816, DTV, and 65EL02, using a syntax similar to that of Omicron TASS and TASM. %prep -%setup -q -%patch -P 0 -p1 -b .sizet -%patch -P 1 -p1 -b .ptrcast +%setup -q -n %{name}-%{version}-src rm README # will be built %build @@ -57,6 +35,9 @@ install -m 755 64tass %{buildroot}%{_bindir}/ %doc LICENSE-my_getopt %changelog +* Sat Jun 07 2014 Eric Smith 1.51.716-1 +- Update to latest upstream + * Fri Jun 06 2014 Fedora Release Engineering - 1.50.486-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 337dfaf..01bc6fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3f2e6a68123d0d8b786cc5f19d115003 64tass-1.50.486.zip +0521b4fcebcd3ab23731100417881856 64tass-1.51.716-src.zip