From cb209f63e685d46465e68de856bc30cfe0e4e8c0 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 25 Sep 2014 16:36:48 +0200 Subject: [PATCH] gtk+3: update to 3.14.0. --- srcpkgs/gtk+3/patches/cross.patch | 11 +++++++++++ srcpkgs/gtk+3/template | 28 ++++++++++------------------ 2 files changed, 21 insertions(+), 18 deletions(-) create mode 100644 srcpkgs/gtk+3/patches/cross.patch diff --git a/srcpkgs/gtk+3/patches/cross.patch b/srcpkgs/gtk+3/patches/cross.patch new file mode 100644 index 00000000000..67ef3ac71ff --- /dev/null +++ b/srcpkgs/gtk+3/patches/cross.patch @@ -0,0 +1,11 @@ +--- util/Makefile.am.orig 2014-09-25 16:26:55.646426018 +0200 ++++ util/Makefile.am 2014-09-25 16:27:20.637300308 +0200 +@@ -2,6 +2,8 @@ + + noinst_PROGRAMS = extract-strings + ++CC = @CC_FOR_BUILD@ ++CFLAGS = @CFLAGS_FOR_BUILD@ + extract_strings_SOURCES = extract-strings.c + extract_strings_CFLAGS = $(GLIB_CFLAGS_FOR_BUILD) + extract_strings_LDADD = $(GLIB_LIBS_FOR_BUILD) diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template index c4a2394638b..b52b5391831 100644 --- a/srcpkgs/gtk+3/template +++ b/srcpkgs/gtk+3/template @@ -1,7 +1,7 @@ # Template build file for 'gtk+3'. pkgname=gtk+3 -version=3.12.2 -revision=3 +version=3.14.0 +revision=1 wrksrc="gtk+-${version}" build_style=gnu-configure configure_args="--disable-schemas-compile --enable-gtk2-dependency" @@ -10,13 +10,14 @@ maintainer="Juan RP " homepage="http://www.gtk.org/" license="LGPL-2.1" distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz" -checksum=61d74eea74231b1ea4b53084a9d6fc9917ab0e1d71b69d92cbf60a4b4fb385d0 +checksum=68d6b57d15c16808d0045e96b303f3dd439cc22a9c06fdffb07025cd713a82bc -hostmakedepends="libtool pkg-config glib-devel>=2.40 gtk-update-icon-cache" -makedepends="libglib-devel>=2.40 atk-devel>=2.12 at-spi2-atk-devel>=2.12 +hostmakedepends="automake gettext-devel libtool pkg-config + glib-devel>=2.42 gtk-doc gobject-introspection gtk-update-icon-cache" +makedepends="libglib-devel>=2.42 atk-devel>=2.14 at-spi2-atk-devel>=2.14 libpng-devel fontconfig-devel cairo-devel pango-devel>=1.36 - gdk-pixbuf-devel>=2.30 gtk-update-icon-cache" -depends="gtk-update-icon-cache shared-mime-info glib>=2.38 atk>=2.10" + gdk-pixbuf-devel>=2.30" +depends="gtk-update-icon-cache shared-mime-info glib>=2.42 atk>=2.14" triggers="gtk3-immodules" conf_files="/etc/gtk-3.0/im-multipress.conf" @@ -78,9 +79,8 @@ else fi pre_configure() { - libtoolize -f + NOCONFIGURE=1 ./autogen.sh } - post_install() { rm -f ${DESTDIR}/usr/share/man/man1/gtk-update-icon-cache.1 # Provide a default (icon)theme. @@ -88,14 +88,7 @@ post_install() { } gtk+3-devel_package() { - depends="libglib-devel>=2.40 atk-devel>=2.12 cairo-devel gdk-pixbuf-devel>=2.30 - pango-devel>=1.36 at-spi2-atk-devel>=2.12 gtk+3>=${version}_${revision}" - if [ "$build_option_x11" ]; then - depends+=" libXcomposite-devel libXcursor-devel libXrandr-devel libXi-devel libXinerama-devel libXdamage-devel" - fi - if [ "$build_option_wayland" ]; then - depends+=" libxkbcommon-devel wayland-devel" - fi + depends="${makedepends} gtk+3>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include @@ -108,7 +101,6 @@ gtk+3-devel_package() { vmove usr/share/aclocal } } - gtk+3-demo_package() { short_desc+=" - demonstration application" pkg_install() {