matchbox-desktop: fix compilation and installation

PATCH New Paulius Zaleckas 2 participants 2 messages Apr 6, 2010 – Apr 8, 2010

Share & tools

Paulius Zaleckas

author

2010-04-06 20:36 UTC #0 lore raw

PATCH 1/1 matchbox-desktop: fix compilation and installation

Libtool patch applies just fine.
mbdesktop_modules is installed by the matchbox-desktop and we don't have to overwrite it with our copy(contains wrong paths).

Signed-off-by Paulius Zaleckas <[email protected]>

---

 .../matchbox/matchbox-desktop/matchbox-desktop.mk  |    7 -------
 .../matchbox/matchbox-desktop/mbdesktop_modules    |    9 ---------
 2 files changed, 0 insertions(+), 16 deletions(-)
 delete mode 100644 package/matchbox/matchbox-desktop/mbdesktop_modules

package/matchbox/matchbox-desktop/matchbox-desktop.mk +0 -7

index a3312af..d5f61c1 100644
@@ -7,16 +7,9 @@
 MATCHBOX_DESKTOP_VERSION = 0.9.1
 MATCHBOX_DESKTOP_SOURCE = matchbox-desktop-$(MATCHBOX_DESKTOP_VERSION).tar.bz2
 MATCHBOX_DESKTOP_SITE = http://matchbox-project.org/sources/matchbox-desktop/$(MATCHBOX_DESKTOP_VERSION)
-MATCHBOX_DESKTOP_LIBTOOL_PATCH = NO
 MATCHBOX_DESKTOP_DEPENDENCIES = matchbox-lib
 MATCHBOX_DESKTOP_CONF_OPT = --enable-expat
 
-define MATCHBOX_DESKTOP_POST_INSTALL_FIXES
- cp -f ./package/matchbox/matchbox-desktop/mbdesktop_modules $(TARGET_DIR)/etc/matchbox/
-endef
-
-MATCHBOX_DESKTOP_POST_INSTALL_TARGET_HOOKS += MATCHBOX_DESKTOP_POST_INSTALL_FIXES
-
 #############################################################
 
 ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y)

package/matchbox/matchbox-desktop/mbdesktop_modules deleted +0 -9

deleted file mode 100644
index 8206dad..0000000
@@ -1,9 +0,0 @@
-# This file lists the 'plug-ins' with any arguments to be loaded by
-# matchbox-desktop. 
-#
-# It can be overridden on a per-user basis by copying this file to ~/.matchbox/
-# and editing. 
-
-/usr/lib/tasks.so
-/usr/lib/dotdesktop.so
-# /usr/lib/simplefilebrowser.so /

Peter Korsgaard

2010-04-08 05:40 UTC #1 lore raw

PATCH 1/1 matchbox-desktop: fix compilation and installation

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Paulius" == Paulius Zaleckas <[email protected]> writes:

Paulius> Libtool patch applies just fine.
Paulius> mbdesktop_modules is installed by the matchbox-desktop and we Paulius> don't have to overwrite it with our copy(contains wrong paths).

Committed, thanks!

Signature · 1 line

Bye, Peter Korsgaard