From 0c395b896ea0e01408bdae5c09d19ea0077f86f8 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 5 Sep 2014 01:50:03 -0300 Subject: gloobus-preview: remove libre suffix and add complex pkgrel --- libre/gloobus-preview-libre/PKGBUILD | 104 ----------------- .../fix-gtksource-include.patch | 39 ------- libre/gloobus-preview-libre/fix-unoconv.patch | 46 -------- ...bus-preview-configuration-pygobject3-port.patch | 124 --------------------- .../gloobus-preview-usr-bsdtar-for-rar.patch | 29 ----- .../gloobus-preview-libre/gloobus-preview.install | 12 -- .../gloobus-sushi-pygobject3-port.patch | 21 ---- libre/gloobus-preview-libre/use-xdg-open.patch | 20 ---- libre/gloobus-preview/PKGBUILD | 102 +++++++++++++++++ libre/gloobus-preview/fix-gtksource-include.patch | 39 +++++++ libre/gloobus-preview/fix-unoconv.patch | 46 ++++++++ ...bus-preview-configuration-pygobject3-port.patch | 124 +++++++++++++++++++++ .../gloobus-preview-usr-bsdtar-for-rar.patch | 29 +++++ libre/gloobus-preview/gloobus-preview.install | 12 ++ .../gloobus-sushi-pygobject3-port.patch | 21 ++++ libre/gloobus-preview/use-xdg-open.patch | 20 ++++ 16 files changed, 393 insertions(+), 395 deletions(-) delete mode 100644 libre/gloobus-preview-libre/PKGBUILD delete mode 100644 libre/gloobus-preview-libre/fix-gtksource-include.patch delete mode 100644 libre/gloobus-preview-libre/fix-unoconv.patch delete mode 100644 libre/gloobus-preview-libre/gloobus-preview-configuration-pygobject3-port.patch delete mode 100644 libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch delete mode 100644 libre/gloobus-preview-libre/gloobus-preview.install delete mode 100644 libre/gloobus-preview-libre/gloobus-sushi-pygobject3-port.patch delete mode 100644 libre/gloobus-preview-libre/use-xdg-open.patch create mode 100644 libre/gloobus-preview/PKGBUILD create mode 100644 libre/gloobus-preview/fix-gtksource-include.patch create mode 100644 libre/gloobus-preview/fix-unoconv.patch create mode 100644 libre/gloobus-preview/gloobus-preview-configuration-pygobject3-port.patch create mode 100644 libre/gloobus-preview/gloobus-preview-usr-bsdtar-for-rar.patch create mode 100644 libre/gloobus-preview/gloobus-preview.install create mode 100644 libre/gloobus-preview/gloobus-sushi-pygobject3-port.patch create mode 100644 libre/gloobus-preview/use-xdg-open.patch diff --git a/libre/gloobus-preview-libre/PKGBUILD b/libre/gloobus-preview-libre/PKGBUILD deleted file mode 100644 index 8385ea8b1..000000000 --- a/libre/gloobus-preview-libre/PKGBUILD +++ /dev/null @@ -1,104 +0,0 @@ -# $Id: PKGBUILD 104564 2014-01-22 21:49:14Z bgyorgy $ -# Maintainer (Arch): Balló György -# Maintainer: André Silva - -_pkgname=gloobus-preview -pkgname=gloobus-preview-libre -pkgver=0.4.5.290 -_pkgver=0.4.5-ubuntu11~ppa290 -pkgrel=2.1 -pkgdesc="Gnome application designed to enable a full screen preview of any kind of file, with libarchive support" -arch=('i686' 'x86_64' 'mips64el') -url="http://gloobus.net/" -license=('GPL') -depends=('gstreamer0.10-base-plugins' 'gtksourceview3' 'poppler-glib' 'python2-dbus' 'python2-gobject' 'gconf' 'taglib' 'xdg-utils') -makedepends=('boost' 'bzr' 'djvulibre' 'libspectre') -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) -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' - 'libarchive: View content of RAR archives' - 'unzip: View content of .ZIP archives') -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-configuration-pygobject3-port.patch - gloobus-sushi-pygobject3-port.patch - gloobus-preview-usr-bsdtar-for-rar.patch) -md5sums=('27b3db2043ecaf47fa928940bbb4f32a' - 'SKIP' - 'ca15a3e31cec01d3d4fc5a4e1720f692' - '03379c173e67ad1b6804bc609336451d' - 'd6d9e2b3e001f0ea8440cccdf90480af' - '16e7a7d892dfde5fd40332fc41de97b0' - '7536f8fbbb2c6bbc0132a2fa25b296b7' - '25cda63ad406f00d3a7ba61ee8816b5c') - -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" - - # Port gloobus-preview-configuration to pygobject3 - patch -Np1 -i "$srcdir/gloobus-preview-configuration-pygobject3-port.patch" - - # Use bsdtar (libarchive) for RAR. - patch -Np1 -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 - - # Port gloobus-sushi to pygobject3 - patch -Np1 -i "$srcdir/gloobus-sushi-pygobject3-port.patch" -} - - -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 deleted file mode 100644 index 053169a43..000000000 --- a/libre/gloobus-preview-libre/fix-gtksource-include.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 deleted file mode 100644 index f918f3019..000000000 --- a/libre/gloobus-preview-libre/fix-unoconv.patch +++ /dev/null @@ -1,46 +0,0 @@ -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-configuration-pygobject3-port.patch b/libre/gloobus-preview-libre/gloobus-preview-configuration-pygobject3-port.patch deleted file mode 100644 index 2c2540753..000000000 --- a/libre/gloobus-preview-libre/gloobus-preview-configuration-pygobject3-port.patch +++ /dev/null @@ -1,124 +0,0 @@ -diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-configuration gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-configuration ---- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-configuration 2014-01-22 21:54:41.555697168 +0100 -+++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-configuration 2014-01-22 21:34:36.867164953 +0100 -@@ -6,10 +6,9 @@ - import os - import sys - import glob --import gtk -+from gi.repository import Gtk, GConf - import signal - import gettext --import gconf - #import config - - #=========================== CLASS COLORS =======================================================# -@@ -69,54 +68,54 @@ - def __init__(self): - self.config = config_load() - -- self.client = gconf.client_get_default() -+ self.client = GConf.Client.get_default() - self.gconf_win_layout = self.client.get_string('/apps/metacity/general/button_layout') - - #================= Show In Taskbar ================= # -- self.entry1 = gtk.CheckButton(label=_("Show in TaskBar"), use_underline=False) -+ self.entry1 = Gtk.CheckButton(label=_("Show in TaskBar"), use_underline=False) - self.entry1.set_tooltip_markup(_("When enabled gloobus-preview will be\nshown in the taskbar")) - self.entry1.set_active(self.config.getboolean("Main","taskbar")) - - #================= Allways on top ================= # -- self.entry2 = gtk.CheckButton(label=_("Always on top"), use_underline=False) -+ self.entry2 = Gtk.CheckButton(label=_("Always on top"), use_underline=False) - self.entry2.set_tooltip_markup(_("When enabled gloobus-preview will be\nalways on top of the other windows")) - self.entry2.set_active(self.config.getboolean("Main","ontop")) - win.set_keep_above(self.config.getboolean("Main","ontop")) - - - #================= Quit on lose focus ================= # -- self.entry3 = gtk.CheckButton(label=_("Quit on lose focus"), use_underline=False) -+ self.entry3 = Gtk.CheckButton(label=_("Quit on lose focus"), use_underline=False) - self.entry3.set_tooltip_markup(_("When enabled, gloobus-preview will exit\nwhen it loses focus")) - self.entry3.set_active(self.config.getboolean("Main","focus")) - - #================= Win bar layout ================= # -- self.entry4 = gtk.CheckButton(label=_("Window Bar Layout inverted"), use_underline=False) -+ self.entry4 = Gtk.CheckButton(label=_("Window Bar Layout inverted"), use_underline=False) - self.entry4.set_tooltip_markup(_("Layout of the buttons\nclose button on the right/left?")) - self.entry4.set_active(self.config.getboolean("Main","winbar_layout")) - - #================= Use gtk theme ================= # -- self.theme_gtk_entry = gtk.CheckButton(label=_("Use gtk theme"), use_underline=False) -+ self.theme_gtk_entry = Gtk.CheckButton(label=_("Use gtk theme"), use_underline=False) - self.theme_gtk_entry.set_tooltip_markup(_("When enabled, gloobus-preview will use system GTK theme")) - self.theme_gtk_entry.set_active(self.config.getboolean("Theme","gtk")) - - #=================== BUTTONS ===================== # -- container0 = gtk.HBox(True,1) #Save and close buttons -+ container0 = Gtk.HBox(True,1) #Save and close buttons - -- ok_button = gtk.Button(_("Save")) -- cancel_button = gtk.Button(_("Cancel")) -+ ok_button = Gtk.Button(_("Save")) -+ cancel_button = Gtk.Button(_("Cancel")) - - container0.add(cancel_button) - container0.add(ok_button) -- cancel_button.connect('clicked', gtk.main_quit) -+ cancel_button.connect('clicked', Gtk.main_quit) - ok_button.connect('clicked', self.save_conf) - - #============ GENERAL CONTAINER ================== # - -- general_container = gtk.VBox(False,1) -+ general_container = Gtk.VBox(False,1) - -- title = gtk.Label() -+ title = Gtk.Label() - title.set_markup(_("Main settings")) -- align2 = gtk.Alignment(0,0,0,0) -+ align2 = Gtk.Alignment.new(0,0,0,0) - align2.set_padding(0,5,0,0) - align2.add(title) - -@@ -128,11 +127,11 @@ - if self.gconf_win_layout == None: - general_container.add(self.entry4) #Always on top - -- general_container.add(gtk.HSeparator()) -- general_container.add(gtk.Label()) #White Space -+ general_container.add(Gtk.HSeparator()) -+ general_container.add(Gtk.Label()) #White Space - general_container.add(container0) #Close & save buttons - -- align = gtk.Alignment(0,0,0,0); -+ align = Gtk.Alignment.new(0,0,0,0); - align.set_padding(10,5,10,10) - - align.add(general_container) -@@ -155,7 +154,7 @@ - - config_save(self.config) - -- gtk.main_quit() -+ Gtk.main_quit() - - - #==================================== GLOBAL FUNCTIONS ===============================================# -@@ -232,13 +231,13 @@ - g.debug("Path: " + abspath) - g.debug("Config File: " + CONFIG_PATH) - --win = gtk.Window() -+win = Gtk.Window() - win.set_title(_("Gloobus-Preview Configuration")) - #win.set_default_size(400,150) --win.connect('delete-event', gtk.main_quit) -+win.connect('delete-event', Gtk.main_quit) - - - gui = GUI() - --gtk.main() -+Gtk.main() - 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 deleted file mode 100644 index 3db748114..000000000 --- a/libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Nur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-compressed/plugin-compressed.cpp gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-compressed/plugin-compressed.cpp ---- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-compressed/plugin-compressed.cpp 2012-04-06 10:07:29.000000000 -0300 -+++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-compressed/plugin-compressed.cpp 2014-08-26 16:55:39.534735733 -0300 -@@ -55,11 +55,8 @@ - else if ( type == GP_COMPRESSED_RAR - || type == GP_COMPRESSED_RAR_X ) - { -- cmd_args.push_back("unrar"); -- cmd_args.push_back("vb"); -- cmd_args.push_back("-c-"); -- cmd_args.push_back("-p-"); // do not query for password -- cmd_args.push_back("--"); -+ cmd_args.push_back("bsdtar"); -+ cmd_args.push_back("-tf"); - line_parser = &iCompressed::parse_line_rar; - } - else if ( type == GP_COMPRESSED_TAR -diff -Nur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-compressed/plugin-compressed.h gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-compressed/plugin-compressed.h ---- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-compressed/plugin-compressed.h 2012-04-06 10:07:29.000000000 -0300 -+++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-compressed/plugin-compressed.h 2014-08-26 16:52:58.903694500 -0300 -@@ -102,7 +102,7 @@ - PluginManager::register_filetype(GP_COMPRESSED_7Z, 1); - } - --if(interface::is_program_available("unrar")) { -+if(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 deleted file mode 100644 index 16ad7278f..000000000 --- a/libre/gloobus-preview-libre/gloobus-preview.install +++ /dev/null @@ -1,12 +0,0 @@ -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/gloobus-sushi-pygobject3-port.patch b/libre/gloobus-preview-libre/gloobus-sushi-pygobject3-port.patch deleted file mode 100644 index f748da875..000000000 --- a/libre/gloobus-preview-libre/gloobus-sushi-pygobject3-port.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur gloobus-sushi.orig/src/gloobus-sushi.py gloobus-sushi/src/gloobus-sushi.py ---- gloobus-sushi.orig/src/gloobus-sushi.py 2014-01-22 21:54:41.297590000 +0100 -+++ gloobus-sushi/src/gloobus-sushi.py 2014-01-22 21:45:21.244184455 +0100 -@@ -16,7 +16,7 @@ - - import dbus - import dbus.service --import gobject -+from gi.repository import GObject - import os - - from dbus.mainloop.glib import DBusGMainLoop -@@ -28,7 +28,7 @@ - def __init__(self): - bus_name = dbus.service.BusName(DBUS_NAME, bus=dbus.SessionBus()) - super(DBusWrapper, self).__init__(bus_name, DBUS_PATH) -- self.loop = gobject.MainLoop() -+ self.loop = GObject.MainLoop() - self.loop.run() - - @dbus.service.method(DBUS_NAME) diff --git a/libre/gloobus-preview-libre/use-xdg-open.patch b/libre/gloobus-preview-libre/use-xdg-open.patch deleted file mode 100644 index 68e219e6a..000000000 --- a/libre/gloobus-preview-libre/use-xdg-open.patch +++ /dev/null @@ -1,20 +0,0 @@ -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")) diff --git a/libre/gloobus-preview/PKGBUILD b/libre/gloobus-preview/PKGBUILD new file mode 100644 index 000000000..7d02eb70e --- /dev/null +++ b/libre/gloobus-preview/PKGBUILD @@ -0,0 +1,102 @@ +# $Id: PKGBUILD 104564 2014-01-22 21:49:14Z bgyorgy $ +# Maintainer (Arch): Balló György +# Maintainer: André Silva + +pkgname=gloobus-preview +pkgver=0.4.5.290 +_pkgver=0.4.5-ubuntu11~ppa290 +pkgrel=2.parabola1 +pkgdesc="Gnome application designed to enable a full screen preview of any kind of file, with libarchive support" +arch=('i686' 'x86_64' 'mips64el') +url="http://gloobus.net/" +license=('GPL') +depends=('gstreamer0.10-base-plugins' 'gtksourceview3' 'poppler-glib' 'python2-dbus' 'python2-gobject' 'gconf' 'taglib' 'xdg-utils') +makedepends=('boost' 'bzr' 'djvulibre' 'libspectre') +replaces=(${pkgname}-libre) +conflicts=(${pkgname}-libre) +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' + 'libarchive: View content of RAR archives' + 'unzip: View content of .ZIP archives') +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-configuration-pygobject3-port.patch + gloobus-sushi-pygobject3-port.patch + gloobus-preview-usr-bsdtar-for-rar.patch) +md5sums=('27b3db2043ecaf47fa928940bbb4f32a' + 'SKIP' + 'ca15a3e31cec01d3d4fc5a4e1720f692' + '03379c173e67ad1b6804bc609336451d' + 'd6d9e2b3e001f0ea8440cccdf90480af' + '16e7a7d892dfde5fd40332fc41de97b0' + '7536f8fbbb2c6bbc0132a2fa25b296b7' + '25cda63ad406f00d3a7ba61ee8816b5c') + +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" + + # Port gloobus-preview-configuration to pygobject3 + patch -Np1 -i "$srcdir/gloobus-preview-configuration-pygobject3-port.patch" + + # Use bsdtar (libarchive) for RAR. + patch -Np1 -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 + + # Port gloobus-sushi to pygobject3 + patch -Np1 -i "$srcdir/gloobus-sushi-pygobject3-port.patch" +} + + +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/fix-gtksource-include.patch b/libre/gloobus-preview/fix-gtksource-include.patch new file mode 100644 index 000000000..053169a43 --- /dev/null +++ b/libre/gloobus-preview/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/fix-unoconv.patch b/libre/gloobus-preview/fix-unoconv.patch new file mode 100644 index 000000000..f918f3019 --- /dev/null +++ b/libre/gloobus-preview/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/gloobus-preview-configuration-pygobject3-port.patch b/libre/gloobus-preview/gloobus-preview-configuration-pygobject3-port.patch new file mode 100644 index 000000000..2c2540753 --- /dev/null +++ b/libre/gloobus-preview/gloobus-preview-configuration-pygobject3-port.patch @@ -0,0 +1,124 @@ +diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-configuration gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-configuration +--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-configuration 2014-01-22 21:54:41.555697168 +0100 ++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-configuration 2014-01-22 21:34:36.867164953 +0100 +@@ -6,10 +6,9 @@ + import os + import sys + import glob +-import gtk ++from gi.repository import Gtk, GConf + import signal + import gettext +-import gconf + #import config + + #=========================== CLASS COLORS =======================================================# +@@ -69,54 +68,54 @@ + def __init__(self): + self.config = config_load() + +- self.client = gconf.client_get_default() ++ self.client = GConf.Client.get_default() + self.gconf_win_layout = self.client.get_string('/apps/metacity/general/button_layout') + + #================= Show In Taskbar ================= # +- self.entry1 = gtk.CheckButton(label=_("Show in TaskBar"), use_underline=False) ++ self.entry1 = Gtk.CheckButton(label=_("Show in TaskBar"), use_underline=False) + self.entry1.set_tooltip_markup(_("When enabled gloobus-preview will be\nshown in the taskbar")) + self.entry1.set_active(self.config.getboolean("Main","taskbar")) + + #================= Allways on top ================= # +- self.entry2 = gtk.CheckButton(label=_("Always on top"), use_underline=False) ++ self.entry2 = Gtk.CheckButton(label=_("Always on top"), use_underline=False) + self.entry2.set_tooltip_markup(_("When enabled gloobus-preview will be\nalways on top of the other windows")) + self.entry2.set_active(self.config.getboolean("Main","ontop")) + win.set_keep_above(self.config.getboolean("Main","ontop")) + + + #================= Quit on lose focus ================= # +- self.entry3 = gtk.CheckButton(label=_("Quit on lose focus"), use_underline=False) ++ self.entry3 = Gtk.CheckButton(label=_("Quit on lose focus"), use_underline=False) + self.entry3.set_tooltip_markup(_("When enabled, gloobus-preview will exit\nwhen it loses focus")) + self.entry3.set_active(self.config.getboolean("Main","focus")) + + #================= Win bar layout ================= # +- self.entry4 = gtk.CheckButton(label=_("Window Bar Layout inverted"), use_underline=False) ++ self.entry4 = Gtk.CheckButton(label=_("Window Bar Layout inverted"), use_underline=False) + self.entry4.set_tooltip_markup(_("Layout of the buttons\nclose button on the right/left?")) + self.entry4.set_active(self.config.getboolean("Main","winbar_layout")) + + #================= Use gtk theme ================= # +- self.theme_gtk_entry = gtk.CheckButton(label=_("Use gtk theme"), use_underline=False) ++ self.theme_gtk_entry = Gtk.CheckButton(label=_("Use gtk theme"), use_underline=False) + self.theme_gtk_entry.set_tooltip_markup(_("When enabled, gloobus-preview will use system GTK theme")) + self.theme_gtk_entry.set_active(self.config.getboolean("Theme","gtk")) + + #=================== BUTTONS ===================== # +- container0 = gtk.HBox(True,1) #Save and close buttons ++ container0 = Gtk.HBox(True,1) #Save and close buttons + +- ok_button = gtk.Button(_("Save")) +- cancel_button = gtk.Button(_("Cancel")) ++ ok_button = Gtk.Button(_("Save")) ++ cancel_button = Gtk.Button(_("Cancel")) + + container0.add(cancel_button) + container0.add(ok_button) +- cancel_button.connect('clicked', gtk.main_quit) ++ cancel_button.connect('clicked', Gtk.main_quit) + ok_button.connect('clicked', self.save_conf) + + #============ GENERAL CONTAINER ================== # + +- general_container = gtk.VBox(False,1) ++ general_container = Gtk.VBox(False,1) + +- title = gtk.Label() ++ title = Gtk.Label() + title.set_markup(_("Main settings")) +- align2 = gtk.Alignment(0,0,0,0) ++ align2 = Gtk.Alignment.new(0,0,0,0) + align2.set_padding(0,5,0,0) + align2.add(title) + +@@ -128,11 +127,11 @@ + if self.gconf_win_layout == None: + general_container.add(self.entry4) #Always on top + +- general_container.add(gtk.HSeparator()) +- general_container.add(gtk.Label()) #White Space ++ general_container.add(Gtk.HSeparator()) ++ general_container.add(Gtk.Label()) #White Space + general_container.add(container0) #Close & save buttons + +- align = gtk.Alignment(0,0,0,0); ++ align = Gtk.Alignment.new(0,0,0,0); + align.set_padding(10,5,10,10) + + align.add(general_container) +@@ -155,7 +154,7 @@ + + config_save(self.config) + +- gtk.main_quit() ++ Gtk.main_quit() + + + #==================================== GLOBAL FUNCTIONS ===============================================# +@@ -232,13 +231,13 @@ + g.debug("Path: " + abspath) + g.debug("Config File: " + CONFIG_PATH) + +-win = gtk.Window() ++win = Gtk.Window() + win.set_title(_("Gloobus-Preview Configuration")) + #win.set_default_size(400,150) +-win.connect('delete-event', gtk.main_quit) ++win.connect('delete-event', Gtk.main_quit) + + + gui = GUI() + +-gtk.main() ++Gtk.main() + diff --git a/libre/gloobus-preview/gloobus-preview-usr-bsdtar-for-rar.patch b/libre/gloobus-preview/gloobus-preview-usr-bsdtar-for-rar.patch new file mode 100644 index 000000000..3db748114 --- /dev/null +++ b/libre/gloobus-preview/gloobus-preview-usr-bsdtar-for-rar.patch @@ -0,0 +1,29 @@ +diff -Nur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-compressed/plugin-compressed.cpp gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-compressed/plugin-compressed.cpp +--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-compressed/plugin-compressed.cpp 2012-04-06 10:07:29.000000000 -0300 ++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-compressed/plugin-compressed.cpp 2014-08-26 16:55:39.534735733 -0300 +@@ -55,11 +55,8 @@ + else if ( type == GP_COMPRESSED_RAR + || type == GP_COMPRESSED_RAR_X ) + { +- cmd_args.push_back("unrar"); +- cmd_args.push_back("vb"); +- cmd_args.push_back("-c-"); +- cmd_args.push_back("-p-"); // do not query for password +- cmd_args.push_back("--"); ++ cmd_args.push_back("bsdtar"); ++ cmd_args.push_back("-tf"); + line_parser = &iCompressed::parse_line_rar; + } + else if ( type == GP_COMPRESSED_TAR +diff -Nur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-compressed/plugin-compressed.h gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-compressed/plugin-compressed.h +--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-compressed/plugin-compressed.h 2012-04-06 10:07:29.000000000 -0300 ++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-compressed/plugin-compressed.h 2014-08-26 16:52:58.903694500 -0300 +@@ -102,7 +102,7 @@ + PluginManager::register_filetype(GP_COMPRESSED_7Z, 1); + } + +-if(interface::is_program_available("unrar")) { ++if(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/gloobus-preview.install b/libre/gloobus-preview/gloobus-preview.install new file mode 100644 index 000000000..16ad7278f --- /dev/null +++ b/libre/gloobus-preview/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/gloobus-sushi-pygobject3-port.patch b/libre/gloobus-preview/gloobus-sushi-pygobject3-port.patch new file mode 100644 index 000000000..f748da875 --- /dev/null +++ b/libre/gloobus-preview/gloobus-sushi-pygobject3-port.patch @@ -0,0 +1,21 @@ +diff -Naur gloobus-sushi.orig/src/gloobus-sushi.py gloobus-sushi/src/gloobus-sushi.py +--- gloobus-sushi.orig/src/gloobus-sushi.py 2014-01-22 21:54:41.297590000 +0100 ++++ gloobus-sushi/src/gloobus-sushi.py 2014-01-22 21:45:21.244184455 +0100 +@@ -16,7 +16,7 @@ + + import dbus + import dbus.service +-import gobject ++from gi.repository import GObject + import os + + from dbus.mainloop.glib import DBusGMainLoop +@@ -28,7 +28,7 @@ + def __init__(self): + bus_name = dbus.service.BusName(DBUS_NAME, bus=dbus.SessionBus()) + super(DBusWrapper, self).__init__(bus_name, DBUS_PATH) +- self.loop = gobject.MainLoop() ++ self.loop = GObject.MainLoop() + self.loop.run() + + @dbus.service.method(DBUS_NAME) diff --git a/libre/gloobus-preview/use-xdg-open.patch b/libre/gloobus-preview/use-xdg-open.patch new file mode 100644 index 000000000..68e219e6a --- /dev/null +++ b/libre/gloobus-preview/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