cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add shared-mime-info to BDEP, build/Install.jam checks for

Browse Source 
update-mime-database presence before installing the mime file.
Patch out the call to update-mime-database anyway since the pkgtools run it.

Should fix spurious packaging failures when shared-mime-info got junked.
This commit is contained in:
landry 2013-10-25 20:43:23 +00:00
parent 70d6bdbd8d
commit 2908ff44c1
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
x11/ede/desktop/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2013/07/15 12:05:26 pascal Exp $
# $OpenBSD: Makefile,v 1.4 2013/10/25 20:43:23 landry Exp $
COMMENT = Equinox desktop environment
DISTNAME = ede-${V}
REVISION = 0
REVISION = 1
WANTLIB += X11 Xau Xdmcp Xext Xft Xinerama Xpm c crypto
WANTLIB += curl dbus-1 edelib edelib_dbus edelib_gui fltk fltk_images
@ -11,7 +11,8 @@ WANTLIB += fontconfig idn jpeg m png pthread ssl startup-notification-1
WANTLIB += stdc++ xkbfile z
MODULES = lang/python
BUILD_DEPENDS = devel/jam
BUILD_DEPENDS = devel/jam \
misc/shared-mime-info
LIB_DEPENDS = devel/startup-notification \
graphics/jpeg \
graphics/png \

12
x11/ede/desktop/patches/patch-build_Install_jam Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-build_Install_jam,v 1.1 2013/10/25 20:43:23 landry Exp $
Donc call update-mime-database
--- build/Install.jam.orig Fri Oct 25 22:40:30 2013
+++ build/Install.jam Fri Oct 25 22:40:40 2013
@@ -150,7 +150,6 @@ rule InstallEdeMimeFiles
# Call update-mime-database after install/uninstall
# Just hoping this will be executed after files are copied/removed...
- MimeUpdater install : $(EDE_MIME_DIR) ;
MimeUpdater uninstall : $(EDE_MIME_DIR) ;
}
}