diff options
| author | T3slider <t3slider@gmail.com> | 2015-06-22 08:04:36 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2015-06-22 08:04:36 +0700 |
| commit | 9608658d7ec132c7e46ad43db852dc22b0c5c879 (patch) | |
| tree | 24584fecd16edbacd4321f68667ab3f353d58abc /academic | |
| parent | 62920d865bb60f8d1870bf0fbfae9efdd58d52bd (diff) | |
| download | slackbuilds-9608658d7ec132c7e46ad43db852dc22b0c5c879.tar.gz | |
academic/kurso: Workaround CRLF issue.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'academic')
| -rw-r--r-- | academic/kurso/datadir.patch | 16 | ||||
| -rw-r--r-- | academic/kurso/kurso.SlackBuild | 6 |
2 files changed, 4 insertions, 18 deletions
diff --git a/academic/kurso/datadir.patch b/academic/kurso/datadir.patch deleted file mode 100644 index f11c0727c7..0000000000 --- a/academic/kurso/datadir.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ur a/kurso4/main.cpp b/kurso4/main.cpp ---- a/kurso4/main.cpp 2012-06-08 22:08:38.000000000 -0400 -+++ b/kurso4/main.cpp 2015-06-13 19:56:29.789088113 -0400 -@@ -46,9 +46,12 @@ - QApplication a(argc, argv); - a.setApplicationName("Kurso4"); - -+ /* - Loko = QApplication::applicationDirPath(); - if (Loko.right(1) != "/") - Loko.append("/"); -+ */ -+ Loko = "/usr/share/kurso/"; - - QFontDatabase::addApplicationFont(":tiparoj/DejaVuSans.ttf"); - QFontDatabase::addApplicationFont(":tiparoj/DejaVuSans-Bold.ttf"); diff --git a/academic/kurso/kurso.SlackBuild b/academic/kurso/kurso.SlackBuild index 0717647c41..f66dc9d79b 100644 --- a/academic/kurso/kurso.SlackBuild +++ b/academic/kurso/kurso.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=kurso VERSION=${VERSION:-4.1.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} SRCTARNAM=kurso4_source SRCNAM=kurso4 @@ -73,7 +73,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -patch -p2 < $CWD/datadir.patch +sed -i -e '/.*Loko = QApplication.*/i \ /*\r' \ + -e '/Loko.append.*/a \ */\r\n Loko = "/usr/share/kurso/";\r' \ + main.cpp qmake \ QMAKE_CFLAGS="$SLKCFLAGS" \ |