Tue Jan 28 03:22:21 UTC 2014

5 files changed, 0 insertions, 174 deletions

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 <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
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-usr-bsdtar-for-rar.patch b/libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch
deleted file mode 100644
index f5b7c8e00..000000000
--- a/libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-------------------------------------------------------------
-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
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/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&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"))