From b323557c9baa53e58a5c7237907d1f907b08aa7f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 16 Jan 2012 17:22:47 +0100 Subject: [PATCH] openbox: update to 3.5.0. --- common/shlibs | 2 ++ srcpkgs/libopenbox | 1 + srcpkgs/openbox-devel | 1 + srcpkgs/openbox/depends | 2 ++ srcpkgs/openbox/libopenbox.rshlibs | 22 ++++++++++++++++++++ srcpkgs/openbox/libopenbox.template | 11 ++++++++++ srcpkgs/openbox/openbox-devel.template | 15 ++++++++++++++ srcpkgs/openbox/openbox.rshlibs | 15 +++----------- srcpkgs/openbox/template | 28 ++++++++++++++------------ 9 files changed, 72 insertions(+), 25 deletions(-) create mode 120000 srcpkgs/libopenbox create mode 120000 srcpkgs/openbox-devel create mode 100644 srcpkgs/openbox/depends create mode 100644 srcpkgs/openbox/libopenbox.rshlibs create mode 100644 srcpkgs/openbox/libopenbox.template create mode 100644 srcpkgs/openbox/openbox-devel.template diff --git a/common/shlibs b/common/shlibs index bd16df7187..11e8ecf392 100644 --- a/common/shlibs +++ b/common/shlibs @@ -944,3 +944,5 @@ libmdbsql.so.0 libmdb mdbtools-devel libkmod.so.1 libkmod libkmod-devel libestr.so.0 libestr libestr-devel libee.so.0 libee libee-devel +libobt.so.0 libopenbox openbox-devel +libobrender.so.27 libopenbox openbox-devel diff --git a/srcpkgs/libopenbox b/srcpkgs/libopenbox new file mode 120000 index 0000000000..32be1cdf0f --- /dev/null +++ b/srcpkgs/libopenbox @@ -0,0 +1 @@ +openbox \ No newline at end of file diff --git a/srcpkgs/openbox-devel b/srcpkgs/openbox-devel new file mode 120000 index 0000000000..32be1cdf0f --- /dev/null +++ b/srcpkgs/openbox-devel @@ -0,0 +1 @@ +openbox \ No newline at end of file diff --git a/srcpkgs/openbox/depends b/srcpkgs/openbox/depends new file mode 100644 index 0000000000..de997e86d8 --- /dev/null +++ b/srcpkgs/openbox/depends @@ -0,0 +1,2 @@ +abi_depends=">=3.5.0" +api_depends="${abi_depends}" diff --git a/srcpkgs/openbox/libopenbox.rshlibs b/srcpkgs/openbox/libopenbox.rshlibs new file mode 100644 index 0000000000..4ccfd963f1 --- /dev/null +++ b/srcpkgs/openbox/libopenbox.rshlibs @@ -0,0 +1,22 @@ +libSM.so.6 +libICE.so.6 +libpangoxft-1.0.so.0 +libpangoft2-1.0.so.0 +libXft.so.2 +libpango-1.0.so.0 +libgobject-2.0.so.0 +libgmodule-2.0.so.0 +libgthread-2.0.so.0 +librt.so.1 +libXrender.so.1 +libfontconfig.so.1 +libfreetype.so.6 +libX11.so.6 +libglib-2.0.so.0 +libImlib2.so.1 +libxml2.so.2 +libpthread.so.0 +libc.so.6 +libXinerama.so.1 +libXrandr.so.2 +libXext.so.6 diff --git a/srcpkgs/openbox/libopenbox.template b/srcpkgs/openbox/libopenbox.template new file mode 100644 index 0000000000..a456fde761 --- /dev/null +++ b/srcpkgs/openbox/libopenbox.template @@ -0,0 +1,11 @@ +# Template file for 'libopenbox'. +# +short_desc="openbox runtime shared libraries" +long_desc=" + ${long_desc} + + This package includes the runtime shared libraries." + +do_install() { + vmove "usr/lib/*.so*" usr/lib +} diff --git a/srcpkgs/openbox/openbox-devel.template b/srcpkgs/openbox/openbox-devel.template new file mode 100644 index 0000000000..44300124ec --- /dev/null +++ b/srcpkgs/openbox/openbox-devel.template @@ -0,0 +1,15 @@ +# Template file for 'openbox-devel'. +# +short_desc="openbox development files" +long_desc=" + ${long_desc} + + This package includes development files: headers, static libs, etc." + +Add_dependency run libopenbox + +do_install() { + vmove "usr/lib/*.a" usr/lib + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib +} diff --git a/srcpkgs/openbox/openbox.rshlibs b/srcpkgs/openbox/openbox.rshlibs index d7735d32ee..8a47e63cbd 100644 --- a/srcpkgs/openbox/openbox.rshlibs +++ b/srcpkgs/openbox/openbox.rshlibs @@ -1,4 +1,3 @@ -libXinerama.so.1 libXrandr.so.2 libXext.so.6 libglib-2.0.so.0 @@ -10,15 +9,7 @@ libstartup-notification-1.so.0 libxml2.so.2 libc.so.6 libXau.so.6 -libpangoxft-1.0.so.0 -libpangoft2-1.0.so.0 -libpango-1.0.so.0 -libgobject-2.0.so.0 -libgmodule-2.0.so.0 -libgthread-2.0.so.0 -librt.so.1 -libXft.so.2 -libXrender.so.1 -libfontconfig.so.1 -libfreetype.so.6 libpthread.so.0 +libXinerama.so.1 +libobrender.so.27 +libobt.so.0 diff --git a/srcpkgs/openbox/template b/srcpkgs/openbox/template index 4836faafca..ea8e3a9181 100644 --- a/srcpkgs/openbox/template +++ b/srcpkgs/openbox/template @@ -1,13 +1,14 @@ # Template file for 'openbox' pkgname=openbox -version=3.4.10 +version=3.5.0 +homepage="http://www.openbox.org" distfiles="http://icculus.org/openbox/releases/$pkgname-$version.tar.gz" build_style=gnu-configure configure_args="--enable-startup-notification" -revision=1 short_desc="Standards compliant, fast, light-weight, extensible window manager" maintainer="Juan RP " -checksum=20356f93c3334c3209284fba2628a9c48c3140a35febd0bdafa3a164d0eaed00 +license="GPL-2" +checksum=6fa90016530b3aa6102e254079461977439398531fb23e7ec076ff2c140fea0a long_desc=" Openbox works with your applications, and makes your desktop easier to manage. This is because the approach to its development was the opposite of @@ -29,18 +30,19 @@ long_desc=" * Multi-head Xinerama support! * Pipe menus" +subpackages="${pkgname}-devel lib${pkgname}" + conf_files=" /etc/xdg/openbox/menu.xml /etc/xdg/openbox/rc.xml -/etc/xdg/openbox/autostart.sh" +/etc/xdg/openbox/environment +/etc/xdg/openbox/autostart" Add_dependency build pkg-config - -_deps="fontconfig freetype glib pango libICE libSM libX11 libXau libXcursor" -_deps="${_deps} libXext libXft libXinerama libXrandr libXrender libxml2" -_deps="${_deps} startup-notification" - -for _dep_ in ${_deps}; do - Add_dependency run ${_dep_} - Add_dependency build ${_dep_}-devel -done +Add_dependency build startup-notification-devel +Add_dependency build libxml2-devel +Add_dependency build libXrandr-devel +Add_dependency build libXcursor-devel +Add_dependency build libXinerama-devel +Add_dependency build imlib2-devel +Add_dependency build pango-devel