Merge pull request #5152 from the-maldridge/fix-cinnamon

Fix cinnamon

common/shlibs

@@ -2656,3 +2656,4 @@ libpcre2-8.so.0 libpcre2-10.22_1
 libpcre2-posix.so.1 libpcre2-10.22_1
 libgnome-autoar-0.so.0 gnome-autoar-0.1.1_1
 libgnome-autoar-gtk-0.so.0 gnome-autoar-0.1.1_1
+libxapp.so.1 xapps-1.0.2_1

srcpkgs/cinnamon-screensaver/template

@@ -1,7 +1,7 @@
 # Template file for 'cinnamon-screensaver'
 pkgname=cinnamon-screensaver
 version=3.2.0
-revision=1
+revision=2
 short_desc="The Cinnamon screensaver"
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile --with-mit-ext"
@@ -9,7 +9,7 @@ hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection
  gettext-devel glib-devel intltool python3-devel"
 makedepends="dbus-glib-devel libgnomekbd-devel cinnamon-desktop-devel
  libXxf86misc-devel pam-devel webkit2gtk-devel python3-devel"
-depends="cinnamon-translations desktop-file-utils hicolor-icon-theme"
+depends="cinnamon-translations desktop-file-utils hicolor-icon-theme python3-gobject xapps"
 conf_files="/etc/pam.d/${pkgname}"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-3"

srcpkgs/cinnamon/template

@@ -1,7 +1,7 @@
 # Template file for 'cinnamon'
 pkgname=cinnamon
 version=3.2.1
-revision=1
+revision=2
 wrksrc="Cinnamon-${version}"
 short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ depends="
  cinnamon-control-center>=${version%.*} cinnamon-screensaver>=${version%.*} cinnamon-translations>=${version%.*} nemo>=${version%.*}
  gnome-themes-standard gnome-themes-standard-metacity gnome-backgrounds network-manager-applet
  python-cairo python-dbus python-pam python-pexpect python-inotify python-lxml python-Pillow
- polkit-gnome upower0"
+ polkit-gnome upower0 libkeybinder3"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-3"
 homepage="http://cinnamon.linuxmint.com/"

srcpkgs/libgnomekbd/template

@@ -1,6 +1,6 @@
 # Template file for 'libgnomekbd'
 pkgname=libgnomekbd
-version=3.22.0
+version=3.22.0.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -11,8 +11,8 @@ short_desc="Gnome keyboard configuration library"
 homepage="http://gnome.org/"
 license="GPL-2"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=340b30dabfebbd4e0e6c0fe34a378966dd5640b5d44595ab8a19b0be255d77df
+distfiles="${GNOME_SITE}/$pkgname/3.22/$pkgname-$version.tar.xz"
+checksum=4efdb6b8ec92f04caced710b5edb285fb27715059ed6ca5e100b6933999a93de
 
 build_options="gir"
 if [ -z "$CROSS_BUILD" ]; then

srcpkgs/xapps-devel

@@ -0,0 +1 @@
+xapps

srcpkgs/xapps/patches/paster.patch

@@ -0,0 +1,11 @@
+--- files/usr/bin/pastebin.orig	2016-11-10 01:27:40.693838803 -0600
++++ files/usr/bin/pastebin	2016-11-10 01:28:05.234837754 -0600
+@@ -22,7 +22,7 @@
+         content = str_args
+ 
+ if content != "":
+-    for paster in ['/usr/bin/gist-paste', '/usr/bin/fpaste']:
++    for paster in ['/usr/bin/gist']:
+         if os.path.exists(paster):
+             p = subprocess.Popen([paster], stdin=subprocess.PIPE)
+             p.communicate(content.encode("UTF-8"))

srcpkgs/xapps/template

@@ -0,0 +1,28 @@
+# Template file for 'xapps'
+pkgname=xapps
+version=1.0.2
+revision=1
+build_style=gnu-configure
+hostmakedepends="gnome-common glib-devel intltool pkg-config libtool intltool"
+makedepends="gettext-devel gobject-introspection gtk+3-devel gdk-pixbuf-devel libgnomekbd-devel"
+depends="inxi gist xfconf"
+short_desc="Cross-desktop libraries and common resources from Linux Mint"
+maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+license="GPL-2"
+homepage="https://github.com/linuxmint/xapps"
+distfiles="https://github.com/linuxmint/xapps/archive/${version}.tar.gz"
+checksum=1443e9f319763f8b90749ea9669880005f315af060f7bbaa2b4241b4c4ca49a4
+
+pre_configure() {
+	./autogen.sh
+}
+
+xapps-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/lib/libxapp.so
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}