quilt-dev
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Quilt-dev] Recursive instances?


From: Mike Mestnik
Subject: [Quilt-dev] Recursive instances?
Date: Wed, 18 Nov 2015 22:43:42 -0600

Hello,
  I'm working on a [1]project that has problems re-applying
[2]patches.  I though to use quilt to manage if the patches are
applied, perhaps not the simplest solution.  The issue I have is that
somewhere during dpkg-buildpackage the patch file is being changed.
The 3 .pc files are being removed from the patch.

1. https://github.com/cheako/0ad/tree/debian-svn
2. 
https://github.com/cheako/0ad/blob/debian-svn/libraries/source/spidermonkey/patch.sh

The patch, debian/patches/usequilt.patch:
Index: 0ad/libraries/source/spidermonkey/build.sh
===================================================================
--- 0ad.orig/libraries/source/spidermonkey/build.sh
+++ 0ad/libraries/source/spidermonkey/build.sh
@@ -74,7 +74,7 @@ rm -rf include-unix-*
 cd mozjs31

 # Apply patches
-. ../patch.sh
+quilt push -a

 cd js/src

Index: 0ad/libraries/source/spidermonkey/patch.sh
===================================================================
--- 0ad.orig/libraries/source/spidermonkey/patch.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-# Apply patches if needed
-# This script gets called from build-osx-libs.sh and build.sh.
-
-# Tracelogger patches (the Tracelogger is a tool for developers and these
-# patches are only needed if the tracelogger is used). The first patch is
-# a backport from newer SpiderMonkey versions and the second patch
-# combines some fixes from newer versions with a change that makes it
-# flush data to the disk after 100 MB. The developer of the tracelogger
-# (h4writer) is informed about everything and an these patches shouldn't
-# be needed anymore for the next version of SpiderMonkey.
-patch -p1 -i ../FixTraceLoggerBuild.diff
-patch -p1 -i ../FixTraceLoggerFlushing.diff
-
-# A patch to fix a bug that prevents Ion compiling of for .. of loops.
-# It makes quite a big difference for performance.
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1046176
-patch -p1 -i ../FixForOfBailouts.diff
-
-# Fix build failures on GCC 5.1 and Clang 3.6
-patch -p1 -i ../FixBug1021171.diff
-patch -p1 -i ../FixBug1119228.diff
-
-# Fix build failures on GCC 5.1 and Clang 3.6
-patch -p1 -i ../FixBug1021171.diff
-patch -p1 -i ../FixBug1119228.diff
-
-# Fix debug build failure on platforms with Ion disabled (eg AArch64)
-patch -p1 -i ../FixBug1037470.diff
Index: 0ad/libraries/source/spidermonkey/mozjs31/.pc/.quilt_patches
===================================================================
--- /dev/null
+++ 0ad/libraries/source/spidermonkey/mozjs31/.pc/.quilt_patches
@@ -0,0 +1 @@
+..
Index: 0ad/libraries/source/spidermonkey/mozjs31/.pc/.quilt_series
===================================================================
--- /dev/null
+++ 0ad/libraries/source/spidermonkey/mozjs31/.pc/.quilt_series
@@ -0,0 +1 @@
+series
Index: 0ad/libraries/source/spidermonkey/mozjs31/.pc/.version
===================================================================
--- /dev/null
+++ 0ad/libraries/source/spidermonkey/mozjs31/.pc/.version
@@ -0,0 +1 @@
+2
Index: 0ad/libraries/source/spidermonkey/mozjs31/series
===================================================================
--- /dev/null
+++ 0ad/libraries/source/spidermonkey/mozjs31/series
@@ -0,0 +1,29 @@
+#!/bin/sh
+# Apply patches if needed
+# This script gets called from build-osx-libs.sh and build.sh.
+
+# Tracelogger patches (the Tracelogger is a tool for developers and these
+# patches are only needed if the tracelogger is used). The first patch is
+# a backport from newer SpiderMonkey versions and the second patch
+# combines some fixes from newer versions with a change that makes it
+# flush data to the disk after 100 MB. The developer of the tracelogger
+# (h4writer) is informed about everything and an these patches shouldn't
+# be needed anymore for the next version of SpiderMonkey.
+FixTraceLoggerBuild.diff
+FixTraceLoggerFlushing.diff
+
+# A patch to fix a bug that prevents Ion compiling of for .. of loops.
+# It makes quite a big difference for performance.
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1046176
+FixForOfBailouts.diff
+
+# Fix build failures on GCC 5.1 and Clang 3.6
+FixBug1021171.diff
+FixBug1119228.diff
+
+# Fix build failures on GCC 5.1 and Clang 3.6
+FixBug1021171.diff
+FixBug1119228.diff
+
+# Fix debug build failure on platforms with Ion disabled (eg AArch64)
+FixBug1037470.diff



reply via email to

[Prev in Thread] Current Thread [Next in Thread]