1
0
mirror of https://github.com/gryf/gryf-overlay.git synced 2026-03-14 15:25:50 +01:00

Added experimental klavaro version and fixed 3.01

This commit is contained in:
2021-06-01 07:27:40 +02:00
parent 471f7edf4e
commit 2ec8c02814
11 changed files with 221 additions and 0 deletions

View File

@@ -0,0 +1,27 @@
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -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) \
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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

View File

@@ -0,0 +1,11 @@
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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

View File

@@ -0,0 +1,8 @@
--- a/gtkdatabox/Makefile.am
+++ b/gtkdatabox/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libgtkdataboks.la
+noinst_LTLIBRARIES = libgtkdataboks.la
libgtkdataboks_la_SOURCES= \
gtkdatabox.c\
gtkdatabox_marshal.c\

View File

@@ -0,0 +1,29 @@
diff -ur klavaro-3.04_orig/data/Makefile.am klavaro-3.04/data/Makefile.am
--- klavaro-3.04_orig/data/Makefile.am 2019-02-01 20:18:40.000000000 +0100
+++ klavaro-3.04/data/Makefile.am 2021-05-31 10:12:24.837980990 +0200
@@ -168,11 +168,11 @@
EXTRA_DIST = $(klavaro_data)
else
@INTLTOOL_DESKTOP_RULE@
-desktopdir = $(prefix)/$(DATADIRNAME)/applications
+desktopdir = $(datadir)/$(DATADIRNAME)/applications
desktop_in_file = klavaro.desktop.in
desktop_DATA = $(desktop_in_file:.desktop.in=.desktop)
@INTLTOOL_XML_RULE@
-appdatadir = $(prefix)/$(DATADIRNAME)/appdata
+appdatadir = $(datadir)/$(DATADIRNAME)/appdata
appdata_in_files = klavaro.appdata.xml.in
appdata_DATA = $(appdata_in_files:.xml.in=.xml)
DISTCLEANFILES = $(desktop_DATA) \
diff -ur klavaro-3.04_orig/src/Makefile.am klavaro-3.04/src/Makefile.am
--- klavaro-3.04_orig/src/Makefile.am 2021-05-31 10:07:46.469974196 +0200
+++ klavaro-3.04/src/Makefile.am 2021-05-31 10:13:11.897982139 +0200
@@ -20,7 +20,7 @@
AM_CPPFLAGS = @GTK_CFLAGS@ \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
- -DPACKAGE_LOCALE_DIR=\""$(localedir)"\"
+ -DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\"
AM_CFLAGS = -Wextra \
-I$(top_srcdir)/gtkdatabox

View File

@@ -0,0 +1,12 @@
diff -ur klavaro-3.04_orig/data/klavaro.desktop.in klavaro-3.04/data/klavaro.desktop.in
--- klavaro-3.04_orig/data/klavaro.desktop.in 2017-06-25 14:00:33.000000000 +0200
+++ klavaro-3.04/data/klavaro.desktop.in 2021-05-31 10:14:51.309984565 +0200
@@ -3,7 +3,7 @@
_GenericName=Yet another touch typing tutor
_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

View File

@@ -0,0 +1,12 @@
diff -ur klavaro-3.04_orig/src/Makefile.am klavaro-3.04/src/Makefile.am
--- klavaro-3.04_orig/src/Makefile.am 2019-01-31 22:55:16.000000000 +0100
+++ klavaro-3.04/src/Makefile.am 2021-05-31 10:07:46.469974196 +0200
@@ -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

View File

@@ -0,0 +1,11 @@
diff -ur klavaro-3.04_orig/gtkdatabox/Makefile.am klavaro-3.04/gtkdatabox/Makefile.am
--- klavaro-3.04_orig/gtkdatabox/Makefile.am 2019-02-02 21:04:48.000000000 +0100
+++ klavaro-3.04/gtkdatabox/Makefile.am 2021-05-31 10:11:00.705978936 +0200
@@ -1,6 +1,6 @@
# From gtkdatabox git repo, adapted
-lib_LTLIBRARIES = libgtkdataboks.la
+noinst_LTLIBRARIES = libgtkdataboks.la
libgtkdataboks_la_SOURCES= \
gtkdatabox.c\
gtkdatabox_marshal.c\

View File

@@ -0,0 +1,11 @@
--- a/data/klavaro.desktop.in
+++ b/data/klavaro.desktop.in
@@ -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