Changeset 10139


Ignore:
Timestamp:
2008-01-06T20:28:39+01:00 (10 years ago)
Author:
blogic
Message:

revert fluxbox rev update

Location:
packages/XOrg/app/fluxbox
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • packages/XOrg/app/fluxbox/Makefile

    r10065 r10139  
    1010 
    1111PKG_NAME:=fluxbox 
    12 PKG_VERSION:=1.0.0 
     12PKG_VERSION:=1.0rc3 
    1313PKG_RELEASE:=1 
    1414 
    1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    16 PKG_SOURCE_URL:=http://switch.dl.sourceforge.net/sourceforge/fluxbox/ 
     16PKG_SOURCE_URL:=http://prdownloads.sourceforge.net/fluxbox/ 
    1717 
    1818EXTRA_LDFLAGS:="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" 
     
    2020include $(INCLUDE_DIR)/package.mk 
    2121 
    22 CONFIGURE_VARS+=LIBS="-nodefaultlibs -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -lm -lImlib2" \ 
    23                 CXXLD="$(TARGET_CC)" 
     22CONFIGURE_VARS+=LIBS="-nodefaultlibs -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -lm" \ 
     23                CXXLD="$(TARGET_CC)"  
    2424 
    2525CONFIGURE_ARGS+=--disable-xmb 
     
    3232define Package/fluxbox 
    3333$(call Package/fluxbox/Default) 
    34   DEPENDS:=+xorg-server-essentials +uclibcxx +xterm +imlib2 @DISPLAY_SUPPORT 
     34  DEPENDS:=+xorg-server-essentials +uclibcxx +xterm @DISPLAY_SUPPORT 
    3535  TITLE:=fluxbox window manager 
    3636  MENU:=1 
  • packages/XOrg/app/fluxbox/patches/120-fbsetroot-compile.patch

    r10065 r10139  
    1 diff -urN fluxbox-1.0.0.orig/util/Makefile.in fluxbox-1.0.0/util/Makefile.in 
    2 --- fluxbox-1.0.0.orig/util/Makefile.in 2007-12-30 18:54:47.000000000 +0100 
    3 +++ fluxbox-1.0.0/util/Makefile.in      2007-12-30 18:55:41.000000000 +0100 
    4 @@ -276,7 +276,7 @@ 
    5         -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) 
     1diff -urN fluxbox-1.0rc3.orig/util/Makefile.in fluxbox-1.0rc3/util/Makefile.in 
     2--- fluxbox-1.0rc3.orig/util/Makefile.in        2007-09-17 19:56:45.000000000 +0200 
     3+++ fluxbox-1.0rc3/util/Makefile.in     2007-09-17 19:58:11.000000000 +0200 
     4@@ -301,7 +301,7 @@ 
     5        done 
    66 fbsetroot$(EXEEXT): $(fbsetroot_OBJECTS) $(fbsetroot_DEPENDENCIES)  
    77        @rm -f fbsetroot$(EXEEXT) 
    88-       $(CXXLINK) $(fbsetroot_OBJECTS) $(fbsetroot_LDADD) $(LIBS) 
    99+       $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) -o $@ $(fbsetroot_OBJECTS) $(fbsetroot_LDADD) $(LDFLAGS) $(LIBS) 
    10  fluxbox-remote$(EXEEXT): $(fluxbox_remote_OBJECTS) $(fluxbox_remote_DEPENDENCIES)  
    11         @rm -f fluxbox-remote$(EXEEXT) 
    12         $(CXXLINK) $(fluxbox_remote_OBJECTS) $(fluxbox_remote_LDADD) $(LIBS) 
     10 fluxbox-update_configs$(EXEEXT): $(fluxbox_update_configs_OBJECTS) $(fluxbox_update_configs_DEPENDENCIES)  
     11        @rm -f fluxbox-update_configs$(EXEEXT) 
     12        $(CXXLINK) $(fluxbox_update_configs_OBJECTS) $(fluxbox_update_configs_LDADD) $(LIBS) 
Note: See TracChangeset for help on using the changeset viewer.