summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre')
-rw-r--r--libre/gloobus-preview-libre/PKGBUILD90
-rw-r--r--libre/gloobus-preview-libre/fix-gtksource-include.patch39
-rw-r--r--libre/gloobus-preview-libre/fix-unoconv.patch46
-rw-r--r--libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch57
-rw-r--r--libre/gloobus-preview-libre/gloobus-preview.install12
-rw-r--r--libre/gloobus-preview-libre/use-xdg-open.patch20
-rw-r--r--libre/grub/PKGBUILD342
7 files changed, 426 insertions, 180 deletions
diff --git a/libre/gloobus-preview-libre/PKGBUILD b/libre/gloobus-preview-libre/PKGBUILD
new file mode 100644
index 000000000..12bff5f1d
--- /dev/null
+++ b/libre/gloobus-preview-libre/PKGBUILD
@@ -0,0 +1,90 @@
+# $Id: PKGBUILD 91027 2013-05-18 11:44:36Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+_pkgname=gloobus-preview
+pkgname=gloobus-preview-libre
+pkgver=0.4.5.290
+_pkgver=0.4.5-ubuntu11~ppa290
+pkgrel=1
+pkgdesc="Gnome application designed to enable a full screen preview of any kind of file (using bsdtar to preview RAR archives)"
+arch=('i686' 'x86_64')
+url="http://gloobus.net/"
+license=('GPL')
+depends=('gstreamer0.10-base-plugins' 'gtksourceview3' 'poppler-glib' 'python2-dbus' 'python2-gconf' 'taglib' 'xdg-utils')
+makedepends=('boost' 'bzr' 'djvulibre' 'libspectre')
+optdepends=('djvulibre: Preview DjVu documents'
+ 'gstreamer0.10-bad-plugins: Extra media codecs'
+ 'gstreamer0.10-good-plugins: Extra media codecs'
+ 'gstreamer0.10-ffmpeg: Extra media codecs'
+ 'gstreamer0.10-ugly-plugins: Extra media codecs'
+ 'libspectre: Preview PostScript documents'
+ 'p7zip: View content of 7z archives'
+ 'unoconv: Preview LibreOffice compatible documents'
+ 'unzip: View content of .ZIP archives')
+options=('!libtool')
+install=$_pkgname.install
+source=(https://launchpad.net/~gloobus-dev/+archive/$_pkgname/+files/${_pkgname}_$_pkgver.orig.tar.xz
+ gloobus-sushi::bzr+http://bazaar.launchpad.net/~gloobus-dev/gloobus-sushi/gloobus-sushi
+ fix-gtksource-include.patch
+ fix-unoconv.patch
+ use-xdg-open.patch
+ gloobus-preview-usr-bsdtar-for-rar.patch)
+md5sums=('27b3db2043ecaf47fa928940bbb4f32a'
+ 'SKIP'
+ 'ca15a3e31cec01d3d4fc5a4e1720f692'
+ '03379c173e67ad1b6804bc609336451d'
+ 'd6d9e2b3e001f0ea8440cccdf90480af'
+ 'eeab61846c861540bb16ca00fa14cdb6')
+
+prepare() {
+ cd "$srcdir/$_pkgname-$_pkgver"
+
+ # Python2 fix
+ sed -i 's@^#!.*python$@#!/usr/bin/python2@' src/gloobus-preview-configuration
+
+ # Fix build
+ patch -Np1 -i "$srcdir/fix-gtksource-include.patch"
+ sed -i 's/-Werror//' configure.ac src/Makefile.am
+
+ # Fix unoconv support
+ patch -Np1 -i "$srcdir/fix-unoconv.patch"
+
+ # Use xdg-open
+ patch -Np1 -i "$srcdir/use-xdg-open.patch"
+
+ # Use bsdtar if unrar is not found.
+ patch -Np0 -i "$srcdir/gloobus-preview-usr-bsdtar-for-rar.patch"
+
+ ### Prepare gloobus-sushi
+ cd "$srcdir/gloobus-sushi"
+
+ # Python2 fix
+ sed -i 's/python /python2 /' src/gloobus-sushi.in
+}
+
+
+build() {
+ cd "$srcdir/$_pkgname-$_pkgver"
+
+ ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --disable-static
+ make
+
+ ### Build gloobus-sushi
+ cd "$srcdir/gloobus-sushi"
+
+ ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+ make
+}
+
+package() {
+ cd "$srcdir/$_pkgname-$_pkgver"
+ make DESTDIR="$pkgdir" install
+
+ ### Install gloobus-sushi
+ cd "$srcdir/gloobus-sushi"
+ make DESTDIR="$pkgdir" install
+
+ # Rename service file to avoid conflict with sushi
+ mv "$pkgdir"/usr/share/dbus-1/services/{org.gnome.Sushi.service,net.gloobus.Sushi.service}
+}
diff --git a/libre/gloobus-preview-libre/fix-gtksource-include.patch b/libre/gloobus-preview-libre/fix-gtksource-include.patch
new file mode 100644
index 000000000..053169a43
--- /dev/null
+++ b/libre/gloobus-preview-libre/fix-gtksource-include.patch
@@ -0,0 +1,39 @@
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-interface-text.h gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-interface-text.h
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-interface-text.h 2012-04-06 15:07:29.000000000 +0200
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-interface-text.h 2013-05-17 06:27:37.833360264 +0200
+@@ -1,8 +1,7 @@
+ #ifndef _ITEXT_
+ #define _ITEXT_
+
+-#include <gtksourceview/gtksourceview.h>
+-#include <gtksourceview/gtksourcelanguagemanager.h>
++#include <gtksourceview/gtksource.h>
+ //sudo ln -s /usr/include/gtksourceview-2.0/gtksourceview/ /usr/include/gtksourceview
+
+ #include "gloobus-preview-interface-main.h"
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-plugin-manager.cpp gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-plugin-manager.cpp
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-plugin-manager.cpp 2012-04-06 15:07:29.000000000 +0200
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-plugin-manager.cpp 2013-05-17 06:28:19.300984059 +0200
+@@ -1,6 +1,6 @@
+ #include "gloobus-preview-plugin-manager.h"
+ #include <dlfcn.h>
+-#include <gtksourceview/gtksourcelanguagemanager.h>
++#include <gtksourceview/gtksource.h>
+
+ vector<gp_plugin_container*> PluginManager::plugins;
+ map<string, int> PluginManager::filetypes;
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-text/plugin-text.h gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-text/plugin-text.h
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-text/plugin-text.h 2012-04-06 15:07:29.000000000 +0200
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-text/plugin-text.h 2013-05-17 06:26:26.788384315 +0200
+@@ -3,10 +3,7 @@
+
+ #ifndef PLUGIN_LOADER
+
+-#include <gtksourceview/gtksourceview.h>
+-#include <gtksourceview/gtksourcelanguagemanager.h>
+-#include <gtksourceview/gtksourcestylescheme.h>
+-#include <gtksourceview/gtksourcestyleschememanager.h>
++#include <gtksourceview/gtksource.h>
+ #include <gio/gio.h>
+
+ #include "../gloobus-preview-config.h"
diff --git a/libre/gloobus-preview-libre/fix-unoconv.patch b/libre/gloobus-preview-libre/fix-unoconv.patch
new file mode 100644
index 000000000..f918f3019
--- /dev/null
+++ b/libre/gloobus-preview-libre/fix-unoconv.patch
@@ -0,0 +1,46 @@
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-loader.cpp gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-loader.cpp
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-loader.cpp 2012-04-06 15:07:29.000000000 +0200
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-loader.cpp 2013-05-18 10:24:33.558221788 +0200
+@@ -87,7 +87,7 @@
+
+ if( NULL == uri && Utils::isProgramAvailable("unoconv") ) {
+ gchar *path = g_file_get_path(file);
+- gchar *cmd = g_strdup_printf("unoconv --stdout \"%s\" > \"%s\"", path, tmp);
++ gchar *cmd = g_strdup_printf("unoconv -f pdf -o \"%s\" \"%s\"", tmp, path);
+
+ if( system(cmd) == 0) {
+ uri = pathToUri(tmp);
+@@ -123,4 +123,4 @@
+ {
+ path = "file://" + path;
+ return g_uri_escape_string(path.c_str(), G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, false);
+-}
+\ No newline at end of file
++}
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-plugin.h gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-plugin.h
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-plugin.h 2012-04-06 15:07:29.000000000 +0200
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-plugin.h 2013-05-18 10:33:02.352806550 +0200
+@@ -6,15 +6,21 @@
+ PluginManager::register_plugin("office");
+
+ PluginManager::register_filetype("application/vnd.oasis.opendocument.text", 1);
++PluginManager::register_filetype("application/vnd.openxmlformats-officedocument.wordprocessingml.document", 1);
+ PluginManager::register_filetype("application/msword", 1);
+ PluginManager::register_filetype("application/rtf", 1);
+ PluginManager::register_filetype("application/vnd.ms-excel", 1);
+ PluginManager::register_filetype("application/vnd.oasis.opendocument.spreadsheet", 1);
++PluginManager::register_filetype("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", 1);
+ PluginManager::register_filetype("application/vnd.ms-powerpoint", 1);
++PluginManager::register_filetype("application/vnd.oasis.opendocument.presentation", 1);
++PluginManager::register_filetype("application/vnd.openxmlformats-officedocument.presentationml.presentation", 1);
+ PluginManager::register_filetype("application/vnd.sun.xml.calc", 1);
++PluginManager::register_filetype("application/vnd.oasis.opendocument.graphics", 1);
++
+
+ // TODO: add more filetypes supported by abiword and/or OpenOffice
+
+ #endif
+
+-#endif /* OFFICE_PLUGIN_H */
+\ No newline at end of file
++#endif /* OFFICE_PLUGIN_H */
diff --git a/libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch b/libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch
new file mode 100644
index 000000000..f5b7c8e00
--- /dev/null
+++ b/libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch
@@ -0,0 +1,57 @@
+------------------------------------------------------------
+revno: 291
+committer: Michał Masłowski <mtjm@mtjm.eu>
+branch nick: gloobus-preview
+timestamp: Sun 2013-06-23 14:43:35 +0200
+message:
+ Use bsdtar to open RAR archives if unrar is not available.
+
+ Needs bsdtar from libarchive 3.0 or newer, not tested with older
+ versions nor checking for them.
+diff:
+=== modified file 'src/plugin-compressed/plugin-compressed.cpp'
+--- src/plugin-compressed/plugin-compressed.cpp 2012-04-06 11:25:47 +0000
++++ src/plugin-compressed/plugin-compressed.cpp 2013-06-23 12:43:35 +0000
+@@ -52,8 +52,9 @@
+ cmd_args.push_back("--");
+ line_parser = &iCompressed::parse_line_7z;
+ }
+- else if ( type == GP_COMPRESSED_RAR
+- || type == GP_COMPRESSED_RAR_X )
++ else if ( (type == GP_COMPRESSED_RAR
++ || type == GP_COMPRESSED_RAR_X)
++ && interface::is_program_available("unrar") )
+ {
+ cmd_args.push_back("unrar");
+ cmd_args.push_back("vb");
+@@ -70,9 +71,15 @@
+ || type == GP_COMPRESSED_TAR_LZOP
+ || type == GP_COMPRESSED_TAR_X
+ || type == GP_COMPRESSED_TAR_XZ
+- || type == GP_COMPRESSED_TAR_Z )
++ || type == GP_COMPRESSED_TAR_Z
++ || type == GP_COMPRESSED_RAR
++ || type == GP_COMPRESSED_RAR_X )
+ {
+- cmd_args.push_back("tar");
++ if ( type == GP_COMPRESSED_RAR
++ || type == GP_COMPRESSED_RAR_X )
++ cmd_args.push_back("bsdtar");
++ else
++ cmd_args.push_back("tar");
+ cmd_args.push_back("-tf");
+ line_parser = &iCompressed::parse_line_rar;
+ }
+
+=== modified file 'src/plugin-compressed/plugin-compressed.h'
+--- src/plugin-compressed/plugin-compressed.h 2010-03-27 15:55:08 +0000
++++ src/plugin-compressed/plugin-compressed.h 2013-06-23 12:43:35 +0000
+@@ -102,7 +102,7 @@
+ PluginManager::register_filetype(GP_COMPRESSED_7Z, 1);
+ }
+
+-if(interface::is_program_available("unrar")) {
++if(interface::is_program_available("unrar") || interface::is_program_available("bsdtar")) {
+ PluginManager::register_filetype(GP_COMPRESSED_RAR, 1);
+ PluginManager::register_filetype(GP_COMPRESSED_RAR_X, 1);
+ }
diff --git a/libre/gloobus-preview-libre/gloobus-preview.install b/libre/gloobus-preview-libre/gloobus-preview.install
new file mode 100644
index 000000000..16ad7278f
--- /dev/null
+++ b/libre/gloobus-preview-libre/gloobus-preview.install
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate
+ gdk-pixbuf-query-loaders --update-cache
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
diff --git a/libre/gloobus-preview-libre/use-xdg-open.patch b/libre/gloobus-preview-libre/use-xdg-open.patch
new file mode 100644
index 000000000..68e219e6a
--- /dev/null
+++ b/libre/gloobus-preview-libre/use-xdg-open.patch
@@ -0,0 +1,20 @@
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-window.cpp gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-window.cpp
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-window.cpp 2012-04-06 15:07:29.000000000 +0200
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-window.cpp 2013-05-18 09:49:24.833574800 +0200
+@@ -560,12 +560,12 @@
+ string label(gtk_menu_item_get_label(item));
+ if(label == _("Settings"))
+ cmd = "gloobus-preview-configuration";
+- else if(label == _("Report a Bug"))
+- cmd = "gnome-open \"https://bugs.launchpad.net/gloobus-preview/\"";
++ else if(label == _("Report a Problem"))
++ cmd = "xdg-open \"https://bugs.launchpad.net/gloobus-preview/\"";
+ else if(label == _("Blog"))
+- cmd = "gnome-open \"http://gloobus.wordpress.com\"" ;
++ cmd = "xdg-open \"http://gloobus.wordpress.com\"" ;
+ else if(label == _("Donate"))
+- cmd = "gnome-open \"https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=guitarboy000%40gmail%2ecom&item_name=Gloobus%2c%20A%20Quicklook%20for%20linux&no_shipping=0&no_note=1&tax=0&currency_code=EUR&lc=US&bn=PP%2dDonationsBF&chars\"" ;
++ cmd = "xdg-open \"https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=guitarboy000%40gmail%2ecom&item_name=Gloobus%2c%20A%20Quicklook%20for%20linux&no_shipping=0&no_note=1&tax=0&currency_code=EUR&lc=US&bn=PP%2dDonationsBF&chars\"" ;
+ else if(label == _("About"))
+ ui->create_about();
+ else if(label == _("Quit"))
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 522c1517d..21220a209 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -1,96 +1,95 @@
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer : Ronald van Haren <ronald.archlinux.org>
+# Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-_grub_lua_ver=24
-_grub_ntldr_ver=21
-_grub_915_ver=9
+## grub-extras lua and gpxe fail to build
-pkgname=('grub-common' 'grub-bios' 'grub-efi-i386')
-pkgbase=grub
+[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
+[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386"
+
+pkgname=grub
+pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)"
pkgver=2.00
-pkgrel=5
+pkgrel=1
url="https://www.gnu.org/software/grub/"
-arch=('i686' 'x86_64')
+arch=('x86_64' 'i686')
license=('GPL3')
+backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom')
+install="${pkgname}.install"
+options=('!makeflags')
+
+conflicts=('grub-legacy' 'grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
+replaces=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
+provides=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
+
makedepends=('xz' 'freetype2' 'bdf-unifont' 'ttf-dejavu' 'python' 'autogen'
- 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse')
+ 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse' 'bzr')
+depends=('sh' 'xz' 'gettext' 'device-mapper')
+optdepends=('freetype2: For grub-mkfont usage'
+ 'fuse: For grub-mount usage'
+ 'dosfstools: For EFI support'
+ 'efibootmgr: For grub-install EFI support'
+ 'libisoburn: Provides xorriso for generating grub rescue iso using grub-mkrescue'
+ 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems'
+ 'mtools: For grub-mkrescue FAT FS support')
source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz"
- "ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub_lua_ver}.tar.xz"
- "ftp://ftp.archlinux.org/other/grub2/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz"
- "ftp://ftp.archlinux.org/other/grub2/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz"
+ '0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch'
+ 'grub-2.00-fix-docs.patch'
'parabola_grub_mkconfig_fixes.patch'
- 'grub.default'
- 'grub.cfg'
'60_memtest86+'
- 'grub_bzr_export.sh'
- '0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch'
- 'grub-2.00-fix-docs.patch')
-md5sums=('a1043102fbc7bcedbf53e7ee3d17ab91'
- '704ea9f250b6137f05fa0197fd07053a'
- '77f7d5f8ce395663cd7fff4d37099957'
- 'a80e2b1d3bab778c3b6117d5a698992f'
- 'c776aaf2cc35488a7c531b59e697470d'
- '52d374e0194e3f2e39ff7c92ecd58a6c'
- '255eafb440b8c285b20431366c2d2d27'
- 'be55eabc102f2c60b38ed35c203686d6'
- 'f343ed2340ebc86c427873641bb72419'
- 'ab751d1d8cd3fd47e5ee24d71ecc31ed'
- '342dd18472a24e5fd252458b24f39a29')
-
-noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz"
- "grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz"
- "grub2_extras_915resolution_r${_grub_915_ver}.tar.xz")
-
+ 'grub.default'
+ 'grub.cfg')
+
+for _DIR_ in 915resolution ntldr-img ; do
+ source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/")
+done
+
+source+=("grub-extras-lua::bzr+bzr://bzr.savannah.gnu.org/grub-extras/lua/#revision=24"
+ "grub-extras-gpxe::bzr+bzr://bzr.savannah.gnu.org/grub-extras/gpxe/#revision=13")
+
+sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b'
+ 'b68565bc155094bade390c257c3f31bc55ae244b'
+ '1dc08391bb13f8e23faa21a76cc4cc4b25467702'
+ 'c631ec04d458c60a3ceffe60d2d1806d54554d9c'
+ '2aa2deeb7d7dc56f389aa1487b7a57b0d44ce559'
+ '06b926320cb2add6c157d59d46e553b89dd3aa03'
+ '662ec5f0d44122b66666a788387ec69389295b2c'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP')
_build_grub-common_and_bios() {
-
- ## copy the source for building the common/bios package
- cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub_bios-${pkgver}"
- cd "${srcdir}/grub_bios-${pkgver}"
-
- ## Apply Parabola specific fixes to enable grub-mkconfig detect kernels and initramfs
- patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch"
- echo
-
- ## fix unifont.bdf location so that grub-mkfont can create *.pf2 files
- sed 's|/usr/share/fonts/unifont|/usr/share/fonts/unifont /usr/share/fonts/misc|g' -i "${srcdir}/grub_bios-${pkgver}/configure.ac"
-
- ## 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 "${srcdir}/grub_bios-${pkgver}/configure.ac"
-
- ## add the grub-extra sources
- export GRUB_CONTRIB="${srcdir}/grub_bios-${pkgver}/grub-extras/"
- install -d "${srcdir}/grub_bios-${pkgver}/grub-extras"
-
- bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \
- -C "${srcdir}/grub_bios-${pkgver}/grub-extras"
-
- bsdtar xf "${srcdir}/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" \
- -C "${srcdir}/grub_bios-${pkgver}/grub-extras"
-
- bsdtar xf "${srcdir}/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz" \
- -C "${srcdir}/grub_bios-${pkgver}/grub-extras"
-
- ## Requires python2
- # sed 's|python |python2 |g' -i "${srcdir}/grub_bios-${pkgver}/autogen.sh"
-
- # fix compiling with gcc48
- patch -Np1 -i ${srcdir}/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch
-
- #fix docs compiling
- patch -Np1 -i ${srcdir}/grub-2.00-fix-docs.patch
-
- ## start the actual build process
- cd "${srcdir}/grub_bios-${pkgver}"
+
+ ## Copy the source for building the common/bios package
+ cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-bios-${pkgver}"
+ cd "${srcdir}/grub-bios-${pkgver}/"
+
+ ## Add the grub-extra sources
+ export GRUB_CONTRIB="${srcdir}/grub-bios-${pkgver}/grub-extras/"
+
+ install -d "${srcdir}/grub-bios-${pkgver}/grub-extras"
+ for _DIR_ in 915resolution ntldr-img lua gpxe ; do
+ cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-bios-${pkgver}/grub-extras/${_DIR_}"
+ done
+
+ ## Unset all compiler FLAGS for bios build
+ unset CFLAGS
+ unset CPPFLAGS
+ unset CXXFLAGS
+ unset LDFLAGS
+ unset MAKEFLAGS
+
+ ## Start the actual build process
+ cd "${srcdir}/grub-bios-${pkgver}/"
./autogen.sh
echo
-
- CFLAGS="" ./configure \
+
+ CFLAGS="-fno-stack-protector" ./configure \
--with-platform="pc" \
--target="i386" \
- --host="${CARCH}-unknown-linux-gnu" \
"${_EFIEMU}" \
--enable-mm-debug \
--enable-nls \
@@ -105,43 +104,43 @@ _build_grub-common_and_bios() {
--infodir="/usr/share/info" \
--datarootdir="/usr/share" \
--sysconfdir="/etc" \
- --program-prefix="" \
+ --program-prefix="" \
--with-bootdir="/boot" \
--with-grubdir="grub" \
--disable-werror
echo
-
- CFLAGS="" make
+
+ make
echo
-
}
-_build_grub-efi-i386() {
-
- ## copy the source for building the efi package
- cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub_efi-${pkgver}"
- cd "${srcdir}/grub_efi-${pkgver}"
-
- export GRUB_CONTRIB="${srcdir}/grub_efi-${pkgver}/grub-extras/"
- install -d "${srcdir}/grub_efi-${pkgver}/grub-extras"
-
- bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \
- -C "${srcdir}/grub_efi-${pkgver}/grub-extras"
-
- # fix compiling with gcc48
- patch -Np1 -i ${srcdir}/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch
-
- #fix docs compiling
- patch -Np1 -i ${srcdir}/grub-2.00-fix-docs.patch
-
- cd "${srcdir}/grub_efi-${pkgver}"
+_build_grub-efi() {
+
+ ## Copy the source for building the efi package
+ cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-efi-${pkgver}"
+ cd "${srcdir}/grub-efi-${pkgver}/"
+
+ export GRUB_CONTRIB="${srcdir}/grub-efi-${pkgver}/grub-extras/"
+
+ install -d "${srcdir}/grub-efi-${pkgver}/grub-extras/"
+ for _DIR_ in lua gpxe ; do
+ cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-bios-${pkgver}/grub-extras/${_DIR_}"
+ done
+
+ ## Unset all compiler FLAGS for efi build
+ unset CFLAGS
+ unset CPPFLAGS
+ unset CXXFLAGS
+ unset LDFLAGS
+ unset MAKEFLAGS
+
+ cd "${srcdir}/grub-efi-${pkgver}/"
./autogen.sh
echo
-
- CFLAGS="" ./configure \
+
+ ./configure \
--with-platform="efi" \
- --target="i386" \
- --host="${CARCH}-unknown-linux-gnu" \
+ --target="${_EFI_ARCH}" \
--disable-efiemu \
--enable-mm-debug \
--enable-nls \
@@ -161,108 +160,91 @@ _build_grub-efi-i386() {
--with-grubdir="grub" \
--disable-werror
echo
-
- CFLAGS="" make
+
+ make
echo
-
+
}
build() {
-
- ## set architecture dependent variables
+
+ ## Set ARCH dependent variables
if [[ "${CARCH}" == 'x86_64' ]]; then
_EFIEMU="--enable-efiemu"
else
_EFIEMU="--disable-efiemu"
fi
-
- _HOST="${CARCH}"
-
- cd "${srcdir}/grub-${pkgver}"
- # _get_locale_files
-
+
+ cd "${srcdir}/grub-${pkgver}/"
+
+ ## Fix compiling with gcc48
+ patch -Np1 -i "${srcdir}/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch"
+ echo
+
+ ## Fix docs compiling
+ patch -Np1 -i "${srcdir}/grub-2.00-fix-docs.patch"
+ echo
+
+ ## Apply Parabola specific fixes to enable grub-mkconfig detect kernels and initramfs
+ patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch"
+ echo
+
+ ## fix unifont.bdf location so that grub-mkfont can create *.pf2 files
+ sed 's|/usr/share/fonts/unifont|/usr/share/fonts/unifont /usr/share/fonts/misc|g' -i "${srcdir}/grub-${pkgver}/configure.ac"
+
+ ## 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 "${srcdir}/grub-${pkgver}/configure.ac"
+
+ ## Requires python2
+ # sed 's|python |python2 |g' -i "${srcdir}/grub-${pkgver}/autogen.sh"
+
_build_grub-common_and_bios
echo
-
- _build_grub-efi-i386
+
+ _build_grub-efi
echo
}
-package_grub-common() {
-
- pkgdesc="GNU GRand Unified Bootloader - Utilities and Common Files (Parabola rebranded)"
- depends=('sh' 'xz' 'gettext' 'device-mapper')
- optdepends=('freetype2: for grub-mkfont usage'
- 'fuse: for grub-mount usage')
- conflicts=('grub-legacy' 'grub')
- replaces=('grub2-common')
- provides=('grub2-common')
- backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom')
- optdepends=('libisoburn: provides xorriso for generating grub rescue iso using grub-mkrescue'
- 'os-prober: to detect other OSes when generating grub.cfg in BIOS systems'
- 'mtools: for grub-mkrescue FAT FS support')
- install="grub.install"
- options=('strip' 'purge' 'docs' 'zipman' '!emptydirs')
-
- cd "${srcdir}/grub_bios-${pkgver}"
+_package_grub-common_and_bios() {
+
+ cd "${srcdir}/grub-bios-${pkgver}/"
make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
echo
-
- ## install extra /etc/grub.d/ files
- install -D -m0755 "${srcdir}/60_memtest86+" "${pkgdir}/etc/grub.d/60_memtest86+"
-
- ## install /etc/default/grub (used by grub-mkconfig)
- install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
-
- ## install grub.cfg (needed so it doesn't get removed on upgrading because it was previously here)
- install -D -m0644 "${srcdir}/grub.cfg" "${pkgdir}/boot/grub/grub.cfg"
-
- # remove platform specific files
- rm -rf "${pkgdir}/usr/lib/grub/i386-pc/"
-
-}
-
-package_grub-bios() {
-
- pkgdesc="GNU GRand Unified Bootloader - i386 PC BIOS Modules"
- depends=("grub-common=${pkgver}")
- options=('!strip' '!emptydirs')
- replaces=('grub2-bios')
- provides=('grub2-bios')
-
- cd "${srcdir}/grub_bios-${pkgver}"
- make DESTDIR="${pkgdir}/" install
- echo
-
- ## remove non platform-specific files
- rm -rf "${pkgdir}"/{boot,etc,usr/{share,bin,sbin}}
-
+
## remove gdb debugging related files
rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.module || true
rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true
rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true
-
+
+ ## Install extra /etc/grub.d/ files
+ install -D -m0755 "${srcdir}/60_memtest86+" "${pkgdir}/etc/grub.d/60_memtest86+"
+
+ ## Install /etc/default/grub (used by grub-mkconfig)
+ install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
+
+ ## Install grub.cfg for backup array
+ install -D -m0644 "${srcdir}/grub.cfg" "${pkgdir}/boot/grub/grub.cfg"
+
}
-package_grub-efi-i386() {
-
- pkgdesc="GNU GRand Unified Bootloader - i386 UEFI Modules"
- depends=("grub-common=${pkgver}" 'dosfstools' 'efibootmgr')
- options=('!strip' '!emptydirs')
- replaces=('grub2-efi-i386')
- provides=('grub2-efi-i386')
-
- cd "${srcdir}/grub_efi-${pkgver}"
+_package_grub-efi() {
+
+ cd "${srcdir}/grub-efi-${pkgver}/"
make DESTDIR="${pkgdir}/" install
echo
-
- ## remove non platform-specific files
- rm -rf "${pkgdir}"/{boot,etc,usr/{share,bin,sbin}}
-
+
## remove gdb debugging related files
- rm -f "${pkgdir}/usr/lib/grub/i386-efi"/*.module || true
- rm -f "${pkgdir}/usr/lib/grub/i386-efi"/*.image || true
- rm -f "${pkgdir}/usr/lib/grub/i386-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true
+ rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.module || true
+ rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.image || true
+ rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true
+
+}
+package() {
+
+ _package_grub-efi
+
+ _package_grub-common_and_bios
+
}