grub-2:2.06-1.parabola1: updating version

1 files changed, 31 insertions, 46 deletions

diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 4e90e1524..ea2764111 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -7,7 +7,7 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 ## '1' to enable Xen support, '0' to disable
-_XEN='1'
+_XEN='0'
 
 ## '1' to enable IA32-EFI build in Arch x86_64, '0' to disable
 _IA32_EFI_IN_ARCH_X64='1'
@@ -18,31 +18,30 @@ _IA32_XEN_IN_ARCH_X64='1'
 ## '1' to enable EMU build (x86_64 and i686 only), "0" to disable
 _GRUB_EMU_BUILD='0'
 
-_GRUB_EXTRAS_COMMIT="136763a4cc9ca3a4f59d05b79eede2159d6f441e"
-_GNULIB_COMMIT="9ce9be2ef0cb1180e35dfe9dfbbe90d774b374bd"
-_UNIFONT_VER="12.1.02"
+[[ "${CARCH}" = 'armv7h' ]] && _EFI_ARCH='arm'
+[[ "${CARCH}" = 'x86_64' ]] && _EFI_ARCH='x86_64'
+[[ "${CARCH}" = 'i686' ]] && _EFI_ARCH='i386'
 
-[[ "${CARCH}" = "armv7h" ]] && _EFI_ARCH="arm"
-[[ "${CARCH}" = "x86_64" ]] && _EFI_ARCH="x86_64"
-[[ "${CARCH}" = "i686" ]] && _EFI_ARCH="i386"
+[[ "${CARCH}" = 'x86_64' ]] && _XEN_ARCH='x86_64'
+[[ "${CARCH}" = 'i686' ]] && _XEN_ARCH='i386'
 
-[[ "${CARCH}" = "x86_64" ]] && _XEN_ARCH="x86_64"
-[[ "${CARCH}" = "i686" ]] && _XEN_ARCH="i386"
-
-[[ "${CARCH}" = "armv7h" ]] && _EMU_ARCH="arm"
-[[ "${CARCH}" = "x86_64" ]] && _EMU_ARCH="x86_64"
-[[ "${CARCH}" = "i686" ]] && _EMU_ARCH="i386"
+[[ "${CARCH}" = 'armv7h' ]] && _EMU_ARCH='arm'
+[[ "${CARCH}" = 'x86_64' ]] && _EMU_ARCH='x86_64'
+[[ "${CARCH}" = 'i686' ]] && _EMU_ARCH='i386'
 
 pkgbase='grub'
 pkgname=('grub')
 [[ $CARCH = armv7h ]] && pkgname+=('grub-am335x_bone' 'grub-udoo' 'grub-omap3_beagle'
                                    'grub-omap3_beagle_xm' 'grub-omap3_beagle_xm_ab')
 pkgdesc='GNU GRand Unified Bootloader (2), (Parabola rebranded)'
-_pkgver=2.04
-pkgver=${_pkgver/-/}
-pkgrel=2
-pkgrel+=.par1
 epoch=2
+_tag='53c5000739db114c229fe69ec3d4b76b92441098' # git rev-parse grub-${_pkgver}
+_gnulib_commit='be584c56eb1311606e5ea1a36363b97bddb6eed3'
+_unifont_ver='13.0.06'
+_pkgver=2.06
+pkgver=${_pkgver/-/}
+pkgrel=1
+pkgrel+=.parabola1
 url='https://www.gnu.org/software/grub/'
 arch=('x86_64')
 arch+=('i686' 'armv7h')
@@ -80,12 +79,11 @@ validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209'  # Vladimir 'phcoder' S
               'BE5C23209ACDDACEB20DB0A28C8189F1988C2166'  # Daniel Kiper <dkiper@net-space.pl>
               '95D2E9AB8740D8046387FD151A09227B1F435A33') #Paul Hardy
 
