From b29a0d2c8447e55abf97a6be921937775e8ffc17 Mon Sep 17 00:00:00 2001 From: Ray-V Date: Tue, 12 Jun 2018 14:42:30 +0100 Subject: [PATCH] make default tdm screen text clearer against dark background and align login button with clickable area added option for language specific patches to tde-i18n.SlackBuild --- Core/tde-i18n/README | 6 ++++++ Core/tde-i18n/tde-i18n-en_GB-patch | 4 ++++ Core/tde-i18n/tde-i18n.SlackBuild | 17 ++++++--------- Core/tdebase/tdebase.SlackBuild | 34 ++++++++++++++++++++++++++++++ 4 files changed, 51 insertions(+), 10 deletions(-) create mode 100644 Core/tde-i18n/README create mode 100644 Core/tde-i18n/tde-i18n-en_GB-patch diff --git a/Core/tde-i18n/README b/Core/tde-i18n/README new file mode 100644 index 0000000..5895888 --- /dev/null +++ b/Core/tde-i18n/README @@ -0,0 +1,6 @@ +There is an option in tde-i18n.SlackBuild to include a language specific patch file in the build. + +It needs to be named tde-i18n-{lang}-patch and will then automatically be included for the build for that language. + +Because of its position in the Slackbuild and the patch -p0 option, the path to the patch file must start with 'tde-i18n-{lang}' - see tde-i18n-en_GB-patch for an example. + diff --git a/Core/tde-i18n/tde-i18n-en_GB-patch b/Core/tde-i18n/tde-i18n-en_GB-patch new file mode 100644 index 0000000..7a8b3d9 --- /dev/null +++ b/Core/tde-i18n/tde-i18n-en_GB-patch @@ -0,0 +1,4 @@ +--- tde-i18n-en_GB/messages/tdebase/libkickermenu_prefmenu.po ++++ tde-i18n-en_GB/messages/tdebase/libkickermenu_prefmenu.po +@@ -23 +22,0 @@ +-#, fuzzy diff --git a/Core/tde-i18n/tde-i18n.SlackBuild b/Core/tde-i18n/tde-i18n.SlackBuild index 8b3b0ce..8ec87b6 100755 --- a/Core/tde-i18n/tde-i18n.SlackBuild +++ b/Core/tde-i18n/tde-i18n.SlackBuild @@ -55,10 +55,13 @@ cd $PRGNAM mkdir -p $PRGNAM # need -p for git builds if more than one lang cd $PRGNAM echo -e " copying $PRGNAM-$lang source files to build area ... \n" -cp -a $BUILD_TDE_ROOT/src/cgit/tdei18n/cgit/tde-i18n/plain/tde-i18n-$lang . -cp -a $BUILD_TDE_ROOT/src/cgit/{admin,cmake} tde-i18n-$lang/ +(cd $BUILD_TDE_ROOT/src/cgit +cp -a tdei18n/cgit/tde-i18n/plain/tde-i18n-$lang $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/ +cp -a --parents {admin,cmake}/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/tde-i18n-$lang/) } +## language specific patches +patch -p0 < $SRCDIR/tde-i18n-$lang-patch || true # continue if patch file doesn't exist chown_fn @@ -117,16 +120,10 @@ $PRGNAM-$lang: cat <> $PKG/install/doinst.sh # Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1 -fi +\$(which update-desktop-database) $INSTALL_TDE/share/applications # Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi +\$(which gtk-update-icon-cache) -f -t $INSTALL_TDE/share/icons/hicolor EOINS diff --git a/Core/tdebase/tdebase.SlackBuild b/Core/tdebase/tdebase.SlackBuild index 0680658..146af7d 100755 --- a/Core/tdebase/tdebase.SlackBuild +++ b/Core/tdebase/tdebase.SlackBuild @@ -43,6 +43,40 @@ sed -i 's|data != None|data != 0|' twin/client.cpp sed -i "s|konq_iconview|$VIEWMODE|" konqueror/profile_filemanagement.desktop ## allow for configuration files directory != /etc/trinity sed -i "s|/etc/trinity/|$SYS_CNF_DIR/|" tdm/kfrontend/gentdmconf.c || true +## make default tdm screen text clearer against dark background and align login button with clickable area +## edit color="#ffff74" and/or color="#ff0000" for your own choice +echo $' +--- tdm/kfrontend/themes/o2_enterprise/enterprise.xml ++++ tdm/kfrontend/themes/o2_enterprise/enterprise.xml +@@ -12 +12 @@ +- ++ +@@ -39 +39 @@ +- ++ +@@ -42 +42 @@ +- ++ +@@ -59 +59 @@ +- ++ +@@ -64 +64 @@ +- ++ +@@ -86,2 +86,2 @@ +- +- ++ ++ +@@ -93,2 +93,2 @@ +- +- ++ ++ +' | while read line +do +patch -p0 +done chown_fn