Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24120/main/finkinfo/x11-wm

Modified Files:
        fluxconf.info fvwm2.info metacity-setup.info metacity.info 
        obconf.info openbox.info 
Added Files:
        metacity.patch obconf.patch openbox-3.4.4.info openbox.patch 
Log Message:
Sync GNOME2.24 from unstable


--- NEW FILE: openbox-3.4.4.info ---
Package: openbox
Version: 3.4.4
Revision: 4
Description: Another Window Manager not unlike blackbox
License: GPL
Maintainer: None <fink-de...@lists.sourceforge.net>
Depends: <<
        lib%N16-shlibs (= %v-%r),
        glib2-shlibs (>= 2.14.0-1),
        libgettext3-shlibs,
        libiconv,
        libxml2-shlibs (>= 2.6.27-1),
        pango1-xft2-ft219-shlibs (>= 1.18.4-4),
        startup-notification-shlibs (>= 0.8-1),
        x11
<<
BuildDepends: <<
        cairo (>= 1.6-1),
        expat1,
        fontconfig2-dev (>= 2.4.1-1),
        freetype219 (>= 2.3.5-1),
        gettext-bin,
        gettext-tools,
        glib2-dev (>= 2.14.0-1),
        glitz,
        libgettext3-dev,
        libiconv-dev,
        libxml2 (>= 2.6.27-1),
        pango1-xft2-ft219-dev (>= 1.10.1-1),
        pixman (>= 0.10.0-1),
        pkgconfig (>= 0.22-3),
        startup-notification-dev (>= 0.8-1),
        x11-dev,
        xft2-dev,
        xmkmf (>= 1.0.2-3)
<<

Source: http://icculus.org/openbox/releases/%n-%v.tar.gz
Source-MD5: 7052597c29e75a77e67089683b8c24f7

PatchScript: <<
 perl -ni -e 'print unless /^LIBTOOL.*--silent/' configure
 chmod +x install-sh
<<
ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking 
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/pkgconfig:$PKG_CONFIG_PATH"
 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
CompileScript: <<
#!/bin/sh -ev
 export PATH=%p/lib/xmkmf/bin:$PATH 
 export IMAKEINCLUDE=-I%p/lib/X11/config
 ./configure %c
 make
<<
InstallScript: <<
#!/bin/sh -ev
 export PATH=%p/lib/xmkmf/bin:$PATH 
 export IMAKEINCLUDE=-I%p/lib/X11/config
 make -j1 install DESTDIR=%d
<<
DocFiles: AUTHORS CHANGELOG COMPLIANCE COPYING README

SplitOff: <<
        Package: lib%N16-shlibs
        Depends: <<
                glib2-shlibs (>= 2.14.0-1),
                libgettext3-shlibs,
                libiconv,
                libxml2-shlibs (>= 2.6.27-1),
                pango1-xft2-ft219-shlibs (>= 1.18.4-4),
                x11
        <<
        Files: <<
                lib/libobparser.16.*
                lib/libobrender.16.*
        <<
        Shlibs: <<
                %p/lib/libobparser.16.dylib 17.0.0 %n (>= 3.4.4-1)
                %p/lib/libobrender.16.dylib 17.0.0 %n (>= 3.4.4-1)
        <<
        DocFiles: AUTHORS CHANGELOG COMPLIANCE COPYING README
<<

SplitOff2: <<
        Package: lib%N16-dev
        Depends: lib%N16-shlibs (= %v-%r)
        Conflicts: lib%N21-dev
        Replaces: %N (<< 3.4.4-1), lib%N21-dev
        BuildDependsOnly: true
        Files: <<
                include
                lib
        <<
        DocFiles: AUTHORS CHANGELOG COMPLIANCE COPYING README
<<

DescDetail: <<
Openbox is a standards compliant, fast, light-weight, extensible window
manager. 

Openbox works with your applications, and makes your desktop easier to manage.
This is because the approach to its development was the opposite of what seems
to be the general case for window managers. Openbox was written first to comply
with standards and to work properly. Only when that was in place did the team
turn to the visual interface. 

Openbox is fully functional as a stand-alone working environment, or can be
used as a drop-in replacement for the default window manager in the GNOME or
KDE desktop environments.
<<
Homepage: http://icculus.org/openbox/

Index: fvwm2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm/fvwm2.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- fvwm2.info  16 Mar 2009 20:55:09 -0000      1.8
+++ fvwm2.info  11 May 2009 18:02:00 -0000      1.9
@@ -76,7 +76,7 @@
  fi
 <<
 License: GPL
-Description: X11 window manager with large virtual desktop (version 2.xx)
+Description: X11 window manager with large virtual desktop
 DescPort: <<
  Requires libstroke-0.5, NOT any earlier version.  
  The patch supplies the fvwm2.desktop file in the main variant.

Index: openbox.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm/openbox.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- openbox.info        23 Aug 2008 04:42:15 -0000      1.2
+++ openbox.info        11 May 2009 18:02:00 -0000      1.3
@@ -1,34 +1,38 @@
 Package: openbox
