From 0f1a926f98445f4ab127af2341eeb9fbc27b75c0 Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Sun, 23 Jun 2013 15:22:04 +0200 Subject: gloobus-preview-libre using bsdtar instead of unrar. --- libre/gloobus-preview-libre/PKGBUILD | 90 ++++++++++++++++++++++ .../fix-gtksource-include.patch | 39 ++++++++++ libre/gloobus-preview-libre/fix-unoconv.patch | 46 +++++++++++ .../gloobus-preview-usr-bsdtar-for-rar.patch | 57 ++++++++++++++ .../gloobus-preview-libre/gloobus-preview.install | 12 +++ libre/gloobus-preview-libre/use-xdg-open.patch | 20 +++++ 6 files changed, 264 insertions(+) create mode 100644 libre/gloobus-preview-libre/PKGBUILD create mode 100644 libre/gloobus-preview-libre/fix-gtksource-include.patch create mode 100644 libre/gloobus-preview-libre/fix-unoconv.patch create mode 100644 libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch create mode 100644 libre/gloobus-preview-libre/gloobus-preview.install create mode 100644 libre/gloobus-preview-libre/use-xdg-open.patch (limited to 'libre/gloobus-preview-libre') 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 + +_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 +-#include ++#include + //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 +-#include ++#include + + vector PluginManager::plugins; + map 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 +-#include +-#include +-#include ++#include + #include + + #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 +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¤cy_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¤cy_code=EUR&lc=US&bn=PP%2dDonationsBF&chars\"" ; + else if(label == _("About")) + ui->create_about(); + else if(label == _("Quit")) -- cgit v1.2.3-54-g00ecf