midori: fix dependencies and package, at least midori startsup somehow

7 files changed, 38 insertions, 11 deletions

diff --git a/package/enchant/Makefile b/package/enchant/Makefile
index f3683cd7f..84ffa533f 100644
--- a/package/enchant/Makefile
+++ b/package/enchant/Makefile
@@ -9,7 +9,6 @@ PKG_RELEASE:=		1
 PKG_HASH:=		2fac9e7be7e9424b2c5570d8affe568db39f7572c10ed48d4e13cddf03f7097f
 PKG_DESCR:=		spelling library
 PKG_SECTION:=		libs/misc
-PKG_URL:=		add project url
 PKG_SITES:=		http://www.abisource.com/downloads/enchant/1.6.0/
 
 DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -19,6 +18,10 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,ENCHANT,enchant,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 
 enchant-install:
-	$(INSTALL_DIR) $(IDIR_ENCHANT)/usr/lib
+	$(INSTALL_DIR) $(IDIR_ENCHANT)/usr/lib/enchant
+	$(CP) $(WRKINST)/usr/lib/libenchant.so* \
+		$(IDIR_ENCHANT)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/enchant/*.so* \
+		$(IDIR_ENCHANT)/usr/lib/enchant
 
 include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/gcr/Makefile b/package/gcr/Makefile
index b769f16a4..dae86a4dc 100644
--- a/package/gcr/Makefile
+++ b/package/gcr/Makefile
@@ -6,7 +6,7 @@ include $(ADK_TOPDIR)/rules.mk
 PKG_NAME:=		gcr
 PKG_VERSION:=		3.20.0
 PKG_EXTRAVER:=		3.20
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_HASH:=		90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379
 PKG_DESCR:=		gnome keyring library
 PKG_SECTION:=		libs/crypto
@@ -20,5 +20,7 @@ $(eval $(call PKG_template,GCR,gcr,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),
 
 gcr-install:
 	$(INSTALL_DIR) $(IDIR_GCR)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/lib*.so* \
+		$(IDIR_GCR)/usr/lib
 
 include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/gstreamer/Makefile b/package/gstreamer/Makefile
index 7927cb8bc..07d54db05 100644
--- a/package/gstreamer/Makefile
+++ b/package/gstreamer/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		gstreamer
 PKG_VERSION:=		1.8.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_HASH:=		9dbebe079c2ab2004ef7f2649fa317cabea1feb4fb5605c24d40744b90918341
 PKG_DESCR:=		opensource multimedia framework
 PKG_SECTION:=		libs/video
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+=	--disable-examples \
 
 gstreamer-install:
 	$(INSTALL_DIR) $(IDIR_GSTREAMER)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libgstreamer*.so* \
+	$(CP) $(WRKINST)/usr/lib/libgst*.so* \
 		$(IDIR_GSTREAMER)/usr/lib
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/icu4c/Makefile b/package/icu4c/Makefile
index 7f61d7feb..507311d2f 100644
--- a/package/icu4c/Makefile
+++ b/package/icu4c/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		icu4c
 PKG_VERSION:=		54.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_HASH:=		d42bc9a8ca6a91c55eb0925c279f49e5b508d51ef26ac9850d9be55de5bb8ab3
 PKG_DESCR:=		unicode and globalization library
 PKG_SECTION:=		libs/misc
@@ -44,6 +44,10 @@ icu4c-install:
 	$(INSTALL_DIR) $(IDIR_ICU4C)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libicuuc.so* \
 		$(IDIR_ICU4C)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libicudata.so* \
+		$(IDIR_ICU4C)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libicui18n.so* \
+		$(IDIR_ICU4C)/usr/lib
 
 include ${ADK_TOPDIR}/mk/host-bottom.mk
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/mesa/Makefile b/package/mesa/Makefile
index f985fe2d3..562f8f4f5 100644
--- a/package/mesa/Makefile
+++ b/package/mesa/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		mesa
 PKG_VERSION:=		13.0.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_HASH:=		71962fb2bf77d33b0ad4a565b490dbbeaf4619099c6d9722f04a73187957a731
 PKG_DESCR:=		3d graphics library
 PKG_SECTION:=		libs/video
@@ -45,6 +45,8 @@ XAKE_FLAGS+=		HOST_CC=${CC_FOR_BUILD}
 
 mesa-install:
 	$(INSTALL_DIR) $(IDIR_MESA)/usr/lib/dri
+	$(CP) $(WRKINST)/usr/lib/libEGL*.so* \
+		$(IDIR_MESA)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libGL*.so* \
 		$(IDIR_MESA)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libglapi.so* \
diff --git a/package/midori/Makefile b/package/midori/Makefile
index 555fcf639..de52480cc 100644
--- a/package/midori/Makefile
+++ b/package/midori/Makefile
@@ -5,13 +5,18 @@ include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		midori
 PKG_VERSION:=		0.5.11
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_HASH:=		3b8f3a0fe8283fcbb0f9c88b2165e2689d3e18f7c1b5d275fff97cf20e7be198
 PKG_DESCR:=		graphical web browser
 PKG_SECTION:=		x11/apps
-PKG_DEPENDS:=		libnotify webkitgtk gcr
+PKG_DEPENDS:=		libnotify webkitgtk gcr pango libatk cairo libsqlite
+PKG_DEPENDS+=		gdk-pixbuf libgtk3 p11-kit libxcomposite at-spi2-atk
+PKG_DEPENDS+=		libpng icu4c gstreamer gst-plugins-base dbus libgnutls
+PKG_DEPENDS+=		libxslt libjpeg-turbo libtasn1 libnettle enchant
+PKG_DEPENDS+=		libgmp at-spi2-core
 PKG_BUILDDEP:=		cmake-host vala-host libnotify webkitgtk gcr
-PKG_BUILDDEP+=		librsvg-host librsvg
+PKG_BUILDDEP+=		librsvg-host librsvg pango atk cairo sqlite
+PKG_BUILDDEP+=		gdk-pixbuf libgtk3 p11-kit libpng icu4c gstreamer
 PKG_URL:=		http://www.midori-browser.org
 PKG_SITES:=		http://distfiles.openadk.org/
 
@@ -30,6 +35,12 @@ CMAKE_FLAGS+=		-DUSE_GTK3=ON \
 			-DUSE_ZEITGEIST=OFF
 
 midori-install:
+	$(INSTALL_DIR) $(IDIR_MIDORI)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/* \
+		$(IDIR_MIDORI)/usr/lib
+	$(INSTALL_DIR) $(IDIR_MIDORI)/usr/share
+	$(CP) $(WRKINST)/usr/share/* \
+		$(IDIR_MIDORI)/usr/share
 	$(INSTALL_DIR) $(IDIR_MIDORI)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/midori \
 		$(IDIR_MIDORI)/usr/bin
diff --git a/package/webkitgtk/Makefile b/package/webkitgtk/Makefile
index 804e597b9..0da0ef090 100644
--- a/package/webkitgtk/Makefile
+++ b/package/webkitgtk/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		webkitgtk
 PKG_VERSION:=		2.14.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_HASH:=		2edbcbd5105046aea55af9671c4de8deedb5b0e3567c618034d440a760675556
 PKG_DESCR:=		web browser engine
 PKG_SECTION:=		libs/misc
@@ -46,5 +46,10 @@ webkitgtk-install:
 		$(IDIR_WEBKITGTK)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libwebkit2gtk*.so* \
 		$(IDIR_WEBKITGTK)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/webkit2gtk-4.0 \
+		$(IDIR_WEBKITGTK)/usr/lib
+	$(INSTALL_DIR) $(IDIR_WEBKITGTK)/usr/libexec
+	$(CP) $(WRKINST)/usr/libexec/* \
+		$(IDIR_WEBKITGTK)/usr/libexec
 
 include $(ADK_TOPDIR)/mk/pkg-bottom.mk