diff -Nru emerald-0.8.8/debian/changelog emerald-0.9.5/debian/changelog --- emerald-0.8.8/debian/changelog 2011-06-04 08:01:04.000000000 +0000 +++ emerald-0.9.5/debian/changelog 2014-04-03 12:09:22.000000000 +0000 @@ -1,20 +1,34 @@ -emerald (0.8.8-0ubuntu1) oneiric; urgency=low +emerald (0.9.5-0~webupd8~trusty2) trusty; urgency=medium - * New upstream release. (LP: #442479) - - Fixes segfault on start. (LP: #733393) - * Migrate to 3.0 (quilt) source format. - * Bump to debhelper 7 (no CDBS) and Standards-Version 3.9.2. - * Bump compiz-dev dependency. - * Use dh-autoreconf, build-depend on intltool. - * Expand extended descriptions in debian/control. - * Remove 01_upstream_pixmap-crashes-window-switcher.patch, applied upstream. - * Refresh 02_improve_desktop_file.patch. - * Remove 03_oldgtk.patch, applied upstream. - * Add 06_adjust_to_new_compiz.patch, by David Foerster : - port to the new compiz API. - * Add 07_potfiles_skip.patch: ignore .pc for autoreconf. - - -- Maia Kozheva Sat, 04 Jun 2011 13:58:53 +0700 + * upload for Trusty + + -- Alin Andrei Thu, 23 May 2012 16:51:32 +0200 + +emerald (0.9.5-0~webupd8~saucy2) saucy; urgency=medium + + * upload for Saucy + + -- Alin Andrei Thu, 23 May 2012 16:51:32 +0200 + +emerald (0.9.5-0~webupd8~raring2) raring; urgency=medium + + * rewrite the rules file + * upload for precise, quantal and raring + + -- Alin Andrei Thu, 23 May 2012 16:51:32 +0200 + +emerald (0.9.5-0~webupd8~oneiric) oneiric; urgency=low + + * New upstream release -> build for Oneiric + * Rewritten 06_adjust_to_new_compiz.patch + + -- Alin Andrei Sun, 15 Jan 2012 16:51:32 +0000 + +emerald (0.8.8-0ubuntu0~malteworld1) natty; urgency=low + + * New upstream release + + -- David Foerster Tue, 03 May 2011 18:51:56 +0200 emerald (0.7.2-0ubuntu6) maverick; urgency=low diff -Nru emerald-0.8.8/debian/compat emerald-0.9.5/debian/compat --- emerald-0.8.8/debian/compat 2011-06-04 07:13:43.000000000 +0000 +++ emerald-0.9.5/debian/compat 2013-05-23 11:26:20.000000000 +0000 @@ -1 +1 @@ -7 +5 diff -Nru emerald-0.8.8/debian/control emerald-0.9.5/debian/control --- emerald-0.8.8/debian/control 2011-06-04 08:00:54.000000000 +0000 +++ emerald-0.9.5/debian/control 2013-05-23 13:10:52.000000000 +0000 @@ -3,11 +3,11 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Nicholas Thomas -Build-Depends: debhelper (>= 7.0.50~), dh-autoreconf, intltool, - compiz-dev (>= 1:0.9.4), libgtk2.0-dev, +Build-Depends: debhelper (>= 5), cdbs, dh-autoreconf, intltool, + compiz-dev (>= 1:0.7.2), libgtk2.0-dev, libpango1.0-dev, libwnck-dev, libxml-parser-perl, libdecoration0-dev -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-dev/emerald/ubuntu Vcs-Browser: https://code.launchpad.net/~ubuntu-dev/emerald/ubuntu @@ -19,34 +19,19 @@ Provides: gcompizthemer, cgwd Recommends: emerald-themes Description: Decorator for compiz-fusion - Emerald is a window decorator for the Compiz window manager, using a custom - theme format (*.emerald). It is highly customizable and supports different - theme engines, with transparency and precise placement of borders and window - title elements. - . - This package provides a decorator for compiz-fusion and a themer application. + This package provides a decorator for compiz-fusion and a themer application Package: libemeraldengine0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Description: Decoration engines for compiz-fusion - Emerald is a window decorator for the Compiz window manager, using a custom - theme format (*.emerald). It is highly customizable and supports different - theme engines, with transparency and precise placement of borders and window - title elements. - . - This package provides some engines for drawing decoration on compiz-fusion. + This package provides some engines for drawing decoration on compiz-fusion Package: libemeraldengine-dev Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, libemeraldengine0 (=${binary:Version}) Description: Development files for emerald engines - Emerald is a window decorator for the Compiz window manager, using a custom - theme format (*.emerald). It is highly customizable and supports different - theme engines, with transparency and precise placement of borders and window - title elements. - . This package contains the headers and development files needed to build engines for emerald. diff -Nru emerald-0.8.8/debian/patches/02_improve_desktop_file.patch emerald-0.9.5/debian/patches/02_improve_desktop_file.patch --- emerald-0.8.8/debian/patches/02_improve_desktop_file.patch 2011-06-04 07:08:45.000000000 +0000 +++ emerald-0.9.5/debian/patches/02_improve_desktop_file.patch 2013-05-23 11:26:20.000000000 +0000 @@ -1,10 +1,8 @@ -Index: emerald-0.8.8/misc/emerald-theme-manager.desktop -=================================================================== ---- emerald-0.8.8.orig/misc/emerald-theme-manager.desktop 2011-04-21 19:43:42.000000000 +0700 -+++ emerald-0.8.8/misc/emerald-theme-manager.desktop 2011-06-04 14:08:33.786049494 +0700 +--- a/misc/emerald-theme-manager.desktop 2011-04-21 14:43:42.000000000 +0200 ++++ b/misc/emerald-theme-manager.desktop 2011-05-03 19:31:21.000000000 +0200 @@ -1,13 +1,18 @@ [Desktop Entry] --Encoding=UTF-8 + Encoding=UTF-8 +Type=Application Name=Emerald Theme Manager Name[fr]=Gestionnaire de thèmes Emerald @@ -21,7 +19,6 @@ Terminal=false -Type=Application Categories=Settings;DesktopSettings; --Exec=emerald-theme-manager -i %f -+Exec=emerald-theme-manager %f + Exec=emerald-theme-manager -i %f MimeType=application/x-emerald-theme; - +- diff -Nru emerald-0.8.8/debian/patches/07_potfiles_skip.patch emerald-0.9.5/debian/patches/07_potfiles_skip.patch --- emerald-0.8.8/debian/patches/07_potfiles_skip.patch 2011-06-04 07:42:59.000000000 +0000 +++ emerald-0.9.5/debian/patches/07_potfiles_skip.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -Index: emerald-0.8.8/po/POTFILES.skip -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ emerald-0.8.8/po/POTFILES.skip 2011-06-04 14:42:56.166050824 +0700 -@@ -0,0 +1 @@ -+.pc diff -Nru emerald-0.8.8/debian/patches/series emerald-0.9.5/debian/patches/series --- emerald-0.8.8/debian/patches/series 2011-06-04 07:47:27.000000000 +0000 +++ emerald-0.9.5/debian/patches/series 2013-05-23 12:21:31.000000000 +0000 @@ -1,5 +1,4 @@ 02_improve_desktop_file.patch 04_manpage.patch 05_build_without_gtk_disable_deprecated.patch -06_adjust_to_new_compiz.patch -07_potfiles_skip.patch +#06_adjust_to_new_compiz.patch diff -Nru emerald-0.8.8/debian/rules emerald-0.9.5/debian/rules --- emerald-0.8.8/debian/rules 2011-06-04 07:23:53.000000000 +0000 +++ emerald-0.9.5/debian/rules 2013-05-23 12:10:05.000000000 +0000 @@ -1,10 +1,13 @@ #!/usr/bin/make -f %: - dh --with=autoreconf $@ - -override_dh_autoreconf: - dh_autoreconf ./autogen.sh + dh $@ override_dh_auto_configure: - dh_auto_configure -- --disable-mime-update + ./autogen.sh + make clean + make distclean + ./configure --prefix=/usr --disable-mime-update --libdir=/usr/lib${LIBDIRSUFFIX} LIBS='-ldl -lm' + +override_dh_install: + dh_install --sourcedir=debian/tmp diff -Nru emerald-0.8.8/libengine/themer.c emerald-0.9.5/libengine/themer.c --- emerald-0.8.8/libengine/themer.c 2011-04-21 12:43:42.000000000 +0000 +++ emerald-0.9.5/libengine/themer.c 2011-10-16 04:09:08.000000000 +0000 @@ -874,7 +874,7 @@ err = dlerror(); if (!hand || err) { - g_warning("%s", err); + g_warning(err); if (hand) dlclose(hand); return; @@ -885,7 +885,7 @@ layout_settings_proc lay; lay = dlsym(hand,"layout_engine_settings"); if ((err=dlerror())) - g_warning("%s", err); + g_warning(err); if (lay) { get_meta_info_proc meta; @@ -896,7 +896,7 @@ "%s"; meta = dlsym(hand,"get_meta_info"); if ((err=dlerror())) - g_warning("%s", err); + g_warning(err); d->meta.description=g_strdup("No Description"); d->meta.version=g_strdup("0.0"); d->meta.last_compat=g_strdup("0.0"); diff -Nru emerald-0.8.8/src/engine_loader.c emerald-0.9.5/src/engine_loader.c --- emerald-0.8.8/src/engine_loader.c 2011-04-21 12:43:42.000000000 +0000 +++ emerald-0.9.5/src/engine_loader.c 2011-10-16 04:09:08.000000000 +0000 @@ -54,7 +54,7 @@ newengine = dlopen(path,RTLD_NOW); if (!newengine) { - g_warning("%s", dlerror()); + g_warning(dlerror()); //here's where we should bail out somehow } } diff -Nru emerald-0.8.8/src/main.c emerald-0.9.5/src/main.c --- emerald-0.8.8/src/main.c 2011-04-21 12:43:42.000000000 +0000 +++ emerald-0.9.5/src/main.c 2011-10-16 04:09:08.000000000 +0000 @@ -472,12 +472,12 @@ static void decor_update_window_property(decor_t * d) { - long data[256]; + long* data = NULL; Display *xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default()); window_settings *ws = d->fs->ws; decor_extents_t maxextents; decor_extents_t extents = ws->win_extents; - gint nQuad; + unsigned int nQuad; decor_quad_t quads[N_QUADS_MAX]; int w, h; gint stretch_offset; @@ -504,15 +504,18 @@ else maxextents = extents; - decor_quads_to_property(data, GDK_PIXMAP_XID(d->pixmap), - &extents, &maxextents, 0, 0, quads, nQuad); + data = decor_alloc_property (1, WINDOW_DECORATION_TYPE_PIXMAP); + + decor_quads_to_property(data, 0, GDK_PIXMAP_XID(d->pixmap), + &extents, &maxextents, &maxextents, &maxextents, + 0, 0, quads, nQuad, 0xffffff, 0, 0); gdk_error_trap_push(); XChangeProperty(xdisplay, d->prop_xid, win_decor_atom, XA_INTEGER, 32, PropModeReplace, (guchar *) data, - BASE_PROP_SIZE + QUAD_PROP_SIZE * nQuad); + PROP_HEADER_SIZE + BASE_PROP_SIZE + QUAD_PROP_SIZE * N_QUADS_MAX); XSync(xdisplay, FALSE); gdk_error_trap_pop(); @@ -553,7 +556,9 @@ &top, stretch_offset, &bottom, w / 2, &left, h / 2, - &right, h / 2); + &right, h / 2); + if (data) + free (data); } static int @@ -1925,9 +1930,9 @@ static void decor_update_switcher_property(decor_t * d) { - long data[256]; + long* data = NULL; Display *xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default()); - gint nQuad; + unsigned int nQuad; decor_quad_t quads[N_QUADS_MAX]; window_settings *ws = d->fs->ws; decor_extents_t extents = ws->switcher_extents; @@ -1936,8 +1941,11 @@ nQuad = set_switcher_quads(quads, d->width, d->height, ws); - decor_quads_to_property(data, GDK_PIXMAP_XID(d->pixmap), - &extents, &extents, 0, 0, quads, nQuad); + data = decor_alloc_property (1, WINDOW_DECORATION_TYPE_PIXMAP); + + decor_quads_to_property(data, 0, GDK_PIXMAP_XID(d->pixmap), + &extents, &extents, &extents, &extents, + 0, 0, quads, nQuad, 0xffffff, 0, 0); style = gtk_widget_get_style (style_window); @@ -1951,11 +1959,13 @@ win_decor_atom, XA_INTEGER, 32, PropModeReplace, (guchar *) data, - BASE_PROP_SIZE + QUAD_PROP_SIZE * nQuad); + PROP_HEADER_SIZE + BASE_PROP_SIZE + QUAD_PROP_SIZE * N_QUADS_MAX); XChangeProperty (xdisplay, d->prop_xid, switcher_fg_atom, XA_INTEGER, 32, PropModeReplace, (guchar *) fgColor, 4); XSync(xdisplay, FALSE); gdk_error_trap_pop(); + if (data) + free (data); } static void draw_switcher_background(decor_t * d) @@ -2336,13 +2346,13 @@ update_default_decorations(GdkScreen * screen, frame_settings * fs_act, frame_settings * fs_inact) { - long data[256]; + long *data = NULL; Window xroot; GdkDisplay *gdkdisplay = gdk_display_get_default(); Display *xdisplay = gdk_x11_display_get_xdisplay(gdkdisplay); - Atom bareAtom, normalAtom, activeAtom; + Atom bareAtom, activeAtom; decor_t d; - gint nQuad; + unsigned int nQuad; decor_quad_t quads[N_QUADS_MAX]; window_settings *ws = fs_act->ws; // hackish, I know, FIXME decor_extents_t extents = ws->win_extents; @@ -2352,7 +2362,6 @@ xroot = RootWindowOfScreen(gdk_x11_screen_get_xscreen(screen)); bareAtom = XInternAtom(xdisplay, DECOR_BARE_ATOM_NAME, FALSE); - normalAtom = XInternAtom(xdisplay, DECOR_NORMAL_ATOM_NAME, FALSE); activeAtom = XInternAtom(xdisplay, DECOR_ACTIVE_ATOM_NAME, FALSE); if (ws->shadow_pixmap) @@ -2363,15 +2372,17 @@ nQuad = set_shadow_quads(quads, width, height, ws); - decor_quads_to_property(data, GDK_PIXMAP_XID(ws->shadow_pixmap), - &ws->shadow_extents, &ws->shadow_extents, 0, 0, - quads, nQuad); + data = decor_alloc_property (1, WINDOW_DECORATION_TYPE_PIXMAP); + + decor_quads_to_property(data, 0, GDK_PIXMAP_XID(ws->shadow_pixmap), + &ws->shadow_extents, &ws->shadow_extents, &ws->shadow_extents, &ws->shadow_extents, + 0, 0, quads, nQuad, 0xffffff, 0, 0); XChangeProperty(xdisplay, xroot, bareAtom, XA_INTEGER, 32, PropModeReplace, (guchar *) data, - BASE_PROP_SIZE + QUAD_PROP_SIZE * nQuad); + PROP_HEADER_SIZE + BASE_PROP_SIZE + QUAD_PROP_SIZE * N_QUADS_MAX); } else @@ -2423,24 +2434,23 @@ (*d.draw) (&d); - decor_quads_to_property(data, GDK_PIXMAP_XID(d.p_inactive), - &extents, &extents, 0, 0, quads, nQuad); - - XChangeProperty(xdisplay, xroot, - normalAtom, - XA_INTEGER, - 32, PropModeReplace, (guchar *) data, - BASE_PROP_SIZE + QUAD_PROP_SIZE * nQuad); - - decor_quads_to_property(data, GDK_PIXMAP_XID(d.p_active), - &extents, &extents, 0, 0, quads, nQuad); + decor_quads_to_property(data, 0, GDK_PIXMAP_XID(d.p_inactive), + &extents, &extents, &extents, &extents, + 0, 0, quads, nQuad, 0xffffff, 0, 0); + + decor_quads_to_property(data, 0, GDK_PIXMAP_XID(d.p_active), + &extents, &extents, &extents, &extents, + 0, 0, quads, nQuad, 0xffffff, 0, 0); XChangeProperty(xdisplay, xroot, activeAtom, XA_INTEGER, 32, PropModeReplace, (guchar *) data, - BASE_PROP_SIZE + QUAD_PROP_SIZE * nQuad); + PROP_HEADER_SIZE + BASE_PROP_SIZE + QUAD_PROP_SIZE * N_QUADS_MAX); } + + if (data) + free (data); } static gboolean get_window_prop(Window xwindow, Atom atom, Window * val) @@ -5512,7 +5522,7 @@ gdkdisplay = gdk_display_get_default(); xdisplay = gdk_x11_display_get_xdisplay(gdkdisplay); - frame_window_atom = XInternAtom(xdisplay, "_NET_FRAME_WINDOW", FALSE); + frame_window_atom = XInternAtom(xdisplay, DECOR_INPUT_FRAME_ATOM_NAME, FALSE); win_decor_atom = XInternAtom(xdisplay, DECOR_WINDOW_ATOM_NAME, FALSE); win_blur_decor_atom = XInternAtom (xdisplay, DECOR_BLUR_ATOM_NAME, FALSE); wm_move_resize_atom = XInternAtom(xdisplay, "_NET_WM_MOVERESIZE", FALSE); @@ -5617,7 +5627,8 @@ update_window_extents(ws); update_shadow(pfs); - decor_set_dm_check_hint(xdisplay, DefaultScreen(xdisplay)); + decor_set_dm_check_hint(xdisplay, DefaultScreen(xdisplay), + WINDOW_DECORATION_TYPE_PIXMAP); update_settings(ws); diff -Nru emerald-0.8.8/themer/main.c emerald-0.9.5/themer/main.c --- emerald-0.8.8/themer/main.c 2011-04-21 12:43:42.000000000 +0000 +++ emerald-0.9.5/themer/main.c 2011-10-16 04:09:08.000000000 +0000 @@ -264,7 +264,6 @@ GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, - "%s", val); gtk_dialog_run(GTK_DIALOG(w)); gtk_widget_destroy(w); @@ -276,7 +275,6 @@ GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, - "%s", val); gtk_dialog_run(GTK_DIALOG(w)); gtk_widget_destroy(w); diff -Nru emerald-0.8.8/VERSION emerald-0.9.5/VERSION --- emerald-0.8.8/VERSION 2011-04-21 12:43:42.000000000 +0000 +++ emerald-0.9.5/VERSION 2011-10-16 04:09:08.000000000 +0000 @@ -1 +1 @@ -VERSION=0.8.8 +VERSION=0.9.5