Bug 2101 – metacity-05-raise-on-frame-click.diff does not apply to 2.23.21

Bug 2101 - metacity-05-raise-on-frame-click.diff does not apply to 2.23.21


Summary:	metacity-05-raise-on-frame-click.diff does not apply to 2.23.21

Status:	RESOLVED FIXED

Product:	opensolaris
Component:	desktop
Version:	unspecified
Platform:	ANY/Generic Solaris

Importance:	P2 major (vote)
Target Milestone:	---
Assigned To:	Erwann Chénedé
QA Contact:	Watcher account for desktop bugs

URL:
Whiteboard:
Keywords:

Depends on:
Blocks:
	Show dependency tree / graph

Reported:	2008-05-30 10:37 UTC by Damien Carbery
Modified:	2008-06-02 10:08 UTC (History)
CC List:	1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note

You need to log in before you can comment on or make changes to this bug.

Description Damien Carbery 2008-05-30 10:37:56 UTC

metacity-05-raise-on-frame-click.diff fails to apply.
Sending this to owners because the #defines in prefs.c's first hunk are no
longer in the module sources.

pkgbuild: patching file src/core/prefs.c
pkgbuild: Hunk #1 FAILED at 78.
pkgbuild: Hunk #3 FAILED at 133.
pkgbuild: Hunk #4 FAILED at 421.
pkgbuild: Hunk #5 FAILED at 847.
pkgbuild: Hunk #6 FAILED at 1686.
pkgbuild: 5 out of 8 hunks FAILED -- saving rejects to file
src/core/prefs.c.rej

pkgbuild: patching file src/core/window.c
pkgbuild: Hunk #2 FAILED at 789.

metacity-03-ctrl-alt-del.diff also fails. It's a trivial update but I chose not
to update this so that other modules could build.

Please update these two patches, and any subsequent ones that might fail and
bump the module.

Comment 1 Erwann Chénedé 2008-06-02 09:35:43 UTC

at least 3 metacity patch don't apply with the latest metacity tarball.

Comment 2 Erwann Chénedé 2008-06-02 10:08:37 UTC

2008-06-02 Erwann Chenede - <erwann.chenede@sun.com>

    ported metacity patches to 2.23.21

    * patches/metacity-08-trusted-extensions.diff : ported
    * patches/metacity-14-wireframe.diff : removed, upstream
    * patches/metacity-03-ctrl-alt-del.diff : ported
    * patches/metacity-11-remove-xopen-source-posix.diff : added to compile
    * patches/metacity-10-lame-client-crash.diff : removedd, upstream
    * patches/metacity-10-wireframe.diff : renamed
    * patches/metacity-11-iconic.diff : removed, upstream
    * patches/metacity-05-raise-on-frame-click.diff : ported
    * base-specs/metacity.spec : ported, bumped to release 2.23.21