diff --git a/common/shlibs b/common/shlibs index c9fa6e8a564..72c24cc4b20 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1221,7 +1221,7 @@ libopusfile.so.0 opusfile-0.2_1 libopusurl.so.0 opusfile-0.6_1 libopusenc.so.0 libopusenc-0.2_1 libgtk-vnc-1.0.so.0 gtk2-vnc-0.4.4_2 -libgranite.so.4 granite-0.5.0_1 +libgranite.so.5 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/patches/fix-build-with-vala-0-42.patch b/srcpkgs/granite/patches/fix-build-with-vala-0-42.patch deleted file mode 100644 index 037d1f270c3..00000000000 --- a/srcpkgs/granite/patches/fix-build-with-vala-0-42.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- lib/Widgets/SeekBar.vala -+++ lib/Widgets/SeekBar.vala -@@ -26,7 +26,7 @@ - - public class Granite.SeekBar : Gtk.Grid { - private double _playback_duration; -- private double _playback_progress; -+ private double _playback_progress = 0.0; - - /* - * The time of the full duration of the playback. -@@ -68,7 +68,6 @@ public class Granite.SeekBar : Gtk.Grid { - scale.set_value (progress); - progression_label.label = DateTime.seconds_to_time ((int) (progress * playback_duration)); - } -- default = 0.0; - } - - /* ---- lib/Widgets/StorageBar.vala -+++ lib/Widgets/StorageBar.vala -@@ -83,7 +83,7 @@ public class Granite.Widgets.StorageBar : Gtk.Box { - } - } - -- private uint64 _total_usage; -+ private uint64 _total_usage = 0; - - public uint64 total_usage { - get { -@@ -94,8 +94,6 @@ public class Granite.Widgets.StorageBar : Gtk.Box { - _total_usage = uint64.min (value, storage); - update_size_description (); - } -- -- default = 0; - } - - public int inner_margin_sides { - diff --git a/srcpkgs/granite/template b/srcpkgs/granite/template index 7eb2516819b..b57edeb753b 100644 --- a/srcpkgs/granite/template +++ b/srcpkgs/granite/template @@ -1,18 +1,17 @@ # Template file for 'granite' pkgname=granite -version=0.5.0 +version=5.1.0 revision=1 -create_wrksrc=yes build_style=cmake 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=2500819cc24f4a9c525389b4180bcdf09c4d63c953201f4650513842cb7a9521 +homepage="https://github.com/elementary/granite" +license="LGPL-3.0-or-later" +distfiles="https://github.com/elementary/granite/archive/${version}.tar.gz" +checksum=4483399c62bf4cf5c26a6b708736b2b80caae8d40a0452be45548f7e8f23e0ed nocross="cross-compilation doesn't create gir- files, breaking applications that depend on it like pantheon-calculator"