Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm
In directory vz-cvs-3.sog:/tmp/cvs-serv18227/stable/main/finkinfo/x11-wm
Modified Files:
fluxbox.info fluxbox.patch
Log Message:
sync newer version of fluxbox to stable (==10.7)
Index: fluxbox.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm/fluxbox.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fluxbox.info 12 Apr 2011 06:05:26 -0000 1.3
+++ fluxbox.info 10 Nov 2011 08:14:59 -0000 1.4
@@ -1,43 +1,50 @@
Package: fluxbox
-Version: 1.0.0
-Revision: 2
+Version: 1.3.1
+Revision: 1
GCC: 4.0
BuildDepends: <<
fink (>= 0.24.12-1),
- fontconfig2-dev,
- freetype219,
- imlib2,
+ fink-package-precedence,
+ fontconfig2-dev (>= 2.8.0-4),
+ freetype219 (>= 2.3.12-1),
+ imlib2 (>= 1.4.2-3),
libiconv-dev,
pkgconfig (>= 0.23),
xft2-dev (>= 2.1.14-1),
x11-dev
<<
Depends: <<
- fontconfig2-shlibs,
- freetype219-shlibs,
- imlib2-shlibs,
+ fontconfig2-shlibs (>= 2.8.0-4),
+ freetype219-shlibs (>= 2.3.12-1),
+ imlib2-shlibs (>= 1.4.2-3),
libiconv,
xft2-shlibs (>= 2.1.14-1),
x11
<<
Source: mirror:sourceforge:%n/%n-%v.tar.bz2
-Source-MD5: 990e276ead0d04421dce4080f485caca
+Source-MD5: 0eaa940a69c0a876a520bb85d67b8bec
PatchFile: %n.patch
-PatchFile-MD5: 4e59b9214e8a97321be7abbc6ed1f7bd
+PatchFile-MD5: 5b07ae09470b6e9d2cd0b76f3e219b44
PatchScript: <<
%{default_script}
perl -pi -e 's,(PATH=.*),\1 && . %p/bin/init.sh,' util/fbsetbg
<<
-ConfigureParams: --enable-xinerama --mandir=%p/share/man
--disable-dependency-tracking
PKG_CONFIG_PATH=%p/lib/fontconfig2/lib/pkgconfig:%p/lib/xft2/lib/pkgconfig:$PKG_CONFIG_PATH
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
+SetCPPFLAGS: -I%p/lib/fontconfig2/include -I%p/lib/xft2/include
+SetLDFLAGS: -L%p/lib/fontconfig2/lib -L%p/lib/xft2/lib
+ConfigureParams: --enable-xinerama --mandir=%p/share/man
--enable-dependency-tracking
PKG_CONFIG_PATH=%p/lib/fontconfig2/lib/pkgconfig:%p/lib/xft2/lib/pkgconfig:$PKG_CONFIG_PATH
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
+CompileScript: <<
+ %{default_script}
+ fink-package-precedence .
+<<
InstallScript: make install DESTDIR=%d
DocFiles: AUTHORS ChangeLog COPYING NEWS README TODO
Description: Another Window Manager not unlike blackbox
DescPackaging: <<
Former Maintainer: Joe Gorse <[email protected]>
- Make sure to reload fink's init file after sanitizing PATH
+ Make sure to reload fink's init file after sanitizing PATH
- Check fink-specific paths ahead of generic places
+ Heavy-handed approach to getting fink library precedence.
<<
DescDetail: <<
Fluxbox is yet another windowmanager for X.
Index: fluxbox.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11-wm/fluxbox.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fluxbox.patch 8 Nov 2009 14:56:46 -0000 1.1
+++ fluxbox.patch 10 Nov 2011 08:14:59 -0000 1.2
@@ -1,76 +1,7 @@
-diff -Nurd -x'*~' fluxbox-1.0.0.orig/configure fluxbox-1.0.0/configure
---- fluxbox-1.0.0.orig/configure 2007-10-07 15:59:23.000000000 -0400
-+++ fluxbox-1.0.0/configure 2008-12-14 01:27:13.000000000 -0500
-@@ -7459,10 +7459,8 @@
- test x$x_includes = "x" && x_includes="/usr/include"
- test x$x_libraries = "x" && x_libraries="/usr/lib"
-
--CFLAGS="$CFLAGS $X_CFLAGS"
- CXXFLAGS="$CXXFLAGS $X_CFLAGS"
--LIBS="$LIBS $X_LIBS"
--LDFLAGS="$LDFLAGS $LIBS $X_PRE_LIBS"
-+LIBS="$LIBS $X_PRE_LIBS $X_LIBS"
-
-
- { echo "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5
-@@ -8366,9 +8364,8 @@
-
- fi
-
--CFLAGS="$CFLAGS $XFT_CFLAGS"
--CXXFLAGS="$CXXFLAGS $XFT_CFLAGS"
--LIBS="$LIBS $XFT_LIBS"
-+CXXFLAGS="$XFT_CFLAGS $CXXFLAGS"
-+LIBS="$XFT_LIBS $LIBS"
-
-
-
-@@ -8976,7 +8973,7 @@
- IMLIB2_LIBS=`imlib2-config --libs`
- IMLIB2_CFLAGS=`imlib2-config --cflags`
- LIBS="$LIBS $IMLIB2_LIBS"
-- CXXFLAGS="$CXXFLAGS $IMLIB2_CFLAGS"
-+ CXXFLAGS="$IMLIB2_CFLAGS $CXXFLAGS"
-
- else
- { echo "$as_me:$LINENO: result: no" >&5
-@@ -9499,7 +9496,9 @@
- _ACEOF
-
-
--
-+CPPFLAGS="$CXXFLAGS"
-+CFLAGS="-g -O2"
-+CXXFLAGS="-g -O2"
-
- { echo "$as_me:$LINENO: result: " >&5
- echo "${ECHO_T}" >&6; }
-@@ -9521,8 +9520,8 @@
- echo "${ECHO_T}Using '$LOCALE_PATH' for nls files." >&6; }
- { echo "$as_me:$LINENO: result: Using '$CXX' for C++ compiler." >&5
- echo "${ECHO_T}Using '$CXX' for C++ compiler." >&6; }
--{ echo "$as_me:$LINENO: result: Building with '$CXXFLAGS' for C++ compiler
flags." >&5
--echo "${ECHO_T}Building with '$CXXFLAGS' for C++ compiler flags." >&6; }
-+{ echo "$as_me:$LINENO: result: Building with '$CPPFLAGS' for C/C++
preprocessor flags." >&5
-+echo "${ECHO_T}Building with '$CPPFLAGS' for C/C++ preprocessor flags." >&6; }
- { echo "$as_me:$LINENO: result: Building with '$LIBS' for linker flags." >&5
- echo "${ECHO_T}Building with '$LIBS' for linker flags." >&6; }
- { echo "$as_me:$LINENO: result: " >&5
-diff -Nurd -x'*~' fluxbox-1.0.0.orig/src/FbTk/Makefile.in
fluxbox-1.0.0/src/FbTk/Makefile.in
---- fluxbox-1.0.0.orig/src/FbTk/Makefile.in 2007-10-07 15:59:22.000000000
-0400
-+++ fluxbox-1.0.0/src/FbTk/Makefile.in 2008-12-14 01:05:38.000000000 -0500
-@@ -219,7 +219,6 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- noinst_LIBRARIES = libFbTk.a
--AM_CPPFLAGS = @CPPFLAGS@
- @XFT_TRUE@xft_SOURCE = XftFontImp.hh XftFontImp.cc
- @MULTIBYTE_TRUE@xmb_SOURCE = XmbFontImp.hh XmbFontImp.cc
- @XPM_TRUE@xpm_SOURCE = ImageXPM.hh ImageXPM.cc
-diff -Nurd -x'*~' fluxbox-1.0.0.orig/util/fluxbox-generate_menu.in
fluxbox-1.0.0/util/fluxbox-generate_menu.in
---- fluxbox-1.0.0.orig/util/fluxbox-generate_menu.in 2007-10-08
14:49:08.000000000 -0400
-+++ fluxbox-1.0.0/util/fluxbox-generate_menu.in 2008-12-13
17:07:23.000000000 -0500
-@@ -48,7 +48,7 @@
+diff -Nurd -x'*~' fluxbox-1.3.1.orig/util/fluxbox-generate_menu.in
fluxbox-1.3.1/util/fluxbox-generate_menu.in
+--- fluxbox-1.3.1.orig/util/fluxbox-generate_menu.in 2010-09-09
08:39:18.000000000 -0400
++++ fluxbox-1.3.1/util/fluxbox-generate_menu.in 2011-04-12
02:12:00.000000000 -0400
+@@ -45,7 +45,7 @@
WHOAMI=`whoami`
@@ -78,8 +9,8 @@
+[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin && .
@PREFIX@/bin/init.sh
# Check for Imlib2-support
- if fluxbox -info 2> /dev/null | grep -q "^IMLIB"; then
-@@ -283,7 +283,7 @@
+ if @pkgprefix@fluxbox@pkgsuffix@ -info 2> /dev/null | grep -q "^IMLIB"; then
+@@ -253,7 +253,7 @@
# echo -n "for $temp_icon"
eval doSearchLoop $USER_ICONPATHS \
"$FB_ICONDIR" \
@@ -88,7 +19,7 @@
${OTHER_ICONPATHS} \
-@@ -1342,6 +1342,14 @@
+@@ -1317,6 +1317,14 @@
-g) GNOMEMENU=yes; shift;;
-in) NO_ICON=yes; shift;;
-is) OTHER_ICONPATHS="
@@ -103,7 +34,7 @@
/usr/share/icons
/usr/share/icons/mini
/usr/share/pixmaps
-@@ -1361,10 +1369,10 @@
+@@ -1336,10 +1344,10 @@
"
shift;;
-ds) OTHER_DESKTOP_PATHS="
@@ -118,7 +49,7 @@
"
# /usr/share/apps \
shift;;
-@@ -1440,7 +1448,7 @@
+@@ -1416,7 +1424,7 @@
# gnome prefix
@@ -127,7 +58,7 @@
if [ -n "${GNOME_PREFIX}" -a -d "$GNOME_PREFIX/share/gnome" ]; then
break;
fi
-@@ -1448,7 +1456,7 @@
+@@ -1424,7 +1432,7 @@
# Will remain $PREFIX if all else fails
# kde prefix
------------------------------------------------------------------------------
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
