Mailinglist Archive: opensuse-commit (1248 mails)

< Previous Next >
commit patchutils for openSUSE:Factory
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Tue, 20 Apr 2010 02:26:53 +0200
  • Message-id: <20100420002653.C48BD20200@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package patchutils for openSUSE:Factory
checked in at Tue Apr 20 02:26:53 CEST 2010.



--------
--- patchutils/patchutils.changes 2010-01-06 03:04:43.000000000 +0100
+++ /mounts/work_src_done/STABLE/patchutils/patchutils.changes 2010-04-19
17:40:16.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Apr 19 17:35:26 CEST 2010 - sndirsch@xxxxxxx
+
+- rediff-hunk-init-fix.diff (Takashi Iwai)
+ * hunk structure wasn't correctly initialized; fixes
+ tests/addhunk2 testcase, which broke the build
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
rediff-hunk-init-fix.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ patchutils.spec ++++++
--- /var/tmp/diff_new_pack.1Il9OH/_old 2010-04-20 02:26:45.000000000 +0200
+++ /var/tmp/diff_new_pack.1Il9OH/_new 2010-04-20 02:26:45.000000000 +0200
@@ -24,11 +24,12 @@
Group: Productivity/File utilities
AutoReqProv: on
Version: 0.3.1
-Release: 2
+Release: 3
Summary: A Collection of Tools for Manipulating Patch Files
Source: %name-%version.tar.bz2
Patch: %name-0.2.30-tailsyntax.diff
Patch1: overrun.diff
+Patch2: rediff-hunk-init-fix.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build

%description
@@ -53,6 +54,7 @@
%setup -q
%patch -p1
%patch1
+%patch2 -p1

%build
autoreconf -fi

++++++ rediff-hunk-init-fix.diff ++++++
---
src/rediff.c | 1 +
1 file changed, 1 insertion(+)

--- a/src/rediff.c
+++ b/src/rediff.c
@@ -841,6 +841,7 @@
newhunk->filepos = pos;
newhunk->line_in_diff = linenum;
newhunk->num_lines = 0;
+ newhunk->discard_offset = 0;

if (!strncmp (line, "--- ", 4)) {
struct file_info *info = xmalloc (sizeof *info);

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages