rename gtk+ to libgtk2

package/avahi/Makefile

@@ -11,7 +11,7 @@ PKG_DESCR:=		multicast dns daemon
 PKG_SECTION:=		net/dns
 PKG_DEPENDS:=		libstdcxx
 PKG_BUILDDEP:=		libdaemon expat gdbm glib
-PKG_BUILDDEP+=		gettext-tiny gtk+ dbus
+PKG_BUILDDEP+=		gettext-tiny libgtk2 dbus
 PKG_URL:=		http://avahi.org/
 PKG_SITES:=		http://avahi.org/download/
 PKG_LIBNAME:=		libavahi
@@ -20,7 +20,7 @@ PKG_OPTS:=		dev
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 PKG_SUBPKGS:=		AVAHI_DAEMON AVAHI_DNSCONFD LIBAVAHI
-PKGSS_AVAHI_DAEMON:=	libavahi libdaemon libexpat libintl libgtk dbus
+PKGSS_AVAHI_DAEMON:=	libavahi libdaemon libexpat libintl libgtk2 dbus
 PKGSS_AVAHI_DNSCONFD:=	libavahi libdaemon avahi-daemon
 PKGSD_AVAHI_DNSCONFD:=	DNS server from mDNS configuration daemon
 PKGSD_LIBAVAHI:=	DNS-SD over mDNS library

package/classpath/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_HASH:=		f929297f8ae9b613a1a167e231566861893260651d913ad9b6c11933895fecc8 26ca659f47d77384f518cf2b6463892fcd4f0b0d4d8c0de2addf697e63e7326b
 PKG_DESCR:=		java classpath
 PKG_SECTION:=		dev/tools
-PKG_BUILDDEP:=		gtk+ gdk-pixbuf orbit2 gconf
-PKG_DEPENDS:=		libgtk gdk-pixbuf orbit2 gconf
+PKG_BUILDDEP:=		libgtk2 gdk-pixbuf orbit2 gconf
+PKG_DEPENDS:=		libgtk2 gdk-pixbuf orbit2 gconf
 HOST_BUILDDEP:=		gcj-host ecj-host
 PKG_URL:=		http://www.gnu.org/software/classpath/home.html
 PKG_SITES:=		ftp://ftp.gnu.org/gnu/classpath/ \

package/firefox/Makefile

@@ -9,11 +9,11 @@ PKG_RELEASE:=		3
 PKG_HASH:=		bedeb5bbd8b49e5b286497ef7732542c6e7441088fd8cd577d7ca8af4c871e81
 PKG_DESCR:=		graphical webbrowser
 PKG_SECTION:=		x11/apps
-PKG_DEPENDS:=		libpthread alsa-lib glib libgtk libpng libtiff libxcursor libffi
+PKG_DEPENDS:=		libpthread alsa-lib glib libgtk2 libpng libtiff libxcursor libffi
 PKG_DEPENDS+=		nspr nss libjpeg-turbo libatk pango cairo libxt libx11 libstdcxx hicolor-icon-theme
 PKG_DEPENDS+=		libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf librt
 PKG_DEPENDS+=		harfbuzz mesalib libvpx libbz2 ca-certificates libevent
-PKG_BUILDDEP:=		alsa-lib glib gtk+ libIDL libX11 mesalib libtiff gdk-pixbuf
+PKG_BUILDDEP:=		alsa-lib glib libgtk2 libIDL libX11 mesalib libtiff gdk-pixbuf
 PKG_BUILDDEP+=		nspr nss libjpeg-turbo libXt fontconfig sqlite atk libpng hicolor-icon-theme
 PKG_BUILDDEP+=		libvpx pango gettext-tiny bzip2 libevent bzip2-host python2-host yasm-host
 PKG_BUILDDEP+=		zip-host

package/kodi/Makefile

@@ -11,35 +11,24 @@ PKG_SECTION:=		mm/video
 PKG_DEPENDS:=		boost python2 libstdcxx glibc-gconv
 PKG_DEPENDS+=		libass libmpeg2 libmad libdbus libglew mesalib
 PKG_DEPENDS+=		libjpeg-turbo libogg libvorbis libmodplug libcurl
-PKG_DEPENDS+=		libflac libbz2 libtiff liblzo libressl
+PKG_DEPENDS+=		libflac libbz2 libtiff liblzo libopenssl
 PKG_DEPENDS+=		yajl tinyxml libsqlite libpcrecpp libpng libncurses
 PKG_DEPENDS+=		libpcre libcdio libfreetype libsamplerate libuuid
-PKG_DEPENDS+=		taglib libjasper libmp3lame libmicrohttpd
+PKG_DEPENDS+=		taglib libjasper libmp3lame libmicrohttpd libgtk2
 PKG_DEPENDS+=		libgpg-error libudev python2-mod-sqlite libffmpeg
 PKG_DEPENDS+=		libxslt libvorbisenc alsa-lib glib libglu librt
-PKG_BUILDDEP:=		boost python2 libass ffmpeg libressl libglew
+PKG_BUILDDEP:=		boost python2 libass ffmpeg openssl libglew
 PKG_BUILDDEP+=		libmpeg2 libmad libjpeg-turbo libogg libvorbis
 PKG_BUILDDEP+=		curl flac bzip2 libtiff liblzo yajl mesalib
 PKG_BUILDDEP+=		tinyxml sqlite pcre libpng libcdio freetype 
 PKG_BUILDDEP+=		libsamplerate taglib libjasper lame libmicrohttpd
-PKG_BUILDDEP+=		eudev alsa-lib glib glu libmodplug
+PKG_BUILDDEP+=		eudev alsa-lib glib glu libmodplug libgtk2
 PKG_BUILDDEP+=		libgpg-error dbus libxslt libvorbis
 PKG_BUILDDEP+=		swig-host sdl-host sdl-image-host liblzo-host
 PKG_BUILDDEP+=		zip-host unzip-host
 PKG_URL:=		http://kodi.tv/
 PKG_SITES:=		https://github.com/xbmc/xbmc.git
 
-#DISTFILES:=		$(PKG_VERSION)-Helix.tar.gz
-#WRKDIST=		$(WRKDIR)/xbmc-$(PKG_VERSION)-Helix
-
-PKG_CHOICES_KODI:=	WITH_LIBRESSL WITH_OPENSSL
-PKGCD_WITH_LIBRESSL:=	with libressl
-PKGCS_WITH_LIBRESSL:=	libressl
-PKGCB_WITH_LIBRESSL:=	libressl
-PKGCD_WITH_OPENSSL:=	with openssl
-PKGCS_WITH_OPENSSL:=	libopenssl
-PKGCB_WITH_OPENSSL:=	openssl
-
 PKG_FLAVOURS_KODI:=	WITH_SMB WITH_NFS WITH_SSH WITH_AVAHI WITH_CEC 
 PKG_FLAVOURS_KODI+=	WITH_AFP WITH_WEBSERVER WITH_RTMP WITH_BLURAY
 

package/gtk+/Makefile → package/libgtk2/Makefile

@@ -3,7 +3,7 @@
 
 include ${ADK_TOPDIR}/rules.mk
 
-PKG_NAME:=		gtk+
+PKG_NAME:=		libgtk2
 PKG_VERSION:=		2.24.23
 PKG_EXTRAVER:=		2.24
 PKG_RELEASE:=		2
@@ -15,16 +15,19 @@ PKG_BUILDDEP:=		cairo atk pango libXext renderproto libXrender
 PKG_BUILDDEP+=		gdk-pixbuf libXcomposite libXdamage libX11
 PKG_URL:=		http://www.gtk.org/
 PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/gtk+/$(PKG_EXTRAVER)/
-PKG_LIBNAME:=		libgtk
+PKG_LIBNAME:=		libgtk2
 PKG_OPTS:=		dev
 
-PKG_CFLINE_GTKX:=	select ADK_PACKAGE_CAIRO_WITH_PDF@
-PKG_CFLINE_GTKX+=	select ADK_PACKAGE_CAIRO_WITH_PS@
-PKG_CFLINE_GTKX+=	select ADK_PACKAGE_CAIRO_WITH_SVG@
+DISTFILES:=		gtk+-$(PKG_VERSION).tar.xz
+WRKDIST=		$(WRKDIR)/gtk+-$(PKG_VERSION)
+
+PKG_CFLINE_LIBGTK2:=	select ADK_PACKAGE_CAIRO_WITH_PDF@
+PKG_CFLINE_LIBGTK2+=	select ADK_PACKAGE_CAIRO_WITH_PS@
+PKG_CFLINE_LIBGTK2+=	select ADK_PACKAGE_CAIRO_WITH_SVG@
 
 include ${ADK_TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBGTK,libgtk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBGTK2,libgtk2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 TARGET_LDFLAGS+=	-lm
 CONFIGURE_ARGS+=	--disable-gtk-doc-html \
@@ -38,14 +41,14 @@ CONFIGURE_ARGS+=	--disable-gtk-doc-html \
 CONFIGURE_ENV+=		gio_can_sniff=no \
 			ac_cv_path_GTK_UPDATE_ICON_CACHE=""
 
-libgtk-install:
-	${INSTALL_DIR} ${IDIR_LIBGTK}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libgdk-x11*so* ${IDIR_LIBGTK}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libgtk-x11*so* ${IDIR_LIBGTK}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libgailutil*so* ${IDIR_LIBGTK}/usr/lib
+libgtk2-install:
+	${INSTALL_DIR} ${IDIR_LIBGTK2}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libgdk-x11*so* ${IDIR_LIBGTK2}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libgtk-x11*so* ${IDIR_LIBGTK2}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libgailutil*so* ${IDIR_LIBGTK2}/usr/lib
 	# workaround dev subpackage
-	${INSTALL_DIR} ${IDIR_LIBGTK_DEV}/usr/lib/gtk-2.0/include
+	${INSTALL_DIR} ${IDIR_LIBGTK2_DEV}/usr/lib/gtk-2.0/include
 	${CP} ${WRKINST}/usr/lib/gtk-2.0/include/* \
-		${IDIR_LIBGTK_DEV}/usr/lib/gtk-2.0/include
+		${IDIR_LIBGTK2_DEV}/usr/lib/gtk-2.0/include
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/libnotify/Makefile

@@ -10,7 +10,7 @@ PKG_HASH:=		0799db8ea1500b65a477421a8c930cc8c8b0bbc0596e55ea1601e2542f3fb0d9
 PKG_DESCR:=		notify library
 PKG_SECTION:=		libs/misc
 PKG_DEPENDS:=		libstdcxx
-PKG_BUILDDEP:=		gtk+ dbus-glib
+PKG_BUILDDEP:=		libgtk2 dbus-glib
 PKG_URL:=		http://www.galago-project.org/
 PKG_SITES:=		http://www.galago-project.org/files/releases/source/libnotify/
 PKG_OPTS:=		dev

package/openjdk7/Makefile

@@ -11,14 +11,14 @@ PKG_DESCR:=		java virtual machine
 PKG_SECTION:=		dev/lang
 PKG_BUILDDEP:=		openjdk7-host alsa-lib xproto libjpeg-turbo zlib giflib libpng freetype cups
 PKG_BUILDDEP+=		libX11 libXt libXp libXinerama libXrender libXtst
-PKG_BUILDDEP+=		libpng giflib gtk+ glib fontconfig nss
+PKG_BUILDDEP+=		libpng giflib libgtk2 glib fontconfig nss
 HOST_BUILDDEP:=		fastjar-host gcj-host ecj-host classpath-host jamvm-host
 HOST_BUILDDEP+=		jikes-host ant-host libXtst-host libXt-host libXinerama-host
 HOST_BUILDDEP+=		cups-host qemu-host alsa-lib-host freetype-host unzip-host
 HOST_BUILDDEP+=		libxslt-host
 PKG_DEPENDS:=		zlib libstdcxx libffi libpthread libxtst libxi cups
 PKG_DEPENDS+=		libfreetype libxrender libx11 libxext libpthread nss libjpeg-turbo
-PKG_DEPENDS+=		libpng giflib libgtk glib fontconfig
+PKG_DEPENDS+=		libpng giflib libgtk2 glib fontconfig
 PKG_URL:=		http://openjdk.org/
 PKG_SITES:=		http://icedtea.classpath.org/download/source/
 

target/linux/config/Config.in.dma

@@ -11,7 +11,6 @@ config ADK_KERNEL_CMA_SIZE_MBYTES
 	default 64 if ADK_KERNEL_CMA_SIZE_64
 	default 8 if ADK_KERNEL_CMA_SIZE_8
 
-choice
 config ADK_KERNEL_CMA_SIZE_256
 	bool
 
@@ -24,8 +23,6 @@ config ADK_KERNEL_CMA_SIZE_64
 config ADK_KERNEL_CMA_SIZE_8
 	bool
 
-endchoice
-
 config ADK_KERNEL_CMA_SIZE_SEL_MBYTES
 	bool