nixphoeni 15/01/09 02:02:49
Added: klavaro-3.0.1-datadir.patch
klavaro-3.0.1-out-of-source.patch
klavaro-desktop-keywords.patch
klavaro-3.0.1-static.patch
Log:
Version bump; fix install directory for .desktop and appdata files; fix
license
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
84E08386)
Revision Changes Path
1.1 app-misc/klavaro/files/klavaro-3.0.1-datadir.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/klavaro/files/klavaro-3.0.1-datadir.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/klavaro/files/klavaro-3.0.1-datadir.patch?rev=1.1&content-type=text/plain
Index: klavaro-3.0.1-datadir.patch
===================================================================
--- data/Makefile.am 2014-12-18 23:16:47.513887559 -0500
+++ data/Makefile.am 2014-12-18 23:16:59.060609420 -0500
@@ -151,11 +151,11 @@
EXTRA_DIST = $(klavaro_data)
else
@INTLTOOL_DESKTOP_RULE@
-desktopdir = $(prefix)/$(DATADIRNAME)/applications
+desktopdir = $(datadir)/applications
desktop_in_file = klavaro.desktop.in
desktop_DATA = $(desktop_in_file:.desktop.in=.desktop)
@INTLTOOL_XML_RULE@
-appdatadir = $(prefix)/$(DATADIRNAME)/appdata
+appdatadir = $(datadir)/appdata
appdata_in_files = klavaro.appdata.xml.in
appdata_DATA = $(appdata_in_files:.xml.in=.xml)
DISTCLEANFILES = $(desktop_DATA) \
--- src/Makefile.am 2014-12-18 23:17:35.956725053 -0500
+++ src/Makefile.am 2014-12-18 23:17:45.309501898 -0500
@@ -20,7 +20,7 @@
AM_CPPFLAGS = @GTK_CFLAGS@ \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
- -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
+ -DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\"
AM_CFLAGS = -Wextra \
-I$(top_srcdir)/gtkdatabox
1.1 app-misc/klavaro/files/klavaro-3.0.1-out-of-source.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/klavaro/files/klavaro-3.0.1-out-of-source.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/klavaro/files/klavaro-3.0.1-out-of-source.patch?rev=1.1&content-type=text/plain
Index: klavaro-3.0.1-out-of-source.patch
===================================================================
--- src/Makefile.am 2014-09-05 10:26:56.000000000 -0400
+++ src/Makefile.am 2014-12-18 21:27:55.443335860 -0500
@@ -29,7 +29,7 @@
klavaro_LDADD = @GTK_LIBS@ \
-lgmodule-2.0 \
- $(top_srcdir)/gtkdatabox/libgtkdataboks.la
+ $(top_builddir)/gtkdatabox/libgtkdataboks.la
if IS_POSIX
AM_CFLAGS += -export-dynamic
1.1 app-misc/klavaro/files/klavaro-desktop-keywords.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/klavaro/files/klavaro-desktop-keywords.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/klavaro/files/klavaro-desktop-keywords.patch?rev=1.1&content-type=text/plain
Index: klavaro-desktop-keywords.patch
===================================================================
--- data/klavaro.desktop.in 2015-01-07 21:52:37.877646655 -0500
+++ data/klavaro.desktop.in 2015-01-07 21:52:56.391720366 -0500
@@ -2,7 +2,7 @@
Name=Klavaro
_Comment=A very flexible and efficient touch typing tutor.
# Translators: these are keywords related to the program. CAI above means
Computer Aided Instruction. Feel free to add and/or change the keywords in your
language.
-_Keywords=keyboard;typing;tutor;CAI
+_Keywords=keyboard;typing;tutor;CAI;
Exec=klavaro
Icon=klavaro
1.1 app-misc/klavaro/files/klavaro-3.0.1-static.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/klavaro/files/klavaro-3.0.1-static.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/klavaro/files/klavaro-3.0.1-static.patch?rev=1.1&content-type=text/plain
Index: klavaro-3.0.1-static.patch
===================================================================
--- gtkdatabox/Makefile.am 2014-12-18 21:26:18.129806730 -0500
+++ gtkdatabox/Makefile.am 2014-12-18 21:26:30.528364491 -0500
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libgtkdataboks.la
+noinst_LTLIBRARIES = libgtkdataboks.la
libgtkdataboks_la_SOURCES= \
gtkdatabox.c\
gtkdatabox_marshal.c\
