From f2d4d962cdc4a6029a7dded933fe8bd2e38da033 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 26 Mar 2012 10:29:09 +0200 Subject: [PATCH] gtkhtml: update to 4.4.0. --- srcpkgs/gtkhtml/gtkhtml-devel.template | 20 ++++++++------------ srcpkgs/gtkhtml/gtkhtml.rshlibs | 1 - srcpkgs/gtkhtml/libgtkhtml.rshlibs | 4 ---- srcpkgs/gtkhtml/libgtkhtml.template | 3 +-- srcpkgs/gtkhtml/template | 14 +++----------- 5 files changed, 12 insertions(+), 30 deletions(-) diff --git a/srcpkgs/gtkhtml/gtkhtml-devel.template b/srcpkgs/gtkhtml/gtkhtml-devel.template index 6d420fc3a0..c9777eacb9 100644 --- a/srcpkgs/gtkhtml/gtkhtml-devel.template +++ b/srcpkgs/gtkhtml/gtkhtml-devel.template @@ -5,20 +5,16 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -Add_dependency run pkg-config -Add_dependency run gtk+3-devel -Add_dependency run glib-devel -Add_dependency run enchant-devel -Add_dependency run atk-devel -Add_dependency run pango-devel -Add_dependency run gdk-pixbuf-devel Add_dependency run cairo-devel -Add_dependency run freetype-devel -Add_dependency run fontconfig-devel -Add_dependency run libgtkhtml +Add_dependency run gtk+3-devel +Add_dependency run enchant-devel +Add_dependency run gsettings-desktop-schemas +Add_dependency run iso-codes +Add_dependency run libgtkhtml ">=${version}" -do_install() -{ +noarch=yes + +do_install() { vmove usr/include usr vmove usr/lib/pkgconfig usr/lib } diff --git a/srcpkgs/gtkhtml/gtkhtml.rshlibs b/srcpkgs/gtkhtml/gtkhtml.rshlibs index f423da332f..610ec87a98 100644 --- a/srcpkgs/gtkhtml/gtkhtml.rshlibs +++ b/srcpkgs/gtkhtml/gtkhtml.rshlibs @@ -2,7 +2,6 @@ libgtkhtml-editor-4.0.so.0 libgtkhtml-4.0.so.0 libgtk-3.so.0 libgobject-2.0.so.0 -libgthread-2.0.so.0 libglib-2.0.so.0 libpthread.so.0 libc.so.6 diff --git a/srcpkgs/gtkhtml/libgtkhtml.rshlibs b/srcpkgs/gtkhtml/libgtkhtml.rshlibs index b9f76452e1..dce2521757 100644 --- a/srcpkgs/gtkhtml/libgtkhtml.rshlibs +++ b/srcpkgs/gtkhtml/libgtkhtml.rshlibs @@ -4,17 +4,13 @@ libgtk-3.so.0 libgdk-3.so.0 libatk-1.0.so.0 libgio-2.0.so.0 -libpangoft2-1.0.so.0 libpangocairo-1.0.so.0 libgdk_pixbuf-2.0.so.0 libcairo-gobject.so.2 libcairo.so.2 libpango-1.0.so.0 -libfreetype.so.6 -libfontconfig.so.1 libgobject-2.0.so.0 libgmodule-2.0.so.0 -libgthread-2.0.so.0 librt.so.1 libglib-2.0.so.0 libm.so.6 diff --git a/srcpkgs/gtkhtml/libgtkhtml.template b/srcpkgs/gtkhtml/libgtkhtml.template index d291cc37a8..fc83574716 100644 --- a/srcpkgs/gtkhtml/libgtkhtml.template +++ b/srcpkgs/gtkhtml/libgtkhtml.template @@ -5,7 +5,6 @@ long_desc="${long_desc} This package contains the runtime libraries." -do_install() -{ +do_install() { vmove "usr/lib/*.so*" usr/lib } diff --git a/srcpkgs/gtkhtml/template b/srcpkgs/gtkhtml/template index 9078ea0337..11bd9e0284 100644 --- a/srcpkgs/gtkhtml/template +++ b/srcpkgs/gtkhtml/template @@ -1,13 +1,13 @@ # Template file for 'gtkhtml' pkgname=gtkhtml -version=4.2.3 -distfiles="${GNOME_SITE}/${pkgname}/4.2/${pkgname}-${version}.tar.xz" +version=4.4.0 +distfiles="${GNOME_SITE}/${pkgname}/4.4/${pkgname}-${version}.tar.xz" build_style=gnu-configure short_desc="Layout engine written in C using the GTK+ widget toolkit" maintainer="davehome " homepage="http://www.gnome.org" license="GPL-2" -checksum=e9867dafd5685a7887afe77f2eb584aeaf5f8e20df83100b8f24adcfc1e422d1 +checksum=9c07260cd5d20c6dfba42fe1e784fffc98af3a82ff5b7d05be3174d6b0bffe9d long_desc=" GtkHTML is a HTML rendering/editing library. It is not designed to be the ultimate HTML browser/editor; instead, it is designed to be easily embedded @@ -18,15 +18,7 @@ subpackages="lib${pkgname} ${pkgname}-devel" Add_dependency build pkg-config Add_dependency build intltool Add_dependency build gtk+3-devel -Add_dependency build glib-devel Add_dependency build enchant-devel -Add_dependency build atk-devel -Add_dependency build pango-devel -Add_dependency build gdk-pixbuf-devel -Add_dependency build cairo-devel -Add_dependency build freetype-devel -Add_dependency build fontconfig-devel -Add_dependency build libsoup-devel Add_dependency build libsoup-gnome-devel Add_dependency full gnome-icon-theme