Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/clementine/PKGBUILD
	community-testing/gedit-plugins/PKGBUILD
	community-testing/giggle/PKGBUILD
	community-testing/gimmie/PKGBUILD
	community-testing/glipper/PKGBUILD
	community-testing/gnome-system-tools/PKGBUILD
	community-testing/gnote/PKGBUILD
	community-testing/gnubiff/PKGBUILD
	community-testing/google-gadgets/PKGBUILD
	community-testing/gphpedit/PKGBUILD
	community-testing/ibus/PKGBUILD
	community-testing/inputattach/PKGBUILD
	community-testing/liboobs/PKGBUILD
	community-testing/perl-gtk2-webkit/PKGBUILD
	community-testing/shotwell/PKGBUILD
	community-testing/surf/PKGBUILD
	community-testing/system-tools-backends/PKGBUILD
	community-testing/uzbl/PKGBUILD
	community-testing/workrave/PKGBUILD
	community/cherrypy/PKGBUILD
	community/llvm/PKGBUILD
	community/xonotic/PKGBUILD
	extra/ntfs-3g/PKGBUILD
	extra/ntfsprogs/PKGBUILD
	extra/rhino/PKGBUILD
	testing/accountsservice/PKGBUILD
	testing/anjuta/PKGBUILD
	testing/ardour/PKGBUILD
	testing/at-spi/PKGBUILD
	testing/at-spi2-atk/PKGBUILD
	testing/at-spi2-core/PKGBUILD
	testing/atk/PKGBUILD
	testing/atkmm/PKGBUILD
	testing/avahi/PKGBUILD
	testing/banshee/PKGBUILD
	testing/brasero/PKGBUILD
	testing/cairomm/PKGBUILD
	testing/cheese/PKGBUILD
	testing/claws-mail-extra-plugins/PKGBUILD
	testing/clutter-gst/PKGBUILD
	testing/clutter-gtk/PKGBUILD
	testing/clutter-gtk2/PKGBUILD
	testing/clutter/PKGBUILD
	testing/cups-pk-helper/PKGBUILD
	testing/dconf/PKGBUILD
	testing/devhelp/PKGBUILD
	testing/ekiga/PKGBUILD
	testing/empathy/PKGBUILD
	testing/eog-plugins/PKGBUILD
	testing/eog/PKGBUILD
	testing/epiphany-extensions/PKGBUILD
	testing/epiphany/PKGBUILD
	testing/evince/PKGBUILD
	testing/evolution-data-server/PKGBUILD
	testing/evolution-exchange/PKGBUILD
	testing/evolution/PKGBUILD
	testing/farsight2/PKGBUILD
	testing/file-roller/PKGBUILD
	testing/folks/PKGBUILD
	testing/gcalctool/PKGBUILD
	testing/gconf-editor/PKGBUILD
	testing/gconf/PKGBUILD
	testing/gdk-pixbuf2/PKGBUILD
	testing/gdl/PKGBUILD
	testing/gdm/PKGBUILD
	testing/gedit/PKGBUILD
	testing/gimp-devel/PKGBUILD
	testing/gimp/PKGBUILD
	testing/gjs/PKGBUILD
	testing/glade/PKGBUILD
	testing/glib-networking/PKGBUILD
	testing/glib2/PKGBUILD
	testing/glibmm/PKGBUILD
	testing/gnome-applets/PKGBUILD
	testing/gnome-bluetooth/PKGBUILD
	testing/gnome-color-manager/PKGBUILD
	testing/gnome-control-center/PKGBUILD
	testing/gnome-desktop/PKGBUILD
	testing/gnome-disk-utility/PKGBUILD
	testing/gnome-games/PKGBUILD
	testing/gnome-keyring/PKGBUILD
	testing/gnome-media/PKGBUILD
	testing/gnome-menus/PKGBUILD
	testing/gnome-nettool/PKGBUILD
	testing/gnome-panel/PKGBUILD
	testing/gnome-pilot/PKGBUILD
	testing/gnome-power-manager/PKGBUILD
	testing/gnome-screensaver/PKGBUILD
	testing/gnome-session/PKGBUILD
	testing/gnome-settings-daemon/PKGBUILD
	testing/gnome-sharp/PKGBUILD
	testing/gnome-shell/PKGBUILD
	testing/gnome-system-monitor/PKGBUILD
	testing/gnome-terminal/PKGBUILD
	testing/gnome-themes-standard/PKGBUILD
	testing/gnome-user-share/PKGBUILD
	testing/gnome-utils/PKGBUILD
	testing/gobject-introspection/PKGBUILD
	testing/gthumb/PKGBUILD
	testing/gtk-vnc/PKGBUILD
	testing/gtk2/PKGBUILD
	testing/gtk3/PKGBUILD
	testing/gtkhtml4/PKGBUILD
	testing/gtkmm/PKGBUILD
	testing/gtkmm3/PKGBUILD
	testing/gtksourceview3/PKGBUILD
	testing/gucharmap/PKGBUILD
	testing/gvfs/PKGBUILD
	testing/kdeplasma-applets-networkmanagement/PKGBUILD
	testing/kismet/PKGBUILD
	testing/lcms2/PKGBUILD
	testing/libcanberra/PKGBUILD
	testing/libchamplain/PKGBUILD
	testing/libdmapsharing/PKGBUILD
	testing/libgda/PKGBUILD
	testing/libgdata/PKGBUILD
	testing/libgnome-keyring/PKGBUILD
	testing/libgnome-media-profiles/PKGBUILD
	testing/libgnomekbd/PKGBUILD
	testing/libgpod/PKGBUILD
	testing/libgweather/PKGBUILD
	testing/libimobiledevice/PKGBUILD
	testing/liblrdf/PKGBUILD
	testing/libnice/PKGBUILD
	testing/libnotify/PKGBUILD
	testing/libpeas/PKGBUILD
	testing/librsvg/PKGBUILD
	testing/libsocialweb/PKGBUILD
	testing/libsoup/PKGBUILD
	testing/libunique/PKGBUILD
	testing/libunique3/PKGBUILD
	testing/libwebkit/PKGBUILD
	testing/libwnck/PKGBUILD
	testing/libwnck3/PKGBUILD
	testing/libxklavier/PKGBUILD
	testing/liferea/PKGBUILD
	testing/mail-notification/PKGBUILD
	testing/metacity/PKGBUILD
	testing/midori/PKGBUILD
	testing/miro/PKGBUILD
	testing/mousetweaks/PKGBUILD
	testing/mpd/PKGBUILD
	testing/mutter/PKGBUILD
	testing/mx/PKGBUILD
	testing/nautilus-open-terminal/PKGBUILD
	testing/nautilus-sendto/PKGBUILD
	testing/nautilus/PKGBUILD
	testing/network-manager-applet/PKGBUILD
	testing/networkmanager-openvpn/PKGBUILD
	testing/networkmanager-pptp/PKGBUILD
	testing/networkmanager-vpnc/PKGBUILD
	testing/networkmanager/PKGBUILD
	testing/notification-daemon/PKGBUILD
	testing/opal/PKGBUILD
	testing/pangomm/PKGBUILD
	testing/pidgin/PKGBUILD
	testing/polkit-gnome/PKGBUILD
	testing/polkit/PKGBUILD
	testing/ptlib/PKGBUILD
	testing/pygobject/PKGBUILD
	testing/pygtk/PKGBUILD
	testing/pywebkitgtk/PKGBUILD
	testing/raptor/PKGBUILD
	testing/raptor1/PKGBUILD
	testing/rasqal/PKGBUILD
	testing/redland/PKGBUILD
	testing/rest/PKGBUILD
	testing/rhythmbox/PKGBUILD
	testing/seahorse/PKGBUILD
	testing/slv2/PKGBUILD
	testing/soprano/PKGBUILD
	testing/sound-juicer/PKGBUILD
	testing/telepathy-gabble/PKGBUILD
	testing/telepathy-glib/PKGBUILD
	testing/telepathy-logger/PKGBUILD
	testing/telepathy-mission-control/PKGBUILD
	testing/tomboy/PKGBUILD
	testing/totem-plparser/PKGBUILD
	testing/totem/PKGBUILD
	testing/udisks/PKGBUILD
	testing/upower/PKGBUILD
	testing/vinagre/PKGBUILD
	testing/vino/PKGBUILD
	testing/vte/PKGBUILD
	testing/yelp/PKGBUILD
	testing/zenity/PKGBUILD

