From 76c4382355c44f92e86b1b55ab728bff1b639ae9 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 3 Apr 2014 10:33:43 +0200 Subject: [PATCH] gimp: split shlibs into libgimp; use lib32disabled. --- common/shlibs | 18 +++++++++--------- srcpkgs/gimp/template | 15 +++++++++++++-- srcpkgs/libgimp | 1 + 3 files changed, 23 insertions(+), 11 deletions(-) create mode 120000 srcpkgs/libgimp diff --git a/common/shlibs b/common/shlibs index 3c9149ec95c..b2008af2ebd 100644 --- a/common/shlibs +++ b/common/shlibs @@ -497,15 +497,15 @@ libwebkitgtk-3.0.so.0 webkitgtk-2.0.0_1 libjavascriptcoregtk-1.0.so.0 webkit-gtk-1.3.12_1 libjavascriptcoregtk-3.0.so.0 webkitgtk-2.0.0_1 libwebkit2gtk-3.0.so.25 webkitgtk-2.0.0_1 -libgimp-2.0.so.0 gimp-2.6.6_1 -libgimpwidgets-2.0.so.0 gimp-2.6.6_1 -libgimpui-2.0.so.0 gimp-2.6.6_1 -libgimpbase-2.0.so.0 gimp-2.6.6_1 -libgimpthumb-2.0.so.0 gimp-2.6.6_1 -libgimpconfig-2.0.so.0 gimp-2.6.6_1 -libgimpmath-2.0.so.0 gimp-2.6.6_1 -libgimpcolor-2.0.so.0 gimp-2.6.6_1 -libgimpmodule-2.0.so.0 gimp-2.6.6_1 +libgimp-2.0.so.0 libgimp-2.8.10_3 +libgimpwidgets-2.0.so.0 libgimp-2.8.10_3 +libgimpui-2.0.so.0 libgimp-2.8.10_3 +libgimpbase-2.0.so.0 libgimp-2.8.10_3 +libgimpthumb-2.0.so.0 libgimp-2.8.10_3 +libgimpconfig-2.0.so.0 libgimp-2.8.10_3 +libgimpmath-2.0.so.0 libgimp-2.8.10_3 +libgimpcolor-2.0.so.0 libgimp-2.8.10_3 +libgimpmodule-2.0.so.0 libgimp-2.8.10_3 libexiv2.so.11 exiv2-0.22_1 libsearchclient.so.0 strigi-0.7.2_1 libstreamanalyzer.so.0 strigi-0.7.2_1 diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template index 7bf070ee178..3037b4fcd11 100644 --- a/srcpkgs/gimp/template +++ b/srcpkgs/gimp/template @@ -1,7 +1,8 @@ # Template build file for 'gimp'. pkgname=gimp version=2.8.10 -revision=2 +revision=3 +lib32disabled=yes build_style=gnu-configure configure_args="--without-aa --without-gvfs --enable-gimp-console --enable-python --with-gif-compression=lzw --with-libcurl --enable-mp" @@ -24,7 +25,7 @@ depends="desktop-file-utils hicolor-icon-theme iso-codes" maintainer="Juan RP " homepage="http://www.gimp.org" license="GPL-3" -distfiles="ftp://ftp.gimp.org/pub/gimp/v${version%.*}/gimp-$version.tar.bz2" +distfiles="http://mirror.ibcp.fr/pub/gimp/v2.8/gimp-${version}.tar.bz2" checksum=e7fd8b19f989138d826003c75f56bd5b6f136eef597e86e3978ede0bba470ae6 pre_configure() { @@ -32,7 +33,16 @@ pre_configure() { sed -e 's,freetype/tttables.h,freetype2/tttables.h,' -i app/text/gimpfont.c } +libgimp_package() { + replaces="gimp<2.8.10_3" + short_desc+=" - runtime libraries" + pkg_install() { + vmove usr/lib/*.so.* + } +} + gimp-devel_package() { + depends="libgimp>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include @@ -44,6 +54,7 @@ gimp-devel_package() { } gimp-python_package() { + lib32disabled=yes depends="pygtk" pycompile_dirs="usr/lib/gimp/2.0/python" short_desc+=" - python bindings" diff --git a/srcpkgs/libgimp b/srcpkgs/libgimp new file mode 120000 index 00000000000..92344a4bb4a --- /dev/null +++ b/srcpkgs/libgimp @@ -0,0 +1 @@ +gimp \ No newline at end of file