aboutsummaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/emerald/Makefile5
-rw-r--r--x11-wm/emerald/distinfo4
-rw-r--r--x11-wm/emerald/files/patch-libengine_themer.c47
-rw-r--r--x11-wm/emerald/files/patch-src_engine_loader.c11
-rw-r--r--x11-wm/emerald/files/patch-src_main.c78
-rw-r--r--x11-wm/emerald/files/patch-themer_main.c16
6 files changed, 4 insertions, 157 deletions
diff --git a/x11-wm/emerald/Makefile b/x11-wm/emerald/Makefile
index f03051a99953..ebdb0486c631 100644
--- a/x11-wm/emerald/Makefile
+++ b/x11-wm/emerald/Makefile
@@ -1,12 +1,11 @@
# $FreeBSD$
PORTNAME= emerald
-PORTVERSION= 0.8.4
-PORTREVISION= 9
+PORTVERSION= 0.8.8
CATEGORIES= x11-wm
MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= freebsd-ports@dan.me.uk
COMMENT= Emerald Window Decorator
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/compiz.pc:${PORTSDIR}/x11-wm/compiz
diff --git a/x11-wm/emerald/distinfo b/x11-wm/emerald/distinfo
index 2c66089481ac..465c2b0218b7 100644
--- a/x11-wm/emerald/distinfo
+++ b/x11-wm/emerald/distinfo
@@ -1,2 +1,2 @@
-SHA256 (emerald-0.8.4.tar.bz2) = 7ed5009a739219c61c26176f738ba5264e93557f353fdf9fc480c73fe8b05e26
-SIZE (emerald-0.8.4.tar.bz2) = 525316
+SHA256 (emerald-0.8.8.tar.bz2) = 239285ced20e817f5303e935d922236f828ca905b264833005a330df2089e8a3
+SIZE (emerald-0.8.8.tar.bz2) = 528715
diff --git a/x11-wm/emerald/files/patch-libengine_themer.c b/x11-wm/emerald/files/patch-libengine_themer.c
deleted file mode 100644
index 6657eb9035df..000000000000
--- a/x11-wm/emerald/files/patch-libengine_themer.c
+++ /dev/null
@@ -1,47 +0,0 @@
---- libengine/themer.c.orig 2009-10-13 20:56:23.000000000 -0400
-+++ libengine/themer.c 2010-11-24 15:34:34.000000000 -0500
-@@ -461,7 +461,7 @@ gboolean get_bool(SettingItem * item)
- }
- gdouble get_float(SettingItem * item)
- {
-- if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
-+ if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
- return gtk_spin_button_get_value((GtkSpinButton *)item->widget);
- }
- else {
-@@ -647,7 +647,7 @@ void set_bool(SettingItem * item, gboole
- }
- void set_float(SettingItem * item, gdouble f)
- {
-- if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
-+ if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
- gtk_spin_button_set_value((GtkSpinButton *)item->widget, f);
- }
- else {
-@@ -874,7 +874,7 @@ static void append_engine(gchar * dlname
- err = dlerror();
- if (!hand || err)
- {
-- g_warning(err);
-+ g_warning("%s", err);
- if (hand)
- dlclose(hand);
- return;
-@@ -885,7 +885,7 @@ static void append_engine(gchar * dlname
- layout_settings_proc lay;
- lay = dlsym(hand,"layout_engine_settings");
- if ((err=dlerror()))
-- g_warning(err);
-+ g_warning("%s", err);
- if (lay)
- {
- get_meta_info_proc meta;
-@@ -896,7 +896,7 @@ static void append_engine(gchar * dlname
- "<i><small>%s</small></i>";
- meta = dlsym(hand,"get_meta_info");
- if ((err=dlerror()))
-- g_warning(err);
-+ g_warning("%s", err);
- d->meta.description=g_strdup("No Description");
- d->meta.version=g_strdup("0.0");
- d->meta.last_compat=g_strdup("0.0");
diff --git a/x11-wm/emerald/files/patch-src_engine_loader.c b/x11-wm/emerald/files/patch-src_engine_loader.c
deleted file mode 100644
index 11ea7adb3973..000000000000
--- a/x11-wm/emerald/files/patch-src_engine_loader.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/engine_loader.c.orig 2009-10-13 20:56:23.000000000 -0400
-+++ src/engine_loader.c 2010-11-24 15:34:33.000000000 -0500
-@@ -54,7 +54,7 @@ gboolean load_engine(gchar * engine_name
- newengine = dlopen(path,RTLD_NOW);
- if (!newengine)
- {
-- g_warning(dlerror());
-+ g_warning("%s", dlerror());
- //here's where we should bail out somehow
- }
- }
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 286cdd522882..000000000000
--- a/x11-wm/emerald/files/patch-src_main.c
+++ /dev/null
@@ -1,78 +0,0 @@
---- src/main.c.orig 2009-10-13 20:56:23.000000000 -0400
-+++ src/main.c 2010-11-24 15:34:35.000000000 -0500
-@@ -27,8 +27,8 @@
- #include <emerald.h>
- #include <engine.h>
-
--#define BASE_PROP_SIZE 12
--#define QUAD_PROP_SIZE 9
-+//#define BASE_PROP_SIZE 12
-+//#define QUAD_PROP_SIZE 9
-
- #ifndef DECOR_INTERFACE_VERSION
- #define DECOR_INTERFACE_VERSION 0
-@@ -2457,7 +2457,7 @@ static gboolean get_window_prop(Window x
- gdk_error_trap_push();
-
- type = None;
-- result = XGetWindowProperty(gdk_display,
-+ result = XGetWindowProperty(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
- xwindow,
- atom,
- 0, G_MAXLONG,
-@@ -3757,7 +3757,7 @@
-
- static void hide_tooltip(void)
- {
-- if (GTK_WIDGET_VISIBLE(tip_window))
-+ if (gtk_widget_get_visible(tip_window))
- g_get_current_time(&tooltip_last_popdown);
-
- gtk_widget_hide(tip_window);
-@@ -4246,10 +4246,10 @@
- WnckWindow *win = data;
-
- gdk_error_trap_push();
-- XSetTransientForHint(gdk_display,
-+ XSetTransientForHint(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
- GDK_WINDOW_XID(dialog->window),
- wnck_window_get_xid(win));
-- XSync(gdk_display, FALSE);
-+ XSync(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
- gdk_error_trap_pop();
- }
-
-@@ -4262,11 +4262,11 @@ static char *get_client_machine(Window x
- int format, result;
- char *retval;
-
-- atom = XInternAtom(gdk_display, "WM_CLIENT_MACHINE", FALSE);
-+ atom = XInternAtom(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "WM_CLIENT_MACHINE", FALSE);
-
- gdk_error_trap_push();
-
-- result = XGetWindowProperty(gdk_display,
-+ result = XGetWindowProperty(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
- xwindow, atom,
- 0, G_MAXLONG,
- FALSE, XA_STRING, &type, &format, &nitems,
-@@ -4318,8 +4318,8 @@ static void kill_window(WnckWindow * win
- }
-
- gdk_error_trap_push();
-- XKillClient(gdk_display, wnck_window_get_xid(win));
-- XSync(gdk_display, FALSE);
-+ XKillClient(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), wnck_window_get_xid(win));
-+ XSync(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
- gdk_error_trap_pop();
- }
-
-@@ -4739,7 +4739,7 @@ static XFixed *create_gaussian_kernel(do
-
- static int update_shadow(frame_settings * fs)
- {
-- Display *xdisplay = gdk_display;
-+ Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
- XRenderPictFormat *format;
- GdkPixmap *pixmap;
- Picture src, dst, tmp;
diff --git a/x11-wm/emerald/files/patch-themer_main.c b/x11-wm/emerald/files/patch-themer_main.c
index 952634316618..2eb7c1054fba 100644
--- a/x11-wm/emerald/files/patch-themer_main.c
+++ b/x11-wm/emerald/files/patch-themer_main.c
@@ -104,19 +104,3 @@
#define LAST_COMPAT_VER "0.1.0"
typedef struct _FetcherInfo
-@@ -264,6 +361,7 @@ static void info_dialog(gchar * val)
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_INFO,
- GTK_BUTTONS_CLOSE,
-+ "%s",
- val);
- gtk_dialog_run(GTK_DIALOG(w));
- gtk_widget_destroy(w);
-@@ -275,6 +373,7 @@ static void error_dialog(gchar * val)
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
-+ "%s",
- val);
- gtk_dialog_run(GTK_DIALOG(w));
- gtk_widget_destroy(w);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 02:24:28 +0000