Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm
In directory vz-cvs-3.sog:/tmp/cvs-serv18366/stable/main/finkinfo/x11-wm
Modified Files:
openbox.info openbox.patch
Log Message:
sync new %v of openbox to stable
Index: openbox.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm/openbox.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- openbox.info 29 Aug 2009 05:34:01 -0000 1.4
+++ openbox.info 10 Nov 2011 08:16:48 -0000 1.5
@@ -1,83 +1,70 @@
Package: openbox
-Version: 3.4.7.2
+Version: 3.4.11.2
Revision: 1
-Distribution: 10.4, 10.5
Description: Another Window Manager not unlike blackbox
License: GPL
Maintainer: None <[email protected]>
Depends: <<
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,
+ fontconfig2-shlibs (>= 2.8.0-4),
+ freetype219-shlibs (>= 2.3.12-1),
+ glib2-shlibs (>= 2.22.0-1),
+ libgettext8-shlibs,
libxml2-shlibs (>= 2.6.30-1),
- pango1-xft2-ft219-shlibs (>= 1.22.0-4),
+ pango1-xft2-ft219-shlibs (>= 1.24.5-4),
startup-notification-shlibs (>= 0.8-1),
- x11
+ x11,
+ xft2-shlibs (>= 2.1.14-1)
<<
BuildDepends: <<
- cairo (>= 1.8-1),
- expat1,
fink (>= 0.24.12-1),
- fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.7-7),
+ fink-package-precedence,
+ fontconfig2-dev (>= 2.8.0-4),
+ freetype219 (>= 2.3.12-1),
gettext-bin,
gettext-tools,
- glib2-dev (>= 2.18.0-1),
- glitz,
- libgettext3-dev,
+ glib2-dev (>= 2.22.0-1),
+ libgettext8-dev,
libiconv-dev,
libxml2 (>= 2.6.30-1),
- pango1-xft2-ft219-dev (>= 1.22.0-4),
- pixman (>= 0.12.0-1),
+ pango1-xft2-ft219-dev (>= 1.24.5-4),
+ pixman (>= 0.16.0-1),
pkgconfig (>= 0.23),
startup-notification-dev (>= 0.8-1),
x11-dev,
- xft2-dev,
- xmkmf (>= 1.0.2-3)
+ xft2-dev (>= 2.1.14-1)
<<
Source: http://icculus.org/openbox/releases/%n-%v.tar.gz
-Source-MD5: 9e7589e90519bc6ac2f4656ea6869439
+Source-MD5: 30e669134fa81df810fe7d1dc59cd931
PatchFile: %n.patch
-PatchFile-MD5: 59f6405419f667e0a0e71c0967526a1b
+PatchFile-MD5: 9e4793d24eea130672a3ff20a08719e3
PatchScript: <<
%{default_script}
perl -ni -e 'print unless /^LIBTOOL.*--silent/' configure
- chmod +x install-sh
<<
-ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
--disable-static
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/pkgconfig:$PKG_CONFIG_PATH"
+ConfigureParams: --mandir=%p/share/man --enable-dependency-tracking
--disable-static
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/xft2/lib/pkgconfig:$PKG_CONFIG_PATH"
CompileScript: <<
-#!/bin/sh -ev
- export PATH=%p/lib/xmkmf/bin:$PATH
- export IMAKEINCLUDE=-I%p/lib/X11/config
- ./configure %c
- make
+ ./configure %c
+ make
+ fink-package-precedence --prohibit-bdep lib%n21-dev .
<<
InstallScript: <<
-#!/bin/sh -ev
- export PATH=%p/lib/xmkmf/bin:$PATH
- export IMAKEINCLUDE=-I%p/lib/X11/config
- make -j1 install DESTDIR=%d
+ make -j1 install DESTDIR=%d
<<
DocFiles: AUTHORS CHANGELOG COMPLIANCE COPYING README
SplitOff: <<
Package: lib%N21-shlibs
Depends: <<
- expat1-shlibs,
- fontconfig2-shlibs (>= 2.4.1-1),
- freetype219-shlibs (>= 2.3.7-7),
- glib2-shlibs (>= 2.18.0-1),
- libgettext3-shlibs,
- libiconv,
+ fontconfig2-shlibs (>= 2.8.0-4),
+ freetype219-shlibs (>= 2.3.12-1),
+ glib2-shlibs (>= 2.22.0-1),
libxml2-shlibs (>= 2.6.30-1),
- pango1-xft2-ft219-shlibs (>= 1.22.0-4),
- x11
+ pango1-xft2-ft219-shlibs (>= 1.24.5-4),
+ x11,
+ xft2-shlibs (>= 2.1.14-1)
<<
Files: <<
lib/libobparser.21.*
@@ -98,7 +85,8 @@
BuildDependsOnly: true
Files: <<
include
- lib
+ lib/lib*
+ lib/pkgconfig
<<
DocFiles: AUTHORS CHANGELOG COMPLIANCE COPYING README
<<
@@ -120,4 +108,4 @@
used as a drop-in replacement for the default window manager in the GNOME or
KDE desktop environments.
<<
-Homepage: http://icculus.org/openbox/
+Homepage: http://openbox.org
Index: openbox.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm/openbox.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- openbox.patch 11 May 2009 18:02:00 -0000 1.1
+++ openbox.patch 10 Nov 2011 08:16:48 -0000 1.2
@@ -1,7 +1,7 @@
-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 @@
+diff -Nurd -x'*~' openbox-3.4.11.2.orig/Makefile.in
openbox-3.4.11.2/Makefile.in
+--- openbox-3.4.11.2.orig/Makefile.in 2010-05-14 10:04:52.000000000 -0400
++++ openbox-3.4.11.2/Makefile.in 2010-11-06 15:44:36.000000000 -0400
+@@ -527,11 +527,11 @@
render_rendertest_SOURCES = render/test.c
render_libobrender_la_CPPFLAGS = \
@@ -14,7 +14,7 @@
-DG_LOG_DOMAIN=\"ObRender\" \
-DDEFAULT_THEME=\"$(theme)\"
-@@ -526,11 +526,11 @@
+@@ -540,11 +540,11 @@
render_libobrender_la_LIBADD = \
parser/libobparser.la \
@@ -28,7 +28,7 @@
render_libobrender_la_SOURCES = \
gettext.h \
-@@ -575,6 +575,10 @@
+@@ -589,6 +589,10 @@
parser/parse.c
openbox_openbox_CPPFLAGS = \
@@ -39,7 +39,7 @@
$(SM_CFLAGS) \
$(XINERAMA_CFLAGS) \
$(XKB_CFLAGS) \
-@@ -584,29 +588,25 @@
+@@ -598,29 +602,25 @@
$(X_CFLAGS) \
$(XCURSOR_CFLAGS) \
$(SM_CFLAGS) \
@@ -74,8 +74,8 @@
render/libobrender.la \
parser/libobparser.la
-@@ -746,12 +746,11 @@
- tools/gnome-panel-control/gnome-panel-control.c
+@@ -770,12 +770,11 @@
+ tools/obxprop/obxprop.c
tools_gdm_control_gdm_control_CPPFLAGS = \
- $(X_CFLAGS) \
@@ -87,20 +87,18 @@
- $(X_LIBS) \
- $(GLIB_LIBS)
+ $(GLIB_LIBS) \
-+ $(X_LIBS)
++ $(X_LIBS) -lXau
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 @@
+diff -Nurd -x'*~' openbox-3.4.11.2.orig/po/Makefile.in.in
openbox-3.4.11.2/po/Makefile.in.in
+--- openbox-3.4.11.2.orig/po/Makefile.in.in 2008-03-05 14:04:06.000000000
-0500
++++ openbox-3.4.11.2/po/Makefile.in.in 2010-11-06 15:45:52.000000000 -0400
+@@ -30,6 +30,7 @@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
+install_sh = @install_sh@
mkinstalldirs = $(SHELL) @install_sh@ -d
-+
mkdir_p = @mkdir_p@
- GMSGFMT_ = @GMSGFMT@
------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
