* [gentoo-commits] proj/kde:master commit in: kde-base/kdebase-startkde/files/
@ 2011-03-24 14:51 Tomas Chvatal
0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal @ 2011-03-24 14:51 UTC (permalink / raw
To: gentoo-commits
commit: af7b5a568f59150005c59a99b5b81d6e0c1c3a43
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 24 14:30:06 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Thu Mar 24 14:30:06 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=af7b5a56
[kde-base/kdebase-startkde] Detect only our string, not if it is subset of some another one.
---
.../files/gentoo-startkde4-3.patch | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kde-base/kdebase-startkde/files/gentoo-startkde4-3.patch b/kde-base/kdebase-startkde/files/gentoo-startkde4-3.patch
index 13b30f0..241dfdf 100644
--- a/kde-base/kdebase-startkde/files/gentoo-startkde4-3.patch
+++ b/kde-base/kdebase-startkde/files/gentoo-startkde4-3.patch
@@ -12,7 +12,7 @@
+@REPLACE_LDPATH@
+export STRIGI_PLUGIN_PATH="${_KDEDIR}/@REPLACE_LIBDIR@/strigi:${STRIGI_PLUGIN_PATH}"
+xdgs=$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#@GENTOO_PORTAGE_EPREFIX@/usr/kde/[^/]*/share/\?:##g;s/:$//g')
-+if [ $(echo $xdgs |grep -c "${_KDEDIR}/share") -eq 0 ]; then
++if [ $(echo $xdgs |grep -c -w "${_KDEDIR}/share") -eq 0 ]; then
+ xdgs="${_KDEDIR}/share:${xdgs}"
+fi
+export XDG_DATA_DIRS=${xdgs}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-base/kdebase-startkde/files/
@ 2011-03-24 15:20 Tomas Chvatal
0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal @ 2011-03-24 15:20 UTC (permalink / raw
To: gentoo-commits
commit: cd80c4b511ce7ff5f17bb983f7564ea4dd4dc061
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 24 15:18:30 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Thu Mar 24 15:18:30 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=cd80c4b5
kdebase-startkde use regexp pattern to be 100% sure.
---
.../files/gentoo-startkde4-3.patch | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kde-base/kdebase-startkde/files/gentoo-startkde4-3.patch b/kde-base/kdebase-startkde/files/gentoo-startkde4-3.patch
index 241dfdf..36829fd 100644
--- a/kde-base/kdebase-startkde/files/gentoo-startkde4-3.patch
+++ b/kde-base/kdebase-startkde/files/gentoo-startkde4-3.patch
@@ -12,7 +12,7 @@
+@REPLACE_LDPATH@
+export STRIGI_PLUGIN_PATH="${_KDEDIR}/@REPLACE_LIBDIR@/strigi:${STRIGI_PLUGIN_PATH}"
+xdgs=$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#@GENTOO_PORTAGE_EPREFIX@/usr/kde/[^/]*/share/\?:##g;s/:$//g')
-+if [ $(echo $xdgs |grep -c -w "${_KDEDIR}/share") -eq 0 ]; then
++if [ $(echo $xdgs |grep -c -E "(:|^)${_KDEDIR}/share(:|$)") -eq 0 ]; then
+ xdgs="${_KDEDIR}/share:${xdgs}"
+fi
+export XDG_DATA_DIRS=${xdgs}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-base/kdebase-startkde/files/
@ 2011-03-24 13:25 Tomas Chvatal
0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal @ 2011-03-24 13:25 UTC (permalink / raw
To: gentoo-commits
commit: 2cf377eb2c03c6648fc1570af073e2e3875df5df
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 24 13:25:31 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Thu Mar 24 13:25:31 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2cf377eb
kdebase-startkde fixup string comparsion to be posixish.
---
.../files/gentoo-startkde4-3.patch | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kde-base/kdebase-startkde/files/gentoo-startkde4-3.patch b/kde-base/kdebase-startkde/files/gentoo-startkde4-3.patch
index 90c1ea2..13b30f0 100644
--- a/kde-base/kdebase-startkde/files/gentoo-startkde4-3.patch
+++ b/kde-base/kdebase-startkde/files/gentoo-startkde4-3.patch
@@ -12,7 +12,7 @@
+@REPLACE_LDPATH@
+export STRIGI_PLUGIN_PATH="${_KDEDIR}/@REPLACE_LIBDIR@/strigi:${STRIGI_PLUGIN_PATH}"
+xdgs=$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#@GENTOO_PORTAGE_EPREFIX@/usr/kde/[^/]*/share/\?:##g;s/:$//g')
-+if [ "$xdgs" != *"${_KDEDIR}/share"* ]; then
++if [ $(echo $xdgs |grep -c "${_KDEDIR}/share") -eq 0 ]; then
+ xdgs="${_KDEDIR}/share:${xdgs}"
+fi
+export XDG_DATA_DIRS=${xdgs}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-03-24 15:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-24 14:51 [gentoo-commits] proj/kde:master commit in: kde-base/kdebase-startkde/files/ Tomas Chvatal
-- strict thread matches above, loose matches on Subject: below --
2011-03-24 15:20 Tomas Chvatal
2011-03-24 13:25 Tomas Chvatal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox