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

Conflicts:
	community/asciijump/PKGBUILD
	community/cairo-compmgr/PKGBUILD
	community/cwiid/PKGBUILD
	community/darcs/PKGBUILD
	community/gadmin-samba/PKGBUILD
	community/gstm/PKGBUILD
	community/haskell-dbus/PKGBUILD
	community/haskell-mmap/PKGBUILD
	community/lastfm-client/PKGBUILD
	community/libtar/PKGBUILD
	community/mget/PKGBUILD
	community/nexuiz/PKGBUILD
	community/pstreams/PKGBUILD
	community/pyglet/PKGBUILD
	community/python-html5lib/PKGBUILD
	community/python-pychm/PKGBUILD
	community/qoauth/PKGBUILD
	community/quilt/PKGBUILD
	community/stormbaancoureur/PKGBUILD
	community/winegame/PKGBUILD
	community/winestuff/PKGBUILD
	community/xdg-user-dirs/PKGBUILD
	core/libfetch/PKGBUILD
	extra/acpi/PKGBUILD
	extra/alex/PKGBUILD
	extra/allegro/PKGBUILD
	extra/capi4k-utils/PKGBUILD
	extra/erlang/PKGBUILD
	extra/ettercap/PKGBUILD
	extra/gftp/PKGBUILD
	extra/gimp-refocus/PKGBUILD
	extra/happy/PKGBUILD
	extra/haskell-cgi/PKGBUILD
	extra/haskell-deepseq/PKGBUILD
	extra/haskell-fgl/PKGBUILD
	extra/haskell-glut/PKGBUILD
	extra/haskell-haskell-src/PKGBUILD
	extra/haskell-html/PKGBUILD
	extra/haskell-hunit/PKGBUILD
	extra/haskell-opengl/PKGBUILD
	extra/haskell-parallel/PKGBUILD
	extra/haskell-platform/PKGBUILD
	extra/haskell-quickcheck/PKGBUILD
	extra/haskell-regex-base/PKGBUILD
	extra/haskell-regex-compat/PKGBUILD
	extra/haskell-regex-posix/PKGBUILD
	extra/haskell-stm/PKGBUILD
	extra/haskell-syb/PKGBUILD
	extra/haskell-xhtml/PKGBUILD
	extra/libnet/PKGBUILD
	extra/linux_logo/PKGBUILD
	extra/mailman/PKGBUILD
	extra/midori/PKGBUILD
	extra/ntrack/PKGBUILD
	extra/pwgen/PKGBUILD
	extra/qtcurve-gtk2/PKGBUILD
	extra/qtcurve-kde4/PKGBUILD
	extra/ristretto/PKGBUILD
	extra/rxvt-unicode/PKGBUILD
	extra/telepathy-sofiasip/PKGBUILD
	extra/tightvnc/PKGBUILD
	extra/vsftpd/PKGBUILD
	extra/windowmaker-crm-git/PKGBUILD
	libre/aufs2-libre/PKGBUILD
	libre/calibre-libre/PKGBUILD
	libre/calibre-libre/calibre-mount-helper
	libre/calibre-libre/calibre.install
	libre/calibre-libre/desktop_integration.patch
	libre/ffmpeg-libre/PKGBUILD
	mozilla-testing/iceweasel-libre/PKGBUILD
	mozilla-testing/iceweasel-libre/libre.patch
	mozilla-testing/iceweasel-libre/mozconfig
	~lukeshu/openni-unstable/PKGBUILD

1 files changed, 0 insertions, 56 deletions

diff --git a/community/subtitleeditor/fix-taking-address-of-temporary-error.patch b/community/subtitleeditor/fix-taking-address-of-temporary-error.patch
deleted file mode 100644
index a35746d62..000000000
--- a/community/subtitleeditor/fix-taking-address-of-temporary-error.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- trunk/plugins/subtitleformats/sami/sami.cc	2011/06/18 08:06:45	772
-+++ trunk/plugins/subtitleformats/sami/sami.cc	2011/07/02 13:01:33	777
-@@ -155,7 +155,7 @@
- 		int state = 0;
- 		Glib::ustring line;
- 		Glib::ustring text;
--		Subtitle* curSt;
-+		Subtitle curSt;
- 		char tmptext[MAXBUF+1] = "";
- 		char *p = NULL, *q = NULL;
- 		if (!file.getline(line))
-@@ -174,8 +174,8 @@
- 					start_sync = utility::string_to_int(inptr + 6);
- 
- 					// Get a line from the current subtitle on memory
--					curSt = &subtitles.append();
--					curSt->set_start(start_sync);
-+					curSt = subtitles.append();
-+					curSt.set_start(start_sync);
- 
- 					state = SAMI_STATE_SYNC_START;
- 					continue;
-@@ -239,14 +239,14 @@
- 					// Now we are sure that this line is the end sync.
- 
- 					end_sync = utility::string_to_int(q + 6);
--					curSt->set_end(end_sync);
-+					curSt.set_end(end_sync);
- 
- 					*p = '\0';
- 					trail_space(tmptext);
- 
- 					// finalize the end sync of current line
- 					if (tmptext[0] != '\0')
--						curSt->set_text(tmptext);
-+						curSt.set_text(tmptext);
- 
- 					// an important check if this is end sync.
- 					// Is there any delimiter " " in this line?
-@@ -276,14 +276,14 @@
- 				else
- 				{
- 					end_sync = SAMISYNC_MAXVAL;
--					curSt->set_end(end_sync);
-+					curSt.set_end(end_sync);
- 
- 					*p = '\0';
- 					trail_space(tmptext);
- 
- 					// finalize the end sync of current line
- 					if (tmptext[0] != '\0')
--						curSt->set_text(tmptext);
-+						curSt.set_text(tmptext);
- 
- 					state = SAMI_STATE_FORCE_QUIT;
- 					break;