2 files changed, 0 insertions, 155 deletions

diff --git a/extra/evince/security_issues_in_dvi-backend.patch b/extra/evince/security_issues_in_dvi-backend.patch
deleted file mode 100644
index 691ee4190..000000000
--- a/extra/evince/security_issues_in_dvi-backend.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 8e473c9796b9a61b811213e7892fd36fd570303a Mon Sep 17 00:00:00 2001
-From: José Aliste <jaliste@src.gnome.org>
-Date: Tue, 07 Dec 2010 18:56:47 +0000
-Subject: backends: Fix several security issues in the dvi-backend.
-
-See CVE-2010-2640, CVE-2010-2641, CVE-2010-2642 and  CVE-2010-2643.
----
-diff --git a/backend/dvi/mdvi-lib/afmparse.c b/backend/dvi/mdvi-lib/afmparse.c
-index 164366b..361e23d 100644
---- a/backend/dvi/mdvi-lib/afmparse.c
-+++ b/backend/dvi/mdvi-lib/afmparse.c
-@@ -160,7 +160,7 @@ static char *token(FILE *stream)
-     
-     idx = 0;
-     while (ch != EOF && ch != ' ' && ch != lineterm 
--           && ch != '\t' && ch != ':' && ch != ';') 
-+           && ch != '\t' && ch != ':' && ch != ';' && idx < MAX_NAME)
-     {
-         ident[idx++] = ch;
-         ch = fgetc(stream);
-diff --git a/backend/dvi/mdvi-lib/dviread.c b/backend/dvi/mdvi-lib/dviread.c
-index 97b7b84..ac98068 100644
---- a/backend/dvi/mdvi-lib/dviread.c
-+++ b/backend/dvi/mdvi-lib/dviread.c
-@@ -1537,6 +1537,10 @@ int	special(DviContext *dvi, int opcode)
- 	Int32	arg;
- 	
- 	arg = dugetn(dvi, opcode - DVI_XXX1 + 1);
-+	if (arg <= 0) {
-+		dvierr(dvi, _("malformed special length\n"));
-+		return -1;
-+	}
- 	s = mdvi_malloc(arg + 1);
- 	dread(dvi, s, arg);
- 	s[arg] = 0;
-diff --git a/backend/dvi/mdvi-lib/pk.c b/backend/dvi/mdvi-lib/pk.c
-index a579186..08377e6 100644
---- a/backend/dvi/mdvi-lib/pk.c
-+++ b/backend/dvi/mdvi-lib/pk.c
-@@ -469,6 +469,15 @@ static int pk_load_font(DviParams *unused, DviFont *font)
- 			}
- 			if(feof(p))
- 				break;
-+
-+			/* Although the PK format support bigger char codes,
-+                         * XeTeX and other extended TeX engines support charcodes up to
-+                         * 65536, while normal TeX engine supports only charcode up to 255.*/
-+			if (cc < 0 || cc > 65536) {
-+				mdvi_error (_("%s: unexpected charcode (%d)\n"),
-+					    font->fontname,cc);
-+				goto error;
-+			} 
- 			if(cc < loc)
- 				loc = cc;
- 			if(cc > hic)
-@@ -512,7 +521,7 @@ static int pk_load_font(DviParams *unused, DviFont *font)
- 	}
- 
- 	/* resize font char data */
--	if(loc > 0 || hic < maxch-1) {
-+	if(loc > 0 && hic < maxch-1) {
- 		memmove(font->chars, font->chars + loc, 
- 			(hic - loc + 1) * sizeof(DviFontChar));
- 		font->chars = xresize(font->chars,
-diff --git a/backend/dvi/mdvi-lib/tfmfile.c b/backend/dvi/mdvi-lib/tfmfile.c
-index 73ebf26..8c2a30b 100644
---- a/backend/dvi/mdvi-lib/tfmfile.c
-+++ b/backend/dvi/mdvi-lib/tfmfile.c
-@@ -172,7 +172,8 @@ int	tfm_load_file(const char *filename, TFMInfo *info)
- 	/* We read the entire TFM file into core */
- 	if(fstat(fileno(in), &st) < 0)
- 		return -1;
--	if(st.st_size == 0)
-+	/* according to the spec, TFM files are smaller than 16K */
-+	if(st.st_size == 0 || st.st_size >= 16384)
- 		goto bad_tfm;
- 
- 	/* allocate a word-aligned buffer to hold the file */
-diff --git a/backend/dvi/mdvi-lib/vf.c b/backend/dvi/mdvi-lib/vf.c
-index fb49847..a5ae3bb 100644
---- a/backend/dvi/mdvi-lib/vf.c
-+++ b/backend/dvi/mdvi-lib/vf.c
-@@ -165,6 +165,12 @@ static int vf_load_font(DviParams *params, DviFont *font)
- 			cc = fuget1(p);
- 			tfm = fuget3(p);
- 		}
-+		if (cc < 0 || cc > 65536) {
-+			/* TeX engines do not support char codes bigger than 65535 */
-+			mdvi_error(_("(vf) %s: unexpected character %d\n"),
-+				   font->fontname, cc);
-+			goto error;
-+		}
- 		if(loc < 0 || cc < loc)
- 			loc = cc;
- 		if(hic < 0 || cc > hic)
---
-cgit v0.8.3.1
diff --git a/extra/evince/update_to_poppler_api.patch b/extra/evince/update_to_poppler_api.patch
deleted file mode 100644
index 29bcad6b9..000000000
--- a/extra/evince/update_to_poppler_api.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From f77e6cf4fd7fef49ac91d8c62b6a9a993529adb8 Mon Sep 17 00:00:00 2001
-From: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri, 17 Sep 2010 11:21:16 +0000
-Subject: [pdf] Update to poppler api changes
-
-Linearized PopplerDocument property is now boolean rather than string.
----
-diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc
-index aa080e6..ced3ef7 100644
---- a/backend/pdf/ev-poppler.cc
-+++ b/backend/pdf/ev-poppler.cc
-@@ -722,6 +722,9 @@ pdf_document_get_info (EvDocument *document)
- 	PopplerPermissions permissions;
- 	EvPage *page;
- 	char *metadata;
-+#ifdef HAVE_POPPLER_DOCUMENT_IS_LINEARIZED
-+	gboolean linearized;
-+#endif
- 
- 	info = g_new0 (EvDocumentInfo, 1);
- 
-@@ -758,7 +761,11 @@ pdf_document_get_info (EvDocument *document)
- 		      "producer", &(info->producer),
- 		      "creation-date", &(info->creation_date),
- 		      "mod-date", &(info->modified_date),
-+#ifdef HAVE_POPPLER_DOCUMENT_IS_LINEARIZED
-+		      "linearized", &linearized,
-+#else
- 		      "linearized", &(info->linearized),
-+#endif
- 		      "metadata", &metadata,
- 		      NULL);
- 
-@@ -864,6 +871,10 @@ pdf_document_get_info (EvDocument *document)
- 		info->security = g_strdup (_("No"));
- 	}
- 
-+#ifdef HAVE_POPPLER_DOCUMENT_IS_LINEARIZED
-+	info->linearized = linearized ? g_strdup (_("Yes")) : g_strdup (_("No"));
-+#endif
-+
- 	return info;
- }
- 
-diff --git a/configure.ac b/configure.ac
-index 0faa16e..9619349 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -512,6 +512,7 @@ if test "x$enable_pdf" = "xyes"; then
- 	    AC_CHECK_FUNCS(poppler_page_get_text_layout)
- 	    AC_CHECK_FUNCS(poppler_page_get_selected_text)
- 	    AC_CHECK_FUNCS(poppler_page_add_annot)
-+	    AC_CHECK_FUNCS(poppler_document_is_linearized)
- 	    LIBS=$evince_save_LIBS
- 	    PKG_CHECK_MODULES(CAIRO_PDF, cairo-pdf, enable_cairo_pdf=yes, enable_cairo_pdf=no)
- 	    if test x$enable_cairo_pdf = xyes; then
---
-cgit v0.8.3.1