From b0552ee23bc92b3f220f6d68017807f84aa3f08b Mon Sep 17 00:00:00 2001
From: NotKit <nekit1000@gmail.com>
Date: Wed, 24 Jan 2018 23:45:47 +0300
Subject: [PATCH] Update Maemo packages (fixes #1148) (#1157)

---
 maemo/gnome-menus/APKBUILD    | 27 +++++++++++++++++++++++++++
 maemo/gnome-menus2/APKBUILD   | 33 ---------------------------------
 maemo/hildon-desktop/APKBUILD | 12 +++++-------
 maemo/libmatchbox2/APKBUILD   |  6 +++---
 4 files changed, 35 insertions(+), 43 deletions(-)
 create mode 100644 maemo/gnome-menus/APKBUILD
 delete mode 100644 maemo/gnome-menus2/APKBUILD

diff --git a/maemo/gnome-menus/APKBUILD b/maemo/gnome-menus/APKBUILD
new file mode 100644
index 000000000..3556cbf30
--- /dev/null
+++ b/maemo/gnome-menus/APKBUILD
@@ -0,0 +1,27 @@
+pkgname=gnome-menus
+pkgver=3.13.3
+pkgrel=0
+pkgdesc='Library for the Desktop Menu Specification'
+arch="all"
+url='http://www.gnome.org/'
+license="LGPL"
+depends="glib"
+makedepends="gobject-introspection intltool python-dev glib-dev"
+subpackages="$pkgname-dev"
+source="http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
+
+builddir="$srcdir/${pkgname}-$pkgver"
+
+build() {
+    cd "$builddir"
+
+    export PYTHON='/usr/bin/python2'
+    ./configure --prefix='/usr' --sysconfdir='/etc' --localstatedir='/var' --disable-static
+    make
+}
+
+package(){
+    cd "$builddir"
+    make DESTDIR="${pkgdir}" install
+}
+sha512sums="d631eb17ddc1b33227d0e5862a9344a8605ee1e9ebc1f12ce4ac98895adaf8a82ef2a49415d99bc194a02f30f30c3d6d49759f280fbc246c9e482711fd5021d2  gnome-menus-3.13.3.tar.xz"
diff --git a/maemo/gnome-menus2/APKBUILD b/maemo/gnome-menus2/APKBUILD
deleted file mode 100644
index f0ab96949..000000000
--- a/maemo/gnome-menus2/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-pkgname=gnome-menus2
-pkgver=3.0.1
-pkgrel=3
-pkgdesc='Library for the Desktop Menu Specification (legacy version)'
-arch="all"
-url='http://www.gnome.org/'
-license="LGPL"
-depends="glib"
-makedepends="gobject-introspection intltool python-dev glib-dev"
-subpackages="$pkgname-dev"
-source="http://ftp.gnome.org/pub/gnome/sources/${pkgname%2}/${pkgver%.*}/${pkgname%2}-${pkgver}.tar.bz2"
-
-prepare() {
-	default_prepare
-	update_config_sub
-	update_config_guess
-}
-
-build() {
-    cd "$srcdir/${pkgname%2}-$pkgver"
-
-    export PYTHON='/usr/bin/python2'
-    ./configure --prefix='/usr' --sysconfdir='/etc' --localstatedir='/var' --disable-static
-    make
-}
-
-package(){
-    cd "$srcdir/${pkgname%2}-$pkgver"
-
-    make -C libmenu DESTDIR="${pkgdir}" install
-    make -C python DESTDIR="${pkgdir}" install
-}
-sha512sums="05eda56b741d7236b17276b3b208b8370ec8ff0db82e32a2c0adb84334c4d9365fe61dea08183858fb7c0093cf04a02ba1311483e3318dbe816a02c28f4198eb  gnome-menus-3.0.1.tar.bz2"
diff --git a/maemo/hildon-desktop/APKBUILD b/maemo/hildon-desktop/APKBUILD
index f576b57ac..a4943a9a5 100644
--- a/maemo/hildon-desktop/APKBUILD
+++ b/maemo/hildon-desktop/APKBUILD
@@ -1,15 +1,15 @@
 pkgname=hildon-desktop
-pkgver=2.2.155
-pkgrel=3
+pkgver=2.2.157.6
+pkgrel=0
 pkgdesc="Hildon desktop for Fremantle"
 arch="all"
 url="https://github.com/maemo-leste/hildon-desktop"
 license="GPL"
-depends="libhildon libmatchbox2 libhildondesktop clutter gnome-menus2 profiled"
+depends="libhildon libmatchbox2 libhildondesktop clutter gnome-menus profiled"
 makedepends="
 	autoconf
 	automake
-	gnome-menus2-dev
+	gnome-menus-dev
 	libhildondesktop-dev
 	libmatchbox2-dev
 	mce-headers
@@ -22,8 +22,6 @@ prepare() {
 	cd "$builddir"
 	sed -i -e 's/libpng12/libpng/g' configure.ac
 	sed -i -e 's/g_return_if_fail (!render_manager->priv->zoomed);//g' src/home/hd-render-manager.c
-	# Temp workaround for top-left button to appear in QEMU x86_64
-	sed -i -e 's/MB_WM_OBJECT_TYPE(c)==HD_TYPE_TITLE_BAR/G_TYPE_CHECK_INSTANCE_TYPE(c, HD_TYPE_TITLE_BAR)/g' src/home/hd-title-bar.h
 }
 
 build() {
@@ -37,4 +35,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir/" install
 }
-sha512sums="5cc45cbf9bc179298d1cdab860e5793922bc8768f5e636ddfbd4730eabef889d5c6f74d59668e982f762fe3d6c1e166071f246fa97d9fe6599ca18504ee87c40  hildon-desktop-2.2.155.tar.gz"
+sha512sums="c8d40ae74c94c490113191ab1abbb9c0b9b9cef9cd1a0c1a86eb5467f91fd3d6a78e42275714cf9e0a306fd83e1b2086cdf6f3995679bfe8c7e5a7a396fce16b  hildon-desktop-2.2.157.6.tar.gz"
diff --git a/maemo/libmatchbox2/APKBUILD b/maemo/libmatchbox2/APKBUILD
index 9a458229c..bd560f26f 100644
--- a/maemo/libmatchbox2/APKBUILD
+++ b/maemo/libmatchbox2/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=libmatchbox2
-pkgver=0.2.92
-pkgrel=2
+pkgver=0.2.94
+pkgrel=0
 pkgdesc="Library for Matchbox Project applications"
 arch="all"
 url="https://github.com/maemo-leste/libmatchbox2"
@@ -31,4 +31,4 @@ package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir/" install
 }
-sha512sums="67abf8db2c1a301a5b3cd81debb306a475066b6de888c5280bb427cbbd689b84d65136f2b49e3f49d3039625f2f5ff55d420e7595f460a433d57298c610862fe  libmatchbox2-0.2.92.tar.gz"
+sha512sums="06730e290b2c1b0edac715f5742a3de00d0cc981f2e33387d5b5345b5f0beec301aa97c38564918d49c4548fef7504b4eafd6826211d9bf9000cc5b6501e19eb  libmatchbox2-0.2.94.tar.gz"