[arch-commits] Commit in syslinux/trunk (PKGBUILD)

[Anatol Pomozov]

    Date: Sunday, February 21, 2016 @ 02:09:11
  Author: anatolik
Revision: 260101

FS#48253 Add gcc5 compatibility patches from upstream

Modified:
  syslinux/trunk/PKGBUILD

----------+
 PKGBUILD |   18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-02-20 21:38:06 UTC (rev 260100)
+++ PKGBUILD	2016-02-21 01:09:11 UTC (rev 260101)
@@ -6,7 +6,7 @@
 pkgname=syslinux
 pkgver=6.03
 _tag=syslinux-$pkgver
-pkgrel=4
+pkgrel=5
 pkgdesc='Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE'
 url='http://www.syslinux.org/'
 arch=(i686 x86_64)
@@ -34,11 +34,16 @@
 source=(git://git.kernel.org/pub/scm/boot/syslinux/syslinux.git#tag=$_tag
         syslinux.cfg
         syslinux-install_update
-        btrfs-fix.patch::http://repo.or.cz/syslinux.git/patch/548386049cd41e887079cdb904d3954365eb28f3?hp=721a0af2f0ba111c31685c5f6c5481eb25346971)
+        btrfs-fix.patch::http://repo.or.cz/syslinux.git/patch/548386049cd41e887079cdb904d3954365eb28f3?hp=721a0af2f0ba111c31685c5f6c5481eb25346971
+        gcc-fix-alignment.patch::http://repo.or.cz/syslinux.git/patch/e5f2b577ded109291c9632dacb6eaa621d8a59fe?hp=8dc6d758b564a1ccc44c3ae11f265d43628219ce
+        dont-guess-alignment.patch::http://repo.or.cz/syslinux.git/patch/0cc9a99e560a2f52bcf052fd85b1efae35ee812f?hp=e5f2b577ded109291c9632dacb6eaa621d8a59fe
+)
 sha1sums=('SKIP'
           '1145f454bd297d373ad123425f93620c3e92f585'
           '29d7c28639e57cdaefc8ef2447e8412a7b59709d'
-          'e1b6768e64f1f9448131b30f2b1f3389f36253f1')
+          'e1b6768e64f1f9448131b30f2b1f3389f36253f1'
+          '08fe2ee244b33d0dc89c46048b7d04b99d13e071'
+          '6a07327fd511796740fe75e59ff12e3aedf947d0')
 
 _targets='bios efi32'
 case "$CARCH" in
@@ -48,8 +53,13 @@
 prepare() {
   cd syslinux
 
-  patch -p1 < ../btrfs-fix.patch # FS#48214
+  # FS#48253
+  patch -p1 < ../gcc-fix-alignment.patch
+  patch -p1 < ../dont-guess-alignment.patch
 
+  # FS#48214
+  patch -p1 < ../btrfs-fix.patch
+
   # do not swallow efi compilation output to make debugging easier
   sed 's|> /dev/null 2>&1||' -i efi/check-gnu-efi.sh