4 files changed, 28 insertions, 77 deletions

diff --git a/x11-wm/emerald/Makefile b/x11-wm/emerald/Makefile
index 4bbd57cf90c8..cee4c412d065 100644
--- a/x11-wm/emerald/Makefile
+++ b/x11-wm/emerald/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	emerald
-PORTVERSION=	0.5.2
-PORTREVISION=	2
+PORTVERSION=	0.7.8
+#PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz-fusion.org/${PORTVERSION}/
 
diff --git a/x11-wm/emerald/distinfo b/x11-wm/emerald/distinfo
index 5e73fc949952..c76199f30634 100644
--- a/x11-wm/emerald/distinfo
+++ b/x11-wm/emerald/distinfo
@@ -1,3 +1,3 @@
-MD5 (emerald-0.5.2.tar.bz2) = 149c17b0a1bddf29e1cd66d29777d96e
-SHA256 (emerald-0.5.2.tar.bz2) = 540cf76f70f8a08c19e5407d9e686d7a90fc2f8d3fa44be716a5fd8337ff6fd9
-SIZE (emerald-0.5.2.tar.bz2) = 521776
+MD5 (emerald-0.7.8.tar.bz2) = c7d90c1ca0c91503d474c7e1422edcd5
+SHA256 (emerald-0.7.8.tar.bz2) = 5e7a52cd2a019fb20a6a2c2b89c9b648798788babb95b7b5c33537a7a449e94f
+SIZE (emerald-0.7.8.tar.bz2) = 516307
diff --git a/x11-wm/emerald/files/patch-src_main.c b/x11-wm/emerald/files/patch-src_main.c
deleted file mode 100644
index d8b6e5160b58..000000000000
--- a/x11-wm/emerald/files/patch-src_main.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- src/main.c.orig	2007-08-12 17:00:01.000000000 -0400
-+++ src/main.c	2007-10-29 15:27:28.000000000 -0400
-@@ -3477,11 +3477,11 @@
- 	WnckWindow *win;
- 	decor_t *d;
- 
--	win = wnck_screen_get_active_window(screen);
-+	win = wnck_screen_get_previously_active_window(screen);
- 	if (win)
- 	{
- 		d = g_object_get_data(G_OBJECT(win), "decor");
--		if (d->pixmap && d->decorated)
-+		if (d && d->pixmap && d->decorated)
- 		{
- 			d->active = wnck_window_is_active(win);
- 			d->fs = (d->active ? d->fs->ws->fs_act : d->fs->ws->fs_inact);
-@@ -3493,11 +3493,11 @@
- 		}
- 	}
- 
--	win = wnck_screen_get_previously_active_window(screen);
-+	win = wnck_screen_get_active_window(screen);
- 	if (win)
- 	{
- 		d = g_object_get_data(G_OBJECT(win), "decor");
--		if (d->pixmap && d->decorated)
-+		if (d && d->pixmap && d->decorated)
- 		{
- 			d->active = wnck_window_is_active(win);
- 			d->fs = (d->active ? d->fs->ws->fs_act : d->fs->ws->fs_inact);
-@@ -3558,6 +3558,8 @@
- 	if (!get_window_prop(wnck_window_get_xid(win), select_window_atom, &window))
- 		remove_frame_window(win);
- 
-+	g_object_set_data (G_OBJECT (win), "decor", NULL);
-+
- 	g_free(d);
- }
- 
-@@ -5567,7 +5569,7 @@
- 
-     if (status != DECOR_ACQUIRE_STATUS_SUCCESS)
-     {
--		if (status == DECOR_ACQUIRE_STATUS_OTHER_DM_RUNNING)
-+		if (status == DECOR_ACQUIRE_STATUS_FAILED)
- 		{
- 			fprintf (stderr,
- 				 "%s: Could not acquire decoration manager "
diff --git a/x11-wm/emerald/pkg-plist b/x11-wm/emerald/pkg-plist
index 37df24a8e5ea..e50a4d3e9937 100644
--- a/x11-wm/emerald/pkg-plist
+++ b/x11-wm/emerald/pkg-plist
@@ -53,18 +53,13 @@ share/mime-info/emerald.mime
 %%DATADIR%%/theme/theme.ini
 share/locale/ca/LC_MESSAGES/emerald.mo
 share/locale/cs/LC_MESSAGES/emerald.mo
-share/locale/de_DE/LC_MESSAGES/emerald.mo
+share/locale/da/LC_MESSAGES/emerald.mo
 share/locale/en_GB/LC_MESSAGES/emerald.mo
 share/locale/es_AR/LC_MESSAGES/emerald.mo
-share/locale/gu_IN/LC_MESSAGES/emerald.mo
-share/locale/hu_HU/LC_MESSAGES/emerald.mo
+share/locale/he/LC_MESSAGES/emerald.mo
 share/locale/ja/LC_MESSAGES/emerald.mo
-share/locale/nb_NO/LC_MESSAGES/emerald.mo
 share/locale/nl/LC_MESSAGES/emerald.mo
 share/locale/pt_BR/LC_MESSAGES/emerald.mo
-share/locale/sv_FI/LC_MESSAGES/emerald.mo
-share/locale/sv_SE/LC_MESSAGES/emerald.mo
-share/locale/tr_TR/LC_MESSAGES/emerald.mo
 share/locale/zh_CN/LC_MESSAGES/emerald.mo
 share/locale/zh_HK/LC_MESSAGES/emerald.mo
 share/locale/zh_TW/LC_MESSAGES/emerald.mo
@@ -72,31 +67,35 @@ share/locale/es/LC_MESSAGES/emerald.mo
 share/locale/fr/LC_MESSAGES/emerald.mo
 share/locale/ko/LC_MESSAGES/emerald.mo
 share/locale/pt/LC_MESSAGES/emerald.mo
-share/locale/it_IT/LC_MESSAGES/emerald.mo
+share/locale/ar/LC_MESSAGES/emerald.mo
+share/locale/bn/LC_MESSAGES/emerald.mo
+share/locale/de/LC_MESSAGES/emerald.mo
+share/locale/el/LC_MESSAGES/emerald.mo
+share/locale/eu/LC_MESSAGES/emerald.mo
+share/locale/fa/LC_MESSAGES/emerald.mo
+share/locale/fi/LC_MESSAGES/emerald.mo
+share/locale/gl/LC_MESSAGES/emerald.mo
+share/locale/gu/LC_MESSAGES/emerald.mo
+share/locale/hi/LC_MESSAGES/emerald.mo
+share/locale/hu/LC_MESSAGES/emerald.mo
+share/locale/it/LC_MESSAGES/emerald.mo
+share/locale/nb/LC_MESSAGES/emerald.mo
+share/locale/or/LC_MESSAGES/emerald.mo
+share/locale/pa/LC_MESSAGES/emerald.mo
+share/locale/pl/LC_MESSAGES/emerald.mo
+share/locale/ru/LC_MESSAGES/emerald.mo
+share/locale/sk/LC_MESSAGES/emerald.mo
+share/locale/sv/LC_MESSAGES/emerald.mo
+share/locale/tr/LC_MESSAGES/emerald.mo
+share/locale/bn_IN/LC_MESSAGES/emerald.mo
 share/pixmaps/emerald-theme-manager-icon.png
 @dirrmtry share/mime-info
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/tr_TR/LC_MESSAGES
-@dirrmtry share/locale/tr_TR
-@dirrmtry share/locale/sv_SE/LC_MESSAGES
-@dirrmtry share/locale/sv_SE
-@dirrmtry share/locale/sv_FI/LC_MESSAGES
-@dirrmtry share/locale/sv_FI
-@dirrmtry share/locale/nb_NO/LC_MESSAGES
-@dirrmtry share/locale/nb_NO
 @dirrmtry share/locale/ja_JP/LC_MESSAGES
 @dirrmtry share/locale/ja_JP
-@dirrmtry share/locale/it_IT/LC_MESSAGES
-@dirrmtry share/locale/it_IT
-@dirrmtry share/locale/hu_HU/LC_MESSAGES
-@dirrmtry share/locale/hu_HU
-@dirrmtry share/locale/gu_IN/LC_MESSAGES
-@dirrmtry share/locale/gu_IN
 @dirrmtry share/locale/es_AR/LC_MESSAGES
 @dirrmtry share/locale/es_AR
-@dirrmtry share/locale/de_DE/LC_MESSAGES
-@dirrmtry share/locale/de_DE
 @dirrmtry share/locale/ca_ES/LC_MESSAGES
 @dirrmtry share/locale/ca_ES
 @dirrmtry %%DATADIR%%/theme