From 261dcc5d5d44f23ce4355102f65b9e0d49f41f16 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Mon, 22 Feb 2016 17:59:13 -0300
Subject: syslinux-6.03-5.parabola1: add gcc5 compatibility patches from
 upstream - FS#48253 -> https://bugs.archlinux.org/task/48253

---
 libre/syslinux/PKGBUILD | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'libre')

diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD
index c0b427821..0ecabfdf3 100644
--- a/libre/syslinux/PKGBUILD
+++ b/libre/syslinux/PKGBUILD
@@ -7,7 +7,7 @@
 pkgname=syslinux
 pkgver=6.03
 _tag=syslinux-$pkgver
-pkgrel=4.parabola1
+pkgrel=5.parabola1
 pkgdesc='Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)'
 url='http://www.syslinux.org/'
 arch=(i686 x86_64)
@@ -39,11 +39,15 @@ 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
+        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
         splash.png)
 sha1sums=('SKIP'
           'e40acf4cf9d05ec000c59284f959d1540b35a3be'
           '29d7c28639e57cdaefc8ef2447e8412a7b59709d'
           'e1b6768e64f1f9448131b30f2b1f3389f36253f1'
+          '08fe2ee244b33d0dc89c46048b7d04b99d13e071'
+          '6a07327fd511796740fe75e59ff12e3aedf947d0'
           'd023b4df93b64ef84453ebde22b760051a63aad5')
 
 _targets='bios efi32'
@@ -54,7 +58,12 @@ esac
 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
-- 
cgit v1.2.3-54-g00ecf