Merge branch 'master' of vparabola:abslibre

Conflicts:
	pcr/pandoc/PKGBUILD

3 files changed, 158 insertions, 4 deletions

diff --git a/libre/gloobus-preview-libre/PKGBUILD b/libre/gloobus-preview-libre/PKGBUILD
index 5881a4c2e..0a7cf95d5 100644
--- a/libre/gloobus-preview-libre/PKGBUILD
+++ b/libre/gloobus-preview-libre/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 91026 2013-05-18 11:44:23Z bgyorgy $
+# $Id: PKGBUILD 104564 2014-01-22 21:49:14Z 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.1
+pkgrel=2
 pkgdesc="Gnome application designed to enable a full screen preview of any kind of file, with libarchive support"
 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')
+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
@@ -25,19 +25,22 @@ optdepends=('djvulibre: Preview DjVu documents'
             'unoconv: Preview LibreOffice compatible documents'
             'libarchive: View content of RAR archives'
             '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-configuration-pygobject3-port.patch
+        gloobus-sushi-pygobject3-port.patch
 	gloobus-preview-usr-bsdtar-for-rar.patch)
 md5sums=('27b3db2043ecaf47fa928940bbb4f32a'
          'SKIP'
          'ca15a3e31cec01d3d4fc5a4e1720f692'
          '03379c173e67ad1b6804bc609336451d'
          'd6d9e2b3e001f0ea8440cccdf90480af'
+         '16e7a7d892dfde5fd40332fc41de97b0'
+         '7536f8fbbb2c6bbc0132a2fa25b296b7'
          'eeab61846c861540bb16ca00fa14cdb6')
 
 prepare() {
@@ -56,6 +59,9 @@ prepare() {
   # 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) if unrar is not found.
   patch -Np0 -i "$srcdir/gloobus-preview-usr-bsdtar-for-rar.patch"
 
@@ -64,6 +70,9 @@ prepare() {
 
   # 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"
 }
 
 
diff --git a/libre/gloobus-preview-libre/gloobus-preview-configuration-pygobject3-port.patch b/libre/gloobus-preview-libre/gloobus-preview-configuration-pygobject3-port.patch
new file mode 100644
index 000000000..2c2540753
--- /dev/null
+++ b/libre/gloobus-preview-libre/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 <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()
+ 
diff --git a/libre/gloobus-preview-libre/gloobus-sushi-pygobject3-port.patch b/libre/gloobus-preview-libre/gloobus-sushi-pygobject3-port.patch
new file mode 100644
index 000000000..f748da875
--- /dev/null
+++ b/libre/gloobus-preview-libre/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)