[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Quilt-dev] [patch] remove patch-wrapper
From: |
Dean Roehrich |
Subject: |
[Quilt-dev] [patch] remove patch-wrapper |
Date: |
Fri, 31 Oct 2008 14:51:19 -0500 |
User-agent: |
Mutt/1.5.9i |
Per discussion today, here's a patch to remove patch-wrapper. It doesn't
appear that patch-wrapper is being used for anything.
Dean
-----
Index: quilt20081022/configure.ac
===================================================================
--- quilt20081022.orig/configure.ac 2008-10-30 15:42:02.442300000 -0500
+++ quilt20081022/configure.ac 2008-10-31 14:39:58.445941000 -0500
@@ -368,11 +368,6 @@ You can download GNU Gettext from ftp.gn
])
fi
-AC_ARG_WITH(patch-wrapper, AC_HELP_STRING(
- [--with-patch-wrapper], [include GNU patch wrapper]))
-PATCH_WRAPPER=$withval
-AC_SUBST(PATCH_WRAPPER)
-
if test $USE_NLS = no ; then
AC_MSG_NOTICE([Building without natural language support])
fi
Index: quilt20081022/Makefile.in
===================================================================
--- quilt20081022.orig/Makefile.in 2008-10-30 16:01:22.000000000 -0500
+++ quilt20081022/Makefile.in 2008-10-31 14:39:37.979932000 -0500
@@ -43,7 +43,6 @@ RPMBUILD := @RPMBUILD@
SENDMAIL := @SENDMAIL@
USE_NLS := @USE_NLS@
-PATCH_WRAPPER := @PATCH_WRAPPER@
CC := @CC@
CPPFLAGS += @CPPFLAGS@ @DEFS@
@@ -74,8 +73,8 @@ DIRT += quilt.spec
BIN_IN := quilt guards
BIN_SRC := $(BIN_IN:%=%.in)
BIN := $(BIN_IN)
-SRC += $(BIN_SRC:%=bin/%) bin/patch-wrapper.in
-DIRT += $(BIN_IN:%=bin/%) bin/patch-wrapper
+SRC += $(BIN_SRC:%=bin/%)
+DIRT += $(BIN_IN:%=bin/%)
QUILT_IN := $(patsubst quilt/%.in,%,$(wildcard quilt/*.in))
QUILT_SRC := $(QUILT_IN:%=%.in)
@@ -155,8 +154,7 @@ endif
$(MSGMERGE) -o $@ $@ $^
scripts : $(BIN:%=bin/%) $(QUILT:%=quilt/%) \
- $(SCRIPTS:%=quilt/scripts/%) $(LIB:%=lib/%) \
- $(if $(PATCH_WRAPPER),bin/patch-wrapper)
+ $(SCRIPTS:%=quilt/scripts/%) $(LIB:%=lib/%)
dist : clean $(PACKAGE)-$(VERSION).tar.gz
@@ -318,11 +316,6 @@ install-main :: scripts
$(BUILD_ROOT)$(datadir)/$(PACKAGE)/scripts
$(INSTALL) -m 644 quilt/scripts/patchfns \
$(BUILD_ROOT)$(datadir)/$(PACKAGE)/scripts
-ifneq ($(PATCH_WRAPPER),)
- $(INSTALL) -d $(BUILD_ROOT)$(datadir)/$(PACKAGE)/wrapper
- $(INSTALL) -m 755 bin/patch-wrapper \
- $(BUILD_ROOT)$(datadir)/$(PACKAGE)/wrapper/patch
-endif
$(INSTALL) -d $(BUILD_ROOT)$(libdir)/$(PACKAGE)
$(INSTALL) -m 755 $(LIB:%=lib/%) $(BUILD_ROOT)$(libdir)/$(PACKAGE)/
@@ -380,8 +373,6 @@ ifneq ($(findstring test,$(MAKECMDGOALS)
-include test/.depend
endif # (test|check)
-test/.patch-wrapper.ok : bin/patch-wrapper
-
# Include a run-time generated list of dependencies for each test case
test/.depend : Makefile $(TESTS)
@( printf "%s : bin/quilt quilt/scripts/patchfns $(LIB:%=lib/%)
$(COMPAT)\n" $(TESTS); \
Index: quilt20081022/test/patch-wrapper.test
===================================================================
--- quilt20081022.orig/test/patch-wrapper.test 2008-10-22 11:04:24.000000000
-0500
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-$ rm -rf d
-$ mkdir -p d/somewhere
-$ cd d
-
-$ cat > foo.orig
-< 1
-<
-< 3
-<
-< 5
-$ sed -e 's/3/3a/' foo.orig > foo
-$ diff -u foo.orig foo > foo.diff
-$ mv foo.orig foo
-
-$ patch-wrapper -s -p0 < foo.diff
-$ quilt pop -q
-> Removing patch patches/foo.diff
-> No patches applied
-$ rm -rf ${QUILT_PATCHES:-patches} ${QUILT_PC:-.pc}
-
-$ patch-wrapper --backup -B xxx/ -s -p0 < foo.diff
-$ find xxx -type f
-> xxx/foo
-$ quilt pop -q
-> Removing patch patches/foo.diff
-> No patches applied
-$ rm -rf ${QUILT_PATCHES:-patches} ${QUILT_PC:-.pc}
-
-$ patch-wrapper -s -p0 -i foo.diff
-$ quilt pop -q
-> Removing patch patches/foo.diff
-> No patches applied
-$ rm -rf ${QUILT_PATCHES:-patches} ${QUILT_PC:-.pc}
-
-$ patch-wrapper -p0 < foo.diff
-> patching file foo
-$ quilt pop -q
-> Removing patch patches/foo.diff
-> No patches applied
-$ rm -rf ${QUILT_PATCHES:-patches} ${QUILT_PC:-.pc}
-
-$ mv foo.diff somewhere/
-$ patch-wrapper -p0 < somewhere/foo.diff
-> patching file foo
-$ quilt pop -q
-> Removing patch patches/somewhere/foo.diff
-> No patches applied
-$ rm -rf ${QUILT_PATCHES:-patches} ${QUILT_PC:-.pc}
-
-$ patch-wrapper -p0 -i somewhere/foo.diff
-> patching file foo
-$ quilt pop -q
-> Removing patch patches/somewhere/foo.diff
-> No patches applied
-$ rm -rf ${QUILT_PATCHES:-patches} ${QUILT_PC:-.pc}
-
-$ sed -e 's/5/5b/' foo > foo.new
-$ mv foo.new foo
-$ patch-wrapper -p0 < somewhere/foo.diff
-> patching file foo
-> Hunk #1 succeeded at 1 with fuzz 1.
-$ cat foo.orig
-> 1
->
-> 3
->
-> 5b
-$ quilt pop -q
-> Removing patch patches/somewhere/foo.diff
-> No patches applied
-$ rm -rf ${QUILT_PATCHES:-patches} ${QUILT_PC:-.pc}
-
-$ cd ..
-$ rm -rf d
- [Quilt-dev] [patch] remove patch-wrapper,
Dean Roehrich <=