summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleksandr Natalenko2021-08-15 18:23:00 +0200
committerOleksandr Natalenko2021-08-15 18:23:00 +0200
commit03ed3fbf23f2b6648f886184464a752d56311150 (patch)
tree7ddf9e8eddeb57be31003bc8f568bdf40884a3a2
parent408a8cecbc336abeb0b20d1407c85812ecd84aff (diff)
downloadaur-03ed3fbf23f2b6648f886184464a752d56311150.tar.gz
simplify dbgcv.patch
Signed-off-by: Oleksandr Natalenko <oleksandr@natalenko.name>
-rw-r--r--PKGBUILD8
-rw-r--r--dbgcv.patch22
2 files changed, 8 insertions, 22 deletions
diff --git a/PKGBUILD b/PKGBUILD
index fc44d251d817..0a99a87830d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -33,11 +33,9 @@ source=(
dbgcv.patch
)
-sha1sums=(
- SKIP
- 49f6a6ca16eba01fafce563e0f14cd145b512ff6
- 9489b5239bbb2b4c3c93ef04c61ec1797ec443dd
-)
+sha1sums=('SKIP'
+ '49f6a6ca16eba01fafce563e0f14cd145b512ff6'
+ 'f41bb76a34bde4a30ec8f17eda857e6d0951d070')
prepare() {
diff --git a/dbgcv.patch b/dbgcv.patch
index 6f3cbefa13ee..c523cd65e9e2 100644
--- a/dbgcv.patch
+++ b/dbgcv.patch
@@ -1,5 +1,6 @@
---- dbgcv.c.orig 2021-06-09 16:42:58.071853143 +0100
-+++ dbgcv.c 2021-06-10 10:32:31.453195825 +0100
+diff '--color=auto' -Naur UASM-c612f83d97a0cb192dfd983676743dabf662ed51~/dbgcv.c UASM-c612f83d97a0cb192dfd983676743dabf662ed51/dbgcv.c
+--- UASM-c612f83d97a0cb192dfd983676743dabf662ed51~/dbgcv.c 2021-04-02 17:57:14.000000000 +0200
++++ UASM-c612f83d97a0cb192dfd983676743dabf662ed51/dbgcv.c 2021-07-20 14:31:39.634571179 +0200
@@ -17,7 +17,24 @@
#include <fixup.h>
#include <dbgcv.h>
@@ -35,20 +36,7 @@
#define MD5_LENGTH ( sizeof( uint_32 ) + sizeof( uint_16 ) + 16 + sizeof( uint_16 ) )
static int calc_md5(const char* filename, unsigned char* sum)
-@@ -1565,22 +1584,31 @@
- s = strcpy(s, "cwd") + 4;
- s = strcpy(s, cv.currdir) + q + 1;
- s = strcpy(s, "exe") + 4;
-+
- len = strlen(_pgmptr) + 1;
- s = strcpy(s, _pgmptr) + len;
-+
- s = strcpy(s, "src") + 4;
- p = cv.files[0].name;
- if (_memicmp(p, cv.currdir, q) == 0)
- p += q + 1;
--
-+
+@@ -1575,12 +1594,20 @@
len = strlen(p) + 1;
s = strcpy(s, p) + len;
*s++ = '\0';
@@ -60,7 +48,7 @@
cv.ps = s;
/* length needs to be added for each symbol */
--
+
+ #ifdef _WIN32
cv.section->length += (s - start);
+ #else