mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 13:16:41 +00:00
fluxbox: update to fluxbox-1.3.7
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
parent
404435704f
commit
5d26964a7c
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
PKG_NAME="fluxbox"
|
PKG_NAME="fluxbox"
|
||||||
# dont bump or go back to ratpoison then f*** all 3rdparty stuff.
|
# dont bump or go back to ratpoison then f*** all 3rdparty stuff.
|
||||||
PKG_VERSION="1.3.5"
|
PKG_VERSION="1.3.7"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="OSS"
|
PKG_LICENSE="OSS"
|
||||||
@ -48,7 +48,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_realloc_0_nonnull=yes \
|
|||||||
--disable-test \
|
--disable-test \
|
||||||
--disable-nls \
|
--disable-nls \
|
||||||
--disable-imlib2"
|
--disable-imlib2"
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
enable_service windowmanager.service
|
enable_service windowmanager.service
|
||||||
}
|
}
|
||||||
@ -63,7 +63,7 @@ post_makeinstall_target() {
|
|||||||
rm -rf $INSTALL/usr/share/fluxbox/styles
|
rm -rf $INSTALL/usr/share/fluxbox/styles
|
||||||
rm -rf $INSTALL/usr/share/fluxbox/init
|
rm -rf $INSTALL/usr/share/fluxbox/init
|
||||||
rm -rf $INSTALL/usr/share/fluxbox/keys
|
rm -rf $INSTALL/usr/share/fluxbox/keys
|
||||||
|
|
||||||
cp $PKG_DIR/config/init $INSTALL/usr/share/fluxbox/
|
cp $PKG_DIR/config/init $INSTALL/usr/share/fluxbox/
|
||||||
cp $PKG_DIR/config/keys $INSTALL/usr/share/fluxbox/
|
cp $PKG_DIR/config/keys $INSTALL/usr/share/fluxbox/
|
||||||
}
|
}
|
||||||
|
@ -7,18 +7,14 @@ Subject: [PATCH] hack: avoid potential SIGFPE in Menu::updateMenu()
|
|||||||
src/FbTk/Menu.cc | 1 +
|
src/FbTk/Menu.cc | 1 +
|
||||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||||
|
|
||||||
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
|
diff -Naur fluxbox-1.3.7/src/FbTk/Menu.cc fluxbox-1.3.7.patch/src/FbTk/Menu.cc
|
||||||
index 3632fc9..75a5b4a 100644
|
--- fluxbox-1.3.7/src/FbTk/Menu.cc 2015-02-08 11:44:45.357187009 +0100
|
||||||
--- a/src/FbTk/Menu.cc
|
+++ fluxbox-1.3.7.patch/src/FbTk/Menu.cc 2015-02-15 21:37:37.322872231 +0100
|
||||||
+++ b/src/FbTk/Menu.cc
|
@@ -390,6 +390,7 @@
|
||||||
@@ -396,6 +396,7 @@ void Menu::enableTitle() {
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Menu::updateMenu() {
|
void Menu::updateMenu() {
|
||||||
+ return; // because nobody cares
|
+ return; // because nobody cares
|
||||||
if (m_title_vis) {
|
|
||||||
m_item_w = theme()->titleFont().textWidth(m_label);
|
int bevel = theme()->bevelWidth();
|
||||||
m_item_w += (theme()->bevelWidth() * 2);
|
int bw = theme()->borderWidth();
|
||||||
--
|
|
||||||
1.7.2.5
|
|
||||||
|
|
||||||
|
@ -0,0 +1,11 @@
|
|||||||
|
diff -Naur fluxbox-1.3.6/Makefile.am fluxbox-1.3.6.patch/Makefile.am
|
||||||
|
--- fluxbox-1.3.6/Makefile.am 2015-01-05 15:14:15.320478262 +0100
|
||||||
|
+++ fluxbox-1.3.6.patch/Makefile.am 2015-01-10 20:39:20.376934793 +0100
|
||||||
|
@@ -79,7 +79,6 @@
|
||||||
|
include src/Makemodule.am
|
||||||
|
include src/tests/Makemodule.am
|
||||||
|
include util/Makemodule.am
|
||||||
|
-include util/fbrun/Makemodule.am
|
||||||
|
|
||||||
|
uninstall-hook:
|
||||||
|
rmdir $(DESTDIR)$(pkgdatadir)
|
Loading…
x
Reference in New Issue
Block a user