diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-06-04 11:19:53 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-06-04 12:18:48 +0200 |
| commit | 77cf90ffd9993712859e09a1c9da83fac184d320 (patch) | |
| tree | 836820521bc53c446ba596581c3b5a207ee792cc | |
| parent | 66c952d1ee7218c065a0cb3628431584984bdb47 (diff) | |
update fluxbox to latest stable version
| -rw-r--r-- | package/fluxbox/Makefile | 9 | ||||
| -rw-r--r-- | package/fluxbox/patches/patch-src_FbTk_XftFontImp_cc | 10 | ||||
| -rw-r--r-- | package/fluxbox/patches/patch-src_defaults_cc | 9 |
3 files changed, 24 insertions, 4 deletions
diff --git a/package/fluxbox/Makefile b/package/fluxbox/Makefile index c09a2c311..31a7c5bb7 100644 --- a/package/fluxbox/Makefile +++ b/package/fluxbox/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= fluxbox -PKG_VERSION:= 1.3.2 +PKG_VERSION:= 1.3.7 PKG_RELEASE:= 1 -PKG_HASH:= c174030bd356f680dc5608f5553cac89b44f362c050d081ae8a8b7a3227280a0 +PKG_HASH:= fc8c75fe94c54ed5a5dd3fd4a752109f8949d6df67a48e5b11a261403c382ec0 PKG_DESCR:= window manager featuring tabs and an iconbar PKG_SECTION:= x11/apps PKG_DEPENDS:= libstdcxx @@ -14,8 +14,6 @@ PKG_BUILDDEP:= libXpm libXft PKG_URL:= http://www.fluxbox.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=fluxbox/} -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - PKG_FLAVOURS_FLUXBOX:= WITH_IMLIB2 PKGFD_WITH_IMLIB2:= enable imlib2 support PKGFS_WITH_IMLIB2:= imlib2 @@ -25,6 +23,9 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,FLUXBOX,fluxbox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes \ + ac_cv_func_realloc_0_nonnull=yes + ifeq (${ADK_PACKAGE_FLUXBOX_WITH_IMLIB2},y) CONFIGURE_ARGS+= --enable-imlib2 else diff --git a/package/fluxbox/patches/patch-src_FbTk_XftFontImp_cc b/package/fluxbox/patches/patch-src_FbTk_XftFontImp_cc new file mode 100644 index 000000000..2cc139fb0 --- /dev/null +++ b/package/fluxbox/patches/patch-src_FbTk_XftFontImp_cc @@ -0,0 +1,10 @@ +--- fluxbox-1.3.7.orig/src/FbTk/XftFontImp.cc 2015-02-08 11:44:45.000000000 +0100 ++++ fluxbox-1.3.7/src/FbTk/XftFontImp.cc 2015-06-03 09:16:38.000000000 +0200 +@@ -23,6 +23,7 @@ + #include "App.hh" + #include "FbDrawable.hh" + ++#include <cstdlib> + #include <cmath> + #include <cstdio> + #include <algorithm> diff --git a/package/fluxbox/patches/patch-src_defaults_cc b/package/fluxbox/patches/patch-src_defaults_cc new file mode 100644 index 000000000..27f5e00f2 --- /dev/null +++ b/package/fluxbox/patches/patch-src_defaults_cc @@ -0,0 +1,9 @@ +--- fluxbox-1.3.7.orig/src/defaults.cc 2015-02-08 11:45:20.000000000 +0100 ++++ fluxbox-1.3.7/src/defaults.cc 2015-06-03 09:01:47.000000000 +0200 +@@ -6,5 +6,5 @@ std::string realProgramName(const std::s + } + + const char* gitrevision() { +- return "88a74ff1cde22be3e894498ffd88934dc92dfef0"; ++ return "unknown"; + } |