Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=libpng.git;a=commitdiff;h=a8206a86e7b57652514f4f7293b9aa4a7a7da07c
commit a8206a86e7b57652514f4f7293b9aa4a7a7da07c Author: Baste <[email protected]> Date: Mon Jan 14 16:14:12 2013 +0100 gtk+2-2.24.14-2-x86_64 * Rebuild with various stuff diff --git a/source/xlib/gtk+2/FrugalBuild b/source/xlib/gtk+2/FrugalBuild index bcf08bd..bcaeffb 100644 --- a/source/xlib/gtk+2/FrugalBuild +++ b/source/xlib/gtk+2/FrugalBuild @@ -4,12 +4,12 @@ pkgname=gtk+2 _F_gnome_name=gtk+ pkgver=2.24.14 -pkgrel=1 +pkgrel=2 pkgdesc="The GTK+ Toolkit (2.x series)" -depends=('libxext' 'libxfixes' 'cairo>=1.8.10-2' 'libgcc' 'libjpeg>=8a' 'libtiff' 'libcups>=1.3.11-4' 'gdk-pixbuf2>=2.23.0-5') +depends=('libxext' 'libxfixes' 'cairo>=1.12.8-2' 'libgcc' 'libjpeg-turbo' 'libtiff>=4.0.3' 'libcups>=1.3.11-4' 'gdk-pixbuf2>=2.26.5-2') rodepends=('gnome-icon-theme' 'shared-mime-info') groups=('xlib') -makedepends=('gtk-doc' 'cups' 'inputproto' 'gobject-introspection' 'gnome-common') +makedepends=('gtk-doc' 'cups' 'inputproto' 'gobject-introspection>=1.34.2-2' 'gnome-common') archs=('i686' 'x86_64' 'arm') replaces=('libgail-gnome') provides=('libgail-gnome') @@ -19,13 +19,14 @@ up2date=$pkgver url="http://www.gtk.org/"; _F_cd_path="gtk+-$pkgver" source=($source \ - xid-collision-debug.patch) + xid-collision-debug.patch automake-1.13.patch) sha1sums=('dc42bce70aa438c8c225b4d16b2cd6e26d462cc7' \ - '75c461740e18696a792739cd1f9a20327dbb23bb') + '75c461740e18696a792739cd1f9a20327dbb23bb' \ + '5860d067d61229621256c8aad808df3bba6b408c') subpkgs=("${subpkgs[@]}" "$pkgname-libs") subdescs=("${subdescs[@]}" "GTK+2 core libraries.") -subdepends=("${subdepends[@]}" "libxinerama libxi libxrandr libxcursor pango>=1.28.0-2 libstdc++ +subdepends=("${subdepends[@]}" "libxinerama libxi libxrandr libxcursor pango>=1.32.5-3 libstdc++ libxcomposite libxdamage atk>=1.28.0 libxau libxdmcp libxml2>=2.7.8") subrodepends=("${subrodepends[@]}" "") subconflicts=("${subconflicts[@]}" "") @@ -35,7 +36,7 @@ subarchs=("${subarchs[@]}" 'i686 x86_64 arm') ## split more maybe ? subpkgs=("${subpkgs[@]}" "$pkgname-tools") subdescs=("${subdescs[@]}" "GTK+2 commandline tools.") -subdepends=("${subdepends[@]}" "glib2>=2.22.4 gdk-pixbuf2") +subdepends=("${subdepends[@]}" "glib2>=2.22.4 gdk-pixbuf2>=2.26.5-2") subrodepends=("${subrodepends[@]}" "") subconflicts=("${subconflicts[@]}" "") subgroups=("${subgroups[@]}" 'xapps') @@ -47,7 +48,7 @@ rodepends=("${rodepends[@]}" "${subpkgs[@]}") subpkgs=("${subpkgs[@]}" "gail") subdescs=("${subdescs[@]}" "Accessibility support for GTK+2 and libgnomecanvas") -subdepends=("${subdepends[@]}" "libxext libxfixes cairo>=1.8.8 zlib libgcc") +subdepends=("${subdepends[@]}" "libxext libxfixes cairo>=1.12.8-2 zlib libgcc") subrodepends=("${subrodepends[@]}" "$pkgname-libs>=$pkgver") subconflicts=("${subconflicts[@]}" "") subgroups=("${subgroups[@]}" 'xlib') diff --git a/source/xlib/gtk+2/automake-1.13.patch b/source/xlib/gtk+2/automake-1.13.patch new file mode 100644 index 0000000..9ab2651 --- /dev/null +++ b/source/xlib/gtk+2/automake-1.13.patch @@ -0,0 +1,40 @@ +From 3bfc67f1c1d724a1a5a1fea7651534c49cd83d95 Mon Sep 17 00:00:00 2001 +From: Marko Lindqvist <[email protected]> +Date: Mon, 07 Jan 2013 04:23:36 +0000 +Subject: configure.in: fix autoreconf with automake-1.13 + +Replace long obsolete AM_CONFIG_HEADER with proper AC_CONFIG_HEADERS. +automake-1.13 errors out upon seeing former. +Similarly remove AM_PROG_CC_STDC. It's proper replacement, AC_PROG_CC, +is already present. + +Signed-off-by: Marko Lindqvist <[email protected]> +--- +diff --git a/configure.in b/configure.in +index 473fca1..e777ed0 100644 +--- a/configure.in ++++ b/configure.in +@@ -44,14 +44,13 @@ AC_INIT([gtk+], [gtk_version], + [gtk+]) + + AC_CONFIG_SRCDIR([gdk/gdktypes.h]) +- ++AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_MACRO_DIR([m4]) + + # Save this value here, since automake will set cflags later + cflags_set=${CFLAGS+set} + + AM_INIT_AUTOMAKE([no-define -Wno-portability dist-bzip2]) +-AM_CONFIG_HEADER(config.h) + + # Support silent build rules, requires at least automake-1.11. Enable + # by either passing --enable-silent-rules to configure or passing V=0 +@@ -300,7 +299,6 @@ AM_SANITY_CHECK + + # Checks for programs. + AC_ISC_POSIX +-AM_PROG_CC_STDC + AM_PROG_CC_C_O + AC_PROG_INSTALL + AC_PROG_MAKE_SET _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
