summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFerdinand Bachmann2021-05-15 01:33:48 +0200
committerFerdinand Bachmann2021-05-15 01:34:43 +0200
commit838eb0a6147c2e63acdd024bf286bddbc182e4b8 (patch)
treebb2c1b51d288c3bfe2852b4951f4da6ca4ffcf7f
parentf72fcfd8dadc5aed6cd31d0c24126b79a82fe66b (diff)
downloadaur-wit-git.tar.gz
simplify wit-makefile.patch so it doesn't break on every Makefile change
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--wit-makefile.patch131
3 files changed, 4 insertions, 135 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ebbd2e185a4..f7ef114d69b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = wit-git
pkgdesc = Wiimms ISO Tools (git version)
- pkgver = 3.03b.r8.7f41a7f
+ pkgver = 3.04a.r9.e58ce74
pkgrel = 1
url = https://wit.wiimm.de
install = wit.install
@@ -22,7 +22,7 @@ pkgbase = wit-git
source = wit-titles.patch
source = wit-makefile-version.patch
b2sums = SKIP
- b2sums = 2440f01dc499477b9c237d2bc6d9a6a712ac22887df022b6a84c6ec6ac9b095aa5944db6c5af9773a2e2446df6cc7774783c8cfd59ed815d9cb413ae8e1c0efb
+ b2sums = f147b464b9d6cf4b909ee782059f1fdc6142317e3a40fe11d2fce65ff3af6beb2f214ebe492c18a34e9693e3e152bbe9bcfaaaf5846c7726476f138025cf79ef
b2sums = a9e615aac8ebafcf98079160f3e2140e1389e42baf7896a2fd845133e47ebcea9199eef847b84732d4dc4fec6107f45e96fb4ab3d4acf5421c88e02f3564eb62
b2sums = 4e241a0c37fd2a082d4285d3685833e3805e35db829961183df02bb426d5679b62f8985f59604512b2615002faa28a9d8947ca9c6fc86a025bee5ab7bbf1bcf7
b2sums = d412e4aaa485a0288f567aac67f4abf7ec4d9bcbe8f4d9b0f580e629727468b60dd98dbba13b1cb2492722cc6f1822751c82317de1fcf2fcbf5dd515ed888334
diff --git a/PKGBUILD b/PKGBUILD
index c2d3a895d92..c90254b9c68 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Gordin <gordin@koeln.ccc.de>
pkgname=wit-git
-pkgver=3.03b.r8.7f41a7f
+pkgver=3.04a.r9.e58ce74
pkgrel=1
pkgdesc='Wiimms ISO Tools (git version)'
arch=(x86_64)
@@ -34,7 +34,7 @@ source=(
wit-makefile-version.patch
)
b2sums=('SKIP'
- '2440f01dc499477b9c237d2bc6d9a6a712ac22887df022b6a84c6ec6ac9b095aa5944db6c5af9773a2e2446df6cc7774783c8cfd59ed815d9cb413ae8e1c0efb'
+ 'f147b464b9d6cf4b909ee782059f1fdc6142317e3a40fe11d2fce65ff3af6beb2f214ebe492c18a34e9693e3e152bbe9bcfaaaf5846c7726476f138025cf79ef'
'a9e615aac8ebafcf98079160f3e2140e1389e42baf7896a2fd845133e47ebcea9199eef847b84732d4dc4fec6107f45e96fb4ab3d4acf5421c88e02f3564eb62'
'4e241a0c37fd2a082d4285d3685833e3805e35db829961183df02bb426d5679b62f8985f59604512b2615002faa28a9d8947ca9c6fc86a025bee5ab7bbf1bcf7'
'd412e4aaa485a0288f567aac67f4abf7ec4d9bcbe8f4d9b0f580e629727468b60dd98dbba13b1cb2492722cc6f1822751c82317de1fcf2fcbf5dd515ed888334')
diff --git a/wit-makefile.patch b/wit-makefile.patch
index f48c2bbc8c5..6d4ffc60122 100644
--- a/wit-makefile.patch
+++ b/wit-makefile.patch
@@ -42,134 +42,3 @@ diff -rupN wiimms-iso-tools.orig/project/Makefile wiimms-iso-tools/project/Makef
DISTRIB_RM = ./wit-v$(VERSION)-r
DISTRIB_BASE = wit-v$(VERSION)-r$(REVISION_NEXT)
-@@ -380,83 +378,70 @@ default_rule: all
- # general rules
-
- $(ALL_TOOLS_X): %: %.o $(ALL_OBJECTS) $(TOBJ_ALL) Makefile | $(HELPER_TOOLS)
-- @printf "$(LOGFORMAT_TOOL)" tool "$@" "$(MODE) $(TOPT_$@) $(TOBJ_$@)"
-- @$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \
-+ $(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \
- $(ALL_OBJECTS) $(TOBJ_$@) $(LIBS) $(TOPT_$@) -o $@
-- @if test -f $@.exe; then $(STRIP) $@.exe; else $(STRIP) $@; fi
-
-- @mkdir -p bin/$(SYSTEM) bin/$(SYSTEM)/debug
-- @if test -s $(MODE_FILE) && grep -Fq -e -DDEBUG $(MODE_FILE); \
-+ mkdir -p bin/$(SYSTEM) bin/$(SYSTEM)/debug
-+ if test -s $(MODE_FILE) && grep -Fq -e -DDEBUG $(MODE_FILE); \
- then cp -p $@ bin/$(SYSTEM)/debug/; \
- else cp -p $@ bin/; cp -p $@ bin/$(SYSTEM)/; fi
-
- #--------------------------
-
- $(HELPER_TOOLS): %: %.o $(ALL_OBJECTS) $(UI_TABS) Makefile
-- @printf "$(LOGFORMAT_TOOL)" helper "$@ $(TOBJ_$@)" "$(MODE)"
-- @$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \
-+ $(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \
- $(ALL_OBJECTS) $(TOBJ_$@) $(LIBS) -o $@
-
- #--------------------------
-
- $(WDF_LINKS): wdf
-- @printf "$(LOGFORMAT_INST)" "link" "wdf -> $@" ""
-- @ln -f wdf "$@"
-+ ln -f wdf "$@"
-
- #--------------------------
-
- $(UI_OBJECTS): %.o: %.c ui-%.c ui-%.h version.h Makefile
-- @printf "$(LOGFORMAT_CC)" +object "$@" "$(MODE)"
-- @$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
-+ $(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
-
- #--------------------------
-
- $(C_OBJECTS): %.o: %.c version.h Makefile $(TEXT_FILES)
-- @printf "$(LOGFORMAT_CC)" object "$@" "$(MODE)"
-- @$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
-+ $(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
-
- #--------------------------
-
- $(ASM_OBJECTS): %.o: %.S Makefile
-- @printf "$(LOGFORMAT_CC)" asm "$@" "$(MODE)"
-- @$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
-+ $(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
-
- #--------------------------
-
- $(SETUP_FILES): templates.sed $(SETUP_DIR)/$@
-- @printf "$(LOGFORMAT)" create "$@" ""
-- @chmod 775 $(GEN_TEMPLATE)
-- @$(GEN_TEMPLATE) $@
-+ chmod 775 $(GEN_TEMPLATE)
-+ $(GEN_TEMPLATE) $@
-
- #--------------------------
-
- $(TEXT_FILES): $(GEN_TEXT_FILE) $(TEXT_DIR)/$@
-- @printf "$(LOGFORMAT)" text "$@" ""
-- @chmod 775 $(GEN_TEXT_FILE)
-- @$(GEN_TEXT_FILE) $(TEXT_DIR) $@
-+ chmod 775 $(GEN_TEXT_FILE)
-+ $(GEN_TEXT_FILE) $(TEXT_DIR) $@
-
- #--------------------------
-
- $(UI_FILES): gen-ui.c ui.h $(UI_TABS) | gen-ui
-- @printf "$(LOGFORMAT)" run gen-ui ""
-- @./gen-ui
-+ ./gen-ui
-
- .PHONY : ui
- ui : gen-ui
-- @printf "$(LOGFORMAT)" run gen-ui ""
-- @./gen-ui
-+ ./gen-ui
-
- #
- ###############################################################################
- # lib specific rules
-
- $(LIBBZ2_OBJ): %.o: %.c Makefile
-- @printf "$(LOGFORMAT_CC)" object "$(subst src/libbz2/,,$@)" "$(MODE) [libbz2]"
-- @$(CC) $(CFLAGS) $(DEPFLAGS) $(BZIP2_FLAGS) $(DEFINES) -c $< -o $@
-+ $(CC) $(CFLAGS) $(DEPFLAGS) $(BZIP2_FLAGS) $(DEFINES) -c $< -o $@
-
- $(LZMA_OBJ): %.o: %.c Makefile
-- @printf "$(LOGFORMAT_CC)" object "$(subst src/lzma/,,$@)" "$(MODE) [lzma]"
-- @$(CC) $(CFLAGS) $(DEPFLAGS) $(LZMA_FLAGS) $(DEFINES) -c $< -o $@
-+ $(CC) $(CFLAGS) $(DEPFLAGS) $(LZMA_FLAGS) $(DEFINES) -c $< -o $@
-
- #
- ###############################################################################
-@@ -654,9 +633,8 @@ doc: $(MAIN_TOOLS) templates.sed gen-doc
-
- .PHONY : gen-doc
- gen-doc:
-- @printf "$(LOGFORMAT)" create documentation ""
-- @chmod ug+x $(GEN_TEMPLATE)
-- @$(GEN_TEMPLATE)
-+ chmod ug+x $(GEN_TEMPLATE)
-+ $(GEN_TEMPLATE)
-
- #
- #--------------------------
-@@ -840,13 +818,12 @@ templates.sed: Makefile
-
- .PHONY : test
- test:
-- @printf "$(LOGFORMAT)" enable test "-> define -DTEST"
-- @rm -f *.o $(ALL_TOOLS_X)
-- @echo "-DTEST" >>$(MODE_FILE)
-- @sort $(MODE_FILE) | uniq > $(MODE_FILE).tmp
-+ rm -f *.o $(ALL_TOOLS_X)
-+ echo "-DTEST" >>$(MODE_FILE)
-+ sort $(MODE_FILE) | uniq > $(MODE_FILE).tmp
- # 2 steps to bypass a cygwin mv failure
-- @cp $(MODE_FILE).tmp $(MODE_FILE)
-- @rm -f $(MODE_FILE).tmp
-+ cp $(MODE_FILE).tmp $(MODE_FILE)
-+ rm -f $(MODE_FILE).tmp
-
- #
- #--------------------------