[arch-commits] Commit in gloobus-preview/trunk (7 files)
Balló György
bgyorgy at archlinux.org
Thu Jan 8 01:06:56 UTC 2015
Date: Thursday, January 8, 2015 @ 02:06:56
Author: bgyorgy
Revision: 125582
upgpkg: gloobus-preview 0.4.5.333-1
Update to latest bzr snapshot, which has many improvements
Modified:
gloobus-preview/trunk/PKGBUILD
gloobus-preview/trunk/gloobus-preview.install
Deleted:
gloobus-preview/trunk/fix-gtksource-include.patch
gloobus-preview/trunk/fix-unoconv.patch
gloobus-preview/trunk/gloobus-preview-configuration-pygobject3-port.patch
gloobus-preview/trunk/gloobus-sushi-pygobject3-port.patch
gloobus-preview/trunk/use-xdg-open.patch
-----------------------------------------------------+
PKGBUILD | 93 ++-----------
fix-gtksource-include.patch | 39 -----
fix-unoconv.patch | 46 ------
gloobus-preview-configuration-pygobject3-port.patch | 124 ------------------
gloobus-preview.install | 5
gloobus-sushi-pygobject3-port.patch | 21 ---
use-xdg-open.patch | 20 --
7 files changed, 21 insertions(+), 327 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-01-07 23:13:42 UTC (rev 125581)
+++ PKGBUILD 2015-01-08 01:06:56 UTC (rev 125582)
@@ -2,93 +2,34 @@
# Maintainer: Balló György <ballogyor+arch at gmail dot com>
pkgname=gloobus-preview
-pkgver=0.4.5.290
-_pkgver=0.4.5-ubuntu11~ppa290
-pkgrel=2
-pkgdesc="Gnome application designed to enable a full screen preview of any kind of file"
+pkgver=0.4.5.333
+pkgrel=1
+pkgdesc="GNOME application designed to enable a full screen preview of any kind of file"
arch=('i686' 'x86_64')
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')
+depends=('gst-plugins-base' 'gtksourceview3' 'poppler-glib' 'python-dbus' 'python-gobject')
+makedepends=('boost' 'bzr' 'djvulibre' 'libgxps' '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'
+ 'gst-libav: Extra media codecs'
+ 'gst-plugins-bad: Extra media codecs'
+ 'gst-plugins-good: Extra media codecs'
+ 'gst-plugins-ugly: Extra media codecs'
+ 'imagemagick: Support for more image formats'
+ 'libgxps: Preview XPS documents'
'libspectre: Preview PostScript documents'
- 'p7zip: View content of 7z archives'
- 'unoconv: Preview LibreOffice compatible documents'
- 'unrar: View content of RAR archives'
- 'unzip: View content of .ZIP archives')
+ 'unoconv: Preview LibreOffice compatible documents')
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)
-md5sums=('27b3db2043ecaf47fa928940bbb4f32a'
- 'SKIP'
- 'ca15a3e31cec01d3d4fc5a4e1720f692'
- '03379c173e67ad1b6804bc609336451d'
- 'd6d9e2b3e001f0ea8440cccdf90480af'
- '16e7a7d892dfde5fd40332fc41de97b0'
- '7536f8fbbb2c6bbc0132a2fa25b296b7')
+source=($pkgname-$pkgver::bzr+http://bazaar.launchpad.net/~gloobus-dev/gloobus-preview/last_working_branch#revision=333)
+md5sums=('SKIP')
-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"
-
- ### 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
+ cd $pkgname-$pkgver
+ ./autogen.sh --prefix=/usr
make
-
- ### Build gloobus-sushi
- cd "$srcdir/gloobus-sushi"
-
- ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var
- make
}
package() {
- cd "$srcdir/$pkgname-$_pkgver"
+ cd $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}
}
Deleted: fix-gtksource-include.patch
===================================================================
--- fix-gtksource-include.patch 2015-01-07 23:13:42 UTC (rev 125581)
+++ fix-gtksource-include.patch 2015-01-08 01:06:56 UTC (rev 125582)
@@ -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 <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"
Deleted: fix-unoconv.patch
===================================================================
--- fix-unoconv.patch 2015-01-07 23:13:42 UTC (rev 125581)
+++ fix-unoconv.patch 2015-01-08 01:06:56 UTC (rev 125582)
@@ -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 */
Deleted: gloobus-preview-configuration-pygobject3-port.patch
===================================================================
--- gloobus-preview-configuration-pygobject3-port.patch 2015-01-07 23:13:42 UTC (rev 125581)
+++ gloobus-preview-configuration-pygobject3-port.patch 2015-01-08 01:06:56 UTC (rev 125582)
@@ -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 <b>taskbar</b>"))
- 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\n<b>always on top</b> 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 <b>exit</b>\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(_("<b>Main settings</b>"))
-- 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()
-
Modified: gloobus-preview.install
===================================================================
--- gloobus-preview.install 2015-01-07 23:13:42 UTC (rev 125581)
+++ gloobus-preview.install 2015-01-08 01:06:56 UTC (rev 125582)
@@ -1,10 +1,13 @@
post_install() {
xdg-icon-resource forceupdate
- gdk-pixbuf-query-loaders --update-cache
}
post_upgrade() {
post_install $1
+
+ if [ "$(vercmp 0.4.5.333-1 "$2")" -eq 1 ]; then
+ gdk-pixbuf-query-loaders --update-cache
+ fi
}
post_remove() {
Deleted: gloobus-sushi-pygobject3-port.patch
===================================================================
--- gloobus-sushi-pygobject3-port.patch 2015-01-07 23:13:42 UTC (rev 125581)
+++ gloobus-sushi-pygobject3-port.patch 2015-01-08 01:06:56 UTC (rev 125582)
@@ -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)
Deleted: use-xdg-open.patch
===================================================================
--- use-xdg-open.patch 2015-01-07 23:13:42 UTC (rev 125581)
+++ use-xdg-open.patch 2015-01-08 01:06:56 UTC (rev 125582)
@@ -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"))
More information about the arch-commits
mailing list