-Version: 3.4.4
-Revision: 3
+Version: 3.4.7.2
+Revision: 1
 Description: Another Window Manager not unlike blackbox
 License: GPL
 Maintainer: None <fink-de...@lists.sourceforge.net>
 Depends: <<
-       lib%N16-shlibs (= %v-%r),
-       glib2-shlibs (>= 2.14.0-1),
+       lib%N21-shlibs (= %v-%r),
+       expat1-shlibs,
+       fontconfig2-shlibs (>= 2.4.1-1),
+       freetype219-shlibs (>= 2.3.7-7),
+       glib2-shlibs (>= 2.18.0-1),
        libgettext3-shlibs,
        libiconv,
-       libxml2-shlibs (>= 2.6.27-1),
-       pango1-xft2-ft219-shlibs (>= 1.18.4-4),
+       libxml2-shlibs (>= 2.6.30-1),
+       pango1-xft2-ft219-shlibs (>= 1.22.0-4),
        startup-notification-shlibs (>= 0.8-1),
        x11
 <<
 BuildDepends: <<
-       cairo (>= 1.6-1),
+       cairo (>= 1.8-1),
        expat1,
+       fink (>= 0.24.12-1),
        fontconfig2-dev (>= 2.4.1-1),
-       freetype219 (>= 2.3.5-1),
+       freetype219 (>= 2.3.7-7),
        gettext-bin,
        gettext-tools,
-       glib2-dev (>= 2.14.0-1),
+       glib2-dev (>= 2.18.0-1),
        glitz,
        libgettext3-dev,
        libiconv-dev,
-       libxml2 (>= 2.6.27-1),
-       pango1-xft2-ft219-dev (>= 1.10.1-1),
-       pixman (>= 0.10.0-1),
-       pkgconfig (>= 0.22-3),
+       libxml2 (>= 2.6.30-1),
+       pango1-xft2-ft219-dev (>= 1.22.0-4),
+       pixman (>= 0.12.0-1),
+       pkgconfig (>= 0.23),
        startup-notification-dev (>= 0.8-1),
        x11-dev,
        xft2-dev,
@@ -36,13 +40,16 @@
 <<
 
 Source: http://icculus.org/openbox/releases/%n-%v.tar.gz
-Source-MD5: 7052597c29e75a77e67089683b8c24f7
+Source-MD5: 9e7589e90519bc6ac2f4656ea6869439
 
+PatchFile: %n.patch
+PatchFile-MD5: 59f6405419f667e0a0e71c0967526a1b
 PatchScript: <<
+       %{default_script}
  perl -ni -e 'print unless /^LIBTOOL.*--silent/' configure
  chmod +x install-sh
 <<
-ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking 
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/pkgconfig:$PKG_CONFIG_PATH"
 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
+ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking 
--disable-static 
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/pkgconfig:$PKG_CONFIG_PATH"
 CompileScript: <<
 #!/bin/sh -ev
  export PATH=%p/lib/xmkmf/bin:$PATH 
@@ -59,30 +66,34 @@
 DocFiles: AUTHORS CHANGELOG COMPLIANCE COPYING README
 
 SplitOff: <<
-       Package: lib%N16-shlibs
+       Package: lib%N21-shlibs
        Depends: <<
-               glib2-shlibs (>= 2.14.0-1),
+               expat1-shlibs,
+               fontconfig2-shlibs (>= 2.4.1-1),
+               freetype219-shlibs (>= 2.3.7-7),
+               glib2-shlibs (>= 2.18.0-1),
                libgettext3-shlibs,
                libiconv,
-               libxml2-shlibs (>= 2.6.27-1),
-               pango1-xft2-ft219-shlibs (>= 1.18.4-4),
+               libxml2-shlibs (>= 2.6.30-1),
+               pango1-xft2-ft219-shlibs (>= 1.22.0-4),
                x11
        <<
        Files: <<
-               lib/libobparser.16.*
-               lib/libobrender.16.*
+               lib/libobparser.21.*
+               lib/libobrender.21.*
        <<
        Shlibs: <<
-               %p/lib/libobparser.16.dylib 17.0.0 %n (>= 3.4.4-1)
-               %p/lib/libobrender.16.dylib 17.0.0 %n (>= 3.4.4-1)
+               %p/lib/libobparser.21.dylib 22.0.0 %n (>= 3.4.7.2-1)
+               %p/lib/libobrender.21.dylib 22.0.0 %n (>= 3.4.7.2-1)
        <<
        DocFiles: AUTHORS CHANGELOG COMPLIANCE COPYING README
 <<
 
 SplitOff2: <<
-       Package: lib%N16-dev
-       Depends: lib%N16-shlibs (= %v-%r)
-       Replaces: %N (<< 3.4.4-1)
+       Package: lib%N21-dev
+       Depends: lib%N21-shlibs (= %v-%r)
+       Conflicts: lib%N16-dev
+       Replaces: %N (<< 3.4.4-1), lib%N16-dev
        BuildDependsOnly: true
        Files: <<
                include
