diff options
-rw-r--r-- | package/libgtk3/Makefile (renamed from package/gtk3/Makefile) | 13 | ||||
-rw-r--r-- | package/webkitgtk/Makefile | 6 |
2 files changed, 11 insertions, 8 deletions
diff --git a/package/gtk3/Makefile b/package/libgtk3/Makefile index 2e78e63bf..e0dc28240 100644 --- a/package/gtk3/Makefile +++ b/package/libgtk3/Makefile @@ -3,11 +3,11 @@ include $(ADK_TOPDIR)/rules.mk -PKG_NAME:= gtk+ -PKG_VERSION:= 3.20.2 +PKG_NAME:= libgtk3 +PKG_VERSION:= 3.20.4 PKG_EXTRAVER:= 3.20 PKG_RELEASE:= 1 -PKG_HASH:= 1ab1d1068ea55e0046f437d69983f164df5e68cb2e9fdfb38787b867f33f69f7 +PKG_HASH:= e7e3aaf54a54dd1c1ca0588939254abe31329e0bcd280a12290d5306b41ea03f PKG_DESCR:= multi-platform toolkit for creating graphical user interfaces PKG_SECTION:= libs/misc PKG_DEPENDS:= glib cairo libxi libepoxy @@ -20,6 +20,13 @@ PKG_SITES:= $(MASTER_SITE_GNOME:=gtk+/$(PKG_EXTRAVER)/) PKG_LIBNAME:= libgtk3 PKG_OPTS:= dev +DISTFILES:= gtk+-$(PKG_VERSION).tar.xz +WRKDIST= $(WRKDIR)/gtk+-$(PKG_VERSION) + +PKG_CFLINE_LIBGTK3:= select ADK_PACKAGE_CAIRO_WITH_PDF@ +PKG_CFLINE_LIBGTK3+= select ADK_PACKAGE_CAIRO_WITH_PS@ +PKG_CFLINE_LIBGTK3+= select ADK_PACKAGE_CAIRO_WITH_SVG@ + include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBGTK3,libgtk3,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) diff --git a/package/webkitgtk/Makefile b/package/webkitgtk/Makefile index 8b8b6e533..65e32a19d 100644 --- a/package/webkitgtk/Makefile +++ b/package/webkitgtk/Makefile @@ -12,17 +12,13 @@ PKG_SECTION:= libs/misc PKG_DEPENDS:= glib icu4c zlib libwebp libgtk3 libsoup PKG_DEPENDS+= libsecret libxt harfbuzz cairo PKG_DEPENDS+= gst-plugins-base gstreamer libnotify -PKG_BUILDDEP:= glib icu4c zlib libwebp gtk3 cmake-host +PKG_BUILDDEP:= glib icu4c zlib libwebp libgtk3 cmake-host PKG_BUILDDEP+= libsoup libsecret libXt harfbuzz libnotify PKG_BUILDDEP+= gst-plugins-base gstreamer cairo enchant PKG_URL:= http://www.webkitgtk.org/ PKG_SITES:= http://webkitgtk.org/releases/ PKG_OPTS:= dev -PKG_CFLINE_WEBKITGTK:= select ADK_PACKAGE_CAIRO_WITH_PDF@ -PKG_CFLINE_WEBKITGTK+= select ADK_PACKAGE_CAIRO_WITH_PS@ -PKG_CFLINE_WEBKITGTK+= select ADK_PACKAGE_CAIRO_WITH_SVG@ - include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,WEBKITGTK,webkitgtk,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) |