rpm/quilt
SHA256
1
0
Fork 0
forked from pool/quilt
Code Pull Requests Activity

- quiltrc-support-all-patch-formats-by-default.patch: quiltrc:

Browse Source 
Support all patch formats by default (bsc#1088281).

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/quilt?expand=0&rev=117
This commit is contained in:
Jean Delvare 2018-05-03 06:59:27 +00:00 committed by Git OBS Bridge
parent c7a90ee9a0
commit 85aace6492
3 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
quilt.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu May 3 08:53:20 CEST 2018 - jdelvare@suse.de
- quiltrc-support-all-patch-formats-by-default.patch: quiltrc:
Support all patch formats by default (bsc#1088281).
-------------------------------------------------------------------
Sun Sep 24 10:00:18 UTC 2017 - coolo@suse.com

4
quilt.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package quilt
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -45,6 +45,7 @@ Patch4: suse-workaround-pseudo-release.patch
Patch5: mail-fix-patch-set-threading.patch
Patch6: quilt-translations.patch
Patch7: perl-526.patch
Patch8: quiltrc-support-all-patch-formats-by-default.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%if 0%{?suse_version}
@ -70,6 +71,7 @@ un-applied, refreshed, and more.
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%build
# --with-rpmbuild=/usr/lib/rpm/rpmb:

30
quiltrc-support-all-patch-formats-by-default.patch Normal file
View File

@ -0,0 +1,30 @@
From: Jean Delvare <jdelvare@suse.de>
Date: Thu, 3 May 2018 08:33:24 +0200
Subject: quiltrc: Support all patch formats by default
Git-commit: 6d2c0da841aeaaec60993441bf6899f1909f310d
Patch-mainline: yes
References: bsc#1088281
Passing --unified to patch by default prevents using other patch
formats. Out of curiosity, I checked if it helped with performance
but was not able to measure any improvement. So stop passing
--unified by default.
Signed-off-by: Jean Delvare <jdelvare@suse.de>
diff --git a/quilt.quiltrc b/quilt.quiltrc
index 58f665e..f0ec21e 100644
--- a/quilt.quiltrc
+++ b/quilt.quiltrc
@@ -3,10 +3,8 @@
# Options passed to GNU diff when generating patches
QUILT_DIFF_OPTS="--show-c-function"
-# Options passed to GNU patch when applying patches.
-# (For appling patches which are not in unified format, remove the "--unified".)
+# Options passed to GNU patch when applying patches
#QUILT_PATCH_OPTS="--ignore-whitespace"
-QUILT_PATCH_OPTS="--unified"
# Options passed to diffstat when generating patch statistics
#QUILT_DIFFSTAT_OPTS="-f0"