@@ -91,6 +102,9 @@
        DocFiles: AUTHORS CHANGELOG COMPLIANCE COPYING README
 <<
 
+DescPort: <<
+       Make sure po/Makefile variable propagates mkdir command.
+<<
 DescDetail: <<
 Openbox is a standards compliant, fast, light-weight, extensible window
 manager. 

--- NEW FILE: openbox.patch ---
diff -Nurd -x'*~' openbox-3.4.7.2.orig/Makefile.in openbox-3.4.7.2/Makefile.in
--- openbox-3.4.7.2.orig/Makefile.in    2008-04-23 11:18:43.000000000 -0400
+++ openbox-3.4.7.2/Makefile.in 2009-01-10 04:14:31.000000000 -0500
@@ -513,11 +513,11 @@
 
 render_rendertest_SOURCES = render/test.c
 render_libobrender_la_CPPFLAGS = \
-       $(X_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(XML_CFLAGS) \
        $(PANGO_CFLAGS) \
        $(XFT_CFLAGS) \
+       $(X_CFLAGS) \
        -DG_LOG_DOMAIN=\"ObRender\" \
        -DDEFAULT_THEME=\"$(theme)\"
 
@@ -526,11 +526,11 @@
 
 render_libobrender_la_LIBADD = \
        parser/libobparser.la \
-       $(X_LIBS) \
        $(PANGO_LIBS) \
        $(XFT_LIBS) \
        $(GLIB_LIBS) \
-       $(XML_LIBS)
+       $(XML_LIBS) \
+       $(X_LIBS)
 
 render_libobrender_la_SOURCES = \
        gettext.h \
@@ -575,6 +575,10 @@
        parser/parse.c
 
 openbox_openbox_CPPFLAGS = \
+       $(PANGO_CFLAGS) \
+       $(GLIB_CFLAGS) \
+       $(LIBSN_CFLAGS) \
+       $(XML_CFLAGS) \
        $(SM_CFLAGS) \
        $(XINERAMA_CFLAGS) \
        $(XKB_CFLAGS) \
@@ -584,29 +588,25 @@
        $(X_CFLAGS) \
        $(XCURSOR_CFLAGS) \
        $(SM_CFLAGS) \
-       $(PANGO_CFLAGS) \
-       $(GLIB_CFLAGS) \
-       $(LIBSN_CFLAGS) \
-       $(XML_CFLAGS) \
        -DLOCALEDIR=\"$(localedir)\" \
        -DDATADIR=\"$(datadir)\" \
        -DCONFIGDIR=\"$(configdir)\" \
        -DG_LOG_DOMAIN=\"Openbox\"
 
 openbox_openbox_LDADD = \
+       $(GLIB_LIBS) \
+       $(LIBSN_LIBS) \
+       $(XML_LIBS) \
+       $(EFENCE_LIBS) \
+       $(LIBINTL) \
        $(SM_LIBS) \
        $(XINERAMA_LIBS) \
        $(XKB_LIBS) \
        $(XRANDR_LIBS) \
        $(XSHAPE_LIBS) \
        $(XSYNC_LIBS) \
-       $(GLIB_LIBS) \
        $(X_LIBS) \
        $(XCURSOR_LIBS) \
-       $(LIBSN_LIBS) \
-       $(XML_LIBS) \
-       $(EFENCE_LIBS) \
-       $(LIBINTL) \
        render/libobrender.la \
        parser/libobparser.la
 
@@ -746,12 +746,11 @@
        tools/gnome-panel-control/gnome-panel-control.c
 
 tools_gdm_control_gdm_control_CPPFLAGS = \
-       $(X_CFLAGS) \
-       $(GLIB_CFLAGS)
-
+       $(GLIB_CFLAGS) \
+       $(X_CFLAGS)
 tools_gdm_control_gdm_control_LDADD = \
-       $(X_LIBS) \
-       $(GLIB_LIBS)
+       $(GLIB_LIBS) \
+       $(X_LIBS)
 
 tools_gdm_control_gdm_control_SOURCES = \
        tools/gdm-control/gdm-control.c
diff -Nurd -x'*~' openbox-3.4.7.2.orig/po/Makefile.in.in 
openbox-3.4.7.2/po/Makefile.in.in
--- openbox-3.4.7.2.orig/po/Makefile.in.in      2008-03-05 14:04:06.000000000 
-0500
+++ openbox-3.4.7.2/po/Makefile.in.in   2009-01-10 04:50:17.000000000 -0500
@@ -30,7 +30,9 @@
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
+install_sh = @install_sh@
 mkinstalldirs = $(SHELL) @install_sh@ -d
+
 mkdir_p = @mkdir_p@
 
 GMSGFMT_ = @GMSGFMT@

Index: obconf.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm/obconf.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- obconf.info 25 Jul 2008 00:23:40 -0000      1.2
+++ obconf.info 11 May 2009 18:02:00 -0000      1.3
@@ -1,58 +1,58 @@
 Package: obconf
-Version: 2.0.2
-Revision: 3
+Version: 2.0.3
+Revision: 1
 Description: Configuration program for openbox
 License: GPL
 Maintainer: None <fink-de...@lists.sourceforge.net>
 Depends: <<
-       atk1-shlibs (>= 1.20.0-1),
+       atk1-shlibs (>= 1.24.0-1),
        desktop-file-utils,
-       glib2-shlibs (>= 2.14.0-1),
-       gtk+2-shlibs (>= 2.12.0-1),
+       glib2-shlibs (>= 2.18.0-1),
+       gtk+2-shlibs (>= 2.14.0-1),
        libgettext3-shlibs,
-       libglade2-shlibs (>= 2.6.2-1),
+       libglade2-shlibs (>= 2.6.3-1),
        libiconv,
-       libopenbox16-shlibs (>= 3.4.4-1),
+       libopenbox21-shlibs,
        libxml2-shlibs (>= 2.6.30-1),
-       openbox (>= 3.4.4-1),
+       openbox (>= 3.4.7.2-1),
        pango1-xft2-ft219-shlibs (>= 1.18.4-4),
        startup-notification-shlibs (>= 0.8-1),
        x11
 <<
 BuildDepends: <<
-       atk1 (>= 1.20.0-1),
-       cairo (>= 1.6-1),
+       atk1 (>= 1.24.0-1),
+       cairo (>= 1.8-1),
        expat1,
+       fink (>= 0.24.12-1),
        fontconfig2-dev (>= 2.4.1-1),
-       freetype219 (>= 2.3.5-1),
+       freetype219 (>= 2.3.7-7),
        gettext-bin,
        gettext-tools,
-       glib2-dev (>= 2.14.0-1),
+       glib2-dev (>= 2.18.0-1),
        glitz,
-       gtk+2-dev (>= 2.12.0-1),
+       gtk+2-dev (>= 2.14.0-1),
        libgettext3-dev,
-       libglade2 (>= 2.6.2-1),
+       libglade2 (>= 2.6.3-1),
        libiconv-dev,
-       libopenbox16-dev,
+       libopenbox21-dev,
        libpng3,
        libxml2 (>= 2.6.30-1),
-       pango1-xft2-ft219-dev (>= 1.18.4-4),
-       pixman (>= 0.10.0-1),
-       pkgconfig (>= 0.21-1),
+       pango1-xft2-ft219-dev (>= 1.22.0-4),
+       pixman (>= 0.12.0-1),
+       pkgconfig (>= 0.23),
        startup-notification-dev (>= 0.8-1),
        x11-dev,
        xft2-dev
 <<
-SetCPPFLAGS: -I%p/lib/pango-ft219/include/pango-1.0 
-I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2 
-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include
-NoSetLDFLAGS: true
-SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib 
-L%p/lib/fontconfig2/lib
-SetLIBS: -L%p/lib
+SetCPPFLAGS: -I%p/lib/fontconfig2/include
+SetLDFLAGS: -L%p/lib/fontconfig2/lib
 SetCFLAGS: -Os -pipe
 Source: http://icculus.org/openbox/obconf/obconf-%v.tar.gz
-Source-MD5: 1a47bbb3c2f42f134c25a3ef4727cde9
+Source-MD5: b22e273721851dedad72acbc77eefb68
 
-PatchScript: perl -ni -e 'print unless /^LDFLAGS.*-export-dynamic/' configure
-ConfigureParams: --disable-dependency-tracking 
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
+PatchFile: %n.patch
+PatchFile-MD5: cbc45ce4c6b9a61ff2468040e086abbd
+ConfigureParams: --disable-dependency-tracking 
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
 #InstallScript:
 DocFiles: AUTHORS CHANGELOG COPYING NEWS README TODO
 
@@ -65,4 +65,7 @@
        [ -x %p/bin/update-desktop-database ] && update-desktop-database -q 
%p/share/applications || :
 <<
 
+DescPort: <<
+       Make sure po/Makefile variable propagates mkdir command.
+<<
 Homepage: http://icculus.org/openbox/index.php/ObConf:About

--- NEW FILE: obconf.patch ---
diff -Nurd -x'*~' obconf-2.0.3.orig/po/Makefile.in.in 
obconf-2.0.3/po/Makefile.in.in
--- obconf-2.0.3.orig/po/Makefile.in.in 2008-01-11 13:22:21.000000000 -0500
+++ obconf-2.0.3/po/Makefile.in.in      2009-01-10 14:28:33.000000000 -0500
@@ -30,7 +30,9 @@
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
+install_sh = @install_sh@
 mkinstalldirs = $(SHELL) @install_sh@ -d
+
 mkdir_p = @mkdir_p@
 
 GMSGFMT_ = @GMSGFMT@

Index: fluxconf.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm/fluxconf.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fluxconf.info       16 Jul 2008 03:01:55 -0000      1.1
+++ fluxconf.info       11 May 2009 18:02:00 -0000      1.2
@@ -1,17 +1,46 @@
 Package: fluxconf
 Version: 0.9.9
-Revision: 3
+Revision: 4
 
 Source: http://devaux.fabien.free.fr/flux/%n-%v.tar.gz
 Source-MD5: ac37b12410daa06128f8eb29163a741d
 
-BuildDepends: glitz, expat1, libpng3, cairo (>= 1.6-1), fontconfig2-dev (>= 
2.4.1-1), freetype219 (>= 2.3.5-1), xft2-dev, pkgconfig (>= 0.21-1), gtk+2-dev 
(>= 2.12.0-1), x11-dev, atk1 (>= 1.20.0-1), pango1-xft2-ft219-dev (>= 
1.18.4-4), pixman (>= 0.10.0-1), glib2-dev (>= 2.14.0-1), libgettext3-dev, 
gettext-tools, libiconv-dev, fink (>= 0.24.12-1)
-Depends: gtk+2-shlibs (>= 2.12.0-1), x11, atk1-shlibs (>= 1.20.0-1), 
pango1-xft2-ft219-shlibs (>= 1.18.4-4), glib2-shlibs (>= 2.14.0-1), 
libgettext3-shlibs, libiconv
+BuildDepends: <<
+       atk1 (>= 1.24.0-1),
+       cairo (>= 1.8-1),
+       expat1,
+       fink (>= 0.24.12-1),
+       fontconfig2-dev (>= 2.4.1-1),
+       freetype219 (>= 2.3.7-7),
+       gettext-tools,
+       glib2-dev (>= 2.18.0-1),
+       glitz,
+       gtk+2-dev (>= 2.14.0-1),
+       libgettext3-dev,
+       libiconv-dev,
+       libpng3,
+       pango1-xft2-ft219-dev (>= 1.22.0-4),
+       pixman (>= 0.12.0-1),
+       pkgconfig (>= 0.23),
+       x11-dev,
+       xft2-dev
+<<
+Depends: <<
+       atk1-shlibs (>= 1.24.0-1),
+       cairo-shlibs (>= 1.8-1),
+       fontconfig2-shlibs (>= 2.4.1-1),
+       freetype219-shlibs (>= 2.3.7-7),
+       glib2-shlibs (>= 2.18.0-1),
+       gtk+2-shlibs (>= 2.14.0-1),
+       libgettext3-shlibs,
+       pango1-xft2-ft219-shlibs (>= 1.22.0-4),
+       x11
+<<
 
 PatchFile: %n.patch
 PatchFile-MD5: a5e499825430b909d0cff521eb8a9a6b
 
-ConfigureParams: --disable-dependency-tracking 
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
+ConfigureParams: --disable-dependency-tracking 
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
 InstallScript: make install DESTDIR=%d
 DocFiles: AUTHORS COPYING ChangeLog NEWS README TODO docs/*.html docs/*.png
 

Index: metacity.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm/metacity.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- metacity.info       16 Jul 2008 03:01:56 -0000      1.5
+++ metacity.info       11 May 2009 18:02:00 -0000      1.6
@@ -1,68 +1,97 @@
 Package: metacity
-Version: 2.20.2
+Version: 2.24.0
 Revision: 2
 Depends: <<
        %N-shlibs (>= %v-%r),
-       atk1-shlibs (>= 1.20.0-1),
-       gconf2 (>= 2.20.0-1),
-       glib2-shlibs (>= 2.14.0-1),
-       gtk+2 (>= 2.12.0-1),
+       atk1-shlibs (>= 1.24.0-1),
+       cairo-shlibs (>= 1.8-1),
+       dbus-shlibs (>= 1.2.1-1),
+       expat1-shlibs,
+       fontconfig2-shlibs (>= 2.4.1-1),
+       freetype219-shlibs (>= 2.3.7-7),
+       gconf2 (>= 2.24.0-1),
+       glib2-shlibs (>= 2.18.0-1),
+       glitz-shlibs,
+       gtk+2-shlibs (>= 2.14.0-1),
        libgettext3-shlibs,
        libiconv,
-       orbit2 (>= 2.14.9-1),
-       pango1-xft2-ft219 (>= 1.18.4-4),
+       libpng3-shlibs,
+       orbit2-shlibs (>= 2.14.16-1),
+       pango1-xft2-ft219 (>= 1.22.0-4),
+       pixman-shlibs (>= 0.12.0-1),
        startup-notification-shlibs (>= 0.8-1),
        x11
 <<
 BuildDepends: <<
-       atk1 (>= 1.20.0-1),
-       cairo (>= 1.6-1),
+       atk1 (>= 1.24.0-1),
+       autoconf,
+       automake1.10,
+       cairo (>= 1.8-1),
+       dbus-dev (>= 1.2.1-1),
        expat1,
+       fink (>= 0.24.12-1),
        fontconfig2-dev (>= 2.4.1-1),
-       freetype219 (>= 2.3.5-1),
-       gconf2-dev (>= 2.20.0-1),
+       freetype219 (>= 2.3.7-7),
+       gconf2-dev (>= 2.24.0-1),
        gettext-bin,
        gettext-tools,
-       glib2-dev (>= 2.14.0-1),
+       glib2-dev (>= 2.18.0-1),
        glitz,
-       gtk+2-dev (>= 2.12.0-1),
-       intltool (>= 0.36.0-1),
+       gtk+2-dev (>= 2.14.0-1),
+       intltool40,
        libgettext3-dev,
-       libglade2 (>= 2.6.2-1),
+       libglade2 (>= 2.6.3-1),
        libiconv-dev,
        libpng3,
+       libtool14,
        libxml2 (>= 2.6.30-1),
-       orbit2-dev (>= 2.14.9-1),
-       pango1-xft2-ft219-dev (>= 1.18.4-4),
-       pixman (>= 0.10.0-1),
-       pkgconfig (>= 0.21-1),
+       orbit2-dev (>= 2.14.16-1),
+       pango1-xft2-ft219-dev (>= 1.22.0-4),
+       pixman (>= 0.12.0-1),
+       pkgconfig (>= 0.23),
        startup-notification-dev (>= 0.8-1),
        x11-dev,
        xft2-dev
 <<
-Source: mirror:gnome:sources/%n/2.20/%n-%v.tar.bz2
-Source-MD5: 3b986030629860674b219fc35c226b1b
-NoSetCPPFLAGS: true
-SetCPPFLAGS: -I%p/lib/pango-ft219/include/pango-1.0 
-I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2 
-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include -I%p/include 
-I/usr/X11R6/include
-NoSetLDFLAGS: true
-SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib 
-L%p/lib/fontconfig2/lib
-SetLIBS: -L%p/lib
+Source: mirror:gnome:sources/%n/2.24/%n-%v.tar.bz2
+Source-MD5: d4aa782d5f71b6c42514b239684a4aa3
+PatchFile: %n.patch
+PatchFile-MD5: 07cf962a26049dde9b03ea6250308981
+SetCPPFLAGS: -I%p/lib/fontconfig2/include
+SetLDFLAGS: -L%p/lib/fontconfig2/lib
 SetCFLAGS: -Os
-SetCXXFLAGS: -Os
-ConfigureParams: --libexecdir=%p/lib/%n --mandir=%p/share/man 
--disable-dependency-tracking --disable-schemas-install 
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
-CompileScript: F77=no ./configure %c; make
+ConfigureParams: <<
+       --libexecdir=%p/lib/%n --mandir=%p/share/man \
+       --disable-dependency-tracking \--disable-schemas-install \
+       --disable-static \
+       --disable-compositor --disable-render \
+       PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
+<<
+CompileScript: <<
+       autoreconf -f -i
+       F77=no ./configure %c
+       make
+<<
 InstallScript: make -j1 install DESTDIR="%d"
 SplitOff: <<
        Package: %N-shlibs
        Depends: <<
-               atk1-shlibs (>= 1.20.0-1),
-               gconf2-shlibs (>= 2.20.0-1),
-               glib2-shlibs (>= 2.14.0-1),
-               gtk+2-shlibs (>= 2.12.0-1),
+               atk1-shlibs (>= 1.24.0-1),
+               cairo-shlibs (>= 1.8-1),
+               dbus-shlibs (>= 1.2.1-1),
+               expat1-shlibs,
+               fontconfig2-shlibs (>= 2.4.1-1),
+               freetype219-shlibs (>= 2.3.7-7),
+               gconf2-shlibs (>= 2.24.0-1),
+               glib2-shlibs (>= 2.18.0-1),
+               glitz-shlibs,
+               gtk+2-shlibs (>= 2.14.0-1),
                libgettext3-shlibs,
                libiconv,
-               orbit2-shlibs (>= 2.14.9-1),
-               pango1-xft2-ft219-shlibs (>= 1.18.4-4),
+               libpng3-shlibs,
+               orbit2-shlibs (>= 2.14.16-1),
+               pango1-xft2-ft219-shlibs (>= 1.22.0-4),
+               pixman-shlibs (>= 0.12.0-1),
                startup-notification-shlibs (>= 0.8-1),
                x11-shlibs
        <<
@@ -78,7 +107,11 @@
        BuildDependsOnly: True
        Replaces: %N (<< 2.6.1-1)
        Description: Headers and libraries for developing with metacity
-       Files: lib include
+       Files: <<
+               include
+               lib/lib*
+               lib/pkgconfig
+       <<
        DocFiles: AUTHORS COPYING ChangeLog po/ChangeLog:ChangeLog.po NEWS 
README
 <<
 PostInstScript: <<
@@ -92,6 +125,23 @@
        Metacity is a simple window manager that integrates nicely with
        GNOME 2.
 <<
+DescPort: <<
+       Patch to make it possible to disable compositing manager. See:
+       http://bugzilla.gnome.org/show_bug.cgi?id=560990
+
+       Fix -I ordering. See:
+       http://bugzilla.gnome.org/show_bug.cgi?id=562033
+
+       _POSIX_C_SOURCE breaks /usr/include/sys/_types.h on 10.4. See:
+       http://bugzilla.gnome.org/show_bug.cgi?id=561962
+<<
+DescPackaging: <<
+       Disable compositing manager because it requires x11 components
+       we don't have.
+
+       Do we need to disable xrender and/or xrandr any more
+       stringently for portability among various x11 flavors?
+<<
 License: GPL
 Maintainer: The Gnome Core Team <fink-gnome-c...@lists.sourceforge.net>
 Homepage: http://people.redhat.com/~hp/metacity/

Index: metacity-setup.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm/metacity-setup.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- metacity-setup.info 23 Jul 2008 13:18:55 -0000      1.2
+++ metacity-setup.info 11 May 2009 18:02:00 -0000      1.3
@@ -1,44 +1,65 @@
 Package: metacity-setup
 Version: 0.7.1
-Revision: 1007
-Depends: gconf2 (>= 2.20.0-1), gnome-vfs2-unified (>= 1:2.20.0-1), gtk+2 (>= 
2.12.0-1), libglade2-shlibs (>= 2.6.2-1), libgnomeui2 (>= 2.20.0-1)
+Revision: 1008
+Depends: <<
+       atk1-shlibs (>= 1.24.0-1),
+       cairo-shlibs (>= 1.8-1),
+       fontconfig2-shlibs (>= 2.4.1-1),
+       freetype219-shlibs (>= 2.3.7-7),
+       gconf2 (>= 2.24.0-1),
+       glib2-shlibs (>= 2.18.0-1),
+       gnome-vfs2-unified-shlibs (>= 1:2.24.0-1),
+       gtk+2-shlibs (>= 2.14.0-1),
+       libart2-shlibs,
+       libbonobo2-shlibs (>= 2.24.0-1),
+       libbonoboui2-shlibs (>= 2.24.0-1),
+       libgettext3-shlibs,
+       libglade2-shlibs (>= 2.6.3-1),
+       libgnome2-shlibs (>= 2.24.0-1),
+       libgnomecanvas2-shlibs (>= 2.20.1.1-2),
+       libgnomeui2-shlibs (>= 2.24.0-1),
+       libiconv,
+       libxml2-shlibs (>= 2.6.30-1),
+       orbit2-shlibs (>= 2.14.16-1),
+       pango1-xft2-ft219-shlibs (>= 1.22.4-1),
+       popt-shlibs,
+       x11
+<<
 BuildDepends: <<
-       atk1 (>= 1.20.0-1),
+       atk1 (>= 1.24.0-1),
        audiofile,
-       cairo (>= 1.6-1),
-       dbus-dev (>= 1.0-1),
+       cairo (>= 1.8-1),
+       dbus-dev (>= 1.2.1-1),
        esound (>= 0.2.38-1),
        expat1,
        fink (>= 0.24.12-1),
        fontconfig2-dev (>= 2.4.1-1),
-       freetype219 (>= 2.3.5-1),
-       gail18-dev,
-       gconf2-dev (>= 2.20.0-1),
+       freetype219 (>= 2.3.7-7),
+       gconf2-dev (>= 2.24.0-1),
        gettext-bin,
        gettext-tools,
-       glib2-dev (>= 2.14.0-1),
+       glib2-dev (>= 2.18.0-1),
        glitz,
        gnome-keyring-dev (>= 0.8.1-1),
-       gnome-vfs2-unified-dev (>= 1:2.20.0-1),
-       gtk+2-dev (>= 2.12.0-1),
-       intltool (>= 0.36.0-1),
+       gnome-vfs2-unified-dev (>= 1:2.24.0-1),
+       gtk+2-dev (>= 2.14.0-1),
+       intltool40,
        libart2,
-       libbonobo2-dev (>= 2.20.0-1),
-       libbonoboui2-dev (>= 2.20.0-1),
+       libbonobo2-dev (>= 2.24.0-1),
+       libbonoboui2-dev (>= 2.24.0-1),
        libgettext3-dev,
-       libglade2 (>= 2.6.2-1),
-       libgnome2-dev (>= 2.20.0-1),
-       libgnomecanvas2-dev (>= 2.20.0-1),
-       libgnomeui2-dev (>= 2.20.0-1),
+       libglade2 (>= 2.6.3-1),
+       libgnome2-dev (>= 2.24.0-1),
+       libgnomecanvas2-dev (>= 2.20.1.1-2),
+       libgnomeui2-dev (>= 2.24.0-1),
        libiconv-dev,
        libpng3,
        libxml2 (>= 2.6.30-1),
-       orbit2-dev (>= 2.14.10-1),
-       pango1-xft2-ft219-dev (>= 1.18.4-4),
-       pixman (>= 0.10.0-1),
-       pkgconfig (>= 0.21-1),
+       orbit2-dev (>= 2.14.16-1),
+       pango1-xft2-ft219-dev (>= 1.22.4-1),
+       pixman (>= 0.12.0-1),
+       pkgconfig (>= 0.23),
        popt,
-       startup-notification-dev (>= 0.8-1),
        x11-dev,
        xft2-dev
 <<
@@ -51,7 +72,7 @@
 ConfigureParams: --disable-dependency-tracking
 CompileScript: <<
 #!/bin/sh -ev
-       export 
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
+       export 
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
        ./configure %c
        make
 <<

--- NEW FILE: metacity.patch ---
diff -Nurd -x'*~' metacity-2.24.0.orig/configure.in metacity-2.24.0/configure.in
--- metacity-2.24.0.orig/configure.in   2008-09-22 14:31:19.000000000 -0400
+++ metacity-2.24.0/configure.in        2008-11-26 01:18:56.000000000 -0500
@@ -211,17 +211,8 @@
 have_xrender=no
 
 XCOMPOSITE_VERSION=0.2
-AC_MSG_CHECKING([Xcomposite >= $XCOMPOSITE_VERSION])
-if $PKG_CONFIG --atleast-version $XCOMPOSITE_VERSION xcomposite; then
-   have_xcomposite=yes
-else
-   have_xcomposite=no
-fi
-AC_MSG_RESULT($have_xcomposite)
-
 if test x$enable_compositor = xyes; then
    have_xcomposite=yes
-   echo "CompositeExt support forced on"
 elif test x$enable_compositor = xauto; then
    echo "Building compositing manager by default now."
    have_xcomposite=yes
@@ -230,15 +221,25 @@
 fi
 
 if test x$have_xcomposite = xyes; then
-  echo "Building with CompositeExt"
+   AC_MSG_CHECKING([Xcomposite >= $XCOMPOSITE_VERSION])
+   if $PKG_CONFIG --atleast-version $XCOMPOSITE_VERSION xcomposite; then
+      AC_MSG_RESULT([yes])
+   else
+      AC_MSG_ERROR([no. Use --disable-compositor to disable.])
+   fi
+fi
+
+if test x$have_xcomposite = xyes; then
   METACITY_PC_MODULES="$METACITY_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION 
xfixes xrender xdamage"
   AC_DEFINE(HAVE_COMPOSITE_EXTENSIONS, , [Building with compositing manager 
support])
+  echo "Building with compositing manager"
 
   ## force on render also
   have_xrender=yes
 else
   echo "Building without compositing manager"
 fi
+AM_CONDITIONAL([USE_COMPOSITOR_EXTENSIONS], [test x$have_xcomposite != xno])
 
 ## if no compositor, still possibly enable render
 if test x$have_xcomposite = xno; then
diff -Nurd -x'*~' metacity-2.24.0.orig/src/Makefile.am 
metacity-2.24.0/src/Makefile.am
--- metacity-2.24.0.orig/src/Makefile.am        2008-09-09 10:31:35.000000000 
-0400
+++ metacity-2.24.0/src/Makefile.am     2008-11-26 01:17:11.000000000 -0500
@@ -2,7 +2,15 @@
 
 SUBDIRS=wm-tester tools themes
 
-includ...@metacity_cflags@ -I $(srcdir)/include 
-DMETACITY_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@host_al...@\" 
-DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" 
-DMETACITY_PKGDATADIR=\"$(pkgdatadir)\" -DMETACITY_DATADIR=\"$(datadir)\" 
-DG_LOG_DOMAIN=\"metacity\" -DSN_API_NOT_YET_FROZEN=1
+INCLUDES=-I$(srcdir)/include -DMETACITY_LIBEXECDIR=\"$(libexecdir)\" 
-DHOST_ALIAS=\"@host_al...@\" 
-DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" 
-DMETACITY_PKGDATADIR=\"$(pkgdatadir)\" -DMETACITY_DATADIR=\"$(datadir)\" 
-DG_LOG_DOMAIN=\"metacity\" -DSN_API_NOT_YET_FROZEN=1 @METACITY_CFLAGS@
+
+if USE_COMPOSITOR_EXTENSIONS
+compositor_ext_sources = \
+       compositor/compositor-xrender.c         \
+       compositor/compositor-xrender.h
+else
+compositor_ext_sources =
+endif
 
 metacity_SOURCES=                              \
        core/async-getprop.c                    \
@@ -14,8 +22,7 @@
        include/boxes.h                         \
        compositor/compositor.c                 \
        compositor/compositor-private.h         \
-       compositor/compositor-xrender.c         \
-       compositor/compositor-xrender.h         \
+       $(compositor_ext_sources)               \
        include/compositor.h                    \
        core/constraints.c                      \
        core/constraints.h                      \
diff -Nurd -x'*~' metacity-2.24.0.orig/src/core/util.c 
metacity-2.24.0/src/core/util.c
--- metacity-2.24.0.orig/src/core/util.c        2008-08-18 08:29:06.000000000 
-0400
+++ metacity-2.24.0/src/core/util.c     2008-11-26 01:13:19.000000000 -0500
@@ -23,7 +23,7 @@
  */
 
 #define _GNU_SOURCE
-#define _POSIX_C_SOURCE /* for fdopen() */
+#define _POSIX_C_SOURCE 200112L /* for fdopen() */
 
 #include <config.h>
 #include "util.h"


------------------------------------------------------------------------------
The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your
production scanning environment may not be a perfect world - but thanks to
Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700
Series Scanner you'll get full speed at 300 dpi even with all image 
processing features enabled. http://p.sf.net/sfu/kodak-com
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to