-source=("git+https://git.savannah.gnu.org/git/grub.git#tag=grub-${_pkgver}?signed"
-        "git+https://git.savannah.gnu.org/git/grub-extras.git#commit=${_GRUB_EXTRAS_COMMIT}"
-        "git+https://git.savannah.gnu.org/git/gnulib.git#commit=${_GNULIB_COMMIT}"
-        "https://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz"{,.sig}
+source=("git+https://git.savannah.gnu.org/git/grub.git#tag=${_tag}?signed"
+        "git+https://git.savannah.gnu.org/git/gnulib.git#commit=${_gnulib_commit}"
+        "https://ftp.gnu.org/gnu/unifont/unifont-${_unifont_ver}/unifont-${_unifont_ver}.bdf.gz"{,.sig}
         '0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch'
-        '0004-add-GRUB_COLOR_variables.patch'
+        '0001-00_header-add-GRUB_COLOR_-variables.patch'
         'grub.default'
         '0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch'
         '0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch'
@@ -96,17 +94,16 @@ source=("git+https://git.savannah.gnu.org/git/grub.git#tag=grub-${_pkgver}?signe
 
 sha256sums=('SKIP'
             'SKIP'
+            'b7668a5d498972dc4981250c49f83601babce797be19b4fdd0f2f1c6cfbd0fc5'
             'SKIP'
-            '04d652be1e28a6d464965c75c71ac84633085cd0960c2687466651c34c94bd89'
-            'SKIP'
-            '3f68a78ecba0284b9d39af60431236cb2ebc8547d3dc1fb26a1ac7a6b9afbbc7'
-            'a5198267ceb04dceb6d2ea7800281a42b3f91fd02da55d2cc9ea20d47273ca29'
-            'c700a3a2e0bdb47620a78b454aaa4bbf52989102eb47b08672240192e91b2a57'
-            '9ece1db537a989ce4dc55ece471883e19b8ab16902f8c4feb68436c3b5700f71'
-            'de71452b9b0fbfb08ea742e9fa217ab34fddf6312452f155fb9d82ebf1c024a5'
-            '222da944b4af43a1d86be0e3d91f2e1a82324fa51c7ad36cc25246ffa3739ab1'
-            '9002c69e74143553ef8cdd32ca04e8bdcb7a1a0ba1c4564163bae061fe68d855'
-            '6584a0dda9dbf6d70dbdfba619abbb628b1a092bd61d6d05e462d6771354223b'
+            'b32a28cb5b97b0bb139c0ee2199b81a2aba124c2ead9b01cfd4485fd2551257f'
+            '5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab'
+            'ed6cf7d8efc391b9331322e4502f7469473a8ed05599c36e2b18f167b3cb7879'
+            '0f2e9abaf872e1e18dfe0cd1da42bdc4f49d3956f97a01c39b82c0e3016c1a32'
+            'c0d84384db273d9fd6ea2aab2a9d8ba36402daf8daf591dcba329cfa02253c87'
+            'ef105dcc067c673e543d4d5384aa7bf6b93e9eca96fec4323ab69a91ec079f56'
+            'f5fb1673536d56a88b3d1aaec75501e4d0acca081ac658d1059ec276f9e062c6'
+            'd8911a513166d2db337b9449542e0ad0e91b114f92dc4b876d88d77d23829a1d'
             '7374137d183957ec8834ce749163c9fa98ff8ee61bbb74b0b38e29daf93857a4')
 
 _backports=(
@@ -144,12 +141,9 @@ prepare() {
 		git cherry-pick -n "${_c}"
 	done
 
-	echo "Patch to detect of Parabola GNU/Linux-libre initramfs images by grub-mkconfig..."
-	patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch"
-
 	echo "Patch to enable GRUB_COLOR_* variables in grub-mkconfig..."
 	## Based on http://lists.gnu.org/archive/html/grub-devel/2012-02/msg00021.html
-	patch -Np1 -i "${srcdir}/0004-add-GRUB_COLOR_variables.patch"
+	patch -Np1 -i "${srcdir}/0001-00_header-add-GRUB_COLOR_-variables.patch"
 
 	echo "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme..."
 	sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac"
@@ -163,18 +157,9 @@ prepare() {
 	echo "Pull in latest language files..."
 	./linguas.sh
 
-	echo "Remove not working langs which need LC_ALL=C.UTF-8..."
-	sed -e 's#en@cyrillic en@greek##g' -i "po/LINGUAS"
-
 	echo "Avoid problem with unifont during compile of grub..."
         # http://savannah.gnu.org/bugs/?40330 and https://bugs.archlinux.org/task/37847
-	gzip -cd "${srcdir}/unifont-${_UNIFONT_VER}.bdf.gz" > "unifont.bdf"
-
-	echo "Add the grub-extra sources for BIOS build..."
-	install -d "grub-extras"
-	cp -r "${srcdir}/grub-extras/915resolution" \
-		"grub-extras/915resolution"
-	export GRUB_CONTRIB="${srcdir}/grub/grub-extras/"
+	gzip -cd "${srcdir}/unifont-${_unifont_ver}.bdf.gz" > "unifont.bdf"
 }
 
 _build_grub-efi() {