Update fluxbox to 1.0.0
git-svn-id: svn://svn.openwrt.org/openwrt/packages@14777 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
f929c75d1d
commit
05409fa213
@ -9,11 +9,13 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=fluxbox
|
||||
PKG_VERSION:=1.0rc3
|
||||
PKG_VERSION:=1.0.0
|
||||
PKG_RELEASE:=1
|
||||
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
||||
PKG_SOURCE_URL:=http://prdownloads.sourceforge.net/fluxbox/
|
||||
PKG_MD5SUM:=990e276ead0d04421dce4080f485caca
|
||||
|
||||
EXTRA_LDFLAGS:="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib"
|
||||
|
||||
|
37
Xorg/wm/fluxbox/patches/010-fix-includes.patch
Normal file
37
Xorg/wm/fluxbox/patches/010-fix-includes.patch
Normal file
@ -0,0 +1,37 @@
|
||||
diff --git a/src/ClientPattern.cc b/src/ClientPattern.cc
|
||||
index 21224cb..b641185 100644
|
||||
--- a/src/ClientPattern.cc
|
||||
+++ b/src/ClientPattern.cc
|
||||
@@ -45,6 +45,7 @@
|
||||
#endif
|
||||
|
||||
// needed as well for index on some systems (e.g. solaris)
|
||||
+#include <string.h>
|
||||
#include <strings.h>
|
||||
|
||||
using std::string;
|
||||
diff --git a/src/FbTk/Text.cc b/src/FbTk/Text.cc
|
||||
index 8c836cc..9f4b3eb 100644
|
||||
--- a/src/FbTk/Text.cc
|
||||
+++ b/src/FbTk/Text.cc
|
||||
@@ -26,6 +26,7 @@
|
||||
#include "Font.hh"
|
||||
#include "Theme.hh"
|
||||
|
||||
+#include <string.h>
|
||||
#include <strings.h>
|
||||
|
||||
namespace FbTk {
|
||||
diff --git a/src/main.cc b/src/main.cc
|
||||
index afbf43e..3c3d17c 100644
|
||||
--- a/src/main.cc
|
||||
+++ b/src/main.cc
|
||||
@@ -45,6 +45,8 @@
|
||||
#include <stdlib.h>
|
||||
#endif
|
||||
|
||||
+#include <string.h>
|
||||
+
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
#include <stdexcept>
|
@ -1,7 +1,6 @@
|
||||
--- fluxbox-1.0rc3/util/fbrun/Makefile.in.orig 2007-09-17 19:52:52.000000000 +0200
|
||||
+++ fluxbox-1.0rc3/util/fbrun/Makefile.in 2007-09-17 19:53:09.000000000 +0200
|
||||
@@ -268,7 +268,7 @@
|
||||
done
|
||||
@@ -236,7 +236,7 @@
|
||||
fbrun$(EXEEXT): $(fbrun_OBJECTS) $(fbrun_DEPENDENCIES)
|
||||
@rm -f fbrun$(EXEEXT)
|
||||
- $(CXXLINK) $(fbrun_OBJECTS) $(fbrun_LDADD) $(LIBS)
|
||||
|
@ -1,12 +1,8 @@
|
||||
diff -urN fluxbox-1.0rc3.orig/util/Makefile.in fluxbox-1.0rc3/util/Makefile.in
|
||||
--- fluxbox-1.0rc3.orig/util/Makefile.in 2007-09-17 19:56:45.000000000 +0200
|
||||
+++ fluxbox-1.0rc3/util/Makefile.in 2007-09-17 19:58:11.000000000 +0200
|
||||
@@ -301,7 +301,7 @@
|
||||
done
|
||||
@@ -277,4 +277,4 @@
|
||||
fbsetroot$(EXEEXT): $(fbsetroot_OBJECTS) $(fbsetroot_DEPENDENCIES)
|
||||
@rm -f fbsetroot$(EXEEXT)
|
||||
- $(CXXLINK) $(fbsetroot_OBJECTS) $(fbsetroot_LDADD) $(LIBS)
|
||||
+ $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) -o $@ $(fbsetroot_OBJECTS) $(fbsetroot_LDADD) $(LDFLAGS) $(LIBS)
|
||||
fluxbox-update_configs$(EXEEXT): $(fluxbox_update_configs_OBJECTS) $(fluxbox_update_configs_DEPENDENCIES)
|
||||
@rm -f fluxbox-update_configs$(EXEEXT)
|
||||
$(CXXLINK) $(fluxbox_update_configs_OBJECTS) $(fluxbox_update_configs_LDADD) $(LIBS)
|
||||
|
Loading…
x
Reference in New Issue
Block a user