From 9f7617eb4d067ce6ee93d38ae133d4d46ea3f54e Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Mon, 11 Feb 2019 22:08:12 +0100
Subject: [PATCH] klavaro: update to 3.04

closes #8544
---
 srcpkgs/klavaro/patches/linking-order.patch | 16 ++++++++++++++++
 srcpkgs/klavaro/template                    |  6 ++++--
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/klavaro/patches/linking-order.patch

diff --git a/srcpkgs/klavaro/patches/linking-order.patch b/srcpkgs/klavaro/patches/linking-order.patch
new file mode 100644
index 00000000000..3fe09b94a10
--- /dev/null
+++ b/srcpkgs/klavaro/patches/linking-order.patch
@@ -0,0 +1,16 @@
+When linking the libraries need to be in the proper order
+to prevent an undefined reference error.
+
+--- src/Makefile.in.orig
++++ src/Makefile.in
+@@ -369,8 +369,8 @@
+ AM_CFLAGS = -Wextra -I$(top_srcdir)/gtkdatabox $(am__append_1) \
+ 	$(am__append_3)
+ AM_LDFLAGS = -static
+-klavaro_LDADD = @GTK_LIBS@ -lgmodule-2.0 \
+-	$(top_srcdir)/gtkdatabox/libgtkdataboks.la $(am__append_2)
++klavaro_LDADD = $(top_srcdir)/gtkdatabox/libgtkdataboks.la $(am__append_2) @GTK_LIBS@ -lgmodule-2.0
++	
+ all: all-am
+ 
+ .SUFFIXES:
diff --git a/srcpkgs/klavaro/template b/srcpkgs/klavaro/template
index 5bc953897ea..0b5e162aab6 100644
--- a/srcpkgs/klavaro/template
+++ b/srcpkgs/klavaro/template
@@ -1,6 +1,6 @@
 # Template file for 'klavaro'
 pkgname=klavaro
-version=3.03
+version=3.04
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
@@ -10,8 +10,10 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-3.0-or-later"
 homepage="http://klavaro.sourceforge.net/en/"
 distfiles="${SOURCEFORGE_SITE}/klavaro/klavaro-${version}.tar.bz2"
-checksum=e0959f21e54e7f4700042a3a14987a7f8fc898701eab4f721ebcf4559a2c87b5
+checksum=0eafdf0e9294aafcdd17bc86824318c7cf80447b3f5687462282d836a3fd1b91
 
 post_install() {
 	rm ${DESTDIR}/usr/lib/*.{a,so}
+	rm -r ${DESTDIR}/usr/include
+	mv ${DESTDIR}/usr/{appdata,applications} ${DESTDIR}/usr/share
 }