Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11947
Modified Files:
icewm-10.6.info icewm.info icewm.patch
Log Message:
new version, also fix build due to some X11's Xlocale token mixup
Index: icewm-10.6.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm/icewm-10.6.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- icewm-10.6.info 10 Nov 2011 08:16:12 -0000 1.2
+++ icewm-10.6.info 30 May 2013 15:40:24 -0000 1.3
@@ -1,9 +1,9 @@
Package: icewm
-Version: 1.3.6
+Version: 1.3.7
Revision: 101
Distribution: 10.6
Source: mirror:sourceforge:%n/%n-1.3/%v/icewm-%v.tar.gz
-Source-MD5: 65a7ddb0fb3f60abea4af52184382570
+Source-MD5: 224695231aedb2b91db3254a13e1c8dd
BuildDepends: <<
atk1 (>= 1.28.0-1),
audiofile,
@@ -11,8 +11,8 @@
esound (>= 0.2.38-1),
fink (>= 0.24.12-1),
fink-package-precedence,
- fontconfig2-dev (>= 2.8.0-4),
- freetype219 (>= 2.3.12-1),
+ fontconfig2-dev (>= 2.10.0-1),
+ freetype219 (>= 2.4.11-1),
gconf2-dev (>= 2.28.0-1),
gettext-tools,
glib2-dev (>= 2.22.0-1),
@@ -34,14 +34,15 @@
popt,
startup-notification-dev (>= 0.8-1),
x11-dev,
- xft2-dev (>= 2.1.14-1)
+ x11-xlocale-fix,
+ xft2-dev (>= 2.2.0-1)
<<
Depends: <<
atk1-shlibs (>= 1.28.0-1),
cairo-shlibs (>= 1.8.8-3),
esound-shlibs (>= 0.2.38-1),
- fontconfig2-shlibs (>= 2.8.0-4),
- freetype219-shlibs (>= 2.3.12-1),
+ fontconfig2-shlibs (>= 2.10.0-1),
+ freetype219-shlibs (>= 2.4.11-1),
gconf2-shlibs (>= 2.28.0-1),
glib2-shlibs (>= 2.22.0-1),
gnome-desktop2.11-shlibs (>= 2.28.0-1),
@@ -60,17 +61,20 @@
popt-shlibs,
startup-notification-shlibs (>= 0.8-1),
x11,
- xft2-shlibs (>= 2.1.14-1)
+ xft2-shlibs (>= 2.2.0-1)
<<
PatchFile: %n.patch
-PatchFile-MD5: 8551672b01104911a10be7cf1d89b81c
+PatchFile-MD5: fb503b8de9c703e2633890bf18e1868f
PatchScript: <<
%{default_script}
perl -pi -e 's/icewm-\$\(VERSION\)/%n/g' Makefile.in src/Makefile.in
+
+ # work-around for bug in older x11 headers
+ perl -pi -e 's,(X11/Xlocale.h),x11-xlocale-fix/\1,' src/icehelp.cc
<<
SetCXXFLAGS: -Os -pipe -MD
GCC: 4.0
-ConfigureParams: --with-docdir=%p/share/doc --mandir=%p/share/man
--with-cfgdir=%p/etc/icewm --enable-guievents --enable-menus-gnome2
--with-icesound=esd
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/xft2/lib/pkgconfig:$PKG_CONFIG_PATH"
ac_cv_path_XFT_CONFIG="" --x-includes=/usr/X11R6/include
--x-libraries=/usr/X11R6/lib
+ConfigureParams: --with-docdir=%p/share/doc --mandir=%p/share/man
--with-cfgdir=%p/etc/icewm --enable-guievents --enable-menus-gnome2
--with-icesound=esd
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:$PKG_CONFIG_PATH"
ac_cv_path_XFT_CONFIG="" --x-includes=/usr/X11R6/include
--x-libraries=/usr/X11R6/lib
Conflicts: icewm-basic
Replaces: icewm-gnome2, icewm-basic
CompileScript: <<
Index: icewm.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm/icewm.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- icewm.patch 10 Nov 2011 08:16:12 -0000 1.4
+++ icewm.patch 30 May 2013 15:40:24 -0000 1.5
@@ -1,6 +1,6 @@
-diff -Nurd -x'*~' icewm-1.3.6.orig/Makefile.in icewm-1.3.6/Makefile.in
---- icewm-1.3.6.orig/Makefile.in 2010-01-12 13:17:13.000000000 -0500
-+++ icewm-1.3.6/Makefile.in 2010-09-16 01:09:09.000000000 -0400
+diff -Nurd -x'*~' icewm-1.3.7.orig/Makefile.in icewm-1.3.7/Makefile.in
+--- icewm-1.3.7.orig/Makefile.in 2010-10-31 10:09:37.000000000 -0400
++++ icewm-1.3.7/Makefile.in 2013-05-30 11:38:12.000000000 -0400
@@ -79,19 +79,19 @@
install-base: base
@echo ------------------------------------------
@@ -77,12 +77,12 @@
+ $(INSTALLLIB) "$(top_srcdir)/lib/icewm-session.desktop"
"$(DESTDIR)/$(PREFIX)/share/xsessions/icewm-session.desktop"
+ $(INSTALLLIB) "$(top_srcdir)/lib/icewm.desktop"
"$(DESTDIR)/$(PREFIX)/share/applications/icewm.desktop"
@echo ------------------------------------------
-diff -Nurd -x'*~' icewm-1.3.6.orig/configure icewm-1.3.6/configure
---- icewm-1.3.6.orig/configure 2010-01-12 13:17:17.000000000 -0500
-+++ icewm-1.3.6/configure 2010-09-16 00:56:02.000000000 -0400
-@@ -11240,8 +11240,8 @@
- #define CONFIG_XFREETYPE 2
- _ACEOF
+diff -Nurd -x'*~' icewm-1.3.7.orig/configure icewm-1.3.7/configure
+--- icewm-1.3.7.orig/configure 2010-10-31 10:09:40.000000000 -0400
++++ icewm-1.3.7/configure 2013-05-30 11:38:12.000000000 -0400
+@@ -6280,8 +6280,8 @@
+
+ $as_echo "#define CONFIG_XFREETYPE 2" >>confdefs.h
- CORE_CFLAGS="${CORE_CFLAGS} $XFT_CFLAGS"
- CORE_LIBS="${CORE_LIBS} $XFT_LIBS"
@@ -90,8 +90,8 @@
+ CORE_LIBS="$XFT_LIBS ${CORE_LIBS}"
features="${features} xfreetype"
else
-
-@@ -12650,7 +12650,7 @@
+ for ac_header in X11/Xft/Xft.h
+@@ -7077,7 +7077,7 @@
VERSION=`sed -ne 's/VERSION=//p' VERSION`
@@ -100,9 +100,9 @@
HOSTCPU=`uname -m || echo unknown`
-diff -Nurd -x'*~' icewm-1.3.6.orig/po/Makefile.in icewm-1.3.6/po/Makefile.in
---- icewm-1.3.6.orig/po/Makefile.in 2010-01-12 13:17:13.000000000 -0500
-+++ icewm-1.3.6/po/Makefile.in 2010-09-16 00:15:29.000000000 -0400
+diff -Nurd -x'*~' icewm-1.3.7.orig/po/Makefile.in icewm-1.3.7/po/Makefile.in
+--- icewm-1.3.7.orig/po/Makefile.in 2010-10-31 10:09:37.000000000 -0400
++++ icewm-1.3.7/po/Makefile.in 2013-05-30 11:38:12.000000000 -0400
@@ -28,7 +28,7 @@
install: all
@@ -112,9 +112,9 @@
lang=`echo $${catalog} | sed -e 's/\.mo//'` ; \
msgdir="$(DESTDIR)$(LOCDIR)/$${lang}/LC_MESSAGES"; \
echo "Installing language: $${lang}" ; \
-diff -Nurd -x'*~' icewm-1.3.6.orig/src/Makefile.in icewm-1.3.6/src/Makefile.in
---- icewm-1.3.6.orig/src/Makefile.in 2010-01-12 13:17:14.000000000 -0500
-+++ icewm-1.3.6/src/Makefile.in 2010-09-16 00:15:29.000000000 -0400
+diff -Nurd -x'*~' icewm-1.3.7.orig/src/Makefile.in icewm-1.3.7/src/Makefile.in
+--- icewm-1.3.7.orig/src/Makefile.in 2010-10-31 10:09:36.000000000 -0400
++++ icewm-1.3.7/src/Makefile.in 2013-05-30 11:38:12.000000000 -0400
@@ -35,11 +35,11 @@
-DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
@@ -176,9 +176,9 @@
genpref$(EXEEXT): $(genpref_OBJS)
-diff -Nurd -x'*~' icewm-1.3.6.orig/src/base.h icewm-1.3.6/src/base.h
---- icewm-1.3.6.orig/src/base.h 2010-01-12 13:17:14.000000000 -0500
-+++ icewm-1.3.6/src/base.h 2010-09-16 00:15:29.000000000 -0400
+diff -Nurd -x'*~' icewm-1.3.7.orig/src/base.h icewm-1.3.7/src/base.h
+--- icewm-1.3.7.orig/src/base.h 2010-10-31 10:09:36.000000000 -0400
++++ icewm-1.3.7/src/base.h 2013-05-30 11:38:12.000000000 -0400
@@ -1,11 +1,11 @@
#ifndef __BASE_H
#define __BASE_H
Index: icewm.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm/icewm.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- icewm.info 10 Nov 2011 08:16:12 -0000 1.9
+++ icewm.info 30 May 2013 15:40:24 -0000 1.10
@@ -1,9 +1,9 @@
Package: icewm
-Version: 1.3.6
-Revision: 2
-Distribution: 10.4, 10.5
+Version: 1.3.7
+Revision: 1
+Distribution: 10.5
Source: mirror:sourceforge:%n/%n-1.3/%v/icewm-%v.tar.gz
-Source-MD5: 65a7ddb0fb3f60abea4af52184382570
+Source-MD5: 224695231aedb2b91db3254a13e1c8dd
BuildDepends: <<
atk1 (>= 1.28.0-1),
audiofile,
@@ -11,8 +11,8 @@
esound (>= 0.2.38-1),
fink (>= 0.24.12-1),
fink-package-precedence,
- fontconfig2-dev (>= 2.8.0-4),
- freetype219 (>= 2.3.12-1),
+ fontconfig2-dev (>= 2.10.0-1),
+ freetype219 (>= 2.4.11-1),
gconf2-dev (>= 2.28.0-1),
gettext-tools,
glib2-dev (>= 2.22.0-1),
@@ -34,14 +34,15 @@
popt,
startup-notification-dev (>= 0.8-1),
x11-dev,
- xft2-dev (>= 2.1.14-1)
+ x11-xlocale-fix,
+ xft2-dev (>= 2.2.0-1)
<<
Depends: <<
atk1-shlibs (>= 1.28.0-1),
cairo-shlibs (>= 1.8.8-3),
esound-shlibs (>= 0.2.38-1),
- fontconfig2-shlibs (>= 2.8.0-4),
- freetype219-shlibs (>= 2.3.12-1),
+ fontconfig2-shlibs (>= 2.10.0-1),
+ freetype219-shlibs (>= 2.4.11-1),
gconf2-shlibs (>= 2.28.0-1),
glib2-shlibs (>= 2.22.0-1),
gnome-desktop2.11-shlibs (>= 2.28.0-1),
@@ -60,17 +61,20 @@
popt-shlibs,
startup-notification-shlibs (>= 0.8-1),
x11,
- xft2-shlibs (>= 2.1.14-1)
+ xft2-shlibs (>= 2.2.0-1)
<<
PatchFile: %n.patch
-PatchFile-MD5: 8551672b01104911a10be7cf1d89b81c
+PatchFile-MD5: fb503b8de9c703e2633890bf18e1868f
PatchScript: <<
%{default_script}
perl -pi -e 's/icewm-\$\(VERSION\)/%n/g' Makefile.in src/Makefile.in
+
+ # work-around for bug in older x11 headers
+ perl -pi -e 's,(X11/Xlocale.h),x11-xlocale-fix/\1,' src/icehelp.cc
<<
SetCXXFLAGS: -Os -pipe -MD
GCC: 4.0
-ConfigureParams: --with-docdir=%p/share/doc --mandir=%p/share/man
--with-cfgdir=%p/etc/icewm --enable-guievents --enable-menus-gnome2
--with-icesound=esd
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/xft2/lib/pkgconfig:$PKG_CONFIG_PATH"
ac_cv_path_XFT_CONFIG="" --x-includes=/usr/X11R6/include
--x-libraries=/usr/X11R6/lib --disable-xrandr
+ConfigureParams: --with-docdir=%p/share/doc --mandir=%p/share/man
--with-cfgdir=%p/etc/icewm --enable-guievents --enable-menus-gnome2
--with-icesound=esd
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:$PKG_CONFIG_PATH"
ac_cv_path_XFT_CONFIG="" --x-includes=/usr/X11R6/include
--x-libraries=/usr/X11R6/lib --disable-xrandr
Conflicts: icewm-basic
Replaces: icewm-gnome2, icewm-basic
CompileScript: <<
------------------------------------------------------------------------------
Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET
Get 100% visibility into your production application - at no cost.
Code-level diagnostics for performance bottlenecks with <2% overhead
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap1
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
