Bug#901327: [Pkg-tigervnc-devel] Bug#901327: tigervnc: FTBFS: Hunk #1 FAILED

2018-06-25 Thread Joachim Falk
Hi Clint,

Am 24.06.2018 um 22:08 schrieb Clint Adams:
> On Mon, Jun 11, 2018 at 05:21:00PM +0300, Niko Tyni wrote:
>>   touch debian/stamp-patched
>>   /usr/bin/make -f debian/rules update-config
>>   make[1]: Entering directory '/<>/tigervnc-1.7.0+dfsg'
>>   make[1]: 'update-config' is up to date.
>>   make[1]: Leaving directory '/<>/tigervnc-1.7.0+dfsg'
>>   cd ./unix/xserver && \
>> { tar --strip-components 1 -xvJf /usr/src/xorg-server.tar.xz | \
>> sed -e 's@^[^/]*/@@' > .apply-patches-unify-xorg-and-vnc-tree.files; 
>> } && \
>> touch .apply-patches-unify-xorg-and-vnc-tree.stamp
>>   cd ./unix/xserver && { \
>>  patch --no-backup-if-mismatch -p1 < 
>> /<>/tigervnc-1.7.0+dfsg/debian/xserver119.patch && \
>>  touch .apply-patches-vnc-patch-xorg.stamp; \
>>   }
>>   patching file configure.ac
>>   Hunk #2 succeeded at 1778 (offset -86 lines).
>>   Hunk #3 succeeded at 1817 (offset -86 lines).
>>   Hunk #4 succeeded at 2036 (offset -87 lines).
>>   Hunk #5 succeeded at 2571 (offset -126 lines).
>>   patching file hw/Makefile.am
>>   patching file mi/miinitext.c
>>   Hunk #1 FAILED at 114.
>>   Hunk #2 succeeded at 109 (offset -129 lines).
>>   1 out of 2 hunks FAILED -- saving rejects to file mi/miinitext.c.rej
>>   patching file include/os.h
>>   Hunk #1 succeeded at 633 (offset 12 lines).
>>   make: *** [debian/rules:129: 
>> unix/xserver/.apply-patches-vnc-patch-xorg.stamp] Error 1
> 
> Why is patchsys-quilt.mk being used with a 3.0 (quilt) source package?
might be due to legacy reasons. We once had patches in debian/patches that
patched the xorg sources. However, these patches could only be applied
after the xorg sources were unpacked from xorg-server-source. Hence, quilt
patch applicated had to be delayed until xorg-server-source unpacking
was complete.

> 
> ___
> Pkg-tigervnc-devel mailing list
> pkg-tigervnc-de...@alioth-lists.debian.net
> https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-tigervnc-devel
> 




signature.asc
Description: OpenPGP digital signature


Bug#901327: tigervnc: FTBFS: Hunk #1 FAILED

2018-06-24 Thread Clint Adams
On Mon, Jun 11, 2018 at 05:21:00PM +0300, Niko Tyni wrote:
>   touch debian/stamp-patched
>   /usr/bin/make -f debian/rules update-config
>   make[1]: Entering directory '/<>/tigervnc-1.7.0+dfsg'
>   make[1]: 'update-config' is up to date.
>   make[1]: Leaving directory '/<>/tigervnc-1.7.0+dfsg'
>   cd ./unix/xserver && \
> { tar --strip-components 1 -xvJf /usr/src/xorg-server.tar.xz | \
> sed -e 's@^[^/]*/@@' > .apply-patches-unify-xorg-and-vnc-tree.files; 
> } && \
> touch .apply-patches-unify-xorg-and-vnc-tree.stamp
>   cd ./unix/xserver && { \
>   patch --no-backup-if-mismatch -p1 < 
> /<>/tigervnc-1.7.0+dfsg/debian/xserver119.patch && \
>   touch .apply-patches-vnc-patch-xorg.stamp; \
>   }
>   patching file configure.ac
>   Hunk #2 succeeded at 1778 (offset -86 lines).
>   Hunk #3 succeeded at 1817 (offset -86 lines).
>   Hunk #4 succeeded at 2036 (offset -87 lines).
>   Hunk #5 succeeded at 2571 (offset -126 lines).
>   patching file hw/Makefile.am
>   patching file mi/miinitext.c
>   Hunk #1 FAILED at 114.
>   Hunk #2 succeeded at 109 (offset -129 lines).
>   1 out of 2 hunks FAILED -- saving rejects to file mi/miinitext.c.rej
>   patching file include/os.h
>   Hunk #1 succeeded at 633 (offset 12 lines).
>   make: *** [debian/rules:129: 
> unix/xserver/.apply-patches-vnc-patch-xorg.stamp] Error 1

Why is patchsys-quilt.mk being used with a 3.0 (quilt) source package?



Bug#901327: tigervnc: FTBFS: Hunk #1 FAILED

2018-06-11 Thread Niko Tyni
Source: tigervnc
Version: 1.7.0+dfsg-8
Severity: serious

This package fails to build from source on current sid/amd64.

>From the build log:

  touch debian/stamp-patched
  /usr/bin/make -f debian/rules update-config
  make[1]: Entering directory '/<>/tigervnc-1.7.0+dfsg'
  make[1]: 'update-config' is up to date.
  make[1]: Leaving directory '/<>/tigervnc-1.7.0+dfsg'
  cd ./unix/xserver && \
{ tar --strip-components 1 -xvJf /usr/src/xorg-server.tar.xz | \
sed -e 's@^[^/]*/@@' > .apply-patches-unify-xorg-and-vnc-tree.files; } 
&& \
touch .apply-patches-unify-xorg-and-vnc-tree.stamp
  cd ./unix/xserver && { \
patch --no-backup-if-mismatch -p1 < 
/<>/tigervnc-1.7.0+dfsg/debian/xserver119.patch && \
touch .apply-patches-vnc-patch-xorg.stamp; \
  }
  patching file configure.ac
  Hunk #2 succeeded at 1778 (offset -86 lines).
  Hunk #3 succeeded at 1817 (offset -86 lines).
  Hunk #4 succeeded at 2036 (offset -87 lines).
  Hunk #5 succeeded at 2571 (offset -126 lines).
  patching file hw/Makefile.am
  patching file mi/miinitext.c
  Hunk #1 FAILED at 114.
  Hunk #2 succeeded at 109 (offset -129 lines).
  1 out of 2 hunks FAILED -- saving rejects to file mi/miinitext.c.rej
  patching file include/os.h
  Hunk #1 succeeded at 633 (offset 12 lines).
  make: *** [debian/rules:129: 
unix/xserver/.apply-patches-vnc-patch-xorg.stamp] Error 1
 
-- 
Niko Tyni   nt...@debian.org