diff --git a/common/shlibs b/common/shlibs index 71b00b3f7ad..d8e20574105 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1130,7 +1130,7 @@ libopusfile.so.0 opusfile-0.2_1 libopusurl.so.0 opusfile-0.6_1 libgtkaml.so.0 libgtkaml-0.5.94_1 libgtk-vnc-1.0.so.0 gtk2-vnc-0.4.4_2 -libgranite.so.3 granite-0.3.1_1 +libgranite.so.4 granite-0.5.0_1 libprotobuf-vala.so.0 libprotobuf-vala-0.1.0_1 librlog.so.5 librlog-1.4_1 libtinyxml.so.0 tinyxml-2.6.2_1 diff --git a/srcpkgs/granite/template b/srcpkgs/granite/template index 1ba153a4031..7eb2516819b 100644 --- a/srcpkgs/granite/template +++ b/srcpkgs/granite/template @@ -1,19 +1,20 @@ # Template file for 'granite' pkgname=granite -version=0.4.1 +version=0.5.0 revision=1 +create_wrksrc=yes build_style=cmake -hostmakedepends="pkg-config gobject-introspection vala-devel" +hostmakedepends="pkg-config gobject-introspection vala-devel libgee08-devel" makedepends="gtk+3-devel libgee08-devel" depends="hicolor-icon-theme" short_desc="GTK+3 extension providing commonly-used widgets" maintainer="Juan RP " homepage="https://launchpad.net/granite" license="LGPL-3" -distfiles="https://launchpad.net/granite/${version%.*}/${version}/+download/granite-${version}.tar.xz" -checksum=8bb411523e6cd5685c928dbfe08893892189cedf9fad5f537aa76182032cf09c +distfiles="https://launchpad.net/granite/${version%.*}/${version%.*}/+download/granite-${version%.*}.tar.xz" +checksum=2500819cc24f4a9c525389b4180bcdf09c4d63c953201f4650513842cb7a9521 -nocross="error: Package 'gee-0.8' not found in specified Vala API directories or GObject-Introspection GIR directories" +nocross="cross-compilation doesn't create gir- files, breaking applications that depend on it like pantheon-calculator" granite-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/pantheon-calculator/template b/srcpkgs/pantheon-calculator/template index f159ed8bd1a..ed5751647e5 100644 --- a/srcpkgs/pantheon-calculator/template +++ b/srcpkgs/pantheon-calculator/template @@ -1,7 +1,7 @@ # Template file for 'pantheon-calculator' pkgname=pantheon-calculator version=0.1.3 -revision=1 +revision=2 build_style=cmake hostmakedepends="bzr intltool pkg-config vala" makedepends="granite-devel gtk+3-devel" diff --git a/srcpkgs/pantheon-screenshot/template b/srcpkgs/pantheon-screenshot/template index 79d443bb214..65af66e2d4f 100644 --- a/srcpkgs/pantheon-screenshot/template +++ b/srcpkgs/pantheon-screenshot/template @@ -1,7 +1,7 @@ # Template file for 'pantheon-screenshot' pkgname=pantheon-screenshot version=0.1.4 -revision=1 +revision=2 build_style=cmake hostmakedepends="intltool pkg-config vala" makedepends="granite-devel gtk+3-devel libcanberra-devel" diff --git a/srcpkgs/pantheon-terminal/template b/srcpkgs/pantheon-terminal/template index 853ba777b58..67b4d0c4d47 100644 --- a/srcpkgs/pantheon-terminal/template +++ b/srcpkgs/pantheon-terminal/template @@ -1,7 +1,7 @@ # Template file for 'pantheon-terminal' pkgname=pantheon-terminal version=0.4.3 -revision=1 +revision=2 build_style=cmake wrksrc="terminal-${version}" configure_args="-DGSETTINGS_COMPILE=FALSE"